From f243326126d30faf6954998cc66f121ee0387cd9 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 21 Mar 2022 11:17:26 +0530
Subject: [PATCH 001/163] incr: type errors, set on frappe

---
 frappe/common/errors.js | 101 ----------------------------------------
 frappe/common/errors.ts |  71 ++++++++++++++++++++++++++++
 frappe/common/index.js  |   2 -
 frappe/index.js         |   6 ++-
 4 files changed, 75 insertions(+), 105 deletions(-)
 delete mode 100644 frappe/common/errors.js
 create mode 100644 frappe/common/errors.ts

diff --git a/frappe/common/errors.js b/frappe/common/errors.js
deleted file mode 100644
index 3d1f4da2..00000000
--- a/frappe/common/errors.js
+++ /dev/null
@@ -1,101 +0,0 @@
-const frappe = require('frappe');
-
-class BaseError extends Error {
-  constructor(statusCode, message) {
-    super(message);
-    this.name = 'BaseError';
-    this.statusCode = statusCode;
-    this.message = message;
-  }
-}
-
-class ValidationError extends BaseError {
-  constructor(message) {
-    super(417, message);
-    this.name = 'ValidationError';
-  }
-}
-
-class NotFoundError extends BaseError {
-  constructor(message) {
-    super(404, message);
-    this.name = 'NotFoundError';
-  }
-}
-
-class ForbiddenError extends BaseError {
-  constructor(message) {
-    super(403, message);
-    this.name = 'ForbiddenError';
-  }
-}
-
-class DuplicateEntryError extends ValidationError {
-  constructor(message) {
-    super(message);
-    this.name = 'DuplicateEntryError';
-  }
-}
-
-class LinkValidationError extends ValidationError {
-  constructor(message) {
-    super(message);
-    this.name = 'LinkValidationError';
-  }
-}
-
-class MandatoryError extends ValidationError {
-  constructor(message) {
-    super(message);
-    this.name = 'MandatoryError';
-  }
-}
-
-class DatabaseError extends BaseError {
-  constructor(message) {
-    super(500, message);
-    this.name = 'DatabaseError';
-  }
-}
-
-class CannotCommitError extends DatabaseError {
-  constructor(message) {
-    super(message);
-    this.name = 'CannotCommitError';
-  }
-}
-
-class ValueError extends ValidationError {}
-class Conflict extends ValidationError {}
-class InvalidFieldError extends ValidationError {}
-
-function throwError(message, error = 'ValidationError') {
-  const errorClass = {
-    ValidationError: ValidationError,
-    NotFoundError: NotFoundError,
-    ForbiddenError: ForbiddenError,
-    ValueError: ValueError,
-    Conflict: Conflict,
-  };
-  const err = new errorClass[error](message);
-  frappe.events.trigger('throw', { message, stackTrace: err.stack });
-  throw err;
-}
-
-frappe.throw = throwError;
-
-module.exports = {
-  BaseError,
-  ValidationError,
-  ValueError,
-  Conflict,
-  NotFoundError,
-  ForbiddenError,
-  DuplicateEntryError,
-  LinkValidationError,
-  DatabaseError,
-  CannotCommitError,
-  MandatoryError,
-  InvalidFieldError,
-  throw: throwError,
-};
diff --git a/frappe/common/errors.ts b/frappe/common/errors.ts
new file mode 100644
index 00000000..5cf534d1
--- /dev/null
+++ b/frappe/common/errors.ts
@@ -0,0 +1,71 @@
+export class BaseError extends Error {
+  message: string;
+  statusCode: number;
+
+  constructor(statusCode: number, message: string) {
+    super(message);
+    this.name = 'BaseError';
+    this.statusCode = statusCode;
+    this.message = message;
+  }
+}
+
+export class ValidationError extends BaseError {
+  constructor(message: string) {
+    super(417, message);
+    this.name = 'ValidationError';
+  }
+}
+
+export class NotFoundError extends BaseError {
+  constructor(message: string) {
+    super(404, message);
+    this.name = 'NotFoundError';
+  }
+}
+
+export class ForbiddenError extends BaseError {
+  constructor(message: string) {
+    super(403, message);
+    this.name = 'ForbiddenError';
+  }
+}
+
+export class DuplicateEntryError extends ValidationError {
+  constructor(message: string) {
+    super(message);
+    this.name = 'DuplicateEntryError';
+  }
+}
+
+export class LinkValidationError extends ValidationError {
+  constructor(message: string) {
+    super(message);
+    this.name = 'LinkValidationError';
+  }
+}
+
+export class MandatoryError extends ValidationError {
+  constructor(message: string) {
+    super(message);
+    this.name = 'MandatoryError';
+  }
+}
+
+export class DatabaseError extends BaseError {
+  constructor(message: string) {
+    super(500, message);
+    this.name = 'DatabaseError';
+  }
+}
+
+export class CannotCommitError extends DatabaseError {
+  constructor(message: string) {
+    super(message);
+    this.name = 'CannotCommitError';
+  }
+}
+
+export class ValueError extends ValidationError {}
+export class Conflict extends ValidationError {}
+export class InvalidFieldError extends ValidationError {}
diff --git a/frappe/common/index.js b/frappe/common/index.js
index ac11c0ce..2b99b881 100644
--- a/frappe/common/index.js
+++ b/frappe/common/index.js
@@ -1,13 +1,11 @@
 export default async function initLibs(frappe) {
   const utils = await import('../utils');
   const format = await import('../utils/format');
-  const errors = await import('./errors');
   const BaseMeta = await import('frappe/model/meta');
   const BaseDocument = await import('frappe/model/document');
 
   Object.assign(frappe, utils.default);
   Object.assign(frappe, format.default);
-  frappe.errors = errors.default;
   frappe.BaseDocument = BaseDocument.default;
   frappe.BaseMeta = BaseMeta.default;
 }
diff --git a/frappe/index.js b/frappe/index.js
index 454445f2..ebca6054 100644
--- a/frappe/index.js
+++ b/frappe/index.js
@@ -1,6 +1,7 @@
 import initLibs from 'frappe/common';
 import { getMoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
+import * as errors from './common/errors';
 import utils from './utils';
 import {
   DEFAULT_DISPLAY_PRECISION,
@@ -10,6 +11,9 @@ import Observable from './utils/observable';
 import { t, T } from './utils/translation';
 
 class Frappe {
+  t = t;
+  T = T;
+  errors = errors;
   isElectron = false;
   isServer = false;
 
@@ -383,8 +387,6 @@ class Frappe {
     isDevelopment: false,
     appVersion: '',
   };
-  t = t;
-  T = T;
 }
 
 export { T, t };

From 807a5d2da7b13826ea4352fc374992616c29ec46 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 21 Mar 2022 11:28:52 +0530
Subject: [PATCH 002/163] incr: remove utils, format from common

---
 frappe/common/index.js |  4 --
 frappe/index.js        | 10 +++--
 frappe/utils/format.js | 92 ++++++++++++++++++++----------------------
 frappe/utils/index.js  | 41 +++++--------------
 4 files changed, 61 insertions(+), 86 deletions(-)

diff --git a/frappe/common/index.js b/frappe/common/index.js
index 2b99b881..269e7ffc 100644
--- a/frappe/common/index.js
+++ b/frappe/common/index.js
@@ -1,11 +1,7 @@
 export default async function initLibs(frappe) {
-  const utils = await import('../utils');
-  const format = await import('../utils/format');
   const BaseMeta = await import('frappe/model/meta');
   const BaseDocument = await import('frappe/model/document');
 
-  Object.assign(frappe, utils.default);
-  Object.assign(frappe, format.default);
   frappe.BaseDocument = BaseDocument.default;
   frappe.BaseMeta = BaseMeta.default;
 }
diff --git a/frappe/index.js b/frappe/index.js
index ebca6054..3db2be5c 100644
--- a/frappe/index.js
+++ b/frappe/index.js
@@ -2,17 +2,21 @@ import initLibs from 'frappe/common';
 import { getMoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
 import * as errors from './common/errors';
-import utils from './utils';
+import { asyncHandler, getDuplicates, getRandomString } from './utils';
 import {
   DEFAULT_DISPLAY_PRECISION,
   DEFAULT_INTERNAL_PRECISION,
 } from './utils/consts';
+import { format } from './utils/format';
 import Observable from './utils/observable';
 import { t, T } from './utils/translation';
 
 class Frappe {
   t = t;
   T = T;
+  format = format;
+  getRandomString = getRandomString;
+
   errors = errors;
   isElectron = false;
   isServer = false;
@@ -114,7 +118,7 @@ class Frappe {
       let fieldnames = (metaDefinition.fields || [])
         .map((df) => df.fieldname)
         .sort();
-      let duplicateFieldnames = utils.getDuplicates(fieldnames);
+      let duplicateFieldnames = getDuplicates(fieldnames);
       if (duplicateFieldnames.length > 0) {
         throw new Error(
           `Duplicate fields in ${doctype}: ${duplicateFieldnames.join(', ')}`
@@ -144,7 +148,7 @@ class Frappe {
       // add to router if client-server
       this.app.post(
         `/api/method/${method}`,
-        this.asyncHandler(async function (request, response) {
+        asyncHandler(async function (request, response) {
           let data = await handler(request.body);
           if (data === undefined) {
             data = {};
diff --git a/frappe/utils/format.js b/frappe/utils/format.js
index a7b0f55d..53c63ebf 100644
--- a/frappe/utils/format.js
+++ b/frappe/utils/format.js
@@ -2,55 +2,51 @@ import frappe from 'frappe';
 import { DateTime } from 'luxon';
 import { DEFAULT_DISPLAY_PRECISION, DEFAULT_LOCALE } from './consts';
 
-export default {
-  format(value, df, doc) {
-    if (!df) {
-      return value;
-    }
-
-    if (typeof df === 'string') {
-      df = { fieldtype: df };
-    }
-
-    if (df.fieldtype === 'Currency') {
-      const currency = getCurrency(df, doc);
-      value = formatCurrency(value, currency);
-    } else if (df.fieldtype === 'Date') {
-      let dateFormat;
-      if (!frappe.SystemSettings) {
-        dateFormat = 'yyyy-MM-dd';
-      } else {
-        dateFormat = frappe.SystemSettings.dateFormat;
-      }
-
-      if (typeof value === 'string') {
-        // ISO String
-        value = DateTime.fromISO(value);
-      } else if (Object.prototype.toString.call(value) === '[object Date]') {
-        // JS Date
-        value = DateTime.fromJSDate(value);
-      }
-
-      value = value.toFormat(dateFormat);
-      if (value === 'Invalid DateTime') {
-        value = '';
-      }
-    } else if (df.fieldtype === 'Check') {
-      typeof parseInt(value) === 'number'
-        ? (value = parseInt(value))
-        : (value = Boolean(value));
-    } else {
-      if (value === null || value === undefined) {
-        value = '';
-      } else {
-        value = value + '';
-      }
-    }
+export function format(value, df, doc) {
+  if (!df) {
     return value;
-  },
-  formatCurrency,
-  formatNumber,
-};
+  }
+
+  if (typeof df === 'string') {
+    df = { fieldtype: df };
+  }
+
+  if (df.fieldtype === 'Currency') {
+    const currency = getCurrency(df, doc);
+    value = formatCurrency(value, currency);
+  } else if (df.fieldtype === 'Date') {
+    let dateFormat;
+    if (!frappe.SystemSettings) {
+      dateFormat = 'yyyy-MM-dd';
+    } else {
+      dateFormat = frappe.SystemSettings.dateFormat;
+    }
+
+    if (typeof value === 'string') {
+      // ISO String
+      value = DateTime.fromISO(value);
+    } else if (Object.prototype.toString.call(value) === '[object Date]') {
+      // JS Date
+      value = DateTime.fromJSDate(value);
+    }
+
+    value = value.toFormat(dateFormat);
+    if (value === 'Invalid DateTime') {
+      value = '';
+    }
+  } else if (df.fieldtype === 'Check') {
+    typeof parseInt(value) === 'number'
+      ? (value = parseInt(value))
+      : (value = Boolean(value));
+  } else {
+    if (value === null || value === undefined) {
+      value = '';
+    } else {
+      value = value + '';
+    }
+  }
+  return value;
+}
 
 function formatCurrency(value, currency) {
   let valueString;
diff --git a/frappe/utils/index.js b/frappe/utils/index.js
index 0abdacf7..23ed1831 100644
--- a/frappe/utils/index.js
+++ b/frappe/utils/index.js
@@ -1,15 +1,6 @@
-const { pesa } = require('pesa');
+import { pesa } from 'pesa';
 
-Array.prototype.equals = function (array) {
-  return (
-    this.length == array.length &&
-    this.every(function (item, i) {
-      return item == array[i];
-    })
-  );
-};
-
-function slug(str) {
+export function slug(str) {
   return str
     .replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) {
       return index == 0 ? letter.toLowerCase() : letter.toUpperCase();
@@ -17,17 +8,17 @@ function slug(str) {
     .replace(/\s+/g, '');
 }
 
-function getRandomString() {
+export function getRandomString() {
   return Math.random().toString(36).substr(3);
 }
 
-async function sleep(seconds) {
+export async function sleep(seconds) {
   return new Promise((resolve) => {
     setTimeout(resolve, seconds * 1000);
   });
 }
 
-function getQueryString(params) {
+export function getQueryString(params) {
   if (!params) return '';
   let parts = [];
   for (let key in params) {
@@ -40,7 +31,7 @@ function getQueryString(params) {
   return parts.join('&');
 }
 
-function asyncHandler(fn) {
+export function asyncHandler(fn) {
   return (req, res, next) =>
     Promise.resolve(fn(req, res, next)).catch((err) => {
       console.log(err);
@@ -53,13 +44,13 @@ function asyncHandler(fn) {
  * Returns array from 0 to n - 1
  * @param {Number} n
  */
-function range(n) {
+export function range(n) {
   return Array(n)
     .fill()
     .map((_, i) => i);
 }
 
-function unique(list, key = (it) => it) {
+export function unique(list, key = (it) => it) {
   var seen = {};
   return list.filter((item) => {
     var k = key(item);
@@ -67,7 +58,7 @@ function unique(list, key = (it) => it) {
   });
 }
 
-function getDuplicates(array) {
+export function getDuplicates(array) {
   let duplicates = [];
   for (let i in array) {
     let previous = array[i - 1];
@@ -82,18 +73,6 @@ function getDuplicates(array) {
   return duplicates;
 }
 
-function isPesa(value) {
+export function isPesa(value) {
   return value instanceof pesa().constructor;
 }
-
-module.exports = {
-  slug,
-  getRandomString,
-  sleep,
-  getQueryString,
-  asyncHandler,
-  range,
-  unique,
-  getDuplicates,
-  isPesa,
-};

From 26e030106fece3ae1410b5c95ee49e35ce231834 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 21 Mar 2022 12:09:06 +0530
Subject: [PATCH 003/163] incr: rename Meta and Document

---
 frappe/backends/helpers.ts                    | 24 ++++++++++++++
 frappe/backends/sqlite.js                     | 32 ++-----------------
 frappe/common/index.js                        |  7 ----
 frappe/index.js                               | 14 ++++----
 frappe/model/meta.js                          | 25 ++++++++-------
 .../NumberSeries/NumberSeriesDocument.js      |  4 +--
 frappe/utils/noop.js                          |  1 -
 models/doctype/Account/AccountDocument.js     |  4 +--
 models/doctype/Event/EventDocument.js         |  4 +--
 models/doctype/GSTR3B/GSTR3BDocument.js       |  4 +--
 .../JournalEntry/JournalEntryServer.js        |  4 +--
 models/doctype/Party/PartyServer.js           |  4 +--
 models/doctype/Payment/PaymentServer.js       |  4 +--
 .../Transaction/TransactionDocument.js        |  4 +--
 src/initialization.js                         |  2 +-
 src/utils.js                                  |  4 +--
 16 files changed, 67 insertions(+), 74 deletions(-)
 create mode 100644 frappe/backends/helpers.ts
 delete mode 100644 frappe/common/index.js
 delete mode 100644 frappe/utils/noop.js

diff --git a/frappe/backends/helpers.ts b/frappe/backends/helpers.ts
new file mode 100644
index 00000000..1d2d38a4
--- /dev/null
+++ b/frappe/backends/helpers.ts
@@ -0,0 +1,24 @@
+export const sqliteTypeMap = {
+  AutoComplete: 'text',
+  Currency: 'text',
+  Int: 'integer',
+  Float: 'float',
+  Percent: 'float',
+  Check: 'integer',
+  Code: 'text',
+  Date: 'text',
+  Datetime: 'text',
+  Time: 'text',
+  Text: 'text',
+  Data: 'text',
+  Link: 'text',
+  DynamicLink: 'text',
+  Password: 'text',
+  Select: 'text',
+  File: 'text',
+  Attach: 'text',
+  AttachImage: 'text',
+  Color: 'text',
+};
+
+export const validTypes = Object.keys(sqliteTypeMap);
diff --git a/frappe/backends/sqlite.js b/frappe/backends/sqlite.js
index 0d76cf5b..f9f8a58a 100644
--- a/frappe/backends/sqlite.js
+++ b/frappe/backends/sqlite.js
@@ -1,5 +1,6 @@
 import frappe from 'frappe';
 import Database from './database';
+import { sqliteTypeMap } from './helpers';
 
 export default class SqliteDatabase extends Database {
   constructor({ dbPath }) {
@@ -67,36 +68,7 @@ export default class SqliteDatabase extends Database {
   }
 
   initTypeMap() {
-    // prettier-ignore
-    this.typeMap = {
-      'AutoComplete': 'text',
-      'Currency': 'text',
-      'Int': 'integer',
-      'Float': 'float',
-      'Percent': 'float',
-      'Check': 'integer',
-      'Small Text': 'text',
-      'Long Text': 'text',
-      'Code': 'text',
-      'Text Editor': 'text',
-      'Date': 'text',
-      'Datetime': 'text',
-      'Time': 'text',
-      'Text': 'text',
-      'Data': 'text',
-      'Link': 'text',
-      'DynamicLink': 'text',
-      'Password': 'text',
-      'Select': 'text',
-      'Read Only': 'text',
-      'File': 'text',
-      'Attach': 'text',
-      'AttachImage': 'text',
-      'Signature': 'text',
-      'Color': 'text',
-      'Barcode': 'text',
-      'Geolocation': 'text'
-    };
+    this.typeMap = sqliteTypeMap;
   }
 
   getError(err) {
diff --git a/frappe/common/index.js b/frappe/common/index.js
deleted file mode 100644
index 269e7ffc..00000000
--- a/frappe/common/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default async function initLibs(frappe) {
-  const BaseMeta = await import('frappe/model/meta');
-  const BaseDocument = await import('frappe/model/document');
-
-  frappe.BaseDocument = BaseDocument.default;
-  frappe.BaseMeta = BaseMeta.default;
-}
diff --git a/frappe/index.js b/frappe/index.js
index 3db2be5c..5976dbb2 100644
--- a/frappe/index.js
+++ b/frappe/index.js
@@ -1,4 +1,3 @@
-import initLibs from 'frappe/common';
 import { getMoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
 import * as errors from './common/errors';
@@ -23,7 +22,10 @@ class Frappe {
 
   async initializeAndRegister(customModels = {}, force = false) {
     this.init(force);
-    await initLibs(this);
+
+    this.Meta = (await import('frappe/model/meta')).default;
+    this.Document = (await import('frappe/model/document')).default;
+
     const coreModels = await import('frappe/models');
     this.registerModels(coreModels.default);
     this.registerModels(customModels);
@@ -233,7 +235,7 @@ class Frappe {
         throw new Error(`${doctype} is not a registered doctype`);
       }
 
-      let metaClass = model.metaClass || this.BaseMeta;
+      let metaClass = model.metaClass || this.Meta;
       this.metaCache[doctype] = new metaClass(model);
     }
 
@@ -257,7 +259,7 @@ class Frappe {
 
   getDocumentClass(doctype) {
     const meta = this.getMeta(doctype);
-    return meta.documentClass || this.BaseDocument;
+    return meta.documentClass || this.Document;
   }
 
   async getSingle(doctype) {
@@ -292,7 +294,7 @@ class Frappe {
   }
 
   async newCustomDoc(fields) {
-    let doc = new this.BaseDocument({ isCustom: 1, fields });
+    let doc = new this.Document({ isCustom: 1, fields });
     doc._notInserted = true;
     doc.name = this.getRandomString();
     this.addToCache(doc);
@@ -300,7 +302,7 @@ class Frappe {
   }
 
   createMeta(fields) {
-    let meta = new this.BaseMeta({ isCustom: 1, fields });
+    let meta = new this.Meta({ isCustom: 1, fields });
     return meta;
   }
 
diff --git a/frappe/model/meta.js b/frappe/model/meta.js
index 5b3dc5c4..f3f0611b 100644
--- a/frappe/model/meta.js
+++ b/frappe/model/meta.js
@@ -1,9 +1,12 @@
 import frappe from 'frappe';
+import { validTypes } from 'frappe/backends/helpers';
+import { ValueError } from 'frappe/common/errors';
 import { indicators as indicatorColor } from '../../src/colors';
+import { t } from '../utils/translation';
 import Document from './document';
 import model from './index';
 
-export default class BaseMeta extends Document {
+export default class Meta extends Document {
   constructor(data) {
     if (data.basedOn) {
       let config = frappe.models[data.basedOn];
@@ -33,7 +36,7 @@ export default class BaseMeta extends Document {
     if (!this.fields.find((df) => df.fieldname === 'name') && !this.isSingle) {
       this.fields = [
         {
-          label: frappe.t`ID`,
+          label: t`ID`,
           fieldname: 'name',
           fieldtype: 'Data',
           required: 1,
@@ -149,12 +152,12 @@ export default class BaseMeta extends Document {
       // fields validation
       this.fields.forEach((df, i) => {
         if (!df.fieldname) {
-          throw new frappe.errors.ValidationError(
+          throw new ValidationError(
             `DocType ${this.name}: "fieldname" is required for field at index ${i}`
           );
         }
         if (!df.fieldtype) {
-          throw new frappe.errors.ValidationError(
+          throw new ValidationError(
             `DocType ${this.name}: "fieldtype" is required for field "${df.fieldname}"`
           );
         }
@@ -165,7 +168,7 @@ export default class BaseMeta extends Document {
       // standard fields
       for (let field of model.commonFields) {
         if (
-          frappe.db.typeMap[field.fieldtype] &&
+          validTypes.includes(field.fieldtype) &&
           !doctypeFields.includes(field.fieldname)
         ) {
           _add(field);
@@ -176,7 +179,7 @@ export default class BaseMeta extends Document {
         _add({
           fieldtype: 'Check',
           fieldname: 'submitted',
-          label: frappe.t`Submitted`,
+          label: t`Submitted`,
         });
       }
 
@@ -184,7 +187,7 @@ export default class BaseMeta extends Document {
         // child fields
         for (let field of model.childFields) {
           if (
-            frappe.db.typeMap[field.fieldtype] &&
+            validTypes.includes(field.fieldtype) &&
             !doctypeFields.includes(field.fieldname)
           ) {
             _add(field);
@@ -194,7 +197,7 @@ export default class BaseMeta extends Document {
         // parent fields
         for (let field of model.parentFields) {
           if (
-            frappe.db.typeMap[field.fieldtype] &&
+            validTypes.includes(field.fieldtype) &&
             !doctypeFields.includes(field.fieldname)
           ) {
             _add(field);
@@ -206,7 +209,7 @@ export default class BaseMeta extends Document {
         // tree fields
         for (let field of model.treeFields) {
           if (
-            frappe.db.typeMap[field.fieldtype] &&
+            validTypes.includes(field.fieldtype) &&
             !doctypeFields.includes(field.fieldname)
           ) {
             _add(field);
@@ -216,7 +219,7 @@ export default class BaseMeta extends Document {
 
       // doctype fields
       for (let field of this.fields) {
-        let include = frappe.db.typeMap[field.fieldtype];
+        const include = validTypes.includes(field.fieldtype);
 
         if (include) {
           _add(field);
@@ -278,7 +281,7 @@ export default class BaseMeta extends Document {
     }
 
     if (!validValues.includes(value)) {
-      throw new frappe.errors.ValueError(
+      throw new ValueError(
         // prettier-ignore
         `DocType ${this.name}: Invalid value "${value}" for "${field.label}". Must be one of ${options.join(', ')}`
       );
diff --git a/frappe/models/doctype/NumberSeries/NumberSeriesDocument.js b/frappe/models/doctype/NumberSeries/NumberSeriesDocument.js
index 7b83ab6c..09c6f73c 100644
--- a/frappe/models/doctype/NumberSeries/NumberSeriesDocument.js
+++ b/frappe/models/doctype/NumberSeries/NumberSeriesDocument.js
@@ -1,8 +1,8 @@
 import { getPaddedName } from '@/utils';
 import frappe from 'frappe';
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 
-export default class NumberSeries extends BaseDocument {
+export default class NumberSeries extends Document {
   validate() {
     if (!this.current) {
       this.current = this.start;
diff --git a/frappe/utils/noop.js b/frappe/utils/noop.js
deleted file mode 100644
index bd375ffa..00000000
--- a/frappe/utils/noop.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = function () { return function () {}; };
\ No newline at end of file
diff --git a/models/doctype/Account/AccountDocument.js b/models/doctype/Account/AccountDocument.js
index b16f1463..f2fa2abb 100644
--- a/models/doctype/Account/AccountDocument.js
+++ b/models/doctype/Account/AccountDocument.js
@@ -1,7 +1,7 @@
 import frappe from 'frappe';
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 
-export default class Account extends BaseDocument {
+export default class Account extends Document {
   async validate() {
     if (!this.accountType && this.parentAccount) {
       this.accountType = await frappe.db.getValue(
diff --git a/models/doctype/Event/EventDocument.js b/models/doctype/Event/EventDocument.js
index 077fbad4..c6c06908 100644
--- a/models/doctype/Event/EventDocument.js
+++ b/models/doctype/Event/EventDocument.js
@@ -1,6 +1,6 @@
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 
-export default class Event extends BaseDocument {
+export default class Event extends Document {
   alertEvent() {
     alert(this.title);
   }
diff --git a/models/doctype/GSTR3B/GSTR3BDocument.js b/models/doctype/GSTR3B/GSTR3BDocument.js
index 31721db5..88cfec2c 100644
--- a/models/doctype/GSTR3B/GSTR3BDocument.js
+++ b/models/doctype/GSTR3B/GSTR3BDocument.js
@@ -1,8 +1,8 @@
 import frappe from 'frappe';
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 import format from './GSTR3BFormat';
 
-export default class GSTR3B extends BaseDocument {
+export default class GSTR3B extends Document {
   async getData() {
     const monthIndex = [
       'January',
diff --git a/models/doctype/JournalEntry/JournalEntryServer.js b/models/doctype/JournalEntry/JournalEntryServer.js
index c081e720..f10f6ce3 100644
--- a/models/doctype/JournalEntry/JournalEntryServer.js
+++ b/models/doctype/JournalEntry/JournalEntryServer.js
@@ -1,7 +1,7 @@
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 import LedgerPosting from '../../../accounting/ledgerPosting';
 
-export default class JournalEntryServer extends BaseDocument {
+export default class JournalEntryServer extends Document {
   getPosting() {
     let entries = new LedgerPosting({ reference: this });
 
diff --git a/models/doctype/Party/PartyServer.js b/models/doctype/Party/PartyServer.js
index 174811c5..6145ad88 100644
--- a/models/doctype/Party/PartyServer.js
+++ b/models/doctype/Party/PartyServer.js
@@ -1,7 +1,7 @@
 import frappe from 'frappe';
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 
-export default class PartyServer extends BaseDocument {
+export default class PartyServer extends Document {
   beforeInsert() {
     if (this.customer && this.supplier) {
       frappe.call({
diff --git a/models/doctype/Payment/PaymentServer.js b/models/doctype/Payment/PaymentServer.js
index 64be0a5c..4f4e6f19 100644
--- a/models/doctype/Payment/PaymentServer.js
+++ b/models/doctype/Payment/PaymentServer.js
@@ -1,8 +1,8 @@
 import frappe from 'frappe';
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 import LedgerPosting from '../../../accounting/ledgerPosting';
 
-export default class PaymentServer extends BaseDocument {
+export default class PaymentServer extends Document {
   async change({ changed }) {
     switch (changed) {
       case 'for': {
diff --git a/models/doctype/Transaction/TransactionDocument.js b/models/doctype/Transaction/TransactionDocument.js
index 6564e5c8..49faf74b 100644
--- a/models/doctype/Transaction/TransactionDocument.js
+++ b/models/doctype/Transaction/TransactionDocument.js
@@ -1,8 +1,8 @@
 import frappe from 'frappe';
-import BaseDocument from 'frappe/model/document';
+import Document from 'frappe/model/document';
 import { getExchangeRate } from '../../../accounting/exchangeRate';
 
-export default class TransactionDocument extends BaseDocument {
+export default class TransactionDocument extends Document {
   async getExchangeRate() {
     if (!this.currency) return 1.0;
 
diff --git a/src/initialization.js b/src/initialization.js
index c536ac99..c49a2255 100644
--- a/src/initialization.js
+++ b/src/initialization.js
@@ -108,7 +108,7 @@ export async function connectToLocalDatabase(filePath) {
 export async function purgeCache(purgeAll = false) {
   const filterFunction = purgeAll
     ? () => true
-    : (d) => frappe.docs[d][d] instanceof frappe.BaseMeta;
+    : (d) => frappe.docs[d][d] instanceof frappe.Meta;
 
   Object.keys(frappe.docs)
     .filter(filterFunction)
diff --git a/src/utils.js b/src/utils.js
index 7ed1f4e6..677639c9 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -484,7 +484,7 @@ export function formatXLabels(label) {
 export function stringifyCircular(
   obj,
   ignoreCircular = false,
-  convertBaseDocument = false
+  convertDocument = false
 ) {
   const cacheKey = [];
   const cacheValue = [];
@@ -504,7 +504,7 @@ export function stringifyCircular(
     cacheKey.push(key);
     cacheValue.push(value);
 
-    if (convertBaseDocument && value instanceof frappe.BaseDocument) {
+    if (convertDocument && value instanceof frappe.Document) {
       return value.getValidDict();
     }
 

From 9424b131be8987886b9402d24f63a00dab59bb6e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 21 Mar 2022 12:19:19 +0530
Subject: [PATCH 004/163] incr: remove common - utils is frontend safe

---
 frappe/index.js                    | 2 +-
 frappe/model/meta.js               | 2 +-
 frappe/{common => utils}/errors.ts | 0
 frappe/utils/translation.js        | 2 +-
 src/errorHandling.ts               | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename frappe/{common => utils}/errors.ts (100%)

diff --git a/frappe/index.js b/frappe/index.js
index 5976dbb2..9ee5495b 100644
--- a/frappe/index.js
+++ b/frappe/index.js
@@ -1,6 +1,6 @@
 import { getMoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
-import * as errors from './common/errors';
+import * as errors from './utils/errors';
 import { asyncHandler, getDuplicates, getRandomString } from './utils';
 import {
   DEFAULT_DISPLAY_PRECISION,
diff --git a/frappe/model/meta.js b/frappe/model/meta.js
index f3f0611b..9fa66c87 100644
--- a/frappe/model/meta.js
+++ b/frappe/model/meta.js
@@ -1,6 +1,6 @@
 import frappe from 'frappe';
 import { validTypes } from 'frappe/backends/helpers';
-import { ValueError } from 'frappe/common/errors';
+import { ValueError } from 'frappe/utils/errors';
 import { indicators as indicatorColor } from '../../src/colors';
 import { t } from '../utils/translation';
 import Document from './document';
diff --git a/frappe/common/errors.ts b/frappe/utils/errors.ts
similarity index 100%
rename from frappe/common/errors.ts
rename to frappe/utils/errors.ts
diff --git a/frappe/utils/translation.js b/frappe/utils/translation.js
index dd5e1089..5a0847d4 100644
--- a/frappe/utils/translation.js
+++ b/frappe/utils/translation.js
@@ -4,7 +4,7 @@ import {
   getSnippets,
   getWhitespaceSanitized,
 } from '../../scripts/helpers';
-import { ValueError } from '../common/errors';
+import { ValueError } from './errors';
 
 class TranslationString {
   constructor(...args) {
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 3d1a4aba..9e10662d 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -5,7 +5,7 @@ import {
   LinkValidationError,
   MandatoryError,
   ValidationError,
-} from 'frappe/common/errors';
+} from 'frappe/utils/errors';
 import Document from 'frappe/model/document';
 import config, { ConfigKeys, TelemetrySetting } from './config';
 import { IPC_ACTIONS, IPC_MESSAGES } from './messages';

From dc5d705a528f4968ee4feef89252d786c185b2d6 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 22 Mar 2022 11:01:03 +0530
Subject: [PATCH 005/163] incr: shift auth out of Frappe to auth

---
 frappe/core/auth.ts      | 88 ++++++++++++++++++++++++++++++++++++++++
 frappe/index.js          | 78 ++++-------------------------------
 frappe/model/document.js |  4 +-
 src/initialization.js    |  2 +-
 4 files changed, 100 insertions(+), 72 deletions(-)
 create mode 100644 frappe/core/auth.ts

diff --git a/frappe/core/auth.ts b/frappe/core/auth.ts
new file mode 100644
index 00000000..bddba15a
--- /dev/null
+++ b/frappe/core/auth.ts
@@ -0,0 +1,88 @@
+interface AuthConfig {
+  serverURL: string;
+  backend: string;
+  port: number;
+}
+
+interface Session {
+  user: string;
+  token: string;
+}
+
+export class Auth {
+  #config: AuthConfig;
+  #session: Session;
+
+  constructor() {
+    this.#config = {
+      serverURL: '',
+      backend: 'sqlite',
+      port: 8000,
+    };
+
+    this.#session = {
+      user: '',
+      token: '',
+    };
+  }
+
+  get session(): Readonly<Session> {
+    return { ...this.#session };
+  }
+
+  get config(): Readonly<AuthConfig> {
+    return { ...this.#config };
+  }
+
+  async login(email: string, password: string) {
+    if (email === 'Administrator') {
+      this.#session.user = 'Administrator';
+      return;
+    }
+
+    const response = await fetch(this.#getServerURL() + '/api/login', {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ email, password }),
+    });
+
+    if (response.status === 200) {
+      const res = await response.json();
+
+      this.#session.user = email;
+      this.#session.token = res.token;
+
+      return res;
+    }
+
+    return response;
+  }
+
+  async signup(email: string, fullName: string, password: string) {
+    const response = await fetch(this.#getServerURL() + '/api/signup', {
+      method: 'POST',
+      headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ email, fullName, password }),
+    });
+
+    if (response.status === 200) {
+      return await response.json();
+    }
+
+    return response;
+  }
+
+  async logout() {
+    // TODO: Implement this with auth flow
+  }
+
+  #getServerURL() {
+    return this.#config.serverURL || '';
+  }
+}
diff --git a/frappe/index.js b/frappe/index.js
index 9ee5495b..954f150b 100644
--- a/frappe/index.js
+++ b/frappe/index.js
@@ -1,11 +1,12 @@
 import { getMoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
-import * as errors from './utils/errors';
+import { Auth } from './core/auth';
 import { asyncHandler, getDuplicates, getRandomString } from './utils';
 import {
   DEFAULT_DISPLAY_PRECISION,
   DEFAULT_INTERNAL_PRECISION,
 } from './utils/consts';
+import * as errors from './utils/errors';
 import { format } from './utils/format';
 import Observable from './utils/observable';
 import { t, T } from './utils/translation';
@@ -20,6 +21,10 @@ class Frappe {
   isElectron = false;
   isServer = false;
 
+  constructor() {
+    this.auth = new Auth();
+  }
+
   async initializeAndRegister(customModels = {}, force = false) {
     this.init(force);
 
@@ -80,25 +85,15 @@ class Frappe {
   init(force) {
     if (this._initialized && !force) return;
 
-    // Initialize Config
-    this.config = {
-      serverURL: '',
-      backend: 'sqlite',
-      port: 8000,
-    };
-
     // Initialize Globals
     this.metaCache = {};
     this.models = {};
-    this.forms = {};
-    this.views = {};
-    this.flags = {};
+
     this.methods = {};
     this.errorLog = [];
 
     // temp params while calling routes
     this.temp = {};
-    this.params = {};
 
     this.docs = new Observable();
     this.events = new Observable();
@@ -139,6 +134,7 @@ class Frappe {
     return filterFunction ? models.filter(filterFunction) : models;
   }
 
+  // del
   registerView(view, name, module) {
     if (!this.views[view]) this.views[view] = {};
     this.views[view][name] = module;
@@ -328,65 +324,9 @@ class Frappe {
     }
   }
 
-  // only for client side
-  async login(email, password) {
-    if (email === 'Administrator') {
-      this.session = {
-        user: 'Administrator',
-      };
-      return;
-    }
-
-    let response = await fetch(this.getServerURL() + '/api/login', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ email, password }),
-    });
-
-    if (response.status === 200) {
-      const res = await response.json();
-
-      this.session = {
-        user: email,
-        token: res.token,
-      };
-
-      return res;
-    }
-
-    return response;
-  }
-
-  async signup(email, fullName, password) {
-    let response = await fetch(this.getServerURL() + '/api/signup', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ email, fullName, password }),
-    });
-
-    if (response.status === 200) {
-      return await response.json();
-    }
-
-    return response;
-  }
-
-  getServerURL() {
-    return this.config.serverURL || '';
-  }
-
   close() {
     this.db.close();
-
-    if (this.server) {
-      this.server.close();
-    }
+    this.auth.logout();
   }
 
   store = {
diff --git a/frappe/model/document.js b/frappe/model/document.js
index d91f983d..f88c7e66 100644
--- a/frappe/model/document.js
+++ b/frappe/model/document.js
@@ -321,7 +321,7 @@ export default class Document extends Observable {
 
       let now = new Date().toISOString();
       if (!this.owner) {
-        this.owner = frappe.session.user;
+        this.owner = frappe.auth.session.user;
       }
 
       if (!this.creation) {
@@ -335,7 +335,7 @@ export default class Document extends Observable {
   updateModified() {
     if (frappe.isServer) {
       let now = new Date().toISOString();
-      this.modifiedBy = frappe.session.user;
+      this.modifiedBy = frappe.auth.session.user
       this.modified = now;
     }
   }
diff --git a/src/initialization.js b/src/initialization.js
index c49a2255..a95287e6 100644
--- a/src/initialization.js
+++ b/src/initialization.js
@@ -39,7 +39,7 @@ export async function connectToLocalDatabase(filePath) {
     return { connectionSuccess: false, reason: DB_CONN_FAILURE.INVALID_FILE };
   }
 
-  frappe.login('Administrator');
+  frappe.auth.login('Administrator');
   try {
     frappe.db = new SQLiteDatabase({
       dbPath: filePath,

From 82709165a40661199c2eae9ed4b1802eb54eb252 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 22 Mar 2022 11:30:33 +0530
Subject: [PATCH 006/163] chore: rename getNewDoc, newDoc - delete irrelevant
 tests

---
 accounting/importCOA.js                   |   2 +-
 accounting/ledgerPosting.js               |   2 +-
 frappe/backends/database.js               |   9 +-
 frappe/index.js                           | 160 ++++++++++------------
 frappe/model/document.js                  |   8 +-
 frappe/model/naming.js                    |   4 +-
 frappe/model/runPatches.js                |   2 +-
 models/doctype/Item/Item.js               |   4 +-
 models/doctype/Party/Customer.js          |   2 +-
 models/doctype/Party/Supplier.js          |   2 +-
 models/doctype/Tax/RegionalEntries.js     |   2 +-
 models/doctype/Transaction/Transaction.js |   2 +-
 src/components/Controls/Link.vue          |   7 +-
 src/components/FilterDropdown.vue         |   6 +-
 src/components/TwoColumnForm.vue          |   6 +-
 src/dataImport.ts                         |   2 +-
 src/pages/ChartOfAccounts.vue             |   8 +-
 src/pages/Dashboard/UnpaidInvoices.vue    |   3 +-
 src/pages/ListView/ListView.vue           |  10 +-
 src/pages/SetupWizard/SetupWizard.vue     |  19 ++-
 src/pages/SetupWizard/setupCompany.js     |   2 +-
 tests/testInvoice.js                      |  56 --------
 22 files changed, 145 insertions(+), 173 deletions(-)
 delete mode 100644 tests/testInvoice.js

diff --git a/accounting/importCOA.js b/accounting/importCOA.js
index d1629840..e9c4bd33 100644
--- a/accounting/importCOA.js
+++ b/accounting/importCOA.js
@@ -25,7 +25,7 @@ async function importAccounts(children, parentAccount, rootType, rootAccount) {
     const { accountType, accountNumber } = child;
     const accountName = getAccountName(rootName, accountNumber);
     const isGroup = identifyIsGroup(child);
-    const doc = frappe.newDoc({
+    const doc = frappe.getNewDoc({
       doctype: 'Account',
       name: accountName,
       parentAccount,
diff --git a/accounting/ledgerPosting.js b/accounting/ledgerPosting.js
index f2f504bf..58a17817 100644
--- a/accounting/ledgerPosting.js
+++ b/accounting/ledgerPosting.js
@@ -145,7 +145,7 @@ export default class LedgerPosting {
 
   async insertEntries() {
     for (let entry of this.entries) {
-      let entryDoc = frappe.newDoc({
+      let entryDoc = frappe.getNewDoc({
         doctype: 'AccountingLedgerEntry',
       });
       Object.assign(entryDoc, entry);
diff --git a/frappe/backends/database.js b/frappe/backends/database.js
index f1bc6874..af4839b8 100644
--- a/frappe/backends/database.js
+++ b/frappe/backends/database.js
@@ -2,6 +2,7 @@ import frappe from 'frappe';
 import Observable from 'frappe/utils/observable';
 import Knex from 'knex';
 import CacheManager from '../utils/cacheManager';
+import { getRandomString } from '../utils/index';
 
 export default class Database extends Observable {
   constructor() {
@@ -49,7 +50,7 @@ export default class Database extends Observable {
       if (await this.singleExists(doctype)) {
         const singleValues = await this.getSingleFieldsToInsert(doctype);
         singleValues.forEach(({ fieldname, value }) => {
-          let singleValue = frappe.newDoc({
+          let singleValue = frappe.getNewDoc({
             doctype: 'SingleValue',
             parent: doctype,
             fieldname,
@@ -429,7 +430,7 @@ export default class Database extends Observable {
     let fields = this.getValidFields(doctype);
 
     if (!doc.name) {
-      doc.name = frappe.getRandomString();
+      doc.name = getRandomString();
     }
 
     let formattedDoc = this.getFormattedDoc(fields, doc);
@@ -509,7 +510,7 @@ export default class Database extends Observable {
     for (let field of meta.getValidFields({ withChildren: false })) {
       let value = doc[field.fieldname];
       if (value != null) {
-        let singleValue = frappe.newDoc({
+        let singleValue = frappe.getNewDoc({
           doctype: 'SingleValue',
           parent: doctype,
           fieldname: field.fieldname,
@@ -540,7 +541,7 @@ export default class Database extends Observable {
 
   prepareChild(parenttype, parent, child, field, idx) {
     if (!child.name) {
-      child.name = frappe.getRandomString();
+      child.name = getRandomString();
     }
     child.parent = parent;
     child.parenttype = parenttype;
diff --git a/frappe/index.js b/frappe/index.js
index 954f150b..e627ac86 100644
--- a/frappe/index.js
+++ b/frappe/index.js
@@ -15,7 +15,6 @@ class Frappe {
   t = t;
   T = T;
   format = format;
-  getRandomString = getRandomString;
 
   errors = errors;
   isElectron = false;
@@ -36,6 +35,67 @@ class Frappe {
     this.registerModels(customModels);
   }
 
+  init(force) {
+    if (this._initialized && !force) return;
+
+    // Initialize Globals
+    this.metaCache = {};
+    this.models = {};
+
+    this.methods = {};
+    this.errorLog = [];
+
+    // temp params while calling routes
+    this.temp = {};
+
+    this.docs = new Observable();
+    this.events = new Observable();
+    this._initialized = true;
+  }
+
+  registerModels(models) {
+    // register models from app/models/index.js
+    for (let doctype in models) {
+      let metaDefinition = models[doctype];
+      if (!metaDefinition.name) {
+        throw new Error(`Name is mandatory for ${doctype}`);
+      }
+      if (metaDefinition.name !== doctype) {
+        throw new Error(
+          `Model name mismatch for ${doctype}: ${metaDefinition.name}`
+        );
+      }
+      let fieldnames = (metaDefinition.fields || [])
+        .map((df) => df.fieldname)
+        .sort();
+      let duplicateFieldnames = getDuplicates(fieldnames);
+      if (duplicateFieldnames.length > 0) {
+        throw new Error(
+          `Duplicate fields in ${doctype}: ${duplicateFieldnames.join(', ')}`
+        );
+      }
+
+      this.models[doctype] = metaDefinition;
+    }
+  }
+
+  registerMethod({ method, handler }) {
+    this.methods[method] = handler;
+    if (this.app) {
+      // add to router if client-server
+      this.app.post(
+        `/api/method/${method}`,
+        asyncHandler(async function (request, response) {
+          let data = await handler(request.body);
+          if (data === undefined) {
+            data = {};
+          }
+          return response.json(data);
+        })
+      );
+    }
+  }
+
   async initializeMoneyMaker(currency) {
     currency ??= 'XXX';
 
@@ -82,50 +142,6 @@ class Frappe {
     });
   }
 
-  init(force) {
-    if (this._initialized && !force) return;
-
-    // Initialize Globals
-    this.metaCache = {};
-    this.models = {};
-
-    this.methods = {};
-    this.errorLog = [];
-
-    // temp params while calling routes
-    this.temp = {};
-
-    this.docs = new Observable();
-    this.events = new Observable();
-    this._initialized = true;
-  }
-
-  registerModels(models) {
-    // register models from app/models/index.js
-    for (let doctype in models) {
-      let metaDefinition = models[doctype];
-      if (!metaDefinition.name) {
-        throw new Error(`Name is mandatory for ${doctype}`);
-      }
-      if (metaDefinition.name !== doctype) {
-        throw new Error(
-          `Model name mismatch for ${doctype}: ${metaDefinition.name}`
-        );
-      }
-      let fieldnames = (metaDefinition.fields || [])
-        .map((df) => df.fieldname)
-        .sort();
-      let duplicateFieldnames = getDuplicates(fieldnames);
-      if (duplicateFieldnames.length > 0) {
-        throw new Error(
-          `Duplicate fields in ${doctype}: ${duplicateFieldnames.join(', ')}`
-        );
-      }
-
-      this.models[doctype] = metaDefinition;
-    }
-  }
-
   getModels(filterFunction) {
     let models = [];
     for (let doctype in this.models) {
@@ -134,29 +150,6 @@ class Frappe {
     return filterFunction ? models.filter(filterFunction) : models;
   }
 
-  // del
-  registerView(view, name, module) {
-    if (!this.views[view]) this.views[view] = {};
-    this.views[view][name] = module;
-  }
-
-  registerMethod({ method, handler }) {
-    this.methods[method] = handler;
-    if (this.app) {
-      // add to router if client-server
-      this.app.post(
-        `/api/method/${method}`,
-        asyncHandler(async function (request, response) {
-          let data = await handler(request.body);
-          if (data === undefined) {
-            data = {};
-          }
-          return response.json(data);
-        })
-      );
-    }
-  }
-
   async call({ method, args }) {
     if (this.isServer) {
       if (this.methods[method]) {
@@ -263,7 +256,7 @@ class Frappe {
   }
 
   async getDuplicate(doc) {
-    const newDoc = await this.getNewDoc(doc.doctype);
+    const newDoc = await this.getEmptyDoc(doc.doctype);
     for (let field of this.getMeta(doc.doctype).getValidFields()) {
       if (['name', 'submitted'].includes(field.fieldname)) continue;
       if (field.fieldtype === 'Table') {
@@ -279,37 +272,26 @@ class Frappe {
     return newDoc;
   }
 
-  getNewDoc(doctype, cacheDoc = true) {
-    let doc = this.newDoc({ doctype: doctype });
+  getEmptyDoc(doctype, cacheDoc = true) {
+    let doc = this.getNewDoc({ doctype: doctype });
     doc._notInserted = true;
-    doc.name = frappe.getRandomString();
+    doc.name = getRandomString();
+
     if (cacheDoc) {
       this.addToCache(doc);
     }
+
     return doc;
   }
 
-  async newCustomDoc(fields) {
-    let doc = new this.Document({ isCustom: 1, fields });
-    doc._notInserted = true;
-    doc.name = this.getRandomString();
-    this.addToCache(doc);
-    return doc;
-  }
-
-  createMeta(fields) {
-    let meta = new this.Meta({ isCustom: 1, fields });
-    return meta;
-  }
-
-  newDoc(data) {
+  getNewDoc(data) {
     let doc = new (this.getDocumentClass(data.doctype))(data);
     doc.setDefaults();
     return doc;
   }
 
-  async insert(data) {
-    return await this.newDoc(data).insert();
+  createMeta(fields) {
+    return new this.Meta({ isCustom: 1, fields });
   }
 
   async syncDoc(data) {
@@ -319,7 +301,7 @@ class Frappe {
       Object.assign(doc, data);
       await doc.update();
     } else {
-      doc = this.newDoc(data);
+      doc = this.getNewDoc(data);
       await doc.insert();
     }
   }
diff --git a/frappe/model/document.js b/frappe/model/document.js
index f88c7e66..fc7303c6 100644
--- a/frappe/model/document.js
+++ b/frappe/model/document.js
@@ -3,7 +3,7 @@ import { Verb } from '@/telemetry/types';
 import frappe from 'frappe';
 import Observable from 'frappe/utils/observable';
 import { DEFAULT_INTERNAL_PRECISION } from '../utils/consts';
-import { isPesa } from '../utils/index';
+import { getRandomString, isPesa } from '../utils/index';
 import { setName } from './naming';
 
 export default class Document extends Observable {
@@ -190,7 +190,7 @@ export default class Document extends Observable {
     }
 
     if (!data.name) {
-      data.name = frappe.getRandomString();
+      data.name = getRandomString();
     }
 
     const childDoc = new Document(data);
@@ -335,7 +335,7 @@ export default class Document extends Observable {
   updateModified() {
     if (frappe.isServer) {
       let now = new Date().toISOString();
-      this.modifiedBy = frappe.auth.session.user
+      this.modifiedBy = frappe.auth.session.user;
       this.modified = now;
     }
   }
@@ -741,7 +741,7 @@ export default class Document extends Observable {
       updateMap.name = updateMap.name + ' CPY';
     }
 
-    const doc = frappe.getNewDoc(this.doctype, false);
+    const doc = frappe.getEmptyDoc(this.doctype, false);
     await doc.set(updateMap);
     await doc.insert();
   }
diff --git a/frappe/model/naming.js b/frappe/model/naming.js
index 1a333cbf..11646197 100644
--- a/frappe/model/naming.js
+++ b/frappe/model/naming.js
@@ -2,7 +2,7 @@ import frappe from 'frappe';
 import { getRandomString } from 'frappe/utils';
 
 export async function isNameAutoSet(doctype) {
-  const doc = frappe.getNewDoc(doctype);
+  const doc = frappe.getEmptyDoc(doctype);
   if (doc.meta.naming === 'autoincrement') {
     return true;
   }
@@ -108,7 +108,7 @@ export async function createNumberSeries(prefix, referenceType, start = 1001) {
     return;
   }
 
-  const series = frappe.newDoc({
+  const series = frappe.getNewDoc({
     doctype: 'NumberSeries',
     name: prefix,
     start,
diff --git a/frappe/model/runPatches.js b/frappe/model/runPatches.js
index dfdcceec..b0bebb7b 100644
--- a/frappe/model/runPatches.js
+++ b/frappe/model/runPatches.js
@@ -17,7 +17,7 @@ export default async function runPatches(patchList) {
 async function runPatch({ patchName, patchFunction }) {
   try {
     await patchFunction();
-    const patchRun = frappe.getNewDoc('PatchRun');
+    const patchRun = frappe.getEmptyDoc('PatchRun');
     patchRun.name = patchName;
     await patchRun.insert();
   } catch (error) {
diff --git a/models/doctype/Item/Item.js b/models/doctype/Item/Item.js
index 19cf9503..0ef9fdf6 100644
--- a/models/doctype/Item/Item.js
+++ b/models/doctype/Item/Item.js
@@ -140,7 +140,7 @@ export default {
       label: t`New Invoice`,
       condition: (doc) => !doc.isNew(),
       action: async (doc, router) => {
-        const invoice = await frappe.getNewDoc('SalesInvoice');
+        const invoice = await frappe.getEmptyDoc('SalesInvoice');
         invoice.append('items', {
           item: doc.name,
           rate: doc.rate,
@@ -153,7 +153,7 @@ export default {
       label: t`New Bill`,
       condition: (doc) => !doc.isNew(),
       action: async (doc, router) => {
-        const invoice = await frappe.getNewDoc('PurchaseInvoice');
+        const invoice = await frappe.getEmptyDoc('PurchaseInvoice');
         invoice.append('items', {
           item: doc.name,
           rate: doc.rate,
diff --git a/models/doctype/Party/Customer.js b/models/doctype/Party/Customer.js
index 404d3d9a..197ddf5e 100644
--- a/models/doctype/Party/Customer.js
+++ b/models/doctype/Party/Customer.js
@@ -15,7 +15,7 @@ export default {
       label: t`Create Invoice`,
       condition: (doc) => !doc.isNew(),
       action: async (customer) => {
-        let doc = await frappe.getNewDoc('SalesInvoice');
+        let doc = await frappe.getEmptyDoc('SalesInvoice');
         router.push({
           path: `/edit/SalesInvoice/${doc.name}`,
           query: {
diff --git a/models/doctype/Party/Supplier.js b/models/doctype/Party/Supplier.js
index f10566b2..b5f09ea8 100644
--- a/models/doctype/Party/Supplier.js
+++ b/models/doctype/Party/Supplier.js
@@ -15,7 +15,7 @@ export default {
       label: t`Create Bill`,
       condition: (doc) => !doc.isNew(),
       action: async (supplier) => {
-        let doc = await frappe.getNewDoc('PurchaseInvoice');
+        let doc = await frappe.getEmptyDoc('PurchaseInvoice');
         router.push({
           path: `/edit/PurchaseInvoice/${doc.name}`,
           query: {
diff --git a/models/doctype/Tax/RegionalEntries.js b/models/doctype/Tax/RegionalEntries.js
index fdb89931..9e0be5cf 100644
--- a/models/doctype/Tax/RegionalEntries.js
+++ b/models/doctype/Tax/RegionalEntries.js
@@ -8,7 +8,7 @@ export default async function generateTaxes(country) {
       'Exempt-GST': [0],
       'Exempt-IGST': [0],
     };
-    let newTax = await frappe.getNewDoc('Tax');
+    let newTax = await frappe.getEmptyDoc('Tax');
 
     for (const type of Object.keys(GSTs)) {
       for (const percent of GSTs[type]) {
diff --git a/models/doctype/Transaction/Transaction.js b/models/doctype/Transaction/Transaction.js
index e81bed84..6e6c302f 100644
--- a/models/doctype/Transaction/Transaction.js
+++ b/models/doctype/Transaction/Transaction.js
@@ -33,7 +33,7 @@ export function getActions(doctype) {
       label: t`Make Payment`,
       condition: (doc) => doc.submitted && doc.outstandingAmount > 0,
       action: async function makePayment(doc) {
-        let payment = await frappe.getNewDoc('Payment');
+        let payment = await frappe.getEmptyDoc('Payment');
         payment.once('afterInsert', async () => {
           await payment.submit();
         });
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index b9203848..c757d8e9 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -1,3 +1,8 @@
+import Badge from '@/components/Badge';
+import { openQuickEdit } from '@/utils';
+import frappe, { t } from 'frappe';
+import { markRaw } from 'vue';
+import AutoComplete from './AutoComplete';
 <script>
 import Badge from '@/components/Badge';
 import { openQuickEdit } from '@/utils';
@@ -103,7 +108,7 @@ export default {
     },
     async openNewDoc() {
       let doctype = this.df.target;
-      let doc = await frappe.getNewDoc(doctype);
+      let doc = await frappe.getEmptyDoc(doctype);
       let filters = await this.getFilters();
       openQuickEdit({
         doctype,
diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index 1e8fc5cd..fb0a7f40 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -20,7 +20,7 @@
         <div class="p-3">
           <template v-if="filters.length">
             <div
-              :key="filter.fieldname + frappe.getRandomString()"
+              :key="filter.fieldname + getRandomString()"
               v-for="(filter, i) in filters"
               class="flex items-center justify-between text-base"
               :class="i !== 0 && 'mt-2'"
@@ -117,6 +117,7 @@
 
 <script>
 import { t } from 'frappe';
+import { getRandomString } from 'frappe/utils';
 import Button from './Button';
 import FormControl from './Controls/FormControl';
 import Icon from './Icon';
@@ -152,6 +153,9 @@ export default {
     this.addNewFilter();
   },
   methods: {
+    getRandomString() {
+      return getRandomString();
+    },
     addNewFilter() {
       let df = this.fields[0];
       this.addFilter(df.fieldname, 'like', '');
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 4a71558e..a437f6e5 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -1,3 +1,7 @@
+import Button from '@/components/Button';
+import FormControl from '@/components/Controls/FormControl';
+import frappe from 'frappe';
+import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
 <template>
   <div class="text-sm" :class="{ 'border-t': !noBorder }">
     <template v-for="df in formFields">
@@ -220,7 +224,7 @@ let TwoColumnForm = {
 
       this.inlineEditField = df;
       if (!this.doc[df.fieldname]) {
-        this.inlineEditDoc = await frappe.getNewDoc(df.target);
+        this.inlineEditDoc = await frappe.getEmptyDoc(df.target);
         this.inlineEditDoc.once('afterInsert', () => {
           this.onChangeCommon(df, this.inlineEditDoc.name);
         });
diff --git a/src/dataImport.ts b/src/dataImport.ts
index 2f66edfa..9c869e4d 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -382,7 +382,7 @@ export class Importer {
         delete docObj[key];
       }
 
-      const doc: Doc = frappe.getNewDoc(this.doctype, false);
+      const doc: Doc = frappe.getEmptyDoc(this.doctype, false);
       try {
         await this.makeEntry(doc, docObj);
         entriesMade += 1;
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 83824265..86b0a69d 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,3 +1,9 @@
+import PageHeader from '@/components/PageHeader';
+import SearchBar from '@/components/SearchBar';
+import { openQuickEdit } from '@/utils';
+import frappe from 'frappe';
+import { nextTick } from 'vue';
+import { handleErrorWithDialog } from '../errorHandling';
 <template>
   <div class="flex flex-col overflow-y-hidden">
     <PageHeader>
@@ -240,7 +246,7 @@ export default {
       this.insertingAccount = true;
 
       accountName = accountName.trim();
-      let account = await frappe.getNewDoc('Account');
+      let account = await frappe.getEmptyDoc('Account');
       try {
         let { name, rootType, accountType } = parentAccount;
         await account.set({
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index e1179b7e..3ce9c415 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -74,6 +74,7 @@ import frappe, { t } from 'frappe';
 import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
+
 export default {
   name: 'UnpaidInvoices',
   components: {
@@ -143,7 +144,7 @@ export default {
       this.invoices = await Promise.all(promises);
     },
     async newInvoice(invoice) {
-      let doc = await frappe.getNewDoc(invoice.doctype);
+      let doc = await frappe.getEmptyDoc(invoice.doctype);
       routeTo(`/edit/${invoice.doctype}/${doc.name}`);
     },
   },
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index e1b56095..d42210dd 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -1,3 +1,11 @@
+import Button from '@/components/Button';
+import FilterDropdown from '@/components/FilterDropdown';
+import PageHeader from '@/components/PageHeader';
+import SearchBar from '@/components/SearchBar';
+import { routeTo } from '@/utils';
+import frappe from 'frappe';
+import List from './List';
+import listConfigs from './listConfig';
 <template>
   <div class="flex flex-col">
     <PageHeader>
@@ -63,7 +71,7 @@ export default {
   methods: {
     async makeNewDoc() {
       const doctype = this.listConfig.doctype;
-      const doc = await frappe.getNewDoc(doctype);
+      const doc = await frappe.getEmptyDoc(doctype);
       if (this.listConfig.filters) {
         doc.set(this.listConfig.filters);
       }
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index dec091fd..97fac3e5 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -1,3 +1,20 @@
+import FormControl from '@/components/Controls/FormControl';
+import LanguageSelector from '@/components/Controls/LanguageSelector.vue';
+import Popover from '@/components/Popover';
+import TwoColumnForm from '@/components/TwoColumnForm';
+import config from '@/config';
+import { connectToLocalDatabase, purgeCache } from '@/initialization';
+import { IPC_MESSAGES } from '@/messages';
+import { setLanguageMap, showMessageDialog } from '@/utils';
+import { ipcRenderer } from 'electron';
+import frappe from 'frappe';
+import fs from 'fs';
+import path from 'path';
+import {
+getErrorMessage, handleErrorWithDialog, showErrorDialog
+} from '../../errorHandling';
+import setupCompany from './setupCompany';
+import Slide from './Slide.vue';
 <template>
   <div>
     <Slide
@@ -137,7 +154,7 @@ export default {
       this.index = 1;
     }
 
-    this.doc = await frappe.newDoc({ doctype: 'SetupWizard' });
+    this.doc = await frappe.getNewDoc({ doctype: 'SetupWizard' });
     this.doc.on('change', () => {
       this.valuesFilled = this.allValuesFilled();
     });
diff --git a/src/pages/SetupWizard/setupCompany.js b/src/pages/SetupWizard/setupCompany.js
index 3f9a4751..04df9f06 100644
--- a/src/pages/SetupWizard/setupCompany.js
+++ b/src/pages/SetupWizard/setupCompany.js
@@ -154,7 +154,7 @@ async function checkAndCreateDoc(docObject) {
     return;
   }
 
-  const doc = await frappe.newDoc(docObject);
+  const doc = await frappe.getNewDoc(docObject);
   return doc.insert();
 }
 
diff --git a/tests/testInvoice.js b/tests/testInvoice.js
deleted file mode 100644
index 9fa9702e..00000000
--- a/tests/testInvoice.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import assert from 'assert';
-import frappe from 'frappe';
-import helpers from 'frappe/tests/helpers';
-import models from '../models';
-
-async function makeFixtures() {
-    if (!(await frappe.db.exists('Party', 'Test Customer'))) {
-        await frappe.insert({doctype:'Party', name:'Test Customer'})
-        await frappe.insert({doctype:'Item', name:'Test Item 1', description:'Test Item Description 1', unit:'No', rate: 100})
-        await frappe.insert({doctype:'Item', name:'Test Item 2', description:'Test Item Description 2', unit:'No', rate: 200})
-        await frappe.insert({doctype:'Account', name:'GST', parentAccount: 'Liabilities'});
-        await frappe.insert({doctype:'Tax', name:'GST',
-            details: [{account: 'GST', rate:10}]
-        })
-    }
-}
-
-describe('Invoice', () => {
-    before(async function() {
-        await helpers.initSqlite({models: models});
-        await makeFixtures();
-    });
-
-    it('show create an invoice', async () => {
-        let invoice = await frappe.insert({
-            doctype:'Invoice',
-            customer: 'Test Customer',
-            items: [
-                {item: 'Test Item 1', quantity: 5},
-                {item: 'Test Item 2', quantity: 7},
-            ]
-        });
-
-        assert.equal(invoice.items[0].amount, 500);
-        assert.equal(invoice.items[1].amount, 1400);
-        assert.equal(invoice.netTotal, 1900);
-    });
-
-    it('show create an invoice with tax', async () => {
-        let invoice = await frappe.insert({
-            doctype:'Invoice',
-            customer: 'Test Customer',
-            items: [
-                {item: 'Test Item 1', quantity: 5, tax: 'GST'},
-                {item: 'Test Item 2', quantity: 7, tax: 'GST'},
-            ]
-        });
-
-        assert.equal(invoice.items[0].amount, 500);
-        assert.equal(invoice.items[1].amount, 1400);
-        assert.equal(invoice.netTotal, 1900);
-        assert.equal(invoice.taxes[0].amount, 190);
-        assert.equal(invoice.grandTotal, 2090);
-    });
-
-});
\ No newline at end of file

From 2afec6a74baf3725c528a30081d1c01d158b3da4 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 22 Mar 2022 13:51:00 +0530
Subject: [PATCH 007/163] incr: deprecate frappe.call

---
 models/doctype/GSTR3B/GSTR3BServer.js         |  9 +--
 models/doctype/Party/PartyServer.js           |  9 +--
 .../BankReconciliationImport.js               |  8 +-
 reports/index.js                              | 81 +++++--------------
 server/postStart.js                           |  3 -
 server/registerServerMethods.js               |  5 --
 src/pages/Report.vue                          |  6 +-
 7 files changed, 25 insertions(+), 96 deletions(-)
 delete mode 100644 server/registerServerMethods.js

diff --git a/models/doctype/GSTR3B/GSTR3BServer.js b/models/doctype/GSTR3B/GSTR3BServer.js
index 424f480d..fe7c006f 100644
--- a/models/doctype/GSTR3B/GSTR3BServer.js
+++ b/models/doctype/GSTR3B/GSTR3BServer.js
@@ -3,14 +3,7 @@ import GSTR3B from './GSTR3BDocument';
 export default class GSTR3BServer extends GSTR3B {
   async validate() {
     if (this.month.length === 0 || this.year.length != 4) {
-      frappe.call({
-        method: 'show-dialog',
-        args: {
-          title: 'Invalid Entry',
-          message: `Month or Year is not valid`
-        }
-      });
-      throw new Error();
+      throw new Error('Month or Year is not valid');
     }
   }
   async beforeInsert() {
diff --git a/models/doctype/Party/PartyServer.js b/models/doctype/Party/PartyServer.js
index 6145ad88..56868140 100644
--- a/models/doctype/Party/PartyServer.js
+++ b/models/doctype/Party/PartyServer.js
@@ -4,14 +4,7 @@ import Document from 'frappe/model/document';
 export default class PartyServer extends Document {
   beforeInsert() {
     if (this.customer && this.supplier) {
-      frappe.call({
-        method: 'show-dialog',
-        args: {
-          title: 'Invalid Entry',
-          message: 'Select a single party type.',
-        },
-      });
-      throw new Error();
+      throw new Error('Select a single party type.');
     }
 
     if (!this.customer && !this.supplier) {
diff --git a/reports/BankReconciliation/BankReconciliationImport.js b/reports/BankReconciliation/BankReconciliationImport.js
index a9745d88..f6534ff6 100644
--- a/reports/BankReconciliation/BankReconciliationImport.js
+++ b/reports/BankReconciliation/BankReconciliationImport.js
@@ -84,12 +84,6 @@ export const findMatchingReferences = async (json, report) => {
       },
     });
   } else {
-    frappe.call({
-      method: 'show-dialog',
-      args: {
-        title: 'Message',
-        message: 'No entries found with matching Ref / Cheque ID',
-      },
-    });
+    //  'No entries found with matching Ref / Cheque ID'
   }
 };
diff --git a/reports/index.js b/reports/index.js
index 3a0a255f..22b16db7 100644
--- a/reports/index.js
+++ b/reports/index.js
@@ -1,4 +1,3 @@
-import frappe from 'frappe';
 import AccountsReceivablePayable from './AccountsReceivablePayable/AccountsReceivablePayable';
 import BalanceSheet from './BalanceSheet/BalanceSheet';
 import BankReconciliation from './BankReconciliation/BankReconciliation';
@@ -10,67 +9,27 @@ import PurchaseRegister from './PurchaseRegister/PurchaseRegister';
 import SalesRegister from './SalesRegister/SalesRegister';
 import TrialBalance from './TrialBalance/TrialBalance';
 
-// called on server side
-function registerReportMethods() {
-  const reports = [
-    {
-      method: 'general-ledger',
-      class: GeneralLedger,
-    },
-    {
-      method: 'profit-and-loss',
-      class: ProfitAndLoss,
-    },
-    {
-      method: 'balance-sheet',
-      class: BalanceSheet,
-    },
-    {
-      method: 'trial-balance',
-      class: TrialBalance,
-    },
-    {
-      method: 'sales-register',
-      class: SalesRegister,
-    },
-    {
-      method: 'purchase-register',
-      class: PurchaseRegister,
-    },
-    {
-      method: 'bank-reconciliation',
-      class: BankReconciliation,
-    },
-    {
-      method: 'gstr-1',
-      class: GSTR1,
-    },
-    {
-      method: 'gstr-2',
-      class: GSTR2,
-    },
-  ];
+export function getReportData(method, filters) {
+  const reports = {
+    'general-ledger': GeneralLedger,
+    'profit-and-loss': ProfitAndLoss,
+    'balance-sheet': BalanceSheet,
+    'trial-balance': TrialBalance,
+    'gstr-1': GSTR1,
+    'gstr-2': GSTR2,
+    'sales-register': SalesRegister,
+    'purchase-register': PurchaseRegister,
+    'bank-reconciliation': BankReconciliation,
+  };
 
-  reports.forEach((report) => {
-    frappe.registerMethod({
-      method: report.method,
-      handler: getReportData(report.class),
-    });
-  });
+  if (method === 'accounts-receivable') {
+    return new AccountsReceivablePayable().run('Receivable', filters);
+  }
 
-  frappe.registerMethod({
-    method: 'accounts-receivable',
-    handler: (args) => new AccountsReceivablePayable().run('Receivable', args),
-  });
+  if (method === 'accounts-payable') {
+    return new AccountsReceivablePayable().run('Payable', filters);
+  }
 
-  frappe.registerMethod({
-    method: 'accounts-payable',
-    handler: (args) => new AccountsReceivablePayable().run('Payable', args),
-  });
+  const ReportClass = reports[method];
+  return new ReportClass().run(filters);
 }
-
-function getReportData(ReportClass) {
-  return (args) => new ReportClass().run(args);
-}
-
-export default registerReportMethods;
diff --git a/server/postStart.js b/server/postStart.js
index a7ea0bbe..c574e911 100644
--- a/server/postStart.js
+++ b/server/postStart.js
@@ -6,7 +6,6 @@ import PartyServer from '../models/doctype/Party/PartyServer.js';
 import PaymentServer from '../models/doctype/Payment/PaymentServer.js';
 import PurchaseInvoiceServer from '../models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js';
 import SalesInvoiceServer from '../models/doctype/SalesInvoice/SalesInvoiceServer.js';
-import registerServerMethods from './registerServerMethods';
 
 export default async function postStart() {
   // set server-side modules
@@ -38,8 +37,6 @@ export default async function postStart() {
 
   // cache currency symbols for frappe.format
   await setCurrencySymbols();
-
-  registerServerMethods();
 }
 
 export async function setCurrencySymbols() {
diff --git a/server/registerServerMethods.js b/server/registerServerMethods.js
deleted file mode 100644
index 200a73b2..00000000
--- a/server/registerServerMethods.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import registerReportMethods from '../reports';
-
-export default function registerServerMethods() {
-  registerReportMethods();
-}
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 6a59ecde..5a556650 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -146,6 +146,7 @@ import SearchBar from '@/components/SearchBar';
 import WithScroll from '@/components/WithScroll';
 import frappe from 'frappe';
 import { h, markRaw } from 'vue';
+import { getReportData } from '../../reports/index';
 import DropdownWithActions from '../components/DropdownWithActions.vue';
 
 export default {
@@ -195,10 +196,7 @@ export default {
       });
     },
     async fetchReportData() {
-      let data = await frappe.call({
-        method: this.report.method,
-        args: this.filters,
-      });
+      let data = await getReportData(this.report.method, this.filters)
 
       let rows;
       if (data.rows) {

From 72b6478e2990b1de187a24e9bf74e7ac6fc63106 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 22 Mar 2022 14:58:36 +0530
Subject: [PATCH 008/163] incr: create typed frappe

---
 frappe/core/{auth.ts => authHandler.ts} |   9 +-
 frappe/core/dbHandler.ts                |  20 ++
 frappe/core/docHandler.ts               | 254 ++++++++++++++++++++++++
 frappe/core/frappe.ts                   | 144 ++++++++++++++
 frappe/index.js                         |   6 +-
 frappe/utils/observable.ts              |   2 +-
 package.json                            |   2 +-
 src/errorHandling.ts                    |   4 +-
 src/pages/SetupWizard/SetupWizard.vue   |  17 --
 src/types/model.ts                      |  13 ++
 yarn.lock                               |   8 +-
 11 files changed, 449 insertions(+), 30 deletions(-)
 rename frappe/core/{auth.ts => authHandler.ts} (91%)
 create mode 100644 frappe/core/dbHandler.ts
 create mode 100644 frappe/core/docHandler.ts
 create mode 100644 frappe/core/frappe.ts

diff --git a/frappe/core/auth.ts b/frappe/core/authHandler.ts
similarity index 91%
rename from frappe/core/auth.ts
rename to frappe/core/authHandler.ts
index bddba15a..05786be1 100644
--- a/frappe/core/auth.ts
+++ b/frappe/core/authHandler.ts
@@ -1,3 +1,5 @@
+import { Frappe } from 'frappe/core/frappe';
+
 interface AuthConfig {
   serverURL: string;
   backend: string;
@@ -9,11 +11,13 @@ interface Session {
   token: string;
 }
 
-export class Auth {
+export class AuthHandler {
   #config: AuthConfig;
   #session: Session;
+  frappe: Frappe;
 
-  constructor() {
+  constructor(frappe: Frappe) {
+    this.frappe = frappe;
     this.#config = {
       serverURL: '',
       backend: 'sqlite',
@@ -34,6 +38,7 @@ export class Auth {
     return { ...this.#config };
   }
 
+  init() {}
   async login(email: string, password: string) {
     if (email === 'Administrator') {
       this.#session.user = 'Administrator';
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
new file mode 100644
index 00000000..8faff14e
--- /dev/null
+++ b/frappe/core/dbHandler.ts
@@ -0,0 +1,20 @@
+import { Frappe } from 'frappe/core/frappe';
+
+type SingleValue = { fieldname: string; parent: string; value: unknown };
+
+export class DbHandler {
+  frappe: Frappe;
+  constructor(frappe: Frappe) {
+    this.frappe = frappe;
+  }
+
+  init() {}
+  close() {}
+  exists(doctype: string, name: string): boolean {
+    return false;
+  }
+
+  getSingleValues(...fieldnames: Omit<SingleValue, 'value'>[]): SingleValue[] {
+    return [];
+  }
+}
diff --git a/frappe/core/docHandler.ts b/frappe/core/docHandler.ts
new file mode 100644
index 00000000..c2a9cc5e
--- /dev/null
+++ b/frappe/core/docHandler.ts
@@ -0,0 +1,254 @@
+import { Field, Model } from '@/types/model';
+import Doc from 'frappe/model/document';
+import Meta from 'frappe/model/meta';
+import { getDuplicates, getRandomString } from 'frappe/utils';
+import Observable from 'frappe/utils/observable';
+import { Frappe } from './frappe';
+
+type DocMap = Record<string, Doc | undefined>;
+type MetaMap = Record<string, Meta | undefined>;
+interface DocData {
+  doctype: string;
+  name?: string;
+  [key: string]: unknown;
+}
+
+export class DocHandler {
+  frappe: Frappe;
+  singles: DocMap = {};
+  metaCache: MetaMap = {};
+  docs?: Observable<Doc>;
+  models: Record<string, Model | undefined> = {};
+
+  constructor(frappe: Frappe) {
+    this.frappe = frappe;
+  }
+
+  init() {
+    this.models = {};
+    this.metaCache = {};
+    this.docs = new Observable();
+  }
+
+  registerModels(models: Record<string, Model>) {
+    for (const doctype in models) {
+      const metaDefinition = models[doctype];
+      if (!metaDefinition.name) {
+        throw new Error(`Name is mandatory for ${doctype}`);
+      }
+
+      if (metaDefinition.name !== doctype) {
+        throw new Error(
+          `Model name mismatch for ${doctype}: ${metaDefinition.name}`
+        );
+      }
+
+      const fieldnames = (metaDefinition.fields || [])
+        .map((df) => df.fieldname)
+        .sort();
+
+      const duplicateFieldnames = getDuplicates(fieldnames);
+      if (duplicateFieldnames.length > 0) {
+        throw new Error(
+          `Duplicate fields in ${doctype}: ${duplicateFieldnames.join(', ')}`
+        );
+      }
+
+      this.models[doctype] = metaDefinition;
+    }
+  }
+
+  getModels(filterFunction: (name: Model) => boolean) {
+    const models: Model[] = [];
+    for (const doctype in this.models) {
+      models.push(this.models[doctype]!);
+    }
+    return filterFunction ? models.filter(filterFunction) : models;
+  }
+
+  /**
+   * Cache operations
+   */
+
+  addToCache(doc: Doc) {
+    if (!this.docs) return;
+
+    // add to `docs` cache
+    const name = doc.name as string | undefined;
+    const doctype = doc.doctype as string | undefined;
+
+    if (!doctype || !name) {
+      return;
+    }
+
+    if (!this.docs[doctype]) {
+      this.docs[doctype] = {};
+    }
+
+    (this.docs[doctype] as DocMap)[name] = doc;
+
+    // singles available as first level objects too
+    if (doctype === doc.name) {
+      this.singles[name] = doc;
+    }
+
+    // propogate change to `docs`
+    doc.on('change', (params: unknown) => {
+      this.docs!.trigger('change', params);
+    });
+  }
+
+  removeFromCache(doctype: string, name: string) {
+    const docMap = this.docs?.[doctype] as DocMap | undefined;
+    const doc = docMap?.[name];
+
+    if (doc) {
+      delete docMap[name];
+    } else {
+      console.warn(`Document ${doctype} ${name} does not exist`);
+    }
+  }
+
+  getDocFromCache(doctype: string, name: string): Doc | undefined {
+    const doc = (this.docs?.[doctype] as DocMap)?.[name];
+    return doc;
+  }
+
+  isDirty(doctype: string, name: string) {
+    const doc = (this.docs?.[doctype] as DocMap)?.[name];
+    if (doc === undefined) {
+      return false;
+    }
+
+    return !!doc._dirty;
+  }
+
+  /**
+   * Meta Operations
+   */
+
+  getMeta(doctype: string): Meta {
+    const meta = this.metaCache[doctype];
+    if (meta) {
+      return meta;
+    }
+
+    const model = this.models?.[doctype];
+    if (!model) {
+      throw new Error(`${doctype} is not a registered doctype`);
+    }
+
+    this.metaCache[doctype] = new this.frappe.Meta!(model);
+    return this.metaCache[doctype]!;
+  }
+
+  createMeta(fields: Field[]) {
+    return new this.frappe.Meta!({ isCustom: 1, fields });
+  }
+
+  /**
+   * Doc Operations
+   */
+
+  async getDoc(
+    doctype: string,
+    name: string,
+    options = { skipDocumentCache: false }
+  ) {
+    let doc = null;
+    if (!options?.skipDocumentCache) {
+      doc = this.getDocFromCache(doctype, name);
+    }
+
+    if (doc) {
+      return doc;
+    }
+
+    const DocClass = this.getDocumentClass(doctype);
+    doc = new DocClass({
+      doctype: doctype,
+      name: name,
+    });
+
+    await doc.load();
+    this.addToCache(doc);
+
+    return doc;
+  }
+
+  getDocumentClass(doctype: string): typeof Doc {
+    const meta = this.getMeta(doctype);
+    let documentClass = this.frappe.Document!;
+    if (meta && meta.documentClass) {
+      documentClass = meta.documentClass as typeof Doc;
+    }
+
+    return documentClass;
+  }
+
+  async getSingle(doctype: string) {
+    return await this.getDoc(doctype, doctype);
+  }
+
+  async getDuplicate(doc: Doc) {
+    const doctype = doc.doctype as string;
+    const newDoc = await this.getEmptyDoc(doctype);
+    const meta = this.getMeta(doctype);
+
+    const fields = meta.getValidFields() as Field[];
+
+    for (const field of fields) {
+      if (['name', 'submitted'].includes(field.fieldname)) {
+        continue;
+      }
+
+      newDoc[field.fieldname] = doc[field.fieldname];
+      if (field.fieldtype === 'Table') {
+        const value = (doc[field.fieldname] as DocData[]) || [];
+        newDoc[field.fieldname] = value.map((d) => {
+          const childData = Object.assign({}, d);
+          childData.name = '';
+          return childData;
+        });
+      }
+    }
+    return newDoc;
+  }
+
+  getEmptyDoc(doctype: string, cacheDoc: boolean = true): Doc {
+    const doc = this.getNewDoc({ doctype });
+    doc._notInserted = true;
+    doc.name = getRandomString();
+
+    if (cacheDoc) {
+      this.addToCache(doc);
+    }
+
+    return doc;
+  }
+
+  getNewDoc(data: DocData): Doc {
+    const DocClass = this.getDocumentClass(data.doctype);
+    const doc = new DocClass(data);
+    doc.setDefaults();
+    return doc;
+  }
+
+  async syncDoc(data: DocData) {
+    let doc;
+    const { doctype, name } = data;
+    if (!doctype || !name) {
+      return;
+    }
+
+    const docExists = await this.frappe.db.exists(doctype, name);
+    if (docExists) {
+      doc = await this.getDoc(doctype, name);
+      Object.assign(doc, data);
+      await doc.update();
+    } else {
+      doc = this.getNewDoc(data);
+      await doc.insert();
+    }
+  }
+}
diff --git a/frappe/core/frappe.ts b/frappe/core/frappe.ts
new file mode 100644
index 00000000..0a20febf
--- /dev/null
+++ b/frappe/core/frappe.ts
@@ -0,0 +1,144 @@
+import { ErrorLog } from '@/errorHandling';
+import { Model } from '@/types/model';
+import Doc from 'frappe/model/document';
+import Meta from 'frappe/model/meta';
+import { getMoneyMaker, MoneyMaker } from 'pesa';
+import { markRaw } from 'vue';
+import {
+  DEFAULT_DISPLAY_PRECISION,
+  DEFAULT_INTERNAL_PRECISION,
+} from '../utils/consts';
+import * as errors from '../utils/errors';
+import { format } from '../utils/format';
+import { t, T } from '../utils/translation';
+import { AuthHandler } from './authHandler';
+import { DbHandler } from './dbHandler';
+import { DocHandler } from './docHandler';
+
+export class Frappe {
+  t = t;
+  T = T;
+  format = format;
+
+  errors = errors;
+  isElectron = false;
+  isServer = false;
+
+  pesa: MoneyMaker;
+
+  auth: AuthHandler;
+  doc: DocHandler;
+  db: DbHandler;
+
+  Meta?: typeof Meta;
+  Document?: typeof Doc;
+
+  _initialized: boolean = false;
+
+  errorLog?: ErrorLog[];
+  methods?: Record<string, Function>;
+  temp?: Record<string, unknown>;
+
+  constructor() {
+    this.auth = new AuthHandler(this);
+    this.doc = new DocHandler(this);
+    this.db = new DbHandler(this);
+    this.pesa = getMoneyMaker({
+      currency: 'XXX',
+      precision: DEFAULT_INTERNAL_PRECISION,
+      display: DEFAULT_DISPLAY_PRECISION,
+      wrapper: markRaw,
+    });
+  }
+
+  get initialized() {
+    return this._initialized;
+  }
+
+  get docs() {
+    return this.doc.docs;
+  }
+
+  get models() {
+    return this.doc.models;
+  }
+
+  async initializeAndRegister(customModels = {}, force = false) {
+    this.init(force);
+
+    this.Meta = (await import('frappe/model/meta')).default;
+    this.Document = (await import('frappe/model/document')).default;
+
+    const coreModels = await import('frappe/models');
+    this.doc.registerModels(coreModels.default as Record<string, Model>);
+    this.doc.registerModels(customModels);
+  }
+
+  init(force: boolean) {
+    if (this._initialized && !force) return;
+
+    this.methods = {};
+    this.errorLog = [];
+
+    // temp params while calling routes
+    this.temp = {};
+
+    this.doc.init();
+    this.auth.init();
+    this.db.init();
+    this._initialized = true;
+  }
+
+  async initializeMoneyMaker(currency: string = 'XXX') {
+    // to be called after db initialization
+    const values =
+      (await this.db?.getSingleValues(
+        {
+          fieldname: 'internalPrecision',
+          parent: 'SystemSettings',
+        },
+        {
+          fieldname: 'displayPrecision',
+          parent: 'SystemSettings',
+        }
+      )) ?? [];
+
+    const acc = values.reduce((acc, sv) => {
+      acc[sv.fieldname] = sv.value as string | number | undefined;
+      return acc;
+    }, {} as Record<string, string | number | undefined>);
+
+    let precision: string | number =
+      acc.internalPrecision ?? DEFAULT_INTERNAL_PRECISION;
+    let display: string | number =
+      acc.displayPrecision ?? DEFAULT_DISPLAY_PRECISION;
+
+    if (typeof precision === 'string') {
+      precision = parseInt(precision);
+    }
+
+    if (typeof display === 'string') {
+      display = parseInt(display);
+    }
+
+    this.pesa = getMoneyMaker({
+      currency,
+      precision,
+      display,
+      wrapper: markRaw,
+    });
+  }
+
+  close() {
+    this.db.close();
+    this.auth.logout();
+  }
+
+  store = {
+    isDevelopment: false,
+    appVersion: '',
+  };
+}
+
+export { T, t };
+export default new Frappe();
diff --git a/frappe/index.js b/frappe/index.js
index e627ac86..314034aa 100644
--- a/frappe/index.js
+++ b/frappe/index.js
@@ -1,6 +1,6 @@
 import { getMoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
-import { Auth } from './core/auth';
+import { AuthHandler } from './core/authHandler';
 import { asyncHandler, getDuplicates, getRandomString } from './utils';
 import {
   DEFAULT_DISPLAY_PRECISION,
@@ -11,7 +11,7 @@ import { format } from './utils/format';
 import Observable from './utils/observable';
 import { t, T } from './utils/translation';
 
-class Frappe {
+export class Frappe {
   t = t;
   T = T;
   format = format;
@@ -21,7 +21,7 @@ class Frappe {
   isServer = false;
 
   constructor() {
-    this.auth = new Auth();
+    this.auth = new AuthHandler();
   }
 
   async initializeAndRegister(customModels = {}, force = false) {
diff --git a/frappe/utils/observable.ts b/frappe/utils/observable.ts
index dea4c940..5583c3eb 100644
--- a/frappe/utils/observable.ts
+++ b/frappe/utils/observable.ts
@@ -3,7 +3,7 @@ enum EventType {
   OnceListeners = '_onceListeners',
 }
 
-export default class Observable {
+export default class Observable<T> {
   [key: string]: unknown;
   _isHot: Map<string, boolean>;
   _eventQueue: Map<string, unknown[]>;
diff --git a/package.json b/package.json
index 57a13c5c..5b9af4ec 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "lodash": "^4.17.21",
     "luxon": "^2.0.2",
     "node-fetch": "2",
-    "pesa": "^1.1.3",
+    "pesa": "^1.1.11",
     "sqlite3": "npm:@vscode/sqlite3@^5.0.7",
     "vue": "^3.2.30",
     "vue-router": "^4.0.12"
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 9e10662d..769f586a 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -1,18 +1,18 @@
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'frappe';
+import Document from 'frappe/model/document';
 import {
   DuplicateEntryError,
   LinkValidationError,
   MandatoryError,
   ValidationError,
 } from 'frappe/utils/errors';
-import Document from 'frappe/model/document';
 import config, { ConfigKeys, TelemetrySetting } from './config';
 import { IPC_ACTIONS, IPC_MESSAGES } from './messages';
 import telemetry from './telemetry/telemetry';
 import { showMessageDialog, showToast } from './utils';
 
-interface ErrorLog {
+export interface ErrorLog {
   name: string;
   message: string;
   stack?: string;
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 97fac3e5..bfa87108 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -1,20 +1,3 @@
-import FormControl from '@/components/Controls/FormControl';
-import LanguageSelector from '@/components/Controls/LanguageSelector.vue';
-import Popover from '@/components/Popover';
-import TwoColumnForm from '@/components/TwoColumnForm';
-import config from '@/config';
-import { connectToLocalDatabase, purgeCache } from '@/initialization';
-import { IPC_MESSAGES } from '@/messages';
-import { setLanguageMap, showMessageDialog } from '@/utils';
-import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
-import fs from 'fs';
-import path from 'path';
-import {
-getErrorMessage, handleErrorWithDialog, showErrorDialog
-} from '../../errorHandling';
-import setupCompany from './setupCompany';
-import Slide from './Slide.vue';
 <template>
   <div>
     <Slide
diff --git a/src/types/model.ts b/src/types/model.ts
index 7aba3629..4a50a29a 100644
--- a/src/types/model.ts
+++ b/src/types/model.ts
@@ -30,6 +30,7 @@ export interface Field {
   readOnly?: number;
   hidden?: number | Function;
   options?: string[];
+  description?: string;
 }
 
 export interface Doc {
@@ -38,3 +39,15 @@ export interface Doc {
   insert: () => Promise<void>;
   submit: () => Promise<void>;
 }
+
+export interface Model {
+  label?: string;
+  name: string;
+  doctype?: string;
+  fields: Field[];
+  isSingle?: number; // boolean
+  regional?: number; // boolean
+  augmented?: number; // boolean
+  keywordFields?: string[];
+  quickEditFields?: string[];
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 6585a242..b935e531 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8573,10 +8573,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pesa@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.6.tgz#a123dc7a31c977bbfb6dbbee14a9913c8385cd0f"
-  integrity sha512-EDs4Tj8QX7hZITkKhfHeVT/9oQRqRPyF3pVet1FqGX94/zkcqreBYb94ojUVrzZmir26+IHaKyCpTB6eqC04uw==
+pesa@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.11.tgz#85829e5aa11ea3e44d7c9ea4b500e4d6def6dc5f"
+  integrity sha512-eyl0lpdUIV0dNXVeTMnhBJj6u9GRIYwP+vFdUN+767Fv3PNQHPHAkCQJqDseGfEF75lhe23ZnfbA/uMidlq5/Q==
 
 pg-connection-string@2.5.0:
   version "2.5.0"

From 71d931ac757e83774a41c44e3fc387f3dba9f0af Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 23 Mar 2022 11:46:13 +0530
Subject: [PATCH 009/163] incr: checkpoint

---
 backend/common.ts            |  43 ++
 backend/database/core.ts     | 959 +++++++++++++++++++++++++++++++++++
 backend/database/database.ts | 925 +++++++++++++++++++++++++++++++++
 backend/database/types.ts    |  11 +
 common/model.ts              |   6 +
 frappe/backends/database.js  |   4 +-
 frappe/core/docHandler.ts    |   2 +-
 frappe/model/meta.js         |   3 +
 frappe/utils/cacheManager.ts |   2 +-
 9 files changed, 1951 insertions(+), 4 deletions(-)
 create mode 100644 backend/common.ts
 create mode 100644 backend/database/core.ts
 create mode 100644 backend/database/database.ts
 create mode 100644 backend/database/types.ts
 create mode 100644 common/model.ts

diff --git a/backend/common.ts b/backend/common.ts
new file mode 100644
index 00000000..03b50842
--- /dev/null
+++ b/backend/common.ts
@@ -0,0 +1,43 @@
+import Document from '../frappe/model/document';
+import Meta from '../frappe/model/meta';
+import { Model } from '../src/types/model';
+
+export function getModels(): Record<string, Model> {
+  // TODO: complete this function
+  return {};
+}
+
+export function getMeta(doctype: string): Meta {
+  // TODO: compete this function
+  return new Meta();
+}
+
+export function getNewDoc(data: Record<string, unknown>): Document {
+  // TODO: compete this function
+  return new Document();
+}
+
+export const sqliteTypeMap = {
+  AutoComplete: 'text',
+  Currency: 'text',
+  Int: 'integer',
+  Float: 'float',
+  Percent: 'float',
+  Check: 'integer',
+  Code: 'text',
+  Date: 'text',
+  Datetime: 'text',
+  Time: 'text',
+  Text: 'text',
+  Data: 'text',
+  Link: 'text',
+  DynamicLink: 'text',
+  Password: 'text',
+  Select: 'text',
+  File: 'text',
+  Attach: 'text',
+  AttachImage: 'text',
+  Color: 'text',
+};
+
+export const validTypes = Object.keys(sqliteTypeMap);
diff --git a/backend/database/core.ts b/backend/database/core.ts
new file mode 100644
index 00000000..a9e6d4ac
--- /dev/null
+++ b/backend/database/core.ts
@@ -0,0 +1,959 @@
+import { knex, Knex } from 'knex';
+import { pesa } from 'pesa';
+import { getRandomString } from '../../frappe/utils';
+import CacheManager from '../../frappe/utils/cacheManager';
+import {
+  CannotCommitError,
+  DatabaseError,
+  DuplicateEntryError,
+  LinkValidationError,
+  ValueError,
+} from '../../frappe/utils/errors';
+import Observable from '../../frappe/utils/observable';
+import { getMeta, getModels, getNewDoc, sqliteTypeMap } from '../common';
+import { GetQueryBuilderOptions, QueryFilter, RawData } from './types';
+
+interface GetAllOptions {
+  doctype?: string;
+  fields?: string[];
+  filters?: Record<string, string>;
+  start?: number;
+  limit?: number;
+  groupBy?: string;
+  orderBy?: string;
+  order?: 'asc' | 'desc';
+}
+
+export default class Database extends Observable<never> {
+  knex: Knex;
+  cache: CacheManager;
+  typeMap = sqliteTypeMap;
+
+  constructor(dbPath: string) {
+    super();
+    this.cache = new CacheManager();
+    this.dbPath = dbPath;
+    this.connectionParams = {
+      client: 'sqlite3',
+      connection: {
+        filename: this.dbPath,
+      },
+      pool: {
+        afterCreate(conn, done) {
+          conn.run('PRAGMA foreign_keys=ON');
+          done();
+        },
+      },
+      useNullAsDefault: true,
+      asyncStackTraces: process.env.NODE_ENV === 'development',
+    };
+  }
+
+  connect() {
+    this.knex = knex(this.connectionParams);
+    this.knex.on('query-error', (error) => {
+      error.type = this.getError(error);
+    });
+  }
+
+  close() {
+    //
+  }
+
+  /**
+   * TODO: Refactor this
+   *
+   * essentially it's not models that are required by the database
+   * but the schema, all the information that is relevant to building
+   * tables needs to given to this function.
+   */
+  async migrate() {
+    const models = getModels();
+    for (const doctype in models) {
+      // check if controller module
+      const meta = getMeta(doctype);
+      const baseDoctype = meta.getBaseDocType();
+
+      if (!meta.isSingle) {
+        if (await this.tableExists(baseDoctype)) {
+          await this.alterTable(baseDoctype);
+        } else {
+          await this.createTable(baseDoctype);
+        }
+      }
+    }
+
+    await this.commit();
+    await this.initializeSingles();
+  }
+
+  async initializeSingles() {
+    const models = getModels();
+    const singleDoctypes = Object.keys(models)
+      .filter((n) => models[n].isSingle)
+      .map((n) => models[n].name);
+
+    for (const doctype of singleDoctypes) {
+      if (await this.singleExists(doctype)) {
+        const singleValues = await this.getSingleFieldsToInsert(doctype);
+        singleValues.forEach(({ fieldname, value }) => {
+          const singleValue = getNewDoc({
+            doctype: 'SingleValue',
+            parent: doctype,
+            fieldname,
+            value,
+          });
+          singleValue.insert();
+        });
+        continue;
+      }
+      const meta = getMeta(doctype);
+      if (meta.fields.every((df) => df.default == null)) {
+        continue;
+      }
+      const defaultValues = meta.fields.reduce((doc, df) => {
+        if (df.default != null) {
+          doc[df.fieldname] = df.default;
+        }
+        return doc;
+      }, {});
+      await this.updateSingle(doctype, defaultValues);
+    }
+  }
+
+  async getSingleFieldsToInsert(doctype) {
+    const existingFields = (
+      await this.knex('SingleValue')
+        .where({ parent: doctype })
+        .select('fieldname')
+    ).map(({ fieldname }) => fieldname);
+
+    return getMeta(doctype)
+      .fields.map(({ fieldname, default: value }) => ({
+        fieldname,
+        value,
+      }))
+      .filter(
+        ({ fieldname, value }) =>
+          !existingFields.includes(fieldname) && value !== undefined
+      );
+  }
+
+  async createTable(doctype, tableName = null) {
+    const fields = this.getValidFields(doctype);
+    return await this.runCreateTableQuery(tableName || doctype, fields);
+  }
+
+  runCreateTableQuery(doctype, fields) {
+    return this.knex.schema.createTable(doctype, (table) => {
+      for (const field of fields) {
+        this.buildColumnForTable(table, field);
+      }
+    });
+  }
+
+  async alterTable(doctype) {
+    // get columns
+    const diff = await this.getColumnDiff(doctype);
+    const newForeignKeys = await this.getNewForeignKeys(doctype);
+
+    return this.knex.schema
+      .table(doctype, (table) => {
+        if (diff.added.length) {
+          for (const field of diff.added) {
+            this.buildColumnForTable(table, field);
+          }
+        }
+
+        if (diff.removed.length) {
+          this.removeColumns(doctype, diff.removed);
+        }
+      })
+      .then(() => {
+        if (newForeignKeys.length) {
+          return this.addForeignKeys(doctype, newForeignKeys);
+        }
+      });
+  }
+
+  buildColumnForTable(table, field) {
+    const columnType = this.typeMap[field.fieldtype];
+    if (!columnType) {
+      // In case columnType is "Table"
+      // childTable links are handled using the childTable's "parent" field
+      return;
+    }
+
+    const column = table[columnType](field.fieldname);
+
+    // primary key
+    if (field.fieldname === 'name') {
+      column.primary();
+    }
+
+    // default value
+    if (!!field.default && !(field.default instanceof Function)) {
+      column.defaultTo(field.default);
+    }
+
+    // required
+    if (
+      (!!field.required && !(field.required instanceof Function)) ||
+      field.fieldtype === 'Currency'
+    ) {
+      column.notNullable();
+    }
+
+    // link
+    if (field.fieldtype === 'Link' && field.target) {
+      const meta = getMeta(field.target);
+      table
+        .foreign(field.fieldname)
+        .references('name')
+        .inTable(meta.getBaseDocType())
+        .onUpdate('CASCADE')
+        .onDelete('RESTRICT');
+    }
+  }
+
+  async getColumnDiff(doctype) {
+    const tableColumns = await this.getTableColumns(doctype);
+    const validFields = this.getValidFields(doctype);
+    const diff = { added: [], removed: [] };
+
+    for (const field of validFields) {
+      if (
+        !tableColumns.includes(field.fieldname) &&
+        this.typeMap[field.fieldtype]
+      ) {
+        diff.added.push(field);
+      }
+    }
+
+    const validFieldNames = validFields.map((field) => field.fieldname);
+    for (const column of tableColumns) {
+      if (!validFieldNames.includes(column)) {
+        diff.removed.push(column);
+      }
+    }
+
+    return diff;
+  }
+
+  async getNewForeignKeys(doctype) {
+    const foreignKeys = await this.getForeignKeys(doctype);
+    const newForeignKeys = [];
+    const meta = getMeta(doctype);
+    for (const field of meta.getValidFields({ withChildren: false })) {
+      if (
+        field.fieldtype === 'Link' &&
+        !foreignKeys.includes(field.fieldname)
+      ) {
+        newForeignKeys.push(field);
+      }
+    }
+    return newForeignKeys;
+  }
+
+  async get(doctype, name = null, fields = '*') {
+    const meta = getMeta(doctype);
+    let doc;
+    if (meta.isSingle) {
+      doc = await this.getSingle(doctype);
+      doc.name = doctype;
+    } else {
+      if (!name) {
+        throw new ValueError('name is mandatory');
+      }
+      doc = await this.getOne(doctype, name, fields);
+    }
+    if (!doc) {
+      return;
+    }
+    await this.loadChildren(doc, meta);
+    return doc;
+  }
+
+  async loadChildren(doc, meta) {
+    // load children
+    const tableFields = meta.getTableFields();
+    for (const field of tableFields) {
+      doc[field.fieldname] = await this.getAll({
+        doctype: field.childtype,
+        fields: ['*'],
+        filters: { parent: doc.name },
+        orderBy: 'idx',
+        order: 'asc',
+      });
+    }
+  }
+
+  async getSingle(doctype) {
+    const values = await this.getAll({
+      doctype: 'SingleValue',
+      fields: ['fieldname', 'value'],
+      filters: { parent: doctype },
+      orderBy: 'fieldname',
+      order: 'asc',
+    });
+    const doc = {};
+    for (const row of values) {
+      doc[row.fieldname] = row.value;
+    }
+    return doc;
+  }
+
+  /**
+   * Get list of values from the singles table.
+   * @param  {...string | Object} fieldnames list of fieldnames to get the values of
+   * @returns {Array<Object>} array of {parent, value, fieldname}.
+   * @example
+   * Database.getSingleValues('internalPrecision');
+   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
+   * @example
+   * Database.getSingleValues({fieldname:'internalPrecision', parent: 'SystemSettings'});
+   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
+   */
+  async getSingleValues(...fieldnames) {
+    fieldnames = fieldnames.map((fieldname) => {
+      if (typeof fieldname === 'string') {
+        return { fieldname };
+      }
+      return fieldname;
+    });
+
+    let builder = this.knex('SingleValue');
+    builder = builder.where(fieldnames[0]);
+
+    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
+      if (typeof parent === 'undefined') {
+        builder = builder.orWhere({ fieldname });
+      } else {
+        builder = builder.orWhere({ fieldname, parent });
+      }
+    });
+
+    let values = [];
+    try {
+      values = await builder.select('fieldname', 'value', 'parent');
+    } catch (error) {
+      if (error.message.includes('no such table')) {
+        return [];
+      }
+      throw error;
+    }
+
+    return values.map((value) => {
+      const fields = getMeta(value.parent).fields;
+      return this.getDocFormattedDoc(fields, values);
+    });
+  }
+
+  async getOne(doctype, name, fields = '*') {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+
+    const doc = await this.knex
+      .select(fields)
+      .from(baseDoctype)
+      .where('name', name)
+      .first();
+
+    if (!doc) {
+      return doc;
+    }
+
+    return this.getDocFormattedDoc(meta.fields, doc);
+  }
+
+  getDocFormattedDoc(fields, doc) {
+    // format for usage, not going into the db
+    const docFields = Object.keys(doc);
+    const filteredFields = fields.filter(({ fieldname }) =>
+      docFields.includes(fieldname)
+    );
+
+    const formattedValues = filteredFields.reduce((d, field) => {
+      const { fieldname } = field;
+      d[fieldname] = this.getDocFormattedValues(field, doc[fieldname]);
+      return d;
+    }, {});
+
+    return Object.assign(doc, formattedValues);
+  }
+
+  getDocFormattedValues(field, value) {
+    // format for usage, not going into the db
+    try {
+      if (field.fieldtype === 'Currency') {
+        return pesa(value);
+      }
+    } catch (err) {
+      err.message += ` value: '${value}' of type: ${typeof value}, fieldname: '${
+        field.fieldname
+      }', label: '${field.label}'`;
+      throw err;
+    }
+    return value;
+  }
+
+  triggerChange(doctype, name) {
+    this.trigger(`change:${doctype}`, { name }, 500);
+    this.trigger(`change`, { doctype, name }, 500);
+    // also trigger change for basedOn doctype
+    const meta = getMeta(doctype);
+    if (meta.basedOn) {
+      this.triggerChange(meta.basedOn, name);
+    }
+  }
+
+  async insert(doctype, doc) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    doc = this.applyBaseDocTypeFilters(doctype, doc);
+
+    // insert parent
+    if (meta.isSingle) {
+      await this.updateSingle(doctype, doc);
+    } else {
+      await this.insertOne(baseDoctype, doc);
+    }
+
+    // insert children
+    await this.insertChildren(meta, doc, baseDoctype);
+
+    this.triggerChange(doctype, doc.name);
+
+    return doc;
+  }
+
+  async insertChildren(meta, doc, doctype) {
+    const tableFields = meta.getTableFields();
+    for (const field of tableFields) {
+      let idx = 0;
+      for (const child of doc[field.fieldname] || []) {
+        this.prepareChild(doctype, doc.name, child, field, idx);
+        await this.insertOne(field.childtype, child);
+        idx++;
+      }
+    }
+  }
+
+  insertOne(doctype, doc) {
+    const fields = this.getValidFields(doctype);
+
+    if (!doc.name) {
+      doc.name = getRandomString();
+    }
+
+    const formattedDoc = this.getFormattedDoc(fields, doc);
+    return this.knex(doctype).insert(formattedDoc);
+  }
+
+  async update(doctype, doc) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    doc = this.applyBaseDocTypeFilters(doctype, doc);
+
+    // update parent
+    if (meta.isSingle) {
+      await this.updateSingle(doctype, doc);
+    } else {
+      await this.updateOne(baseDoctype, doc);
+    }
+
+    // insert or update children
+    await this.updateChildren(meta, doc, baseDoctype);
+
+    this.triggerChange(doctype, doc.name);
+
+    return doc;
+  }
+
+  async updateChildren(meta, doc, doctype) {
+    const tableFields = meta.getTableFields();
+    for (const field of tableFields) {
+      const added = [];
+      for (const child of doc[field.fieldname] || []) {
+        this.prepareChild(doctype, doc.name, child, field, added.length);
+        if (await this.exists(field.childtype, child.name)) {
+          await this.updateOne(field.childtype, child);
+        } else {
+          await this.insertOne(field.childtype, child);
+        }
+        added.push(child.name);
+      }
+      await this.runDeleteOtherChildren(field, doc.name, added);
+    }
+  }
+
+  updateOne(doctype, doc) {
+    const validFields = this.getValidFields(doctype);
+    const fieldsToUpdate = Object.keys(doc).filter((f) => f !== 'name');
+    const fields = validFields.filter((df) =>
+      fieldsToUpdate.includes(df.fieldname)
+    );
+    const formattedDoc = this.getFormattedDoc(fields, doc);
+
+    return this.knex(doctype)
+      .where('name', doc.name)
+      .update(formattedDoc)
+      .then(() => {
+        const cacheKey = `${doctype}:${doc.name}`;
+        if (this.cache.hexists(cacheKey)) {
+          for (const fieldname in formattedDoc) {
+            const value = formattedDoc[fieldname];
+            this.cache.hset(cacheKey, fieldname, value);
+          }
+        }
+      });
+  }
+
+  runDeleteOtherChildren(field, parent, added) {
+    // delete other children
+    return this.knex(field.childtype)
+      .where('parent', parent)
+      .andWhere('name', 'not in', added)
+      .delete();
+  }
+
+  async updateSingle(doctype, doc) {
+    const meta = getMeta(doctype);
+    await this.deleteSingleValues(doctype);
+    for (const field of meta.getValidFields({ withChildren: false })) {
+      const value = doc[field.fieldname];
+      if (value != null) {
+        const singleValue = getNewDoc({
+          doctype: 'SingleValue',
+          parent: doctype,
+          fieldname: field.fieldname,
+          value: value,
+        });
+        await singleValue.insert();
+      }
+    }
+  }
+
+  async rename(doctype, oldName, newName) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    await this.knex(baseDoctype)
+      .update({ name: newName })
+      .where('name', oldName)
+      .then(() => {
+        this.clearValueCache(doctype, oldName);
+      });
+    await this.commit();
+
+    this.triggerChange(doctype, newName);
+  }
+
+  prepareChild(parenttype, parent, child, field, idx) {
+    if (!child.name) {
+      child.name = getRandomString();
+    }
+    child.parent = parent;
+    child.parenttype = parenttype;
+    child.parentfield = field.fieldname;
+    child.idx = idx;
+  }
+
+  getValidFields(doctype) {
+    return getMeta(doctype).getValidFields({ withChildren: false });
+  }
+
+  getFormattedDoc(fields, doc) {
+    // format for storage, going into the db
+    const formattedDoc = {};
+    fields.map((field) => {
+      const value = doc[field.fieldname];
+      formattedDoc[field.fieldname] = this.getFormattedValue(field, value);
+    });
+    return formattedDoc;
+  }
+
+  getFormattedValue(field, value) {
+    // format for storage, going into the db
+    const type = typeof value;
+    if (field.fieldtype === 'Currency') {
+      let currency = value;
+
+      if (type === 'number' || type === 'string') {
+        currency = pesa(value);
+      }
+
+      const currencyValue = currency.store;
+      if (typeof currencyValue !== 'string') {
+        throw new Error(
+          `invalid currencyValue '${currencyValue}' of type '${typeof currencyValue}' on converting from '${value}' of type '${type}'`
+        );
+      }
+
+      return currencyValue;
+    }
+
+    if (value instanceof Date) {
+      if (field.fieldtype === 'Date') {
+        // date
+        return value.toISOString().substr(0, 10);
+      } else {
+        // datetime
+        return value.toISOString();
+      }
+    } else if (field.fieldtype === 'Link' && !value) {
+      // empty value must be null to satisfy
+      // foreign key constraint
+      return null;
+    } else {
+      return value;
+    }
+  }
+
+  applyBaseDocTypeFilters(doctype, doc) {
+    const meta = getMeta(doctype);
+    if (meta.filters) {
+      for (const fieldname in meta.filters) {
+        const value = meta.filters[fieldname];
+        if (typeof value !== 'object') {
+          doc[fieldname] = value;
+        }
+      }
+    }
+    return doc;
+  }
+
+  async deleteMany(doctype, names) {
+    for (const name of names) {
+      await this.delete(doctype, name);
+    }
+  }
+
+  async delete(doctype, name) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    await this.deleteOne(baseDoctype, name);
+
+    // delete children
+    const tableFields = getMeta(doctype).getTableFields();
+    for (const field of tableFields) {
+      await this.deleteChildren(field.childtype, name);
+    }
+
+    this.triggerChange(doctype, name);
+  }
+
+  async deleteOne(doctype, name) {
+    return this.knex(doctype)
+      .where('name', name)
+      .delete()
+      .then(() => {
+        this.clearValueCache(doctype, name);
+      });
+  }
+
+  deleteChildren(parenttype, parent) {
+    return this.knex(parenttype).where('parent', parent).delete();
+  }
+
+  async exists(doctype, name) {
+    return (await this.getValue(doctype, name)) ? true : false;
+  }
+
+  async getValue(doctype, filters, fieldname = 'name') {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    if (typeof filters === 'string') {
+      filters = { name: filters };
+    }
+    if (meta.filters) {
+      Object.assign(filters, meta.filters);
+    }
+
+    const row = await this.getAll({
+      doctype: baseDoctype,
+      fields: [fieldname],
+      filters: filters,
+      start: 0,
+      limit: 1,
+      orderBy: 'name',
+      order: 'asc',
+    });
+    return row.length ? row[0][fieldname] : null;
+  }
+
+  async setValue(doctype, name, fieldname, value) {
+    return await this.setValues(doctype, name, {
+      [fieldname]: value,
+    });
+  }
+
+  async setValues(
+    doctype: string,
+    name: string,
+    fieldValuePair: Record<string, unknown>
+  ) {
+    const doc = Object.assign({}, fieldValuePair, { name });
+    return this.updateOne(doctype, doc);
+  }
+
+  async getCachedValue(doctype: string, name: string, fieldname: string) {
+    let value = this.cache.hget(`${doctype}:${name}`, fieldname);
+    if (value == null) {
+      value = await this.getValue(doctype, name, fieldname);
+    }
+    return value;
+  }
+
+  // TODO: Not in core
+  async getAll({
+    doctype,
+    fields,
+    filters,
+    start,
+    limit,
+    groupBy,
+    orderBy = 'creation',
+    order = 'desc',
+  }: GetAllOptions = {}) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    if (!fields) {
+      fields = meta.getKeywordFields();
+      fields.push('name');
+    }
+    if (typeof fields === 'string') {
+      fields = [fields];
+    }
+    if (meta.filters) {
+      filters = Object.assign({}, filters, meta.filters);
+    }
+
+    const docs = await this.getQueryBuilder(doctype, fields, filters, {
+      offset: start,
+      limit,
+      groupBy,
+      orderBy,
+      order,
+    });
+    return docs.map((doc) => this.getDocFormattedDoc(meta.fields, doc));
+  }
+
+  clearValueCache(doctype: string, name: string) {
+    const cacheKey = `${doctype}:${name}`;
+    this.cache.hclear(cacheKey);
+  }
+
+  async addForeignKeys(tableName: string, newForeignKeys: string[]) {
+    await this.sql('PRAGMA foreign_keys=OFF');
+    await this.sql('BEGIN TRANSACTION');
+
+    const tempName = 'TEMP' + tableName;
+
+    // create temp table
+    await this.createTable(tableName, tempName);
+
+    try {
+      // copy from old to new table
+      await this.knex(tempName).insert(this.knex.select().from(tableName));
+    } catch (err) {
+      await this.sql('ROLLBACK');
+      await this.sql('PRAGMA foreign_keys=ON');
+
+      const rows = await this.knex.select().from(tableName);
+      await this.prestigeTheTable(tableName, rows);
+      return;
+    }
+
+    // drop old table
+    await this.knex.schema.dropTable(tableName);
+
+    // rename new table
+    await this.knex.schema.renameTable(tempName, tableName);
+
+    await this.sql('COMMIT');
+    await this.sql('PRAGMA foreign_keys=ON');
+  }
+
+  /**
+   *
+   *
+   *
+   *
+   * Everything below this is a leaf node function in this file
+   * and is safe, doesn't reuqire refactors
+   *
+   *
+   *
+   *
+   *
+   */
+
+  async tableExists(tableName: string) {
+    return await this.knex.schema.hasTable(tableName);
+  }
+
+  async singleExists(singleDoctypeName: string) {
+    const res = await this.knex('SingleValue')
+      .count('parent as count')
+      .where('parent', singleDoctypeName)
+      .first();
+    return res.count > 0;
+  }
+
+  async removeColumns(tableName: string, targetColumns: string[]) {
+    // TODO: Implement this for sqlite
+  }
+
+  async deleteSingleValues(singleDoctypeName: string) {
+    return await this.knex('SingleValue')
+      .where('parent', singleDoctypeName)
+      .delete();
+  }
+
+  async sql(query: string, params: Knex.RawBinding[] = []) {
+    return await this.knex.raw(query, params);
+  }
+
+  async commit() {
+    try {
+      await this.sql('commit');
+    } catch (e) {
+      if (e.type !== CannotCommitError) {
+        throw e;
+      }
+    }
+  }
+
+  getError(err: Error) {
+    let errorType = DatabaseError;
+    if (err.message.includes('FOREIGN KEY')) {
+      errorType = LinkValidationError;
+    }
+    if (err.message.includes('SQLITE_ERROR: cannot commit')) {
+      errorType = CannotCommitError;
+    }
+    if (err.message.includes('SQLITE_CONSTRAINT: UNIQUE constraint failed:')) {
+      errorType = DuplicateEntryError;
+    }
+    return errorType;
+  }
+
+  async prestigeTheTable(tableName: string, tableRows: RawData) {
+    const max = 200;
+
+    // Alter table hacx for sqlite in case of schema change.
+    const tempName = `__${tableName}`;
+    await this.knex.schema.dropTableIfExists(tempName);
+
+    await this.knex.raw('PRAGMA foreign_keys=OFF');
+    await this.createTable(tableName, tempName);
+
+    if (tableRows.length > 200) {
+      const fi = Math.floor(tableRows.length / max);
+      for (let i = 0; i <= fi; i++) {
+        const rowSlice = tableRows.slice(i * max, i + 1 * max);
+        if (rowSlice.length === 0) {
+          break;
+        }
+        await this.knex.batchInsert(tempName, rowSlice);
+      }
+    } else {
+      await this.knex.batchInsert(tempName, tableRows);
+    }
+
+    await this.knex.schema.dropTable(tableName);
+    await this.knex.schema.renameTable(tempName, tableName);
+    await this.knex.raw('PRAGMA foreign_keys=ON');
+  }
+
+  async getTableColumns(doctype: string) {
+    const info = await this.sql(`PRAGMA table_info(${doctype})`);
+    return info.map((d) => d.name);
+  }
+
+  async getForeignKeys(doctype: string) {
+    const foreignKeyList = await this.sql(
+      `PRAGMA foreign_key_list(${doctype})`
+    );
+    return foreignKeyList.map((d) => d.from);
+  }
+
+  getQueryBuilder(
+    tableName: string,
+    fields: string[],
+    filters: QueryFilter,
+    options: GetQueryBuilderOptions
+  ) {
+    const builder = this.knex.select(fields).from(tableName);
+
+    this.applyFiltersToBuilder(builder, filters);
+
+    if (options.orderBy) {
+      builder.orderBy(options.orderBy, options.order);
+    }
+
+    if (options.groupBy) {
+      builder.groupBy(options.groupBy);
+    }
+
+    if (options.offset) {
+      builder.offset(options.offset);
+    }
+
+    if (options.limit) {
+      builder.limit(options.limit);
+    }
+
+    return builder;
+  }
+
+  applyFiltersToBuilder(builder: Knex.QueryBuilder, filters: QueryFilter) {
+    // {"status": "Open"} => `status = "Open"`
+
+    // {"status": "Open", "name": ["like", "apple%"]}
+    // => `status="Open" and name like "apple%"
+
+    // {"date": [">=", "2017-09-09", "<=", "2017-11-01"]}
+    // => `date >= 2017-09-09 and date <= 2017-11-01`
+
+    const filtersArray = [];
+
+    for (const field in filters) {
+      const value = filters[field];
+      let operator = '=';
+      let comparisonValue = value;
+
+      if (Array.isArray(value)) {
+        operator = value[0];
+        comparisonValue = value[1];
+        operator = operator.toLowerCase();
+
+        if (operator === 'includes') {
+          operator = 'like';
+        }
+
+        if (operator === 'like' && !comparisonValue.includes('%')) {
+          comparisonValue = `%${comparisonValue}%`;
+        }
+      }
+
+      filtersArray.push([field, operator, comparisonValue]);
+
+      if (Array.isArray(value) && value.length > 2) {
+        // multiple conditions
+        const operator = value[2];
+        const comparisonValue = value[3];
+        filtersArray.push([field, operator, comparisonValue]);
+      }
+    }
+
+    filtersArray.map((filter) => {
+      const [field, operator, comparisonValue] = filter;
+      if (operator === '=') {
+        builder.where(field, comparisonValue);
+      } else {
+        builder.where(field, operator, comparisonValue);
+      }
+    });
+  }
+}
diff --git a/backend/database/database.ts b/backend/database/database.ts
new file mode 100644
index 00000000..183a2841
--- /dev/null
+++ b/backend/database/database.ts
@@ -0,0 +1,925 @@
+import { knex, Knex } from 'knex';
+import { pesa } from 'pesa';
+import { getRandomString } from '../../frappe/utils';
+import CacheManager from '../../frappe/utils/cacheManager';
+import {
+  CannotCommitError,
+  DatabaseError,
+  DuplicateEntryError,
+  LinkValidationError,
+  ValueError,
+} from '../../frappe/utils/errors';
+import Observable from '../../frappe/utils/observable';
+import { getMeta, getModels, getNewDoc, sqliteTypeMap } from '../common';
+
+interface GetAllOptions {
+  doctype?: string;
+  fields?: string[];
+  filters?: Record<string, string>;
+  start?: number;
+  limit?: number;
+  groupBy?: string;
+  orderBy?: string;
+  order?: string;
+}
+
+export default class Database extends Observable<never> {
+  knex: Knex;
+  cache: CacheManager;
+
+  constructor(dbPath: string) {
+    super();
+    this.typeMap = sqliteTypeMap;
+    this.cache = new CacheManager();
+    this.dbPath = dbPath;
+    this.connectionParams = {
+      client: 'sqlite3',
+      connection: {
+        filename: this.dbPath,
+      },
+      pool: {
+        afterCreate(conn, done) {
+          conn.run('PRAGMA foreign_keys=ON');
+          done();
+        },
+      },
+      useNullAsDefault: true,
+      asyncStackTraces: process.env.NODE_ENV === 'development',
+    };
+  }
+
+  connect() {
+    this.knex = knex(this.connectionParams);
+    this.knex.on('query-error', (error) => {
+      error.type = this.getError(error);
+    });
+  }
+
+  close() {
+    //
+  }
+
+  /**
+   * TODO: Refactor this
+   *
+   * essentially it's not models that are required by the database
+   * but the schema, all the information that is relevant to building
+   * tables needs to given to this function.
+   */
+  async migrate() {
+    const models = getModels();
+    for (const doctype in models) {
+      // check if controller module
+      const meta = getMeta(doctype);
+      const baseDoctype = meta.getBaseDocType();
+
+      if (!meta.isSingle) {
+        if (await this.tableExists(baseDoctype)) {
+          await this.alterTable(baseDoctype);
+        } else {
+          await this.createTable(baseDoctype);
+        }
+      }
+    }
+
+    await this.commit();
+    await this.initializeSingles();
+  }
+
+  async initializeSingles() {
+    const models = getModels();
+    const singleDoctypes = Object.keys(models)
+      .filter((n) => models[n].isSingle)
+      .map((n) => models[n].name);
+
+    for (const doctype of singleDoctypes) {
+      if (await this.singleExists(doctype)) {
+        const singleValues = await this.getSingleFieldsToInsert(doctype);
+        singleValues.forEach(({ fieldname, value }) => {
+          const singleValue = getNewDoc({
+            doctype: 'SingleValue',
+            parent: doctype,
+            fieldname,
+            value,
+          });
+          singleValue.insert();
+        });
+        continue;
+      }
+      const meta = getMeta(doctype);
+      if (meta.fields.every((df) => df.default == null)) {
+        continue;
+      }
+      const defaultValues = meta.fields.reduce((doc, df) => {
+        if (df.default != null) {
+          doc[df.fieldname] = df.default;
+        }
+        return doc;
+      }, {});
+      await this.updateSingle(doctype, defaultValues);
+    }
+  }
+
+  async singleExists(doctype) {
+    const res = await this.knex('SingleValue')
+      .count('parent as count')
+      .where('parent', doctype)
+      .first();
+    return res.count > 0;
+  }
+
+  async getSingleFieldsToInsert(doctype) {
+    const existingFields = (
+      await this.knex('SingleValue')
+        .where({ parent: doctype })
+        .select('fieldname')
+    ).map(({ fieldname }) => fieldname);
+
+    return getMeta(doctype)
+      .fields.map(({ fieldname, default: value }) => ({
+        fieldname,
+        value,
+      }))
+      .filter(
+        ({ fieldname, value }) =>
+          !existingFields.includes(fieldname) && value !== undefined
+      );
+  }
+
+  tableExists(table) {
+    return this.knex.schema.hasTable(table);
+  }
+
+  async createTable(doctype, tableName = null) {
+    const fields = this.getValidFields(doctype);
+    return await this.runCreateTableQuery(tableName || doctype, fields);
+  }
+
+  runCreateTableQuery(doctype, fields) {
+    return this.knex.schema.createTable(doctype, (table) => {
+      for (const field of fields) {
+        this.buildColumnForTable(table, field);
+      }
+    });
+  }
+
+  async alterTable(doctype) {
+    // get columns
+    const diff = await this.getColumnDiff(doctype);
+    const newForeignKeys = await this.getNewForeignKeys(doctype);
+
+    return this.knex.schema
+      .table(doctype, (table) => {
+        if (diff.added.length) {
+          for (const field of diff.added) {
+            this.buildColumnForTable(table, field);
+          }
+        }
+
+        if (diff.removed.length) {
+          this.removeColumns(doctype, diff.removed);
+        }
+      })
+      .then(() => {
+        if (newForeignKeys.length) {
+          return this.addForeignKeys(doctype, newForeignKeys);
+        }
+      });
+  }
+
+  buildColumnForTable(table, field) {
+    const columnType = this.getColumnType(field);
+    if (!columnType) {
+      // In case columnType is "Table"
+      // childTable links are handled using the childTable's "parent" field
+      return;
+    }
+
+    const column = table[columnType](field.fieldname);
+
+    // primary key
+    if (field.fieldname === 'name') {
+      column.primary();
+    }
+
+    // default value
+    if (!!field.default && !(field.default instanceof Function)) {
+      column.defaultTo(field.default);
+    }
+
+    // required
+    if (
+      (!!field.required && !(field.required instanceof Function)) ||
+      field.fieldtype === 'Currency'
+    ) {
+      column.notNullable();
+    }
+
+    // link
+    if (field.fieldtype === 'Link' && field.target) {
+      const meta = getMeta(field.target);
+      table
+        .foreign(field.fieldname)
+        .references('name')
+        .inTable(meta.getBaseDocType())
+        .onUpdate('CASCADE')
+        .onDelete('RESTRICT');
+    }
+  }
+
+  async getColumnDiff(doctype) {
+    const tableColumns = await this.getTableColumns(doctype);
+    const validFields = this.getValidFields(doctype);
+    const diff = { added: [], removed: [] };
+
+    for (const field of validFields) {
+      if (
+        !tableColumns.includes(field.fieldname) &&
+        this.getColumnType(field)
+      ) {
+        diff.added.push(field);
+      }
+    }
+
+    const validFieldNames = validFields.map((field) => field.fieldname);
+    for (const column of tableColumns) {
+      if (!validFieldNames.includes(column)) {
+        diff.removed.push(column);
+      }
+    }
+
+    return diff;
+  }
+
+  async removeColumns(doctype: string, removed: string[]) {
+    // TODO: Implement this for sqlite
+  }
+
+  async getNewForeignKeys(doctype) {
+    const foreignKeys = await this.getForeignKeys(doctype);
+    const newForeignKeys = [];
+    const meta = getMeta(doctype);
+    for (const field of meta.getValidFields({ withChildren: false })) {
+      if (
+        field.fieldtype === 'Link' &&
+        !foreignKeys.includes(field.fieldname)
+      ) {
+        newForeignKeys.push(field);
+      }
+    }
+    return newForeignKeys;
+  }
+
+  async get(doctype, name = null, fields = '*') {
+    const meta = getMeta(doctype);
+    let doc;
+    if (meta.isSingle) {
+      doc = await this.getSingle(doctype);
+      doc.name = doctype;
+    } else {
+      if (!name) {
+        throw new ValueError('name is mandatory');
+      }
+      doc = await this.getOne(doctype, name, fields);
+    }
+    if (!doc) {
+      return;
+    }
+    await this.loadChildren(doc, meta);
+    return doc;
+  }
+
+  async loadChildren(doc, meta) {
+    // load children
+    const tableFields = meta.getTableFields();
+    for (const field of tableFields) {
+      doc[field.fieldname] = await this.getAll({
+        doctype: field.childtype,
+        fields: ['*'],
+        filters: { parent: doc.name },
+        orderBy: 'idx',
+        order: 'asc',
+      });
+    }
+  }
+
+  async getSingle(doctype) {
+    const values = await this.getAll({
+      doctype: 'SingleValue',
+      fields: ['fieldname', 'value'],
+      filters: { parent: doctype },
+      orderBy: 'fieldname',
+      order: 'asc',
+    });
+    const doc = {};
+    for (const row of values) {
+      doc[row.fieldname] = row.value;
+    }
+    return doc;
+  }
+
+  /**
+   * Get list of values from the singles table.
+   * @param  {...string | Object} fieldnames list of fieldnames to get the values of
+   * @returns {Array<Object>} array of {parent, value, fieldname}.
+   * @example
+   * Database.getSingleValues('internalPrecision');
+   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
+   * @example
+   * Database.getSingleValues({fieldname:'internalPrecision', parent: 'SystemSettings'});
+   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
+   */
+  async getSingleValues(...fieldnames) {
+    fieldnames = fieldnames.map((fieldname) => {
+      if (typeof fieldname === 'string') {
+        return { fieldname };
+      }
+      return fieldname;
+    });
+
+    let builder = this.knex('SingleValue');
+    builder = builder.where(fieldnames[0]);
+
+    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
+      if (typeof parent === 'undefined') {
+        builder = builder.orWhere({ fieldname });
+      } else {
+        builder = builder.orWhere({ fieldname, parent });
+      }
+    });
+
+    let values = [];
+    try {
+      values = await builder.select('fieldname', 'value', 'parent');
+    } catch (error) {
+      if (error.message.includes('no such table')) {
+        return [];
+      }
+      throw error;
+    }
+
+    return values.map((value) => {
+      const fields = getMeta(value.parent).fields;
+      return this.getDocFormattedDoc(fields, values);
+    });
+  }
+
+  async getOne(doctype, name, fields = '*') {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+
+    const doc = await this.knex
+      .select(fields)
+      .from(baseDoctype)
+      .where('name', name)
+      .first();
+
+    if (!doc) {
+      return doc;
+    }
+
+    return this.getDocFormattedDoc(meta.fields, doc);
+  }
+
+  getDocFormattedDoc(fields, doc) {
+    // format for usage, not going into the db
+    const docFields = Object.keys(doc);
+    const filteredFields = fields.filter(({ fieldname }) =>
+      docFields.includes(fieldname)
+    );
+
+    const formattedValues = filteredFields.reduce((d, field) => {
+      const { fieldname } = field;
+      d[fieldname] = this.getDocFormattedValues(field, doc[fieldname]);
+      return d;
+    }, {});
+
+    return Object.assign(doc, formattedValues);
+  }
+
+  getDocFormattedValues(field, value) {
+    // format for usage, not going into the db
+    try {
+      if (field.fieldtype === 'Currency') {
+        return pesa(value);
+      }
+    } catch (err) {
+      err.message += ` value: '${value}' of type: ${typeof value}, fieldname: '${
+        field.fieldname
+      }', label: '${field.label}'`;
+      throw err;
+    }
+    return value;
+  }
+
+  triggerChange(doctype, name) {
+    this.trigger(`change:${doctype}`, { name }, 500);
+    this.trigger(`change`, { doctype, name }, 500);
+    // also trigger change for basedOn doctype
+    const meta = getMeta(doctype);
+    if (meta.basedOn) {
+      this.triggerChange(meta.basedOn, name);
+    }
+  }
+
+  async insert(doctype, doc) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    doc = this.applyBaseDocTypeFilters(doctype, doc);
+
+    // insert parent
+    if (meta.isSingle) {
+      await this.updateSingle(doctype, doc);
+    } else {
+      await this.insertOne(baseDoctype, doc);
+    }
+
+    // insert children
+    await this.insertChildren(meta, doc, baseDoctype);
+
+    this.triggerChange(doctype, doc.name);
+
+    return doc;
+  }
+
+  async insertChildren(meta, doc, doctype) {
+    const tableFields = meta.getTableFields();
+    for (const field of tableFields) {
+      let idx = 0;
+      for (const child of doc[field.fieldname] || []) {
+        this.prepareChild(doctype, doc.name, child, field, idx);
+        await this.insertOne(field.childtype, child);
+        idx++;
+      }
+    }
+  }
+
+  insertOne(doctype, doc) {
+    const fields = this.getValidFields(doctype);
+
+    if (!doc.name) {
+      doc.name = getRandomString();
+    }
+
+    const formattedDoc = this.getFormattedDoc(fields, doc);
+    return this.knex(doctype).insert(formattedDoc);
+  }
+
+  async update(doctype, doc) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    doc = this.applyBaseDocTypeFilters(doctype, doc);
+
+    // update parent
+    if (meta.isSingle) {
+      await this.updateSingle(doctype, doc);
+    } else {
+      await this.updateOne(baseDoctype, doc);
+    }
+
+    // insert or update children
+    await this.updateChildren(meta, doc, baseDoctype);
+
+    this.triggerChange(doctype, doc.name);
+
+    return doc;
+  }
+
+  async updateChildren(meta, doc, doctype) {
+    const tableFields = meta.getTableFields();
+    for (const field of tableFields) {
+      const added = [];
+      for (const child of doc[field.fieldname] || []) {
+        this.prepareChild(doctype, doc.name, child, field, added.length);
+        if (await this.exists(field.childtype, child.name)) {
+          await this.updateOne(field.childtype, child);
+        } else {
+          await this.insertOne(field.childtype, child);
+        }
+        added.push(child.name);
+      }
+      await this.runDeleteOtherChildren(field, doc.name, added);
+    }
+  }
+
+  updateOne(doctype, doc) {
+    const validFields = this.getValidFields(doctype);
+    const fieldsToUpdate = Object.keys(doc).filter((f) => f !== 'name');
+    const fields = validFields.filter((df) =>
+      fieldsToUpdate.includes(df.fieldname)
+    );
+    const formattedDoc = this.getFormattedDoc(fields, doc);
+
+    return this.knex(doctype)
+      .where('name', doc.name)
+      .update(formattedDoc)
+      .then(() => {
+        const cacheKey = `${doctype}:${doc.name}`;
+        if (this.cache.hexists(cacheKey)) {
+          for (const fieldname in formattedDoc) {
+            const value = formattedDoc[fieldname];
+            this.cache.hset(cacheKey, fieldname, value);
+          }
+        }
+      });
+  }
+
+  runDeleteOtherChildren(field, parent, added) {
+    // delete other children
+    return this.knex(field.childtype)
+      .where('parent', parent)
+      .andWhere('name', 'not in', added)
+      .delete();
+  }
+
+  async updateSingle(doctype, doc) {
+    const meta = getMeta(doctype);
+    await this.deleteSingleValues(doctype);
+    for (const field of meta.getValidFields({ withChildren: false })) {
+      const value = doc[field.fieldname];
+      if (value != null) {
+        const singleValue = getNewDoc({
+          doctype: 'SingleValue',
+          parent: doctype,
+          fieldname: field.fieldname,
+          value: value,
+        });
+        await singleValue.insert();
+      }
+    }
+  }
+
+  deleteSingleValues(name) {
+    return this.knex('SingleValue').where('parent', name).delete();
+  }
+
+  async rename(doctype, oldName, newName) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    await this.knex(baseDoctype)
+      .update({ name: newName })
+      .where('name', oldName)
+      .then(() => {
+        this.clearValueCache(doctype, oldName);
+      });
+    await this.commit();
+
+    this.triggerChange(doctype, newName);
+  }
+
+  prepareChild(parenttype, parent, child, field, idx) {
+    if (!child.name) {
+      child.name = getRandomString();
+    }
+    child.parent = parent;
+    child.parenttype = parenttype;
+    child.parentfield = field.fieldname;
+    child.idx = idx;
+  }
+
+  getValidFields(doctype) {
+    return getMeta(doctype).getValidFields({ withChildren: false });
+  }
+
+  getFormattedDoc(fields, doc) {
+    // format for storage, going into the db
+    const formattedDoc = {};
+    fields.map((field) => {
+      const value = doc[field.fieldname];
+      formattedDoc[field.fieldname] = this.getFormattedValue(field, value);
+    });
+    return formattedDoc;
+  }
+
+  getFormattedValue(field, value) {
+    // format for storage, going into the db
+    const type = typeof value;
+    if (field.fieldtype === 'Currency') {
+      let currency = value;
+
+      if (type === 'number' || type === 'string') {
+        currency = pesa(value);
+      }
+
+      const currencyValue = currency.store;
+      if (typeof currencyValue !== 'string') {
+        throw new Error(
+          `invalid currencyValue '${currencyValue}' of type '${typeof currencyValue}' on converting from '${value}' of type '${type}'`
+        );
+      }
+
+      return currencyValue;
+    }
+
+    if (value instanceof Date) {
+      if (field.fieldtype === 'Date') {
+        // date
+        return value.toISOString().substr(0, 10);
+      } else {
+        // datetime
+        return value.toISOString();
+      }
+    } else if (field.fieldtype === 'Link' && !value) {
+      // empty value must be null to satisfy
+      // foreign key constraint
+      return null;
+    } else {
+      return value;
+    }
+  }
+
+  applyBaseDocTypeFilters(doctype, doc) {
+    const meta = getMeta(doctype);
+    if (meta.filters) {
+      for (const fieldname in meta.filters) {
+        const value = meta.filters[fieldname];
+        if (typeof value !== 'object') {
+          doc[fieldname] = value;
+        }
+      }
+    }
+    return doc;
+  }
+
+  async deleteMany(doctype, names) {
+    for (const name of names) {
+      await this.delete(doctype, name);
+    }
+  }
+
+  async delete(doctype, name) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    await this.deleteOne(baseDoctype, name);
+
+    // delete children
+    const tableFields = getMeta(doctype).getTableFields();
+    for (const field of tableFields) {
+      await this.deleteChildren(field.childtype, name);
+    }
+
+    this.triggerChange(doctype, name);
+  }
+
+  async deleteOne(doctype, name) {
+    return this.knex(doctype)
+      .where('name', name)
+      .delete()
+      .then(() => {
+        this.clearValueCache(doctype, name);
+      });
+  }
+
+  deleteChildren(parenttype, parent) {
+    return this.knex(parenttype).where('parent', parent).delete();
+  }
+
+  async exists(doctype, name) {
+    return (await this.getValue(doctype, name)) ? true : false;
+  }
+
+  async getValue(doctype, filters, fieldname = 'name') {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    if (typeof filters === 'string') {
+      filters = { name: filters };
+    }
+    if (meta.filters) {
+      Object.assign(filters, meta.filters);
+    }
+
+    const row = await this.getAll({
+      doctype: baseDoctype,
+      fields: [fieldname],
+      filters: filters,
+      start: 0,
+      limit: 1,
+      orderBy: 'name',
+      order: 'asc',
+    });
+    return row.length ? row[0][fieldname] : null;
+  }
+
+  async setValue(doctype, name, fieldname, value) {
+    return await this.setValues(doctype, name, {
+      [fieldname]: value,
+    });
+  }
+
+  async setValues(doctype, name, fieldValuePair) {
+    const doc = Object.assign({}, fieldValuePair, { name });
+    return this.updateOne(doctype, doc);
+  }
+
+  async getCachedValue(doctype, name, fieldname) {
+    let value = this.cache.hget(`${doctype}:${name}`, fieldname);
+    if (value == null) {
+      value = await this.getValue(doctype, name, fieldname);
+    }
+    return value;
+  }
+
+  async getAll({
+    doctype,
+    fields,
+    filters,
+    start,
+    limit,
+    groupBy,
+    orderBy = 'creation',
+    order = 'desc',
+  }: GetAllOptions = {}) {
+    const meta = getMeta(doctype);
+    const baseDoctype = meta.getBaseDocType();
+    if (!fields) {
+      fields = meta.getKeywordFields();
+      fields.push('name');
+    }
+    if (typeof fields === 'string') {
+      fields = [fields];
+    }
+    if (meta.filters) {
+      filters = Object.assign({}, filters, meta.filters);
+    }
+
+    const builder = this.knex.select(fields).from(baseDoctype);
+
+    this.applyFiltersToBuilder(builder, filters);
+
+    if (orderBy) {
+      builder.orderBy(orderBy, order);
+    }
+
+    if (groupBy) {
+      builder.groupBy(groupBy);
+    }
+
+    if (start) {
+      builder.offset(start);
+    }
+
+    if (limit) {
+      builder.limit(limit);
+    }
+
+    const docs = await builder;
+    return docs.map((doc) => this.getDocFormattedDoc(meta.fields, doc));
+  }
+
+  applyFiltersToBuilder(builder, filters) {
+    // {"status": "Open"} => `status = "Open"`
+
+    // {"status": "Open", "name": ["like", "apple%"]}
+    // => `status="Open" and name like "apple%"
+
+    // {"date": [">=", "2017-09-09", "<=", "2017-11-01"]}
+    // => `date >= 2017-09-09 and date <= 2017-11-01`
+
+    const filtersArray = [];
+
+    for (const field in filters) {
+      const value = filters[field];
+      let operator = '=';
+      let comparisonValue = value;
+
+      if (Array.isArray(value)) {
+        operator = value[0];
+        comparisonValue = value[1];
+        operator = operator.toLowerCase();
+
+        if (operator === 'includes') {
+          operator = 'like';
+        }
+
+        if (operator === 'like' && !comparisonValue.includes('%')) {
+          comparisonValue = `%${comparisonValue}%`;
+        }
+      }
+
+      filtersArray.push([field, operator, comparisonValue]);
+
+      if (Array.isArray(value) && value.length > 2) {
+        // multiple conditions
+        const operator = value[2];
+        const comparisonValue = value[3];
+        filtersArray.push([field, operator, comparisonValue]);
+      }
+    }
+
+    filtersArray.map((filter) => {
+      const [field, operator, comparisonValue] = filter;
+      if (operator === '=') {
+        builder.where(field, comparisonValue);
+      } else {
+        builder.where(field, operator, comparisonValue);
+      }
+    });
+  }
+
+  sql(query: string, params: Knex.RawBinding[] = []) {
+    // run raw query
+    return this.knex.raw(query, params);
+  }
+
+  async commit() {
+    try {
+      await this.sql('commit');
+    } catch (e) {
+      if (e.type !== CannotCommitError) {
+        throw e;
+      }
+    }
+  }
+
+  clearValueCache(doctype, name) {
+    const cacheKey = `${doctype}:${name}`;
+    this.cache.hclear(cacheKey);
+  }
+
+  getColumnType(field) {
+    return this.typeMap[field.fieldtype];
+  }
+
+  async addForeignKeys(doctype, newForeignKeys) {
+    await this.sql('PRAGMA foreign_keys=OFF');
+    await this.sql('BEGIN TRANSACTION');
+
+    const tempName = 'TEMP' + doctype;
+
+    // create temp table
+    await this.createTable(doctype, tempName);
+
+    try {
+      // copy from old to new table
+      await this.knex(tempName).insert(this.knex.select().from(doctype));
+    } catch (err) {
+      await this.sql('ROLLBACK');
+      await this.sql('PRAGMA foreign_keys=ON');
+
+      const rows = await this.knex.select().from(doctype);
+      await this.prestigeTheTable(doctype, rows);
+      return;
+    }
+
+    // drop old table
+    await this.knex.schema.dropTable(doctype);
+
+    // rename new table
+    await this.knex.schema.renameTable(tempName, doctype);
+
+    await this.sql('COMMIT');
+    await this.sql('PRAGMA foreign_keys=ON');
+  }
+
+  async getTableColumns(doctype: string) {
+    return (await this.sql(`PRAGMA table_info(${doctype})`)).map((d) => d.name);
+  }
+
+  async getForeignKeys(doctype: string) {
+    return (await this.sql(`PRAGMA foreign_key_list(${doctype})`)).map(
+      (d) => d.from
+    );
+  }
+
+  getError(err) {
+    let errorType = DatabaseError;
+    if (err.message.includes('FOREIGN KEY')) {
+      errorType = LinkValidationError;
+    }
+    if (err.message.includes('SQLITE_ERROR: cannot commit')) {
+      errorType = CannotCommitError;
+    }
+    if (err.message.includes('SQLITE_CONSTRAINT: UNIQUE constraint failed:')) {
+      errorType = DuplicateEntryError;
+    }
+    return errorType;
+  }
+
+  async prestigeTheTable(tableName, tableRows) {
+    const max = 200;
+
+    // Alter table hacx for sqlite in case of schema change.
+    const tempName = `__${tableName}`;
+    await this.knex.schema.dropTableIfExists(tempName);
+
+    await this.knex.raw('PRAGMA foreign_keys=OFF');
+    await this.createTable(tableName, tempName);
+
+    if (tableRows.length > 200) {
+      const fi = Math.floor(tableRows.length / max);
+      for (let i = 0; i <= fi; i++) {
+        const rowSlice = tableRows.slice(i * max, i + 1 * max);
+        if (rowSlice.length === 0) {
+          break;
+        }
+        await this.knex.batchInsert(tempName, rowSlice);
+      }
+    } else {
+      await this.knex.batchInsert(tempName, tableRows);
+    }
+
+    await this.knex.schema.dropTable(tableName);
+    await this.knex.schema.renameTable(tempName, tableName);
+    await this.knex.raw('PRAGMA foreign_keys=ON');
+  }
+}
diff --git a/backend/database/types.ts b/backend/database/types.ts
new file mode 100644
index 00000000..39e62812
--- /dev/null
+++ b/backend/database/types.ts
@@ -0,0 +1,11 @@
+export type RawType = string | number | boolean;
+export type RawData = Record<string, RawType>[];
+export type QueryFilter = Record<string, string | string[]>;
+
+export interface GetQueryBuilderOptions {
+  offset: number;
+  limit: number;
+  groupBy: string;
+  orderBy: string;
+  order: 'desc' | 'asc';
+}
diff --git a/common/model.ts b/common/model.ts
new file mode 100644
index 00000000..278a6696
--- /dev/null
+++ b/common/model.ts
@@ -0,0 +1,6 @@
+import models from '../models';
+import coreModels from '../frappe/models';
+
+export function getModel() {
+  console.log(models, coreModels);
+}
diff --git a/frappe/backends/database.js b/frappe/backends/database.js
index af4839b8..d0951e00 100644
--- a/frappe/backends/database.js
+++ b/frappe/backends/database.js
@@ -1,6 +1,6 @@
 import frappe from 'frappe';
 import Observable from 'frappe/utils/observable';
-import Knex from 'knex';
+import { knex } from 'knex';
 import CacheManager from '../utils/cacheManager';
 import { getRandomString } from '../utils/index';
 
@@ -13,7 +13,7 @@ export default class Database extends Observable {
   }
 
   connect() {
-    this.knex = Knex(this.connectionParams);
+    this.knex = knex(this.connectionParams);
     this.knex.on('query-error', (error) => {
       error.type = this.getError(error);
     });
diff --git a/frappe/core/docHandler.ts b/frappe/core/docHandler.ts
index c2a9cc5e..ad3b6a66 100644
--- a/frappe/core/docHandler.ts
+++ b/frappe/core/docHandler.ts
@@ -58,7 +58,7 @@ export class DocHandler {
     }
   }
 
-  getModels(filterFunction: (name: Model) => boolean) {
+  getModels(filterFunction: (name: Model) => boolean): Model[] {
     const models: Model[] = [];
     for (const doctype in this.models) {
       models.push(this.models[doctype]!);
diff --git a/frappe/model/meta.js b/frappe/model/meta.js
index 9fa66c87..9dd9153c 100644
--- a/frappe/model/meta.js
+++ b/frappe/model/meta.js
@@ -7,6 +7,9 @@ import Document from './document';
 import model from './index';
 
 export default class Meta extends Document {
+  filters;
+  basedOn;
+
   constructor(data) {
     if (data.basedOn) {
       let config = frappe.models[data.basedOn];
diff --git a/frappe/utils/cacheManager.ts b/frappe/utils/cacheManager.ts
index 2c7f3de0..f00e3857 100644
--- a/frappe/utils/cacheManager.ts
+++ b/frappe/utils/cacheManager.ts
@@ -38,7 +38,7 @@ export default class CacheManager {
     this._hashCache.get(hashName)!.set(key, value);
   }
 
-  hclear(hashName: string, key: string) {
+  hclear(hashName: string, key?: string) {
     if (key) {
       this._hashCache.get(hashName)?.delete(key);
     } else {

From a546f144cac78591313537f23ef3f28207656ac5 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 23 Mar 2022 12:17:13 +0530
Subject: [PATCH 010/163] incr: drop unused doctypes

---
 frappe/models/doctype/File/File.js            |  61 ---
 .../models/doctype/PrintFormat/PrintFormat.js |  33 --
 frappe/models/doctype/Role/Role.js            |  17 -
 frappe/models/doctype/Session/Session.js      |  23 --
 frappe/models/doctype/ToDo/ToDo.js            |  62 ---
 frappe/models/doctype/ToDo/ToDoList.js        |   7 -
 frappe/models/doctype/User/User.js            |  42 --
 frappe/models/doctype/UserRole/UserRole.js    |  17 -
 frappe/models/index.js                        |  12 -
 models/doctype/Email/Email.js                 |  73 ----
 models/doctype/EmailAccount/EmailAccount.js   |  54 ---
 models/doctype/Event/Event.js                 |  39 --
 models/doctype/Event/EventDocument.js         |   7 -
 models/doctype/EventSchedule/EventSchedule.js |  19 -
 models/doctype/EventSettings/EventSettings.js |  17 -
 models/doctype/Fulfillment/Fulfillment.js     |  27 --
 .../FulfillmentItem/FulfillmentItem.js        |   6 -
 .../FulfillmentItem/RegionalChanges.js        |  25 --
 .../FulfillmentSettings.js                    |   9 -
 models/doctype/GSTR3B/GSTR3B.js               |  78 ----
 models/doctype/GSTR3B/GSTR3BDocument.js       | 150 -------
 models/doctype/GSTR3B/GSTR3BFormat.js         | 386 ------------------
 models/doctype/GSTR3B/GSTR3BList.js           |   7 -
 models/doctype/GSTR3B/GSTR3BPrintView.vue     | 367 -----------------
 models/doctype/GSTR3B/GSTR3BServer.js         |  12 -
 models/doctype/PurchaseOrder/PurchaseOrder.js |  33 --
 .../PurchaseOrderItem/PurchaseOrderItem.js    |   6 -
 .../PurchaseOrderSettings.js                  |   9 -
 .../PurchaseReceipt/PurchaseReceipt.js        |  27 --
 .../PurchaseReceiptItem.js                    |  21 -
 .../PurchaseReceiptSettings.js                |   9 -
 models/doctype/Quotation/Quotation.js         |  37 --
 models/doctype/Quotation/QuotationDocument.js |   3 -
 models/doctype/QuotationItem/QuotationItem.js |   6 -
 .../doctype/QuotationItem/RegionalChanges.js  |  25 --
 .../QuotationSettings/QuotationSettings.js    |   9 -
 models/doctype/SalesOrder/SalesOrder.js       |  27 --
 .../doctype/SalesOrderItem/RegionalChanges.js |  25 --
 .../doctype/SalesOrderItem/SalesOrderItem.js  |   6 -
 .../SalesOrderSettings/SalesOrderSettings.js  |   9 -
 models/index.js                               |  76 +---
 models/types.ts                               |   1 -
 reports/GoodsAndServiceTax/BaseViewConfig.js  |   4 +-
 reports/view.js                               |  28 +-
 server/postStart.js                           |   7 -
 src/pages/ListView/listConfig.js              |  24 +-
 46 files changed, 42 insertions(+), 1900 deletions(-)
 delete mode 100644 frappe/models/doctype/File/File.js
 delete mode 100644 frappe/models/doctype/PrintFormat/PrintFormat.js
 delete mode 100644 frappe/models/doctype/Role/Role.js
 delete mode 100644 frappe/models/doctype/Session/Session.js
 delete mode 100644 frappe/models/doctype/ToDo/ToDo.js
 delete mode 100644 frappe/models/doctype/ToDo/ToDoList.js
 delete mode 100644 frappe/models/doctype/User/User.js
 delete mode 100644 frappe/models/doctype/UserRole/UserRole.js
 delete mode 100644 models/doctype/Email/Email.js
 delete mode 100644 models/doctype/EmailAccount/EmailAccount.js
 delete mode 100644 models/doctype/Event/Event.js
 delete mode 100644 models/doctype/Event/EventDocument.js
 delete mode 100644 models/doctype/EventSchedule/EventSchedule.js
 delete mode 100644 models/doctype/EventSettings/EventSettings.js
 delete mode 100644 models/doctype/Fulfillment/Fulfillment.js
 delete mode 100644 models/doctype/FulfillmentItem/FulfillmentItem.js
 delete mode 100644 models/doctype/FulfillmentItem/RegionalChanges.js
 delete mode 100644 models/doctype/FulfillmentSettings/FulfillmentSettings.js
 delete mode 100644 models/doctype/GSTR3B/GSTR3B.js
 delete mode 100644 models/doctype/GSTR3B/GSTR3BDocument.js
 delete mode 100644 models/doctype/GSTR3B/GSTR3BFormat.js
 delete mode 100644 models/doctype/GSTR3B/GSTR3BList.js
 delete mode 100644 models/doctype/GSTR3B/GSTR3BPrintView.vue
 delete mode 100644 models/doctype/GSTR3B/GSTR3BServer.js
 delete mode 100644 models/doctype/PurchaseOrder/PurchaseOrder.js
 delete mode 100644 models/doctype/PurchaseOrderItem/PurchaseOrderItem.js
 delete mode 100644 models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js
 delete mode 100644 models/doctype/PurchaseReceipt/PurchaseReceipt.js
 delete mode 100644 models/doctype/PurchaseReceiptItem/PurchaseReceiptItem.js
 delete mode 100644 models/doctype/PurchaseReceiptSettings/PurchaseReceiptSettings.js
 delete mode 100644 models/doctype/Quotation/Quotation.js
 delete mode 100644 models/doctype/Quotation/QuotationDocument.js
 delete mode 100644 models/doctype/QuotationItem/QuotationItem.js
 delete mode 100644 models/doctype/QuotationItem/RegionalChanges.js
 delete mode 100644 models/doctype/QuotationSettings/QuotationSettings.js
 delete mode 100644 models/doctype/SalesOrder/SalesOrder.js
 delete mode 100644 models/doctype/SalesOrderItem/RegionalChanges.js
 delete mode 100644 models/doctype/SalesOrderItem/SalesOrderItem.js
 delete mode 100644 models/doctype/SalesOrderSettings/SalesOrderSettings.js

diff --git a/frappe/models/doctype/File/File.js b/frappe/models/doctype/File/File.js
deleted file mode 100644
index 3f41637d..00000000
--- a/frappe/models/doctype/File/File.js
+++ /dev/null
@@ -1,61 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'File',
-  doctype: 'DocType',
-  isSingle: 0,
-  keywordFields: ['name', 'filename'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`File Path`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'filename',
-      label: t`File Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'mimetype',
-      label: t`MIME Type`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'size',
-      label: t`File Size`,
-      fieldtype: 'Int',
-    },
-    {
-      fieldname: 'referenceDoctype',
-      label: t`Reference DocType`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'referenceName',
-      label: t`Reference Name`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'referenceField',
-      label: t`Reference Field`,
-      fieldtype: 'Data',
-    },
-  ],
-  layout: [
-    {
-      columns: [{ fields: ['filename'] }],
-    },
-    {
-      columns: [{ fields: ['mimetype'] }, { fields: ['size'] }],
-    },
-    {
-      columns: [
-        { fields: ['referenceDoctype'] },
-        { fields: ['referenceName'] },
-      ],
-    },
-  ],
-};
diff --git a/frappe/models/doctype/PrintFormat/PrintFormat.js b/frappe/models/doctype/PrintFormat/PrintFormat.js
deleted file mode 100644
index 728c9f13..00000000
--- a/frappe/models/doctype/PrintFormat/PrintFormat.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'PrintFormat',
-  label: t`Print Format`,
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'for',
-      label: t`For`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'template',
-      label: t`Template`,
-      fieldtype: 'Code',
-      required: 1,
-      options: {
-        mode: 'text/html',
-      },
-    },
-  ],
-};
diff --git a/frappe/models/doctype/Role/Role.js b/frappe/models/doctype/Role/Role.js
deleted file mode 100644
index fc228cef..00000000
--- a/frappe/models/doctype/Role/Role.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'Role',
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-  ],
-};
diff --git a/frappe/models/doctype/Session/Session.js b/frappe/models/doctype/Session/Session.js
deleted file mode 100644
index c5835a19..00000000
--- a/frappe/models/doctype/Session/Session.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'Session',
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'username',
-      label: t`Username`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'password',
-      label: t`Password`,
-      fieldtype: 'Password',
-      required: 1,
-    },
-  ],
-};
diff --git a/frappe/models/doctype/ToDo/ToDo.js b/frappe/models/doctype/ToDo/ToDo.js
deleted file mode 100644
index 4ea3d7ce..00000000
--- a/frappe/models/doctype/ToDo/ToDo.js
+++ /dev/null
@@ -1,62 +0,0 @@
-const { indicators } = require('../../../../src/colors');
-const { BLUE, GREEN } = indicators;
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'ToDo',
-  label: t`To Do`,
-  naming: 'autoincrement',
-  isSingle: 0,
-  keywordFields: ['subject', 'description'],
-  titleField: 'subject',
-  indicators: {
-    key: 'status',
-    colors: {
-      Open: BLUE,
-      Closed: GREEN,
-    },
-  },
-  fields: [
-    {
-      fieldname: 'subject',
-      label: t`Subject`,
-      placeholder: t`Subject`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'status',
-      label: t`Status`,
-      fieldtype: 'Select',
-      options: ['Open', 'Closed'],
-      default: 'Open',
-      required: 1,
-    },
-    {
-      fieldname: 'description',
-      label: t`Description`,
-      fieldtype: 'Text',
-    },
-  ],
-
-  quickEditFields: ['status', 'description'],
-
-  actions: [
-    {
-      label: t`Close`,
-      condition: (doc) => doc.status !== 'Closed',
-      action: async (doc) => {
-        await doc.set('status', 'Closed');
-        await doc.update();
-      },
-    },
-    {
-      label: t`Re-Open`,
-      condition: (doc) => doc.status !== 'Open',
-      action: async (doc) => {
-        await doc.set('status', 'Open');
-        await doc.update();
-      },
-    },
-  ],
-};
diff --git a/frappe/models/doctype/ToDo/ToDoList.js b/frappe/models/doctype/ToDo/ToDoList.js
deleted file mode 100644
index 893d6475..00000000
--- a/frappe/models/doctype/ToDo/ToDoList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const BaseList = require('frappe/client/view/list');
-
-module.exports = class ToDoList extends BaseList {
-  getFields(list) {
-    return ['name', 'subject', 'status'];
-  }
-};
diff --git a/frappe/models/doctype/User/User.js b/frappe/models/doctype/User/User.js
deleted file mode 100644
index 9553e9e9..00000000
--- a/frappe/models/doctype/User/User.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'User',
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: ['name', 'fullName'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Email`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'password',
-      label: t`Password`,
-      fieldtype: 'Password',
-      required: 1,
-      hidden: 1,
-    },
-    {
-      fieldname: 'fullName',
-      label: t`Full Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'roles',
-      label: t`Roles`,
-      fieldtype: 'Table',
-      childtype: 'UserRole',
-    },
-    {
-      fieldname: 'userId',
-      label: t`User ID`,
-      fieldtype: 'Data',
-      hidden: 1,
-    },
-  ],
-};
diff --git a/frappe/models/doctype/UserRole/UserRole.js b/frappe/models/doctype/UserRole/UserRole.js
deleted file mode 100644
index 54f4e37c..00000000
--- a/frappe/models/doctype/UserRole/UserRole.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'UserRole',
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 1,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'role',
-      label: t`Role`,
-      fieldtype: 'Link',
-      target: 'Role',
-    },
-  ],
-};
diff --git a/frappe/models/index.js b/frappe/models/index.js
index f4b69e46..49fa70a0 100644
--- a/frappe/models/index.js
+++ b/frappe/models/index.js
@@ -1,25 +1,13 @@
-import File from './doctype/File/File.js';
 import NumberSeries from './doctype/NumberSeries/NumberSeries.js';
 import PatchRun from './doctype/PatchRun/PatchRun.js';
 import PrintFormat from './doctype/PrintFormat/PrintFormat.js';
-import Role from './doctype/Role/Role.js';
-import Session from './doctype/Session/Session.js';
 import SingleValue from './doctype/SingleValue/SingleValue.js';
 import SystemSettings from './doctype/SystemSettings/SystemSettings.js';
-import ToDo from './doctype/ToDo/ToDo.js';
-import User from './doctype/User/User.js';
-import UserRole from './doctype/UserRole/UserRole.js';
 
 export default {
   NumberSeries,
   PrintFormat,
-  Role,
-  Session,
   SingleValue,
   SystemSettings,
-  ToDo,
-  User,
-  UserRole,
-  File,
   PatchRun,
 };
diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
deleted file mode 100644
index eda52895..00000000
--- a/models/doctype/Email/Email.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import frappe, { t } from 'frappe';
-
-export default {
-  name: 'Email',
-  doctype: 'DocType',
-  pageSettings: {
-    hideTitle: true,
-  },
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: ['name'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`name`,
-      fieldtype: 'Data',
-      required: 0,
-      hidden: 1,
-      disabled: 0,
-    },
-    {
-      fieldname: 'fromEmailAddress',
-      label: t`From`,
-      fieldtype: 'Data',
-      required: 1,
-      hidden: 0,
-      formula: async () => {
-        const accountingSettings = await frappe.getDoc('AccountingSettings');
-        return accountingSettings.email;
-      },
-      disabled: 1,
-    },
-    {
-      fieldname: 'toEmailAddress',
-      label: t`To`,
-      fieldtype: 'Data',
-      required: 1,
-      hidden: 0,
-      disabled: 0,
-    },
-    {
-      fieldname: 'date',
-      label: t`Date`,
-      fieldtype: 'Datetime',
-      required: 0,
-      hidden: 0,
-      disabled: 1,
-    },
-    {
-      fieldname: 'subject',
-      label: t`Subject`,
-      fieldtype: 'Data',
-      required: 0,
-      hidden: 0,
-      disabled: 0,
-    },
-    {
-      fieldname: 'bodyText',
-      label: t`Body`,
-      fieldtype: 'Text',
-      required: 0,
-      hidden: 0,
-      disabled: 0,
-    },
-    {
-      fieldname: 'filePath',
-      label: t`File Path`,
-      fieldtype: 'Text',
-      required: 0,
-      hidden: 1,
-    },
-  ],
-};
diff --git a/models/doctype/EmailAccount/EmailAccount.js b/models/doctype/EmailAccount/EmailAccount.js
deleted file mode 100644
index 19859567..00000000
--- a/models/doctype/EmailAccount/EmailAccount.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import frappe, { t } from 'frappe';
-
-export default {
-  name: 'EmailAccount',
-  label: t`Email Account`,
-  doctype: 'DocType',
-  isSingle: true,
-  isChild: false,
-  keywordFields: ['email'],
-  fields: [
-    {
-      fieldname: 'email',
-      label: t`Email`,
-      fieldtype: 'Data',
-      required: 1,
-      formula: async () => {
-        const accountingSettings = await frappe.getDoc('AccountingSettings');
-        return accountingSettings.email;
-      },
-    },
-    {
-      fieldname: 'password',
-      label: t`Password`,
-      fieldtype: 'Password',
-      required: 1,
-    },
-    {
-      fieldname: 'confirmPassword',
-      label: t`Confirm Password`,
-      fieldtype: 'Password',
-      required: 1,
-    },
-    {
-      fieldname: 'smtpHost',
-      label: t`SMTP Host`,
-      fieldtype: 'Select',
-      options: [
-        'smtp.gmail.com',
-        'smtp.mail.yahoo.com',
-        'smtp-mail.outlook.com',
-        'smtp.mail.me.com',
-        'smtp.aol.com',
-      ],
-      default: 'smtp.gmail.com',
-    },
-    {
-      fieldname: 'smtpPort',
-      label: t`SMTP Port`,
-      fieldtype: 'Select',
-      options: ['465', '587'],
-      default: '465',
-    },
-  ],
-};
diff --git a/models/doctype/Event/Event.js b/models/doctype/Event/Event.js
deleted file mode 100644
index b33b511d..00000000
--- a/models/doctype/Event/Event.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { t } from 'frappe';
-import EventDocument from './EventDocument';
-
-export default {
-  name: 'Event',
-  doctype: 'DocType',
-  naming: 'random',
-  documentClass: EventDocument,
-  settings: 'EventSettings',
-  fields: [
-    {
-      fieldname: 'title',
-      label: t`Title`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'date',
-      label: t`Date`,
-      fieldtype: 'Date',
-    },
-    {
-      fieldname: 'schedule',
-      fieldtype: 'Table',
-      childtype: 'EventSchedule',
-      label: t`Schedule`,
-    },
-  ],
-  titleField: 'title',
-  keywordFields: [],
-  isSingle: 0,
-  listSettings: {
-    getFields(list) {
-      return ['name', 'title', 'date'];
-    },
-    getRowHTML(list, data) {
-      return `<div class='col-11'>${data.title} on ${data.date}</div>`;
-    },
-  },
-};
diff --git a/models/doctype/Event/EventDocument.js b/models/doctype/Event/EventDocument.js
deleted file mode 100644
index c6c06908..00000000
--- a/models/doctype/Event/EventDocument.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import Document from 'frappe/model/document';
-
-export default class Event extends Document {
-  alertEvent() {
-    alert(this.title);
-  }
-}
diff --git a/models/doctype/EventSchedule/EventSchedule.js b/models/doctype/EventSchedule/EventSchedule.js
deleted file mode 100644
index 8b37acc8..00000000
--- a/models/doctype/EventSchedule/EventSchedule.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'EventSchedule',
-  doctype: 'DocType',
-  isChild: 1,
-  fields: [
-    {
-      fieldname: 'startTime',
-      label: t`Start Time`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'title',
-      label: t`Title`,
-      fieldtype: 'Data',
-    },
-  ],
-};
diff --git a/models/doctype/EventSettings/EventSettings.js b/models/doctype/EventSettings/EventSettings.js
deleted file mode 100644
index 86df3259..00000000
--- a/models/doctype/EventSettings/EventSettings.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'EventSettings',
-  label: t`Event Settings`,
-  doctype: 'DocType',
-  isSingle: 1,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'enableNotifications',
-      label: t`Enable Notifications`,
-      fieldtype: 'Check',
-    },
-  ],
-};
diff --git a/models/doctype/Fulfillment/Fulfillment.js b/models/doctype/Fulfillment/Fulfillment.js
deleted file mode 100644
index 7fbb7ec2..00000000
--- a/models/doctype/Fulfillment/Fulfillment.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-import Quotation from '../Quotation/Quotation';
-
-export default model.extend(Quotation, {
-  name: 'Fulfillment',
-  label: t`Fulfillment`,
-  settings: 'FulfillmentSettings',
-  fields: [
-    {
-      fieldname: 'items',
-      childtype: 'FulfillmentItem',
-    },
-    {
-      fieldname: 'numberSeries',
-      label: t`Number Series`,
-      fieldtype: 'Link',
-      target: 'NumberSeries',
-      required: 1,
-      getFilters: () => {
-        return { referenceType: 'Fulfillment' };
-      },
-      default: DEFAULT_NUMBER_SERIES['FulFillment'],
-    },
-  ],
-});
diff --git a/models/doctype/FulfillmentItem/FulfillmentItem.js b/models/doctype/FulfillmentItem/FulfillmentItem.js
deleted file mode 100644
index 331e19ed..00000000
--- a/models/doctype/FulfillmentItem/FulfillmentItem.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import model from 'frappe/model';
-import QuotationItem from '../QuotationItem/QuotationItem';
-
-export default model.extend(QuotationItem, {
-  name: 'FulfillmentItem',
-});
diff --git a/models/doctype/FulfillmentItem/RegionalChanges.js b/models/doctype/FulfillmentItem/RegionalChanges.js
deleted file mode 100644
index 87b0f5e8..00000000
--- a/models/doctype/FulfillmentItem/RegionalChanges.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import FulfillmentItemOriginal from './FulfillmentItem';
-
-export default function getAugmentedFulfillmentItem({ country }) {
-  const FulfillmentItem = cloneDeep(FulfillmentItemOriginal);
-  if (!country) {
-    return FulfillmentItem;
-  }
-
-  if (country === 'India') {
-    FulfillmentItem.fields = [
-      ...FulfillmentItem.fields,
-      {
-        fieldname: 'hsnCode',
-        label: t`HSN/SAC`,
-        fieldtype: 'Int',
-        formula: (row, doc) => doc.getFrom('Item', row.item, 'hsnCode'),
-        formulaDependsOn: ['item'],
-      },
-    ];
-  }
-
-  return FulfillmentItem;
-}
diff --git a/models/doctype/FulfillmentSettings/FulfillmentSettings.js b/models/doctype/FulfillmentSettings/FulfillmentSettings.js
deleted file mode 100644
index a752bb7c..00000000
--- a/models/doctype/FulfillmentSettings/FulfillmentSettings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import QuotationSettings from '../QuotationSettings/QuotationSettings';
-
-export default model.extend(QuotationSettings, {
-  name: 'FulfillmentSettings',
-  label: t`Fulfillment Settings`,
-  fields: [],
-});
diff --git a/models/doctype/GSTR3B/GSTR3B.js b/models/doctype/GSTR3B/GSTR3B.js
deleted file mode 100644
index 2a310e63..00000000
--- a/models/doctype/GSTR3B/GSTR3B.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import frappe, { t } from 'frappe';
-import GSTR3B from './GSTR3BDocument.js';
-
-export default {
-  name: 'GSTR3B',
-  label: t`GSTR 3B`,
-  doctype: 'DocType',
-  documentClass: GSTR3B,
-  print: {
-    printFormat: 'GSTR3B Print Format',
-  },
-  keywordFields: ['name', 'month', 'year'],
-  fields: [
-    {
-      fieldname: 'year',
-      label: t`Year`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'month',
-      label: t`Month`,
-      placeholder: t`Month`,
-      fieldtype: 'Select',
-      options: [
-        'January',
-        'February',
-        'March',
-        'April',
-        'May',
-        'June',
-        'July',
-        'August',
-        'September',
-        'October',
-        'November',
-        'December',
-      ],
-      required: 1,
-    },
-    {
-      fieldname: 'jsonData',
-      label: t`JSON Data`,
-      fieldtype: 'Code',
-      formula: (doc) => doc.getJson(),
-      required: 1,
-      readOnly: 1,
-      rows: 15,
-    },
-  ],
-  layout: [
-    {
-      columns: [{ fields: ['year', 'month', 'jsonData'] }],
-    },
-  ],
-  links: [
-    {
-      label: t`Print PDF`,
-      condition: (form) => !form.doc._notInserted,
-      action: async (form) => {
-        form.$router.push({
-          path: `/print/GSTR3B/${form.doc.name}`,
-        });
-      },
-    },
-    {
-      label: t`Delete`,
-      condition: (form) => !form.doc._notInserted,
-      action: async (form) => {
-        const doc = await frappe.getDoc('GSTR3B', form.doc.name);
-        await doc.delete();
-        form.$router.push({
-          path: `/list/GSTR3B`,
-        });
-      },
-    },
-  ],
-};
diff --git a/models/doctype/GSTR3B/GSTR3BDocument.js b/models/doctype/GSTR3B/GSTR3BDocument.js
deleted file mode 100644
index 88cfec2c..00000000
--- a/models/doctype/GSTR3B/GSTR3BDocument.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import frappe from 'frappe';
-import Document from 'frappe/model/document';
-import format from './GSTR3BFormat';
-
-export default class GSTR3B extends Document {
-  async getData() {
-    const monthIndex = [
-      'January',
-      'February',
-      'March',
-      'April',
-      'May',
-      'June',
-      'July',
-      'August',
-      'September',
-      'October',
-      'November',
-      'December',
-    ].indexOf(this.month);
-    const month = monthIndex + 1 > 9 ? monthIndex + 1 : `0${monthIndex + 1}`;
-    const lastDate = new Date(this.year, monthIndex + 1, 0).getDate();
-    const filters = {
-      date: [
-        '>=',
-        `${this.year}-${month}-01`,
-        '<=',
-        `${this.year}-${month}-${lastDate}`,
-      ],
-    };
-    const salesInvoices = frappe.db.getAll({
-      doctype: 'SalesInvoice',
-      filters,
-      fields: ['*'],
-    });
-    const purchaseInvoices = frappe.db.getAll({
-      doctype: 'PurchaseInvoice',
-      filters,
-      fields: ['*'],
-    });
-    const [gstr1Data, gstr2Data] = await Promise.all([
-      salesInvoices,
-      purchaseInvoices,
-    ]);
-    let gstr3bData = [[], []];
-
-    for (let ledgerEntry of gstr1Data) {
-      ledgerEntry.doctype = 'SalesInvoice';
-      gstr3bData[0].push(await this.makeGSTRow(ledgerEntry));
-    }
-    for (let ledgerEntry of gstr2Data) {
-      ledgerEntry.doctype = 'PurchaseInvoice';
-      gstr3bData[1].push(await this.makeGSTRow(ledgerEntry));
-    }
-
-    return gstr3bData;
-  }
-
-  async makeGSTRow(ledgerEntry) {
-    let row = {};
-    ledgerEntry = await frappe.getDoc(ledgerEntry.doctype, ledgerEntry.name);
-    let party = await frappe.getDoc(
-      'Party',
-      ledgerEntry.customer || ledgerEntry.supplier
-    );
-    if (party.address) {
-      let addressDetails = await frappe.getDoc('Address', party.address);
-      row.place = addressDetails.state || '';
-    }
-    row.gstin = party.gstin;
-    row.partyName = ledgerEntry.customer || ledgerEntry.supplier;
-    row.invNo = ledgerEntry.name;
-    row.invDate = ledgerEntry.date;
-    row.rate = 0;
-    row.inState = true;
-    row.reverseCharge = !party.gstin ? 'Y' : 'N';
-    ledgerEntry.taxes.forEach((tax) => {
-      row.rate += tax.rate;
-      const taxAmt = (tax.rate * ledgerEntry.netTotal) / 100;
-      if (tax.account === 'IGST') row.igstAmt = taxAmt;
-      if (tax.account === 'IGST') row.inState = false;
-      if (tax.account === 'CGST') row.cgstAmt = taxAmt;
-      if (tax.account === 'SGST') row.sgstAmt = taxAmt;
-      if (tax.account === 'Nil Rated') row.nilRated = true;
-      if (tax.account === 'Exempt') row.exempt = true;
-      if (tax.account === 'Non GST') row.nonGST = true;
-    });
-    row.invAmt = ledgerEntry.grandTotal;
-    row.taxVal = ledgerEntry.netTotal;
-    return row;
-  }
-
-  async createJson(data) {
-    let jsonData = JSON.parse(JSON.stringify(format));
-
-    for (let ledgerEntry of data[0]) {
-      if (ledgerEntry.rate > 0) {
-        jsonData['sup_details']['osup_det']['samt'] += ledgerEntry.sgstAmt || 0;
-        jsonData['sup_details']['osup_det']['camt'] += ledgerEntry.cgstAmt || 0;
-        jsonData['sup_details']['osup_det']['iamt'] += ledgerEntry.igstAmt || 0;
-        jsonData['sup_details']['osup_det']['txval'] += ledgerEntry.taxVal;
-      }
-      if (ledgerEntry.rate === 0) {
-        jsonData['sup_details']['osup_zero']['txval'] += ledgerEntry.taxVal;
-      }
-      if (ledgerEntry.nilRated || ledgerEntry.exempt) {
-        jsonData['sup_details']['osup_nil_exmp']['txval'] += ledgerEntry.taxVal;
-      }
-      if (ledgerEntry.nonGST) {
-        jsonData['sup_details']['osup_nongst']['txval'] += ledgerEntry.taxVal;
-      }
-      if (!ledgerEntry.inState && !ledgerEntry.gstin) {
-        jsonData['inter_sup']['unreg_details'].push({
-          pos: ledgerEntry.place,
-          txval: ledgerEntry.taxVal,
-          iAmt: ledgerEntry.igstAmt || 0,
-        });
-      }
-    }
-
-    for (let ledgerEntry of data[1]) {
-      if (ledgerEntry.reverseCharge === 'Y') {
-        jsonData['sup_details']['isup_rev']['samt'] += ledgerEntry.sgstAmt || 0;
-        jsonData['sup_details']['isup_rev']['camt'] += ledgerEntry.cgstAmt || 0;
-        jsonData['sup_details']['isup_rev']['iamt'] += ledgerEntry.igstAmt || 0;
-        jsonData['sup_details']['isup_rev']['txval'] += ledgerEntry.taxVal;
-      }
-      if (ledgerEntry.nilRated || ledgerEntry.exempt) {
-        jsonData['inward_sup']['isup_details'][0][
-          ledgerEntry.inState ? 'intra' : 'inter'
-        ] += ledgerEntry.taxVal;
-      }
-      if (ledgerEntry.nonGST) {
-        jsonData['inward_sup']['isup_details'][0][
-          ledgerEntry.inState ? 'intra' : 'inter'
-        ] += ledgerEntry.taxVal;
-      }
-    }
-
-    return jsonData;
-  }
-
-  async getJson() {
-    if (this.year && this.month) {
-      const data = await this.getData();
-      const json = await this.createJson(data);
-      return JSON.stringify(json, undefined, 2);
-    }
-  }
-}
diff --git a/models/doctype/GSTR3B/GSTR3BFormat.js b/models/doctype/GSTR3B/GSTR3BFormat.js
deleted file mode 100644
index 5281be0a..00000000
--- a/models/doctype/GSTR3B/GSTR3BFormat.js
+++ /dev/null
@@ -1,386 +0,0 @@
-export default {
-  gstin: '',
-  ret_period: '',
-  inward_sup: {
-    isup_details: [
-      {
-        ty: 'GST',
-        intra: 0,
-        inter: 0
-      },
-      {
-        ty: 'NONGST',
-        inter: 0,
-        intra: 0
-      }
-    ]
-  },
-  sup_details: {
-    osup_zero: {
-      csamt: 0,
-      txval: 0,
-      iamt: 0
-    },
-    osup_nil_exmp: {
-      txval: 0
-    },
-    osup_det: {
-      samt: 0,
-      csamt: 0,
-      txval: 0,
-      camt: 0,
-      iamt: 0
-    },
-    isup_rev: {
-      samt: 0,
-      csamt: 0,
-      txval: 0,
-      camt: 0,
-      iamt: 0
-    },
-    osup_nongst: {
-      txval: 0
-    }
-  },
-  inter_sup: {
-    unreg_details: [],
-    comp_details: [],
-    uin_details: []
-  },
-  itc_elg: {
-    itc_avl: [
-      {
-        csamt: 0,
-        samt: 0,
-        ty: 'IMPG',
-        camt: 0,
-        iamt: 0
-      },
-      {
-        csamt: 0,
-        samt: 0,
-        ty: 'IMPS',
-        camt: 0,
-        iamt: 0
-      },
-      {
-        samt: 0,
-        csamt: 0,
-        ty: 'ISRC',
-        camt: 0,
-        iamt: 0
-      },
-      {
-        ty: 'ISD',
-        iamt: 0,
-        camt: 0,
-        samt: 0,
-        csamt: 0
-      },
-      {
-        samt: 0,
-        csamt: 0,
-        ty: 'OTH',
-        camt: 0,
-        iamt: 0
-      }
-    ],
-    itc_rev: [
-      {
-        ty: 'RUL',
-        iamt: 0,
-        camt: 0,
-        samt: 0,
-        csamt: 0
-      },
-      {
-        ty: 'OTH',
-        iamt: 0,
-        camt: 0,
-        samt: 0,
-        csamt: 0
-      }
-    ],
-    itc_net: {
-      samt: 0,
-      csamt: 0,
-      camt: 0,
-      iamt: 0
-    },
-    itc_inelg: [
-      {
-        ty: 'RUL',
-        iamt: 0,
-        camt: 0,
-        samt: 0,
-        csamt: 0
-      },
-      {
-        ty: 'OTH',
-        iamt: 0,
-        camt: 0,
-        samt: 0,
-        csamt: 0
-      }
-    ]
-  }
-};
-
-function generateHTML(data) {
-  let template = `
-    <div class="p-5 m-5" style="font-size: 14px !important">
-    <div>
-      <h3 class="text-center">GSTR3B-Form</h3>
-      <h5>GSTIN: &nbsp ${data.gstin}</h5>
-      <h5>Period: &nbsp ${data.ret_period}</h5>
-    </div>
-
-    <h5>3.1&nbsp&nbspDetails of Outward Supplies and inward supplies liable to reverse charge</h5>
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th>Nature Of Supplies</th>
-          <th>Total Taxable value</th>
-          <th>Integrated Tax</th>
-          <th>Central Tax</th>
-          <th>State/UT Tax</th>
-          <th>Cess</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>(a) Outward taxable supplies(other than zero rated, nil rated and exempted</td>
-          <td class="right">${data.sup_details.osup_det.txval}</td>
-          <td class="right">${data.sup_details.osup_det.iamt}</td>
-          <td class="right">${data.sup_details.osup_det.camt}</td>
-          <td class="right">${data.sup_details.osup_det.samt}</td>
-          <td class="right">${data.sup_details.osup_det.csamt}</td>
-        </tr>
-        <tr>
-          <td>(b) Outward taxable supplies(zero rated)</td>
-          <td class="right">${data.sup_details.osup_zero.txval}</td>
-          <td class="right">${data.sup_details.osup_zero.iamt}</td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td class="right">${data.sup_details.osup_zero.csamt}</td>
-        </tr>
-        <tr>
-          <td>(b) Other outward supplies(Nil rated,Exempted)</td>
-          <td class="right">${data.sup_details.osup_nil_exmp.txval}</td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td style="background-color:#d9d9d9;"></td>
-        <tr>
-          <td>(d) Inward Supplies(liable to reverse charge</td>
-          <td class="right">${data.sup_details.isup_rev.txval}</td>
-          <td class="right">${data.sup_details.isup_rev.iamt}</td>
-          <td class="right">${data.sup_details.isup_rev.camt}</td>
-          <td class="right">${data.sup_details.isup_rev.samt}</td>
-          <td class="right">${data.sup_details.isup_rev.csamt}</td>
-        </tr>
-        <tr>
-          <td>(e) Non-GST outward supplies</td>
-          <td class="right">${data.sup_details.osup_nongst.txval}</td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td style="background-color:#d9d9d9;"></td>
-          <td style="background-color:#d9d9d9;"></td>
-        </tr>
-      </tbody>
-    </table>
-
-    <h5>
-      3.2&nbsp&nbspOf the supplies shown in 3.1 (a) above, details of inter-State supplies made to unregisterd
-      persons, composition taxable persons and UIN holders
-    </h5>
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th></th>
-          <th>Place Of Supply (State/UT)</th>
-          <th>Total Taxable Value</th>
-          <th>Amount of Integrated Tax</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>Supplies made to Unregistered Persons</td>
-          <td class="right">`;
-  for (let row of data.inter_sup.unreg_details) {
-    if (row) template += row.pos + '<br>';
-  }
-  template += '</td><td class="right">';
-  for (let row of data.inter_sup.unreg_details) {
-    if (row) template += row.txval + '<br>';
-  }
-  template += '</td><td class="right">';
-  for (let row of data.inter_sup.unreg_details) {
-    if (row) template += row.iamt + '<br>';
-  }
-
-  template +=
-    '</td></tr><tr><td>Supplies made to Composition Taxable Persons</td><td class="right">';
-  for (let row of data.inter_sup.comp_details) {
-    if (row) template += row.pos + '<br>';
-  }
-  template += '</td><td class="right">';
-  for (let row of data.inter_sup.comp_details) {
-    if (row) template += row.txval + '<br>';
-  }
-  template += '</td><td class="right">';
-  for (let row of data.inter_sup.comp_details) {
-    if (row) template += row.iamt + '<br>';
-  }
-
-  template +=
-    '</td></tr><tr><td>Supplies made to UIN holders</td><td class="right">';
-  for (let row of data.inter_sup.uin_details) {
-    if (row) template += row.pos + '<br>';
-  }
-  template += '</td><td class="right">';
-  for (let row of data.inter_sup.uin_details) {
-    if (row) template += row.txval + '<br>';
-  }
-  template += '</td><td class="right">';
-  for (let row of data.inter_sup.uin_details) {
-    if (row) template += row.iamt + '<br>';
-  }
-
-  template += `</td>
-        </tr>
-      </tbody>
-    </table>
-
-    <h5>4. &nbsp Eligible ITC</h5>
-    <table class="table table-bordered">
-        <thead>
-          <tr>
-            <th>Details</th>
-            <th>Integrated Tax</th>
-            <th>Central Tax</th>
-            <th>State/UT tax</th>
-            <th>Cess</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td><b>(A) ITC Available (whether in full op part)</b></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-          </tr>
-          <tr>
-            <td>&nbsp (1) Import of goods </td>
-            <td class="right">${data.itc_elg.itc_avl[0].iamt}</td>
-            <td class="right">${data.itc_elg.itc_avl[0].camt}</td>
-            <td class="right">${data.itc_elg.itc_avl[0].samt}</td>
-            <td class="right">${data.itc_elg.itc_avl[0].csamt}</td>
-          </tr>
-          <tr>
-            <td>&nbsp (2) Import of services</td>
-            <td class="right">${data.itc_elg.itc_avl[1].iamt}</td>
-            <td class="right">${data.itc_elg.itc_avl[1].camt}</td>
-            <td class="right">${data.itc_elg.itc_avl[1].samt}</td>
-            <td class="right">${data.itc_elg.itc_avl[1].csamt}</td>
-          </tr>
-          <tr>
-            <td>&nbsp (3) Inward supplies liable to reverse charge (other than 1 & 2 above)</td>
-            <td class="right">${data.itc_elg.itc_avl[2].iamt}</td>
-            <td class="right">${data.itc_elg.itc_avl[2].camt}</td>
-            <td class="right">${data.itc_elg.itc_avl[2].samt}</td>
-            <td class="right">${data.itc_elg.itc_avl[2].csamt}</td>
-          </tr>
-          <tr>
-            <td>&nbsp (4) Inward supplies from ISD</td>
-            <td class="right">${data.itc_elg.itc_avl[3].iamt}</td>
-            <td class="right">${data.itc_elg.itc_avl[3].camt}</td>
-            <td class="right">${data.itc_elg.itc_avl[3].samt}</td>
-            <td class="right">${data.itc_elg.itc_avl[3].csamt}</td>
-          </tr>
-          <tr>
-            <td>&nbsp (5) All other ITC</td>
-            <td class="right">${data.itc_elg.itc_avl[4].iamt}</td>
-            <td class="right">${data.itc_elg.itc_avl[4].camt}</td>
-            <td class="right">${data.itc_elg.itc_avl[4].samt}</td>
-            <td class="right">${data.itc_elg.itc_avl[4].csamt}</td>
-          </tr>
-          <tr>
-            <td><b>(B) ITC Reversed</b></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-          </tr>
-          <tr>
-            <td>&nbsp (1) As per rules 42 & 43 of CGST Rules</td>
-            <td class="right">${data.itc_elg.itc_rev[0].iamt}</td>
-            <td class="right">${data.itc_elg.itc_rev[0].camt}</td>
-            <td class="right">${data.itc_elg.itc_rev[0].samt}</td>
-            <td class="right">${data.itc_elg.itc_rev[0].csamt}</td>
-          </tr>
-          <tr>
-            <td>&nbsp (2) Others</td>
-            <td class="right">${data.itc_elg.itc_rev[1].iamt}</td>
-            <td class="right">${data.itc_elg.itc_rev[1].camt}</td>
-            <td class="right">${data.itc_elg.itc_rev[1].samt}</td>
-            <td class="right">${data.itc_elg.itc_rev[1].csamt}</td>
-          </tr>
-          <tr>
-            <td><b>(C) Net ITC Available(A) - (B)</b></td>
-            <td class="right">${data.itc_elg.itc_net.iamt}</td>
-            <td class="right">${data.itc_elg.itc_net.camt}</td>
-            <td class="right">${data.itc_elg.itc_net.samt}</td>
-            <td class="right">${data.itc_elg.itc_net.csamt}</td>
-          </tr>
-          <tr>
-            <td><b>(D) Ineligible ITC</b></td>
-            <td></td>
-            <td></td>
-            <td></td>
-            <td></td>
-          </tr>
-          <tr>
-            <td>&nbsp (1) As per section 17(5)</td>
-            <td class="right">${data.itc_elg.itc_inelg[0].iamt}</td>
-            <td class="right">${data.itc_elg.itc_inelg[0].camt}</td>
-            <td class="right">${data.itc_elg.itc_inelg[0].samt}</td>
-            <td class="right">${data.itc_elg.itc_inelg[0].csamt}</td>
-          </tr>
-          <tr>
-            <td>&nbsp (2) Others</td>
-            <td class="right">${data.itc_elg.itc_inelg[1].iamt}</td>
-            <td class="right">${data.itc_elg.itc_inelg[1].camt}</td>
-            <td class="right">${data.itc_elg.itc_inelg[1].samt}</td>
-            <td class="right">${data.itc_elg.itc_inelg[1].csamt}</td>
-          </tr>
-        </tbody>
-      </table>
-
-    <h5>5. &nbsp&nbsp Values of exempt, nil rated and non-GST inward supplies</h5>
-    <table class="table table-bordered">
-      <thead>
-        <tr>
-          <th>Nature of Supplies</th>
-          <th>Inter-State Supplies</th>
-          <th>Intra-State Supplies</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>From a supplier under composition scheme, Exempt and Nil rated</td>
-          <td class="right">${data.inward_sup.isup_details[0].inter}</td>
-          <td class="right">${data.inward_sup.isup_details[0].intra}</td>
-        </tr>
-        <tr>
-          <td>Non GST Inward Supplies</td>
-          <td class="right">${data.inward_sup.isup_details[1].inter}</td>
-          <td class="right">${data.inward_sup.isup_details[1].intra}</td>
-        </tr>
-      </tbody>
-    </table>
-    </div>`;
-
-  return template;
-}
\ No newline at end of file
diff --git a/models/doctype/GSTR3B/GSTR3BList.js b/models/doctype/GSTR3B/GSTR3BList.js
deleted file mode 100644
index e6e9f297..00000000
--- a/models/doctype/GSTR3B/GSTR3BList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  doctype: 'GSTR3B',
-  title: t`GSTR 3B Report`,
-  columns: ['year', 'month'],
-};
diff --git a/models/doctype/GSTR3B/GSTR3BPrintView.vue b/models/doctype/GSTR3B/GSTR3BPrintView.vue
deleted file mode 100644
index c0f94e76..00000000
--- a/models/doctype/GSTR3B/GSTR3BPrintView.vue
+++ /dev/null
@@ -1,367 +0,0 @@
-<template>
-  <div>
-    <div class="row no-gutters">
-      <div class="col-8 mx-auto text-right mt-4">
-        <f-button
-          primary
-          @click="$emit('makePDF', $refs.printComponent.innerHTML)"
-          >{{ t`PDF` }}</f-button
-        >
-      </div>
-    </div>
-    <div ref="printComponent" class="col-8 bg-white mt-4 mx-auto border shadow">
-      <div
-        class="print-format"
-        style="padding: 3.5rem; font-size: 8pt !important"
-      >
-        <div>
-          <h3 class="text-center">GSTR3B-Form</h3>
-          <h5>GSTIN: &nbsp; {{ jsonData.gstin }}</h5>
-          <h5>Period: &nbsp; {{ jsonData.ret_period }}</h5>
-        </div>
-
-        <h5>
-          3.1&nbsp;&nbsp;Details of Outward Supplies and inward supplies liable
-          to reverse charge
-        </h5>
-        <table class="table table-bordered">
-          <thead>
-            <tr>
-              <th>Nature Of Supplies</th>
-              <th>Total Taxable value</th>
-              <th>Integrated Tax</th>
-              <th>Central Tax</th>
-              <th>State/UT Tax</th>
-              <th>Cess</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>
-                (a) Outward taxable supplies(other than zero rated, nil rated
-                and exempted
-              </td>
-              <td class="right">{{ jsonData.sup_details.osup_det.txval }}</td>
-              <td class="right">{{ jsonData.sup_details.osup_det.iamt }}</td>
-              <td class="right">{{ jsonData.sup_details.osup_det.camt }}</td>
-              <td class="right">{{ jsonData.sup_details.osup_det.samt }}</td>
-              <td class="right">{{ jsonData.sup_details.osup_det.csamt }}</td>
-            </tr>
-            <tr>
-              <td>(b) Outward taxable supplies(zero rated)</td>
-              <td class="right">{{ jsonData.sup_details.osup_zero.txval }}</td>
-              <td class="right">{{ jsonData.sup_details.osup_zero.iamt }}</td>
-              <td class="disabled"></td>
-              <td class="disabled"></td>
-              <td class="right">{{ jsonData.sup_details.osup_zero.csamt }}</td>
-            </tr>
-            <tr>
-              <td>(b) Other outward supplies(Nil rated,Exempted)</td>
-              <td class="right">
-                {{ jsonData.sup_details.osup_nil_exmp.txval }}
-              </td>
-              <td class="disabled"></td>
-              <td class="disabled"></td>
-              <td class="disabled"></td>
-              <td class="disabled"></td>
-            </tr>
-            <tr>
-              <td>(d) Inward Supplies(liable to reverse charge</td>
-              <td class="right">{{ jsonData.sup_details.isup_rev.txval }}</td>
-              <td class="right">{{ jsonData.sup_details.isup_rev.iamt }}</td>
-              <td class="right">{{ jsonData.sup_details.isup_rev.camt }}</td>
-              <td class="right">{{ jsonData.sup_details.isup_rev.samt }}</td>
-              <td class="right">{{ jsonData.sup_details.isup_rev.csamt }}</td>
-            </tr>
-            <tr>
-              <td>(e) Non-GST outward supplies</td>
-              <td class="right">
-                {{ jsonData.sup_details.osup_nongst.txval }}
-              </td>
-              <td class="disabled"></td>
-              <td class="disabled"></td>
-              <td class="disabled"></td>
-              <td class="disabled"></td>
-            </tr>
-          </tbody>
-        </table>
-
-        <h5>
-          3.2&nbsp;&nbsp;Of the supplies shown in 3.1 (a) above, details of
-          inter-State supplies made to unregisterd persons, composition taxable
-          persons and UIN holders
-        </h5>
-        <table class="table table-bordered">
-          <thead>
-            <tr>
-              <th></th>
-              <th>Place Of Supply (State/UT)</th>
-              <th>Total Taxable Value</th>
-              <th>Amount of Integrated Tax</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>Supplies made to Unregistered Persons</td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.unreg_details"
-                  :key="i"
-                >
-                  <p>{{ row.pos }}</p>
-                </div>
-              </td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.unreg_details"
-                  :key="i"
-                >
-                  <p>{{ row.txval }}</p>
-                </div>
-              </td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.unreg_details"
-                  :key="i"
-                >
-                  <p>{{ row.iamt }}</p>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <td>Suppliies made to Composition Taxable Persons</td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.comp_details"
-                  :key="i"
-                >
-                  <p>{{ row.pos }}</p>
-                </div>
-              </td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.comp_details"
-                  :key="i"
-                >
-                  <p>{{ row.txval }}</p>
-                </div>
-              </td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.comp_details"
-                  :key="i"
-                >
-                  <p>{{ row.iamt }}</p>
-                </div>
-              </td>
-            </tr>
-            <tr>
-              <td>Supplies made to UIN holders</td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.uin_details"
-                  :key="i"
-                >
-                  <p>{{ row.pos }}</p>
-                </div>
-              </td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.uin_details"
-                  :key="i"
-                >
-                  <p>{{ row.txval }}</p>
-                </div>
-              </td>
-              <td class="right">
-                <div
-                  v-for="(row, i) in jsonData.inter_sup.uin_details"
-                  :key="i"
-                >
-                  <p>{{ row.iamt }}</p>
-                </div>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-
-        <h5>4. &nbsp; Eligible ITC</h5>
-        <table class="table table-bordered">
-          <thead>
-            <tr>
-              <th>Details</th>
-              <th>Integrated Tax</th>
-              <th>Central Tax</th>
-              <th>State/UT tax</th>
-              <th>Cess</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>
-                <b>(A) ITC Available (whether in full op part)</b>
-              </td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>&nbsp; (1) Import of goods</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[0].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[0].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[0].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[0].csamt }}</td>
-            </tr>
-            <tr>
-              <td>&nbsp; (2) Import of services</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[1].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[1].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[1].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[1].csamt }}</td>
-            </tr>
-            <tr>
-              <td>
-                &nbsp; (3) Inward supplies liable to reverse charge (other than
-                1 & 2 above)
-              </td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[2].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[2].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[2].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[2].csamt }}</td>
-            </tr>
-            <tr>
-              <td>&nbsp; (4) Inward supplies from ISD</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[3].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[3].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[3].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[3].csamt }}</td>
-            </tr>
-            <tr>
-              <td>&nbsp; (5) All other ITC</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[4].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[4].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[4].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_avl[4].csamt }}</td>
-            </tr>
-            <tr>
-              <td>
-                <b>(B) ITC Reversed</b>
-              </td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>&nbsp; (1) As per rules 42 & 43 of CGST Rules</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[0].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[0].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[0].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[0].csamt }}</td>
-            </tr>
-            <tr>
-              <td>&nbsp; (2) Others</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[1].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[1].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[1].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_rev[1].csamt }}</td>
-            </tr>
-            <tr>
-              <td>
-                <b>(C) Net ITC Available(A) - (B)</b>
-              </td>
-              <td class="right">{{ jsonData.itc_elg.itc_net.iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_net.camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_net.samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_net.csamt }}</td>
-            </tr>
-            <tr>
-              <td>
-                <b>(D) Ineligible ITC</b>
-              </td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>&nbsp; (1) As per section 17(5)</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[0].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[0].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[0].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[0].csamt }}</td>
-            </tr>
-            <tr>
-              <td>&nbsp; (2) Others</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[1].iamt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[1].camt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[1].samt }}</td>
-              <td class="right">{{ jsonData.itc_elg.itc_inelg[1].csamt }}</td>
-            </tr>
-          </tbody>
-        </table>
-
-        <h5>
-          5. &nbsp;&nbsp; Values of exempt, nil rated and non-GST inward
-          supplies
-        </h5>
-        <table class="table table-bordered">
-          <thead>
-            <tr>
-              <th>Nature of Supplies</th>
-              <th>Inter-State Supplies</th>
-              <th>Intra-State Supplies</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>
-                From a supplier under composition scheme, Exempt and Nil rated
-              </td>
-              <td class="right">
-                {{ jsonData.inward_sup.isup_details[0].inter }}
-              </td>
-              <td class="right">
-                {{ jsonData.inward_sup.isup_details[0].intra }}
-              </td>
-            </tr>
-            <tr>
-              <td>Non GST Inward Supplies</td>
-              <td class="right">
-                {{ jsonData.inward_sup.isup_details[1].inter }}
-              </td>
-              <td class="right">
-                {{ jsonData.inward_sup.isup_details[1].intra }}
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'GSTR3BPrintView',
-  props: ['doc'],
-  emits: ['makePDF'],
-  computed: {
-    jsonData() {
-      return JSON.parse(this.doc.jsonData);
-    },
-  },
-};
-</script>
-
-<style>
-.print-format {
-}
-.disabled {
-  background-color: #d9d9d9;
-}
-.right {
-  text-align: right;
-}
-</style>
diff --git a/models/doctype/GSTR3B/GSTR3BServer.js b/models/doctype/GSTR3B/GSTR3BServer.js
deleted file mode 100644
index fe7c006f..00000000
--- a/models/doctype/GSTR3B/GSTR3BServer.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import GSTR3B from './GSTR3BDocument';
-
-export default class GSTR3BServer extends GSTR3B {
-  async validate() {
-    if (this.month.length === 0 || this.year.length != 4) {
-      throw new Error('Month or Year is not valid');
-    }
-  }
-  async beforeInsert() {
-    this.name = `${this.doctype} Report ${this.month} ${this.year}`;
-  }
-};
diff --git a/models/doctype/PurchaseOrder/PurchaseOrder.js b/models/doctype/PurchaseOrder/PurchaseOrder.js
deleted file mode 100644
index a47960d9..00000000
--- a/models/doctype/PurchaseOrder/PurchaseOrder.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-import PurchaseInvoice from '../PurchaseInvoice/PurchaseInvoice';
-
-export default model.extend(
-  PurchaseInvoice,
-  {
-    name: 'PurchaseOrder',
-    label: t`Purchase Order`,
-    settings: 'PurchaseOrderSettings',
-    fields: [
-      {
-        fieldname: 'items',
-        childtype: 'PurchaseOrderItem',
-      },
-      {
-        fieldname: 'numberSeries',
-        label: t`Number Series`,
-        fieldtype: 'Link',
-        target: 'NumberSeries',
-        required: 1,
-        getFilters: () => {
-          return { referenceType: 'PurchaseOrder' };
-        },
-        default: DEFAULT_NUMBER_SERIES['PurchaseOrder'],
-      },
-    ],
-  },
-  {
-    skipFields: ['account'],
-  }
-);
diff --git a/models/doctype/PurchaseOrderItem/PurchaseOrderItem.js b/models/doctype/PurchaseOrderItem/PurchaseOrderItem.js
deleted file mode 100644
index 215580f7..00000000
--- a/models/doctype/PurchaseOrderItem/PurchaseOrderItem.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import model from 'frappe/model';
-import PurchaseInvoiceItem from '../PurchaseInvoiceItem/PurchaseInvoiceItem';
-
-export default model.extend(PurchaseInvoiceItem, {
-  name: 'PurchaseOrderItem',
-});
diff --git a/models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js b/models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js
deleted file mode 100644
index 4aab3f3d..00000000
--- a/models/doctype/PurchaseOrderSettings/PurchaseOrderSettings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import PurchaseInvoiceSettings from '../PurchaseInvoiceSettings/PurchaseInvoiceSettings';
-
-export default model.extend(PurchaseInvoiceSettings, {
-  name: 'PurchaseOrderSettings',
-  label: t`Purchase Order Settings`,
-  fields: [],
-});
diff --git a/models/doctype/PurchaseReceipt/PurchaseReceipt.js b/models/doctype/PurchaseReceipt/PurchaseReceipt.js
deleted file mode 100644
index d3c31ee7..00000000
--- a/models/doctype/PurchaseReceipt/PurchaseReceipt.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-import PurchaseOrder from '../PurchaseOrder/PurchaseOrder';
-
-export default model.extend(PurchaseOrder, {
-  name: 'PurchaseReceipt',
-  label: t`Purchase Receipt`,
-  settings: 'PurchaseReceiptSettings',
-  fields: [
-    {
-      fieldname: 'items',
-      childtype: 'PurchaseReceiptItem',
-    },
-    {
-      fieldname: 'numberSeries',
-      label: t`Number Series`,
-      fieldtype: 'Link',
-      target: 'NumberSeries',
-      required: 1,
-      getFilters: () => {
-        return { referenceType: 'PurchaseReceipt' };
-      },
-      default: DEFAULT_NUMBER_SERIES['PurchaseReceipt'],
-    },
-  ],
-});
diff --git a/models/doctype/PurchaseReceiptItem/PurchaseReceiptItem.js b/models/doctype/PurchaseReceiptItem/PurchaseReceiptItem.js
deleted file mode 100644
index 15eef59b..00000000
--- a/models/doctype/PurchaseReceiptItem/PurchaseReceiptItem.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import PurchaseOrderItem from '../PurchaseOrderItem/PurchaseOrderItem';
-
-export default model.extend(
-  PurchaseOrderItem,
-  {
-    name: 'PurchaseReceiptItem',
-    fields: [
-      {
-        fieldname: 'acceptedQuantity',
-        label: t`Accepted Quantity`,
-        fieldtype: 'Float',
-        required: 1,
-      },
-    ],
-  },
-  {
-    skipFields: ['expenseAccount'],
-  }
-);
diff --git a/models/doctype/PurchaseReceiptSettings/PurchaseReceiptSettings.js b/models/doctype/PurchaseReceiptSettings/PurchaseReceiptSettings.js
deleted file mode 100644
index b2c441c2..00000000
--- a/models/doctype/PurchaseReceiptSettings/PurchaseReceiptSettings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import PurchaseOrderSettings from '../PurchaseOrderSettings/PurchaseOrderSettings';
-
-export default model.extend(PurchaseOrderSettings, {
-  name: 'PurchaseReceiptSettings',
-  label: t`Purchase Receipt Settings`,
-  fields: [],
-});
diff --git a/models/doctype/Quotation/Quotation.js b/models/doctype/Quotation/Quotation.js
deleted file mode 100644
index d2401a63..00000000
--- a/models/doctype/Quotation/Quotation.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-import SalesInvoice from '../SalesInvoice/SalesInvoice';
-
-const Quotation = model.extend(
-  SalesInvoice,
-  {
-    name: 'Quotation',
-    label: t`Quotation`,
-    settings: 'QuotationSettings',
-    fields: [
-      {
-        fieldname: 'items',
-        childtype: 'QuotationItem',
-      },
-      {
-        fieldname: 'numberSeries',
-        label: t`Number Series`,
-        fieldtype: 'Link',
-        target: 'NumberSeries',
-        required: 1,
-        getFilters: () => {
-          return { referenceType: 'Quotation' };
-        },
-        default: DEFAULT_NUMBER_SERIES['Quotation'],
-      },
-    ],
-    links: [],
-  },
-  {
-    skipFields: ['account'],
-    overrideProps: ['links'],
-  }
-);
-
-export default Quotation;
diff --git a/models/doctype/Quotation/QuotationDocument.js b/models/doctype/Quotation/QuotationDocument.js
deleted file mode 100644
index 2e1f3484..00000000
--- a/models/doctype/Quotation/QuotationDocument.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import SalesInvoiceDocument from '../SalesInvoice/SalesInvoiceDocument';
-
-export default class Quotation extends SalesInvoiceDocument {};
diff --git a/models/doctype/QuotationItem/QuotationItem.js b/models/doctype/QuotationItem/QuotationItem.js
deleted file mode 100644
index db71423d..00000000
--- a/models/doctype/QuotationItem/QuotationItem.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import model from 'frappe/model';
-import SalesInvoiceItem from '../SalesInvoiceItem/SalesInvoiceItem';
-
-export default model.extend(SalesInvoiceItem, {
-  name: 'QuotationItem',
-});
diff --git a/models/doctype/QuotationItem/RegionalChanges.js b/models/doctype/QuotationItem/RegionalChanges.js
deleted file mode 100644
index 8a163ee5..00000000
--- a/models/doctype/QuotationItem/RegionalChanges.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import QuotationItemOriginal from './QuotationItem';
-
-export default function getAugmentedQuotationItem({ country }) {
-  const QuotationItem = cloneDeep(QuotationItemOriginal);
-  if (!country) {
-    return QuotationItem;
-  }
-
-  if (country === 'India') {
-    QuotationItem.fields = [
-      ...QuotationItem.fields,
-      {
-        fieldname: 'hsnCode',
-        label: t`HSN/SAC`,
-        fieldtype: 'Int',
-        formula: (row, doc) => doc.getFrom('Item', row.item, 'hsnCode'),
-        formulaDependsOn: ['item'],
-      },
-    ];
-  }
-
-  return QuotationItem;
-}
diff --git a/models/doctype/QuotationSettings/QuotationSettings.js b/models/doctype/QuotationSettings/QuotationSettings.js
deleted file mode 100644
index 2128dbf1..00000000
--- a/models/doctype/QuotationSettings/QuotationSettings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import SalesInvoiceSettings from '../SalesInvoiceSettings/SalesInvoiceSettings';
-
-export default model.extend(SalesInvoiceSettings, {
-  name: 'QuotationSettings',
-  label: t`Quotation Settings`,
-  fields: [],
-});
diff --git a/models/doctype/SalesOrder/SalesOrder.js b/models/doctype/SalesOrder/SalesOrder.js
deleted file mode 100644
index b8ed2eb6..00000000
--- a/models/doctype/SalesOrder/SalesOrder.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-import Quotation from '../Quotation/Quotation';
-
-export default model.extend(Quotation, {
-  name: 'SalesOrder',
-  label: t`Sales Order`,
-  settings: 'SalesOrderSettings',
-  fields: [
-    {
-      fieldname: 'items',
-      childtype: 'SalesOrderItem',
-    },
-    {
-      fieldname: 'numberSeries',
-      label: t`Number Series`,
-      fieldtype: 'Link',
-      target: 'NumberSeries',
-      required: 1,
-      getFilters: () => {
-        return { referenceType: 'SalesOrder' };
-      },
-      default: DEFAULT_NUMBER_SERIES['SalesOrder'],
-    },
-  ],
-});
diff --git a/models/doctype/SalesOrderItem/RegionalChanges.js b/models/doctype/SalesOrderItem/RegionalChanges.js
deleted file mode 100644
index 13e59fb0..00000000
--- a/models/doctype/SalesOrderItem/RegionalChanges.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import SalesOrderItemOriginal from './SalesOrderItem';
-
-export default function getAugmentedSalesOrderItem({ country }) {
-  const SalesOrderItem = cloneDeep(SalesOrderItemOriginal);
-  if (!country) {
-    return SalesOrderItem;
-  }
-
-  if (country === 'India') {
-    SalesOrderItem.fields = [
-      ...SalesOrderItem.fields,
-      {
-        fieldname: 'hsnCode',
-        label: t`HSN/SAC`,
-        fieldtype: 'Int',
-        formula: (row, doc) => doc.getFrom('Item', row.item, 'hsnCode'),
-        formulaDependsOn: ['item'],
-      },
-    ];
-  }
-
-  return SalesOrderItem;
-}
diff --git a/models/doctype/SalesOrderItem/SalesOrderItem.js b/models/doctype/SalesOrderItem/SalesOrderItem.js
deleted file mode 100644
index 9a498fc5..00000000
--- a/models/doctype/SalesOrderItem/SalesOrderItem.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import model from 'frappe/model';
-import QuotationItem from '../QuotationItem/QuotationItem';
-
-export default model.extend(QuotationItem, {
-  name: 'SalesOrderItem',
-});
diff --git a/models/doctype/SalesOrderSettings/SalesOrderSettings.js b/models/doctype/SalesOrderSettings/SalesOrderSettings.js
deleted file mode 100644
index 755f2c91..00000000
--- a/models/doctype/SalesOrderSettings/SalesOrderSettings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { t } from 'frappe';
-import model from 'frappe/model';
-import QuotationSettings from '../QuotationSettings/QuotationSettings';
-
-export default model.extend(QuotationSettings, {
-  name: 'SalesOrderSettings',
-  label: t`Sales Order Settings`,
-  fields: [],
-});
diff --git a/models/index.js b/models/index.js
index 0288d118..3ddd0c4f 100644
--- a/models/index.js
+++ b/models/index.js
@@ -1,54 +1,33 @@
-import SetupWizard from './doctype/SetupWizard/SetupWizard.js';
-import Currency from './doctype/Currency/Currency.js';
-import Color from './doctype/Color/Color.js';
 import Account from './doctype/Account/Account.js';
-import AccountingSettings from './doctype/AccountingSettings/AccountingSettings.js';
-import CompanySettings from './doctype/CompanySettings/CompanySettings.js';
 import AccountingLedgerEntry from './doctype/AccountingLedgerEntry/AccountingLedgerEntry.js';
-import Party from './doctype/Party/Party.js';
+import AccountingSettings from './doctype/AccountingSettings/AccountingSettings.js';
+import Address from './doctype/Address/Address.js';
+import Color from './doctype/Color/Color.js';
+import CompanySettings from './doctype/CompanySettings/CompanySettings.js';
+import Contact from './doctype/Contact/Contact.js';
+import Currency from './doctype/Currency/Currency.js';
+import GetStarted from './doctype/GetStarted/GetStarted.js';
+import Item from './doctype/Item/Item.js';
+import JournalEntry from './doctype/JournalEntry/JournalEntry.js';
+import JournalEntryAccount from './doctype/JournalEntryAccount/JournalEntryAccount.js';
+import JournalEntrySettings from './doctype/JournalEntrySettings/JournalEntrySettings.js';
 import Customer from './doctype/Party/Customer.js';
+import Party from './doctype/Party/Party.js';
 import Supplier from './doctype/Party/Supplier.js';
 import Payment from './doctype/Payment/Payment.js';
 import PaymentFor from './doctype/PaymentFor/PaymentFor.js';
 import PaymentSettings from './doctype/PaymentSettings/PaymentSettings.js';
-import Item from './doctype/Item/Item.js';
-import SalesInvoice from './doctype/SalesInvoice/SalesInvoice.js';
-import SalesInvoiceItem from './doctype/SalesInvoiceItem/SalesInvoiceItem.js';
-import SalesInvoiceSettings from './doctype/SalesInvoiceSettings/SalesInvoiceSettings.js';
+import PrintSettings from './doctype/PrintSettings/PrintSettings.js';
 import PurchaseInvoice from './doctype/PurchaseInvoice/PurchaseInvoice.js';
 import PurchaseInvoiceItem from './doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js';
 import PurchaseInvoiceSettings from './doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js';
+import SalesInvoice from './doctype/SalesInvoice/SalesInvoice.js';
+import SalesInvoiceItem from './doctype/SalesInvoiceItem/SalesInvoiceItem.js';
+import SalesInvoiceSettings from './doctype/SalesInvoiceSettings/SalesInvoiceSettings.js';
+import SetupWizard from './doctype/SetupWizard/SetupWizard.js';
 import Tax from './doctype/Tax/Tax.js';
 import TaxDetail from './doctype/TaxDetail/TaxDetail.js';
 import TaxSummary from './doctype/TaxSummary/TaxSummary.js';
-import GSTR3B from './doctype/GSTR3B/GSTR3B.js';
-import Address from './doctype/Address/Address.js';
-import Contact from './doctype/Contact/Contact.js';
-import JournalEntry from './doctype/JournalEntry/JournalEntry.js';
-import JournalEntryAccount from './doctype/JournalEntryAccount/JournalEntryAccount.js';
-import JournalEntrySettings from './doctype/JournalEntrySettings/JournalEntrySettings.js';
-import Quotation from './doctype/Quotation/Quotation.js';
-import QuotationItem from './doctype/QuotationItem/QuotationItem.js';
-import QuotationSettings from './doctype/QuotationSettings/QuotationSettings.js';
-import SalesOrder from './doctype/SalesOrder/SalesOrder.js';
-import SalesOrderItem from './doctype/SalesOrderItem/SalesOrderItem.js';
-import SalesOrderSettings from './doctype/SalesOrderSettings/SalesOrderSettings.js';
-import Fulfillment from './doctype/Fulfillment/Fulfillment.js';
-import FulfillmentItem from './doctype/FulfillmentItem/FulfillmentItem.js';
-import FulfillmentSettings from './doctype/FulfillmentSettings/FulfillmentSettings.js';
-import PurchaseOrder from './doctype/PurchaseOrder/PurchaseOrder.js';
-import PurchaseOrderItem from './doctype/PurchaseOrderItem/PurchaseOrderItem.js';
-import PurchaseOrderSettings from './doctype/PurchaseOrderSettings/PurchaseOrderSettings.js';
-import PurchaseReceipt from './doctype/PurchaseReceipt/PurchaseReceipt.js';
-import PurchaseReceiptItem from './doctype/PurchaseReceiptItem/PurchaseReceiptItem.js';
-import PurchaseReceiptSettings from './doctype/PurchaseReceiptSettings/PurchaseReceiptSettings.js';
-import Event from './doctype/Event/Event.js';
-import EventSchedule from './doctype/EventSchedule/EventSchedule.js';
-import EventSettings from './doctype/EventSettings/EventSettings.js';
-import Email from './doctype/Email/Email.js';
-import EmailAccount from './doctype/EmailAccount/EmailAccount.js';
-import PrintSettings from './doctype/PrintSettings/PrintSettings.js';
-import GetStarted from './doctype/GetStarted/GetStarted.js';
 
 export default {
   SetupWizard,
@@ -74,32 +53,11 @@ export default {
   Tax,
   TaxDetail,
   TaxSummary,
-  GSTR3B,
   Address,
   Contact,
   JournalEntry,
   JournalEntryAccount,
   JournalEntrySettings,
-  Quotation,
-  QuotationItem,
-  QuotationSettings,
-  SalesOrder,
-  SalesOrderItem,
-  SalesOrderSettings,
-  Fulfillment,
-  FulfillmentItem,
-  FulfillmentSettings,
-  PurchaseOrder,
-  PurchaseOrderItem,
-  PurchaseOrderSettings,
-  PurchaseReceipt,
-  PurchaseReceiptItem,
-  PurchaseReceiptSettings,
-  Event,
-  EventSchedule,
-  EventSettings,
-  Email,
-  EmailAccount,
   PrintSettings,
   GetStarted,
 };
diff --git a/models/types.ts b/models/types.ts
index 72f59c63..296d171f 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -22,7 +22,6 @@ export enum DoctypeName {
   Tax = 'Tax',
   TaxDetail = 'TaxDetail',
   TaxSummary = 'TaxSummary',
-  GSTR3B = 'GSTR3B',
   Address = 'Address',
   Contact = 'Contact',
   JournalEntry = 'JournalEntry',
diff --git a/reports/GoodsAndServiceTax/BaseViewConfig.js b/reports/GoodsAndServiceTax/BaseViewConfig.js
index acc07c86..54e297e9 100644
--- a/reports/GoodsAndServiceTax/BaseViewConfig.js
+++ b/reports/GoodsAndServiceTax/BaseViewConfig.js
@@ -3,8 +3,6 @@ import { DateTime } from 'luxon';
 import { stateCodeMap } from '../../accounting/gst';
 import { titleCase } from '../../src/utils';
 
-const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
-
 export default {
   filterFields: [
     {
@@ -13,7 +11,7 @@ export default {
       size: 'small',
       placeholder: t`Place`,
       fieldname: 'place',
-      getList: () => stateList,
+      getList: () => Object.keys(stateCodeMap).map(titleCase).sort(),
     },
     {
       fieldtype: 'Date',
diff --git a/reports/view.js b/reports/view.js
index c4dade3d..d73df6e1 100644
--- a/reports/view.js
+++ b/reports/view.js
@@ -1,21 +1,19 @@
-import GeneralLedgerViewConfig from './GeneralLedger/viewConfig';
-import SalesRegisterViewConfig from './SalesRegister/viewConfig';
-import PurchaseRegisterViewConfig from './PurchaseRegister/viewConfig';
 import BalanceSheetViewConfig from './BalanceSheet/viewConfig';
-import ProfitAndLossViewConfig from './ProfitAndLoss/viewConfig';
-import TrialBalanceViewConfig from './TrialBalance/viewConfig';
-// import BankReconciliationViewConfig from './BankReconciliation/viewConfig';
+import GeneralLedgerViewConfig from './GeneralLedger/viewConfig';
 import GoodsAndServiceTaxGSTR1View from './GoodsAndServiceTax/GSTR1View';
 import GoodsAndServiceTaxGSTR2View from './GoodsAndServiceTax/GSTR2View';
+import ProfitAndLossViewConfig from './ProfitAndLoss/viewConfig';
+import PurchaseRegisterViewConfig from './PurchaseRegister/viewConfig';
+import SalesRegisterViewConfig from './SalesRegister/viewConfig';
+import TrialBalanceViewConfig from './TrialBalance/viewConfig';
 
 export default {
-  'general-ledger' : GeneralLedgerViewConfig,
-  'sales-register' : SalesRegisterViewConfig,
-  'purchase-register' : PurchaseRegisterViewConfig,
-  'balance-sheet' : BalanceSheetViewConfig,
-  'profit-and-loss' : ProfitAndLossViewConfig,
-  'trial-balance' : TrialBalanceViewConfig,
-  // 'bank-reconciliation' : BankReconciliationViewConfig,
-  'gstr-1' : GoodsAndServiceTaxGSTR1View,
-  'gstr-2' : GoodsAndServiceTaxGSTR2View,
+  'general-ledger': GeneralLedgerViewConfig,
+  'sales-register': SalesRegisterViewConfig,
+  'purchase-register': PurchaseRegisterViewConfig,
+  'balance-sheet': BalanceSheetViewConfig,
+  'profit-and-loss': ProfitAndLossViewConfig,
+  'trial-balance': TrialBalanceViewConfig,
+  'gstr-1': GoodsAndServiceTaxGSTR1View,
+  'gstr-2': GoodsAndServiceTaxGSTR2View,
 };
diff --git a/server/postStart.js b/server/postStart.js
index c574e911..7383a004 100644
--- a/server/postStart.js
+++ b/server/postStart.js
@@ -1,6 +1,5 @@
 import frappe from 'frappe';
 import { createNumberSeries } from 'frappe/model/naming';
-import GSTR3BServer from '../models/doctype/GSTR3B/GSTR3BServer.js';
 import JournalEntryServer from '../models/doctype/JournalEntry/JournalEntryServer.js';
 import PartyServer from '../models/doctype/Party/PartyServer.js';
 import PaymentServer from '../models/doctype/Payment/PaymentServer.js';
@@ -14,7 +13,6 @@ export default async function postStart() {
   frappe.models.Party.documentClass = PartyServer;
   frappe.models.PurchaseInvoice.documentClass = PurchaseInvoiceServer;
   frappe.models.JournalEntry.documentClass = JournalEntryServer;
-  frappe.models.GSTR3B.documentClass = GSTR3BServer;
 
   frappe.metaCache = {};
 
@@ -23,11 +21,6 @@ export default async function postStart() {
   await createNumberSeries('PINV-', 'PurchaseInvoice');
   await createNumberSeries('PAY-', 'Payment');
   await createNumberSeries('JV-', 'JournalEntry');
-  // await naming.createNumberSeries('QTN-', 'QuotationSettings');
-  // await naming.createNumberSeries('SO-', 'SalesOrderSettings');
-  // await naming.createNumberSeries('OF-', 'FulfillmentSettings');
-  // await naming.createNumberSeries('PO-', 'PurchaseOrderSettings');
-  // await naming.createNumberSeries('PREC-', 'PurchaseReceiptSettings');
 
   // fetch singles
   // so that they are available synchronously
diff --git a/src/pages/ListView/listConfig.js b/src/pages/ListView/listConfig.js
index 9d329468..97eba638 100644
--- a/src/pages/ListView/listConfig.js
+++ b/src/pages/ListView/listConfig.js
@@ -1,15 +1,14 @@
-import SalesInvoice from '../../../models/doctype/SalesInvoice/SalesInvoiceList';
-import PurchaseInvoice from '../../../models/doctype/PurchaseInvoice/PurchaseInvoiceList';
-import Customer from '../../../models/doctype/Party/CustomerList';
-import Supplier from '../../../models/doctype/Party/SupplierList';
-import Party from '../../../models/doctype/Party/PartyList';
-import Item from '../../../models/doctype/Item/ItemList';
-import Payment from '../../../models/doctype/Payment/PaymentList';
-import Tax from '../../../models/doctype/Tax/TaxList';
-import JournalEntry from '../../../models/doctype/JournalEntry/JournalEntryList';
-import AccountingLedgerEntry from '../../../models/doctype/AccountingLedgerEntry/AccountingLedgerEntryList';
 import Account from '../../../models/doctype/Account/AccountList';
-import GSTR3B from '../../../models/doctype/GSTR3B/GSTR3BList';
+import AccountingLedgerEntry from '../../../models/doctype/AccountingLedgerEntry/AccountingLedgerEntryList';
+import Item from '../../../models/doctype/Item/ItemList';
+import JournalEntry from '../../../models/doctype/JournalEntry/JournalEntryList';
+import Customer from '../../../models/doctype/Party/CustomerList';
+import Party from '../../../models/doctype/Party/PartyList';
+import Supplier from '../../../models/doctype/Party/SupplierList';
+import Payment from '../../../models/doctype/Payment/PaymentList';
+import PurchaseInvoice from '../../../models/doctype/PurchaseInvoice/PurchaseInvoiceList';
+import SalesInvoice from '../../../models/doctype/SalesInvoice/SalesInvoiceList';
+import Tax from '../../../models/doctype/Tax/TaxList';
 
 export default {
   SalesInvoice,
@@ -22,6 +21,5 @@ export default {
   Tax,
   JournalEntry,
   Account,
-  GSTR3B,
-  AccountingLedgerEntry
+  AccountingLedgerEntry,
 };

From 02cacd569739b348fdb271637c110aa7d5318205 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 23 Mar 2022 13:01:15 +0530
Subject: [PATCH 011/163] incr: add schemas

---
 schemas/app/Account.json                 |  88 +++++++++
 schemas/app/AccountingLedgerEntry.json   |  87 +++++++++
 schemas/app/AccountingSettings.json      | 102 +++++++++++
 schemas/app/Address.json                 |  95 ++++++++++
 schemas/app/Color.json                   |  17 ++
 schemas/app/CompanySettings.json         |  27 +++
 schemas/app/Contact.json                 |  87 +++++++++
 schemas/app/Currency.json                |  42 +++++
 schemas/app/Customer.json                | 121 +++++++++++++
 schemas/app/GetStarted.json              |  66 +++++++
 schemas/app/Item.json                    | 134 ++++++++++++++
 schemas/app/JournalEntry.json            |  97 ++++++++++
 schemas/app/JournalEntryAccount.json     |  30 ++++
 schemas/app/JournalEntrySettings.json    |   9 +
 schemas/app/Party.json                   | 109 +++++++++++
 schemas/app/Payment.json                 | 219 +++++++++++++++++++++++
 schemas/app/PaymentFor.json              |  43 +++++
 schemas/app/PaymentSettings.json         |   8 +
 schemas/app/PrintSettings.json           | 131 ++++++++++++++
 schemas/app/PurchaseInvoice.json         | 142 +++++++++++++++
 schemas/app/PurchaseInvoiceItem.json     |  73 ++++++++
 schemas/app/PurchaseInvoiceSettings.json |   9 +
 schemas/app/SalesInvoice.json            | 142 +++++++++++++++
 schemas/app/SalesInvoiceItem.json        |  93 ++++++++++
 schemas/app/SalesInvoiceSettings.json    |  45 +++++
 schemas/app/SetupWizard.json             | 101 +++++++++++
 schemas/app/Supplier.json                | 121 +++++++++++++
 schemas/app/Tax.json                     |  28 +++
 schemas/app/TaxDetail.json               |  28 +++
 schemas/app/TaxSummary.json              |  32 ++++
 schemas/core/NumberSeries.json           |  75 ++++++++
 schemas/core/PatchRun.json               |  11 ++
 schemas/core/SingleValue.json            |  27 +++
 schemas/core/SystemSettings.json         |  86 +++++++++
 34 files changed, 2525 insertions(+)
 create mode 100644 schemas/app/Account.json
 create mode 100644 schemas/app/AccountingLedgerEntry.json
 create mode 100644 schemas/app/AccountingSettings.json
 create mode 100644 schemas/app/Address.json
 create mode 100644 schemas/app/Color.json
 create mode 100644 schemas/app/CompanySettings.json
 create mode 100644 schemas/app/Contact.json
 create mode 100644 schemas/app/Currency.json
 create mode 100644 schemas/app/Customer.json
 create mode 100644 schemas/app/GetStarted.json
 create mode 100644 schemas/app/Item.json
 create mode 100644 schemas/app/JournalEntry.json
 create mode 100644 schemas/app/JournalEntryAccount.json
 create mode 100644 schemas/app/JournalEntrySettings.json
 create mode 100644 schemas/app/Party.json
 create mode 100644 schemas/app/Payment.json
 create mode 100644 schemas/app/PaymentFor.json
 create mode 100644 schemas/app/PaymentSettings.json
 create mode 100644 schemas/app/PrintSettings.json
 create mode 100644 schemas/app/PurchaseInvoice.json
 create mode 100644 schemas/app/PurchaseInvoiceItem.json
 create mode 100644 schemas/app/PurchaseInvoiceSettings.json
 create mode 100644 schemas/app/SalesInvoice.json
 create mode 100644 schemas/app/SalesInvoiceItem.json
 create mode 100644 schemas/app/SalesInvoiceSettings.json
 create mode 100644 schemas/app/SetupWizard.json
 create mode 100644 schemas/app/Supplier.json
 create mode 100644 schemas/app/Tax.json
 create mode 100644 schemas/app/TaxDetail.json
 create mode 100644 schemas/app/TaxSummary.json
 create mode 100644 schemas/core/NumberSeries.json
 create mode 100644 schemas/core/PatchRun.json
 create mode 100644 schemas/core/SingleValue.json
 create mode 100644 schemas/core/SystemSettings.json

diff --git a/schemas/app/Account.json b/schemas/app/Account.json
new file mode 100644
index 00000000..42416775
--- /dev/null
+++ b/schemas/app/Account.json
@@ -0,0 +1,88 @@
+{
+  "name": "Account",
+  "label": "Account",
+  "doctype": "DocType",
+  "isSingle": false,
+  "isTree": true,
+  "keywordFields": [
+    "name",
+    "rootType",
+    "accountType"
+  ],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Account Name",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "rootType",
+      "label": "Root Type",
+      "fieldtype": "Select",
+      "placeholder": "Root Type",
+      "options": [
+        "Asset",
+        "Liability",
+        "Equity",
+        "Income",
+        "Expense"
+      ],
+      "required": true
+    },
+    {
+      "fieldname": "parentAccount",
+      "label": "Parent Account",
+      "fieldtype": "Link",
+      "target": "Account"
+    },
+    {
+      "fieldname": "accountType",
+      "label": "Account Type",
+      "placeholder": "Account Type",
+      "fieldtype": "Select",
+      "options": [
+        "Accumulated Depreciation",
+        "Bank",
+        "Cash",
+        "Chargeable",
+        "Cost of Goods Sold",
+        "Depreciation",
+        "Equity",
+        "Expense Account",
+        "Expenses Included In Valuation",
+        "Fixed Asset",
+        "Income Account",
+        "Payable",
+        "Receivable",
+        "Round Off",
+        "Stock",
+        "Stock Adjustment",
+        "Stock Received But Not Billed",
+        "Tax",
+        "Temporary"
+      ]
+    },
+    {
+      "fieldname": "balance",
+      "label": "Balance",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "isGroup",
+      "label": "Is Group",
+      "fieldtype": "Check"
+    }
+  ],
+  "quickEditFields": [
+    "name",
+    "rootType",
+    "parentAccount",
+    "accountType",
+    "isGroup"
+  ],
+  "treeSettings": {
+    "parentField": "parentAccount"
+  }
+}
\ No newline at end of file
diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
new file mode 100644
index 00000000..6de20eae
--- /dev/null
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -0,0 +1,87 @@
+{
+  "name": "AccountingLedgerEntry",
+  "label": "Ledger Entry",
+  "naming": "autoincrement",
+  "doctype": "DocType",
+  "isSingle": false,
+  "isChild": false,
+  "keywordFields": [
+    "account",
+    "party",
+    "referenceName"
+  ],
+  "fields": [
+    {
+      "fieldname": "date",
+      "label": "Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "account",
+      "label": "Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true
+    },
+    {
+      "fieldname": "description",
+      "label": "Description",
+      "fieldtype": "Text"
+    },
+    {
+      "fieldname": "party",
+      "label": "Party",
+      "fieldtype": "Link",
+      "target": "Party"
+    },
+    {
+      "fieldname": "debit",
+      "label": "Debit",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "credit",
+      "label": "Credit",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "againstAccount",
+      "label": "Against Account",
+      "fieldtype": "Text"
+    },
+    {
+      "fieldname": "referenceType",
+      "label": "Ref. Type",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "referenceName",
+      "label": "Ref. Name",
+      "fieldtype": "DynamicLink",
+      "references": "referenceType"
+    },
+    {
+      "fieldname": "balance",
+      "label": "Balance",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "reverted",
+      "label": "Reverted",
+      "fieldtype": "Check",
+      "default": 0
+    }
+  ],
+  "quickEditFields": [
+    "date",
+    "account",
+    "description",
+    "party",
+    "debit",
+    "credit",
+    "againstAccount",
+    "referenceType",
+    "referenceName",
+    "balance"
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/AccountingSettings.json b/schemas/app/AccountingSettings.json
new file mode 100644
index 00000000..7b2998dc
--- /dev/null
+++ b/schemas/app/AccountingSettings.json
@@ -0,0 +1,102 @@
+{
+  "name": "AccountingSettings",
+  "label": "Accounting Settings",
+  "naming": "name",
+  "isSingle": true,
+  "isChild": false,
+  "isSubmittable": false,
+  "settings": null,
+  "keywordFields": [],
+  "fields": [
+    {
+      "label": "Company Name",
+      "fieldname": "companyName",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "label": "Write Off Account",
+      "fieldname": "writeOffAccount",
+      "fieldtype": "Link",
+      "target": "Account",
+      "default": "Write Off"
+    },
+    {
+      "label": "Round Off Account",
+      "fieldname": "roundOffAccount",
+      "fieldtype": "Link",
+      "target": "Account",
+      "default": "Rounded Off"
+    },
+    {
+      "fieldname": "country",
+      "label": "Country",
+      "fieldtype": "AutoComplete",
+      "placeholder": "Select Country",
+      "readOnly": true,
+      "required": true
+    },
+    {
+      "fieldname": "currency",
+      "label": "Currency",
+      "fieldtype": "Data",
+      "readOnly": true,
+      "required": false
+    },
+    {
+      "fieldname": "fullname",
+      "label": "Name",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "email",
+      "label": "Email",
+      "fieldtype": "Data",
+      "required": true,
+      "validate": {
+        "type": "email"
+      }
+    },
+    {
+      "fieldname": "bankName",
+      "label": "Bank Name",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "fiscalYearStart",
+      "label": "Fiscal Year Start Date",
+      "fieldtype": "Date",
+      "required": true
+    },
+    {
+      "fieldname": "fiscalYearEnd",
+      "label": "Fiscal Year End Date",
+      "fieldtype": "Date",
+      "required": true
+    },
+    {
+      "fieldname": "setupComplete",
+      "label": "Setup Complete",
+      "fieldtype": "Check",
+      "default": 0
+    },
+    {
+      "fieldname": "gstin",
+      "label": "GSTIN",
+      "fieldtype": "Data",
+      "placeholder": "27AAAAA0000A1Z5"
+    }
+  ],
+  "quickEditFields": [
+    "fullname",
+    "email",
+    "companyName",
+    "country",
+    "currency",
+    "fiscalYearStart",
+    "fiscalYearEnd",
+    "gstin"
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/Address.json b/schemas/app/Address.json
new file mode 100644
index 00000000..c1134297
--- /dev/null
+++ b/schemas/app/Address.json
@@ -0,0 +1,95 @@
+{
+  "name": "Address",
+  "doctype": "DocType",
+  "regional": 1,
+  "isSingle": false,
+  "keywordFields": [
+    "addressLine1",
+    "addressLine2",
+    "city",
+    "state",
+    "country",
+    "postalCode"
+  ],
+  "fields": [
+    {
+      "fieldname": "addressLine1",
+      "label": "Address Line 1",
+      "placeholder": "Address Line 1",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "addressLine2",
+      "label": "Address Line 2",
+      "placeholder": "Address Line 2",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "city",
+      "label": "City / Town",
+      "placeholder": "City / Town",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "state",
+      "label": "State",
+      "placeholder": "State",
+      "fieldtype": "AutoComplete"
+    },
+    {
+      "fieldname": "country",
+      "label": "Country",
+      "placeholder": "Country",
+      "fieldtype": "AutoComplete",
+      "required": true
+    },
+    {
+      "fieldname": "postalCode",
+      "label": "Postal Code",
+      "placeholder": "Postal Code",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "emailAddress",
+      "label": "Email Address",
+      "placeholder": "Email Address",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "phone",
+      "label": "Phone",
+      "placeholder": "Phone",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "fax",
+      "label": "Fax",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "addressDisplay",
+      "fieldtype": "Text",
+      "label": "Address Display",
+      "readOnly": true
+    },
+    {
+      "fieldname": "pos",
+      "label": "Place of Supply",
+      "fieldtype": "AutoComplete",
+      "placeholder": "Place of Supply"
+    }
+  ],
+  "quickEditFields": [
+    "addressLine1",
+    "addressLine2",
+    "city",
+    "state",
+    "country",
+    "postalCode",
+    "pos"
+  ],
+  "inlineEditDisplayField": "addressDisplay",
+  "augmented": 1
+}
\ No newline at end of file
diff --git a/schemas/app/Color.json b/schemas/app/Color.json
new file mode 100644
index 00000000..8f6a2eb1
--- /dev/null
+++ b/schemas/app/Color.json
@@ -0,0 +1,17 @@
+{
+  "name": "Color",
+  "doctype": "DocType",
+  "fields": [
+    {
+      "fieldname": "name",
+      "fieldtype": "Data",
+      "label": "Color",
+      "required": true
+    },
+    {
+      "fieldname": "hexvalue",
+      "fieldtype": "Data",
+      "label": "Hex Value"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/CompanySettings.json b/schemas/app/CompanySettings.json
new file mode 100644
index 00000000..5f6ad6c6
--- /dev/null
+++ b/schemas/app/CompanySettings.json
@@ -0,0 +1,27 @@
+{
+  "name": "CompanySettings",
+  "label": "Company Settings",
+  "naming": "autoincrement",
+  "isSingle": true,
+  "isChild": false,
+  "keywordFields": [
+    "companyName"
+  ],
+  "fields": [
+    {
+      "fieldname": "companyName",
+      "label": "Company Name",
+      "fieldtype": "Data",
+      "disabled": false,
+      "required": true
+    },
+    {
+      "fieldname": "companyAddress",
+      "label": "Company Address",
+      "fieldtype": "Link",
+      "disabled": false,
+      "required": true,
+      "target": "Address"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/Contact.json b/schemas/app/Contact.json
new file mode 100644
index 00000000..d9e18d31
--- /dev/null
+++ b/schemas/app/Contact.json
@@ -0,0 +1,87 @@
+{
+  "name": "Contact",
+  "doctype": "DocType",
+  "isSingle": false,
+  "naming": "autoincrement",
+  "pageSettings": {
+    "hideTitle": true
+  },
+  "titleField": "fullName",
+  "keywordFields": [
+    "fullName"
+  ],
+  "fields": [
+    {
+      "fieldname": "fullName",
+      "label": "Full Name",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "emailAddress",
+      "label": "Email Address",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "userId",
+      "label": "User ID",
+      "fieldtype": "Link",
+      "target": "User",
+      "hidden": true
+    },
+    {
+      "fieldname": "status",
+      "label": "Status",
+      "fieldtype": "Select",
+      "options": [
+        "Passive",
+        "Open",
+        "Replied"
+      ]
+    },
+    {
+      "fieldname": "gender",
+      "label": "Gender",
+      "fieldtype": "Select",
+      "options": [
+        "Male",
+        "Female",
+        "Gender"
+      ]
+    },
+    {
+      "fieldname": "mobileNumber",
+      "label": "Mobile Number",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "phone",
+      "label": "Phone",
+      "fieldtype": "Data"
+    }
+  ],
+  "events": {},
+  "listSettings": {},
+  "layout": [
+    {
+      "columns": [
+        {
+          "fields": [
+            "fullName",
+            "emailAddress",
+            "userId",
+            "status"
+          ]
+        },
+        {
+          "fields": [
+            "postalCode",
+            "gender",
+            "phone",
+            "mobileNumber"
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/Currency.json b/schemas/app/Currency.json
new file mode 100644
index 00000000..91055a4c
--- /dev/null
+++ b/schemas/app/Currency.json
@@ -0,0 +1,42 @@
+{
+  "name": "Currency",
+  "label": "Currency",
+  "doctype": "DocType",
+  "isSingle": false,
+  "keywordFields": [
+    "name",
+    "symbol"
+  ],
+  "quickEditFields": [
+    "name",
+    "symbol"
+  ],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Currency Name",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "fraction",
+      "label": "Fraction",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "fractionUnits",
+      "label": "Fraction Units",
+      "fieldtype": "Int"
+    },
+    {
+      "label": "Smallest Currency Fraction Value",
+      "fieldname": "smallestValue",
+      "fieldtype": "Currency"
+    },
+    {
+      "label": "Symbol",
+      "fieldname": "symbol",
+      "fieldtype": "Data"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/Customer.json b/schemas/app/Customer.json
new file mode 100644
index 00000000..ac72af24
--- /dev/null
+++ b/schemas/app/Customer.json
@@ -0,0 +1,121 @@
+{
+  "name": "Customer",
+  "label": "Customer",
+  "basedOn": "Party",
+  "filters": {
+    "customer": 1
+  },
+  "actions": [
+    {
+      "label": "Create Invoice"
+    },
+    {
+      "label": "View Invoices"
+    }
+  ],
+  "regional": 1,
+  "keywordFields": [
+    "name"
+  ],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Name",
+      "fieldtype": "Data",
+      "required": true,
+      "placeholder": "Full Name"
+    },
+    {
+      "fieldname": "image",
+      "label": "Image",
+      "fieldtype": "AttachImage"
+    },
+    {
+      "fieldname": "customer",
+      "label": "Is Customer",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "gstin",
+      "label": "GSTIN No.",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "gstType",
+      "label": "GST Registration",
+      "placeholder": "GST Registration",
+      "fieldtype": "Select",
+      "default": "Unregistered",
+      "options": [
+        "Unregistered",
+        "Registered Regular",
+        "Consumer"
+      ]
+    },
+    {
+      "fieldname": "supplier",
+      "label": "Is Supplier",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "defaultAccount",
+      "label": "Default Account",
+      "fieldtype": "Link",
+      "target": "Account"
+    },
+    {
+      "fieldname": "outstandingAmount",
+      "label": "Outstanding Amount",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "currency",
+      "label": "Currency",
+      "fieldtype": "Link",
+      "target": "Currency",
+      "placeholder": "INR"
+    },
+    {
+      "fieldname": "email",
+      "label": "Email",
+      "fieldtype": "Data",
+      "placeholder": "john@doe.com",
+      "validate": {
+        "type": "email"
+      }
+    },
+    {
+      "fieldname": "phone",
+      "label": "Phone",
+      "fieldtype": "Data",
+      "placeholder": "Phone",
+      "validate": {
+        "type": "phone"
+      }
+    },
+    {
+      "fieldname": "address",
+      "label": "Address",
+      "fieldtype": "Link",
+      "target": "Address",
+      "placeholder": "Click to create",
+      "inline": true
+    },
+    {
+      "fieldname": "addressDisplay",
+      "label": "Address Display",
+      "fieldtype": "Text",
+      "readOnly": true
+    }
+  ],
+  "quickEditFields": [
+    "email",
+    "phone",
+    "address",
+    "defaultAccount",
+    "currency",
+    "gstType",
+    "gstin"
+  ],
+  "augmented": 1
+}
\ No newline at end of file
diff --git a/schemas/app/GetStarted.json b/schemas/app/GetStarted.json
new file mode 100644
index 00000000..9e4bf4f4
--- /dev/null
+++ b/schemas/app/GetStarted.json
@@ -0,0 +1,66 @@
+{
+  "name": "GetStarted",
+  "isSingle": true,
+  "fields": [
+    {
+      "fieldname": "onboardingComplete",
+      "label": "Onboarding Complete",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "companySetup",
+      "label": "Company Setup",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "systemSetup",
+      "label": "System Setup",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "invoiceSetup",
+      "label": "Invoice Setup",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "itemCreated",
+      "label": "Item Created",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "customerCreated",
+      "label": "Customer Created",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "supplierCreated",
+      "label": "Supplier Created",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "invoiceCreated",
+      "label": "Invoice Created",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "billCreated",
+      "label": "Bill Created",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "chartOfAccountsReviewed",
+      "label": "Chart Of Accounts Reviewed",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "openingBalanceChecked",
+      "label": "Opening Balances",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "taxesAdded",
+      "label": "Add Taxes",
+      "fieldtype": "Check"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
new file mode 100644
index 00000000..5053af5e
--- /dev/null
+++ b/schemas/app/Item.json
@@ -0,0 +1,134 @@
+{
+  "name": "Item",
+  "label": "Item",
+  "doctype": "DocType",
+  "isSingle": false,
+  "regional": 1,
+  "keywordFields": [
+    "name",
+    "description"
+  ],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Item Name",
+      "fieldtype": "Data",
+      "placeholder": "Item Name",
+      "required": true
+    },
+    {
+      "fieldname": "hsnCode",
+      "label": "HSN/SAC",
+      "fieldtype": "Int",
+      "placeholder": "HSN/SAC Code"
+    },
+    {
+      "fieldname": "image",
+      "label": "Image",
+      "fieldtype": "AttachImage"
+    },
+    {
+      "fieldname": "description",
+      "label": "Description",
+      "placeholder": "Item Description",
+      "fieldtype": "Text"
+    },
+    {
+      "fieldname": "unit",
+      "label": "Unit Type",
+      "fieldtype": "Select",
+      "placeholder": "Unit Type",
+      "default": "Unit",
+      "options": [
+        "Unit",
+        "Kg",
+        "Gram",
+        "Hour",
+        "Day"
+      ]
+    },
+    {
+      "fieldname": "itemType",
+      "label": "Type",
+      "placeholder": "Type",
+      "fieldtype": "Select",
+      "default": "Product",
+      "options": [
+        "Product",
+        "Service"
+      ]
+    },
+    {
+      "fieldname": "for",
+      "label": "For",
+      "fieldtype": "Select",
+      "options": [
+        "purchases",
+        "sales",
+        "both"
+      ],
+      "map": {
+        "purchases": "Purchases",
+        "sales": "Sales",
+        "both": "Both"
+      },
+      "default": "both"
+    },
+    {
+      "fieldname": "incomeAccount",
+      "label": "Income",
+      "fieldtype": "Link",
+      "target": "Account",
+      "placeholder": "Income",
+      "required": true,
+      "disableCreation": true,
+      "formulaDependsOn": [
+        "itemType"
+      ]
+    },
+    {
+      "fieldname": "expenseAccount",
+      "label": "Expense",
+      "fieldtype": "Link",
+      "target": "Account",
+      "placeholder": "Expense",
+      "required": true,
+      "disableCreation": true,
+      "formulaDependsOn": [
+        "itemType"
+      ]
+    },
+    {
+      "fieldname": "tax",
+      "label": "Tax",
+      "fieldtype": "Link",
+      "target": "Tax",
+      "placeholder": "Tax"
+    },
+    {
+      "fieldname": "rate",
+      "label": "Rate",
+      "fieldtype": "Currency"
+    }
+  ],
+  "quickEditFields": [
+    "hsnCode",
+    "rate",
+    "unit",
+    "itemType",
+    "for",
+    "tax",
+    "description",
+    "incomeAccount",
+    "expenseAccount"
+  ],
+  "actions": [
+    {
+      "label": "New Invoice"
+    },
+    {
+      "label": "New Bill"
+    }
+  ],
+  "augmented": 1
+}
\ No newline at end of file
diff --git a/schemas/app/JournalEntry.json b/schemas/app/JournalEntry.json
new file mode 100644
index 00000000..bb84ed13
--- /dev/null
+++ b/schemas/app/JournalEntry.json
@@ -0,0 +1,97 @@
+{
+  "label": "Journal Entry",
+  "name": "JournalEntry",
+  "doctype": "DocType",
+  "isSubmittable": true,
+  "settings": "JournalEntrySettings",
+  "fields": [
+    {
+      "fieldname": "entryType",
+      "label": "Entry Type",
+      "fieldtype": "Select",
+      "placeholder": "Entry Type",
+      "options": [
+        "Journal Entry",
+        "Bank Entry",
+        "Cash Entry",
+        "Credit Card Entry",
+        "Debit Note",
+        "Credit Note",
+        "Contra Entry",
+        "Excise Entry",
+        "Write Off Entry",
+        "Opening Entry",
+        "Depreciation Entry"
+      ],
+      "map": {
+        "Journal Entry": "Journal Entry",
+        "Bank Entry": "Bank Entry",
+        "Cash Entry": "Cash Entry",
+        "Credit Card Entry": "Credit Card Entry",
+        "Debit Note": "Debit Note",
+        "Credit Note": "Credit Note",
+        "Contra Entry": "Contra Entry",
+        "Excise Entry": "Excise Entry",
+        "Write Off Entry": "Write Off Entry",
+        "Opening Entry": "Opening Entry",
+        "Depreciation Entry": "Depreciation Entry"
+      },
+      "required": true
+    },
+    {
+      "label": "Entry No",
+      "fieldname": "name",
+      "fieldtype": "Data",
+      "required": true,
+      "readOnly": true
+    },
+    {
+      "fieldname": "date",
+      "label": "Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "accounts",
+      "label": "Account Entries",
+      "fieldtype": "Table",
+      "childtype": "JournalEntryAccount",
+      "required": true
+    },
+    {
+      "fieldname": "referenceNumber",
+      "label": "Reference Number",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "referenceDate",
+      "label": "Reference Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "userRemark",
+      "label": "User Remark",
+      "fieldtype": "Text",
+      "placeholder": "User Remark"
+    },
+    {
+      "fieldname": "cancelled",
+      "label": "Cancelled",
+      "fieldtype": "Check",
+      "default": 0,
+      "readOnly": true
+    },
+    {
+      "fieldname": "numberSeries",
+      "label": "Number Series",
+      "fieldtype": "Link",
+      "target": "NumberSeries",
+      "required": true,
+      "default": "JV-"
+    }
+  ],
+  "actions": [
+    {
+      "label": "Ledger Entries"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/JournalEntryAccount.json b/schemas/app/JournalEntryAccount.json
new file mode 100644
index 00000000..2e3b6f4c
--- /dev/null
+++ b/schemas/app/JournalEntryAccount.json
@@ -0,0 +1,30 @@
+{
+  "name": "JournalEntryAccount",
+  "isChild": true,
+  "fields": [
+    {
+      "fieldname": "account",
+      "label": "Account",
+      "placeholder": "Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true,
+      "groupBy": "rootType"
+    },
+    {
+      "fieldname": "debit",
+      "label": "Debit",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "credit",
+      "label": "Credit",
+      "fieldtype": "Currency"
+    }
+  ],
+  "tableFields": [
+    "account",
+    "debit",
+    "credit"
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/JournalEntrySettings.json b/schemas/app/JournalEntrySettings.json
new file mode 100644
index 00000000..9a365dfc
--- /dev/null
+++ b/schemas/app/JournalEntrySettings.json
@@ -0,0 +1,9 @@
+{
+  "name": "JournalEntrySettings",
+  "label": "Journal Entry Setting",
+  "doctype": "DocType",
+  "isSingle": true,
+  "isChild": false,
+  "keywordFields": [],
+  "fields": []
+}
\ No newline at end of file
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
new file mode 100644
index 00000000..effe5835
--- /dev/null
+++ b/schemas/app/Party.json
@@ -0,0 +1,109 @@
+{
+  "name": "Party",
+  "label": "Party",
+  "regional": 1,
+  "keywordFields": [
+    "name"
+  ],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Name",
+      "fieldtype": "Data",
+      "required": true,
+      "placeholder": "Full Name"
+    },
+    {
+      "fieldname": "image",
+      "label": "Image",
+      "fieldtype": "AttachImage"
+    },
+    {
+      "fieldname": "customer",
+      "label": "Is Customer",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "gstin",
+      "label": "GSTIN No.",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "gstType",
+      "label": "GST Registration",
+      "placeholder": "GST Registration",
+      "fieldtype": "Select",
+      "default": "Unregistered",
+      "options": [
+        "Unregistered",
+        "Registered Regular",
+        "Consumer"
+      ]
+    },
+    {
+      "fieldname": "supplier",
+      "label": "Is Supplier",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "defaultAccount",
+      "label": "Default Account",
+      "fieldtype": "Link",
+      "target": "Account"
+    },
+    {
+      "fieldname": "outstandingAmount",
+      "label": "Outstanding Amount",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "currency",
+      "label": "Currency",
+      "fieldtype": "Link",
+      "target": "Currency",
+      "placeholder": "INR"
+    },
+    {
+      "fieldname": "email",
+      "label": "Email",
+      "fieldtype": "Data",
+      "placeholder": "john@doe.com",
+      "validate": {
+        "type": "email"
+      }
+    },
+    {
+      "fieldname": "phone",
+      "label": "Phone",
+      "fieldtype": "Data",
+      "placeholder": "Phone",
+      "validate": {
+        "type": "phone"
+      }
+    },
+    {
+      "fieldname": "address",
+      "label": "Address",
+      "fieldtype": "Link",
+      "target": "Address",
+      "placeholder": "Click to create",
+      "inline": true
+    },
+    {
+      "fieldname": "addressDisplay",
+      "label": "Address Display",
+      "fieldtype": "Text",
+      "readOnly": true
+    }
+  ],
+  "quickEditFields": [
+    "email",
+    "phone",
+    "address",
+    "defaultAccount",
+    "currency",
+    "gstType",
+    "gstin"
+  ],
+  "augmented": 1
+}
\ No newline at end of file
diff --git a/schemas/app/Payment.json b/schemas/app/Payment.json
new file mode 100644
index 00000000..e2009c75
--- /dev/null
+++ b/schemas/app/Payment.json
@@ -0,0 +1,219 @@
+{
+  "name": "Payment",
+  "label": "Payment",
+  "isSingle": false,
+  "isChild": false,
+  "isSubmittable": true,
+  "keywordFields": [],
+  "settings": "PaymentSettings",
+  "fields": [
+    {
+      "label": "Payment No",
+      "fieldname": "name",
+      "fieldtype": "Data",
+      "required": true,
+      "readOnly": true
+    },
+    {
+      "fieldname": "party",
+      "label": "Party",
+      "fieldtype": "Link",
+      "target": "Party",
+      "required": true
+    },
+    {
+      "fieldname": "date",
+      "label": "Posting Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "account",
+      "label": "From Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true
+    },
+    {
+      "fieldname": "paymentType",
+      "label": "Payment Type",
+      "fieldtype": "Select",
+      "placeholder": "Payment Type",
+      "options": [
+        "Receive",
+        "Pay"
+      ],
+      "map": {
+        "Receive": "Receive",
+        "Pay": "Pay"
+      },
+      "required": true
+    },
+    {
+      "fieldname": "paymentAccount",
+      "label": "To Account",
+      "placeholder": "To Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true
+    },
+    {
+      "fieldname": "numberSeries",
+      "label": "Number Series",
+      "fieldtype": "Link",
+      "target": "NumberSeries",
+      "required": true,
+      "default": "PAY-"
+    },
+    {
+      "fieldname": "paymentMethod",
+      "label": "Payment Method",
+      "placeholder": "Payment Method",
+      "fieldtype": "Select",
+      "options": [
+        "Cash",
+        "Cheque",
+        "Transfer"
+      ],
+      "default": "Cash",
+      "required": true
+    },
+    {
+      "fieldname": "referenceId",
+      "label": "Ref. / Cheque No.",
+      "placeholder": "Ref. / Cheque No.",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "referenceDate",
+      "label": "Ref. Date",
+      "placeholder": "Ref. Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "clearanceDate",
+      "label": "Clearance Date",
+      "placeholder": "Clearance Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "amount",
+      "label": "Amount",
+      "fieldtype": "Currency",
+      "required": true
+    },
+    {
+      "fieldname": "writeoff",
+      "label": "Write Off / Refund",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "for",
+      "label": "Payment Reference",
+      "fieldtype": "Table",
+      "childtype": "PaymentFor",
+      "required": false
+    },
+    {
+      "fieldname": "cancelled",
+      "label": "Cancelled",
+      "fieldtype": "Check",
+      "default": 0,
+      "readOnly": true
+    }
+  ],
+  "quickEditFields": [
+    "numberSeries",
+    "party",
+    "date",
+    "paymentMethod",
+    "account",
+    "paymentType",
+    "paymentAccount",
+    "referenceId",
+    "referenceDate",
+    "clearanceDate",
+    "amount",
+    "writeoff",
+    "for"
+  ],
+  "layout": [
+    {
+      "columns": [
+        {
+          "fields": [
+            "party",
+            "account"
+          ]
+        },
+        {
+          "fields": [
+            "date",
+            "paymentAccount"
+          ]
+        }
+      ]
+    },
+    {
+      "columns": [
+        {
+          "fields": [
+            "paymentMethod"
+          ]
+        },
+        {
+          "fields": [
+            "paymentType"
+          ]
+        },
+        {
+          "fields": [
+            "referenceId"
+          ]
+        }
+      ]
+    },
+    {
+      "columns": [
+        {
+          "fields": [
+            "referenceDate"
+          ]
+        },
+        {
+          "fields": [
+            "clearanceDate"
+          ]
+        }
+      ]
+    },
+    {
+      "columns": [
+        {
+          "fields": [
+            "for"
+          ]
+        }
+      ]
+    },
+    {
+      "columns": [
+        {
+          "fields": [
+            "amount",
+            "writeoff"
+          ]
+        }
+      ]
+    }
+  ],
+  "actions": [
+    {
+      "label": "Ledger Entries"
+    }
+  ],
+  "links": [
+    {
+      "label": "Ledger Entries"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/PaymentFor.json b/schemas/app/PaymentFor.json
new file mode 100644
index 00000000..8f475ca3
--- /dev/null
+++ b/schemas/app/PaymentFor.json
@@ -0,0 +1,43 @@
+{
+  "name": "PaymentFor",
+  "label": "Payment For",
+  "isSingle": false,
+  "isChild": true,
+  "keywordFields": [],
+  "tableFields": [
+    "referenceType",
+    "referenceName",
+    "amount"
+  ],
+  "fields": [
+    {
+      "fieldname": "referenceType",
+      "label": "Reference Type",
+      "placeholder": "Type",
+      "fieldtype": "Select",
+      "options": [
+        "SalesInvoice",
+        "PurchaseInvoice"
+      ],
+      "map": {
+        "SalesInvoice": "Invoice",
+        "PurchaseInvoice": "Bill"
+      },
+      "required": true
+    },
+    {
+      "fieldname": "referenceName",
+      "label": "Reference Name",
+      "fieldtype": "DynamicLink",
+      "references": "referenceType",
+      "placeholder": "Name",
+      "required": true
+    },
+    {
+      "fieldname": "amount",
+      "label": "Allocated Amount",
+      "fieldtype": "Currency",
+      "required": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/PaymentSettings.json b/schemas/app/PaymentSettings.json
new file mode 100644
index 00000000..964ccef4
--- /dev/null
+++ b/schemas/app/PaymentSettings.json
@@ -0,0 +1,8 @@
+{
+  "name": "PaymentSettings",
+  "label": "Payment Settings",
+  "isSingle": true,
+  "isChild": false,
+  "keywordFields": [],
+  "fields": []
+}
\ No newline at end of file
diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json
new file mode 100644
index 00000000..32d3b02d
--- /dev/null
+++ b/schemas/app/PrintSettings.json
@@ -0,0 +1,131 @@
+{
+  "name": "PrintSettings",
+  "label": "Print Settings",
+  "isSingle": true,
+  "fields": [
+    {
+      "fieldname": "logo",
+      "label": "Logo",
+      "fieldtype": "AttachImage"
+    },
+    {
+      "fieldname": "companyName",
+      "label": "Company Name",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "email",
+      "label": "Email",
+      "fieldtype": "Data",
+      "placeholder": "john@doe.com",
+      "validate": {
+        "type": "email"
+      }
+    },
+    {
+      "fieldname": "displayLogo",
+      "label": "Display Logo in Invoice",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "phone",
+      "label": "Phone",
+      "fieldtype": "Data",
+      "placeholder": "9888900000",
+      "validate": {
+        "type": "phone"
+      }
+    },
+    {
+      "fieldname": "address",
+      "label": "Address",
+      "fieldtype": "Link",
+      "target": "Address",
+      "placeholder": "Click to create",
+      "inline": true
+    },
+    {
+      "fieldname": "template",
+      "label": "Template",
+      "placeholder": "Template",
+      "fieldtype": "Select",
+      "options": [
+        "Basic",
+        "Minimal",
+        "Business"
+      ],
+      "default": "Basic"
+    },
+    {
+      "fieldname": "color",
+      "label": "Color",
+      "placeholder": "Select Color",
+      "fieldtype": "Color",
+      "colors": [
+        {
+          "label": "Red",
+          "value": "#f56565"
+        },
+        {
+          "label": "Orange",
+          "value": "#ed8936"
+        },
+        {
+          "label": "Yellow",
+          "value": "#ecc94b"
+        },
+        {
+          "label": "Green",
+          "value": "#48bb78"
+        },
+        {
+          "label": "Teal",
+          "value": "#38b2ac"
+        },
+        {
+          "label": "Blue",
+          "value": "#33a1ff"
+        },
+        {
+          "label": "Indigo",
+          "value": "#667eea"
+        },
+        {
+          "label": "Purple",
+          "value": "#9f7aea"
+        },
+        {
+          "label": "Pink",
+          "value": "#ed64a6"
+        },
+        {
+          "label": "Black",
+          "value": "#112B42"
+        }
+      ]
+    },
+    {
+      "fieldname": "font",
+      "label": "Font",
+      "placeholder": "Font",
+      "fieldtype": "Select",
+      "options": [
+        "Inter",
+        "Times New Roman",
+        "Arial",
+        "Courier"
+      ],
+      "default": "Inter"
+    }
+  ],
+  "quickEditFields": [
+    "logo",
+    "displayLogo",
+    "template",
+    "color",
+    "font",
+    "email",
+    "phone",
+    "address"
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
new file mode 100644
index 00000000..9aecaab6
--- /dev/null
+++ b/schemas/app/PurchaseInvoice.json
@@ -0,0 +1,142 @@
+{
+  "name": "PurchaseInvoice",
+  "doctype": "DocType",
+  "label": "Bill",
+  "printTemplate": {
+    "name": "InvoiceTemplate",
+    "props": [
+      "doc",
+      "printSettings"
+    ],
+    "computed": {},
+    "__file": "models/doctype/SalesInvoice/InvoiceTemplate.vue",
+    "__hmrId": "3d0cd49d"
+  },
+  "isSingle": false,
+  "isChild": false,
+  "isSubmittable": true,
+  "keywordFields": [
+    "name",
+    "supplier"
+  ],
+  "settings": "PurchaseInvoiceSettings",
+  "showTitle": true,
+  "fields": [
+    {
+      "label": "Bill No",
+      "fieldname": "name",
+      "fieldtype": "Data",
+      "required": true,
+      "readOnly": true
+    },
+    {
+      "fieldname": "date",
+      "label": "Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "supplier",
+      "label": "Supplier",
+      "fieldtype": "Link",
+      "target": "Supplier",
+      "required": true
+    },
+    {
+      "fieldname": "account",
+      "label": "Account",
+      "fieldtype": "Link",
+      "target": "Account"
+    },
+    {
+      "fieldname": "currency",
+      "label": "Supplier Currency",
+      "fieldtype": "Link",
+      "target": "Currency",
+      "hidden": true,
+      "formulaDependsOn": [
+        "supplier"
+      ]
+    },
+    {
+      "fieldname": "exchangeRate",
+      "label": "Exchange Rate",
+      "fieldtype": "Float",
+      "default": 1
+    },
+    {
+      "fieldname": "items",
+      "label": "Items",
+      "fieldtype": "Table",
+      "childtype": "PurchaseInvoiceItem",
+      "required": true
+    },
+    {
+      "fieldname": "netTotal",
+      "label": "Net Total",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "baseNetTotal",
+      "label": "Net Total (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "taxes",
+      "label": "Taxes",
+      "fieldtype": "Table",
+      "childtype": "TaxSummary",
+      "readOnly": true
+    },
+    {
+      "fieldname": "grandTotal",
+      "label": "Grand Total",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "baseGrandTotal",
+      "label": "Grand Total (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "outstandingAmount",
+      "label": "Outstanding Amount",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "terms",
+      "label": "Terms",
+      "fieldtype": "Text"
+    },
+    {
+      "fieldname": "cancelled",
+      "label": "Cancelled",
+      "fieldtype": "Check",
+      "default": 0,
+      "readOnly": true
+    },
+    {
+      "fieldname": "numberSeries",
+      "label": "Number Series",
+      "fieldtype": "Link",
+      "target": "NumberSeries",
+      "required": true,
+      "default": "PINV-"
+    }
+  ],
+  "actions": [
+    {
+      "label": "Make Payment"
+    },
+    {
+      "label": "Print"
+    },
+    {
+      "label": "Ledger Entries"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/PurchaseInvoiceItem.json b/schemas/app/PurchaseInvoiceItem.json
new file mode 100644
index 00000000..985013a1
--- /dev/null
+++ b/schemas/app/PurchaseInvoiceItem.json
@@ -0,0 +1,73 @@
+{
+  "name": "PurchaseInvoiceItem",
+  "doctype": "DocType",
+  "isChild": true,
+  "keywordFields": [],
+  "tableFields": [
+    "item",
+    "tax",
+    "quantity",
+    "rate",
+    "amount"
+  ],
+  "fields": [
+    {
+      "fieldname": "item",
+      "label": "Item",
+      "fieldtype": "Link",
+      "target": "Item",
+      "required": true
+    },
+    {
+      "fieldname": "description",
+      "label": "Description",
+      "fieldtype": "Text",
+      "hidden": true
+    },
+    {
+      "fieldname": "quantity",
+      "label": "Quantity",
+      "fieldtype": "Float",
+      "required": true,
+      "default": 1
+    },
+    {
+      "fieldname": "rate",
+      "label": "Rate",
+      "fieldtype": "Currency",
+      "required": true
+    },
+    {
+      "fieldname": "baseRate",
+      "label": "Rate (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "account",
+      "label": "Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true,
+      "readOnly": true
+    },
+    {
+      "fieldname": "tax",
+      "label": "Tax",
+      "fieldtype": "Link",
+      "target": "Tax"
+    },
+    {
+      "fieldname": "amount",
+      "label": "Amount",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "baseAmount",
+      "label": "Amount (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/PurchaseInvoiceSettings.json b/schemas/app/PurchaseInvoiceSettings.json
new file mode 100644
index 00000000..1b21c546
--- /dev/null
+++ b/schemas/app/PurchaseInvoiceSettings.json
@@ -0,0 +1,9 @@
+{
+  "name": "PurchaseInvoiceSettings",
+  "label": "Bills Settings",
+  "doctype": "DocType",
+  "isSingle": true,
+  "isChild": false,
+  "keywordFields": [],
+  "fields": []
+}
\ No newline at end of file
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
new file mode 100644
index 00000000..b1437a46
--- /dev/null
+++ b/schemas/app/SalesInvoice.json
@@ -0,0 +1,142 @@
+{
+  "name": "SalesInvoice",
+  "label": "Invoice",
+  "doctype": "DocType",
+  "printTemplate": {
+    "name": "InvoiceTemplate",
+    "props": [
+      "doc",
+      "printSettings"
+    ],
+    "computed": {},
+    "__file": "models/doctype/SalesInvoice/InvoiceTemplate.vue",
+    "__hmrId": "3d0cd49d"
+  },
+  "isSingle": false,
+  "isChild": false,
+  "isSubmittable": true,
+  "keywordFields": [
+    "name",
+    "customer"
+  ],
+  "settings": "SalesInvoiceSettings",
+  "fields": [
+    {
+      "label": "Invoice No",
+      "fieldname": "name",
+      "fieldtype": "Data",
+      "required": true,
+      "readOnly": true
+    },
+    {
+      "fieldname": "date",
+      "label": "Date",
+      "fieldtype": "Date"
+    },
+    {
+      "fieldname": "customer",
+      "label": "Customer",
+      "fieldtype": "Link",
+      "target": "Customer",
+      "required": true
+    },
+    {
+      "fieldname": "account",
+      "label": "Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "disableCreation": true
+    },
+    {
+      "fieldname": "currency",
+      "label": "Customer Currency",
+      "fieldtype": "Link",
+      "target": "Currency",
+      "formulaDependsOn": [
+        "customer"
+      ]
+    },
+    {
+      "fieldname": "exchangeRate",
+      "label": "Exchange Rate",
+      "fieldtype": "Float",
+      "default": 1,
+      "readOnly": true
+    },
+    {
+      "fieldname": "items",
+      "label": "Items",
+      "fieldtype": "Table",
+      "childtype": "SalesInvoiceItem",
+      "required": true
+    },
+    {
+      "fieldname": "netTotal",
+      "label": "Net Total",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "baseNetTotal",
+      "label": "Net Total (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "taxes",
+      "label": "Taxes",
+      "fieldtype": "Table",
+      "childtype": "TaxSummary",
+      "readOnly": true
+    },
+    {
+      "fieldname": "grandTotal",
+      "label": "Grand Total",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "baseGrandTotal",
+      "label": "Grand Total (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "outstandingAmount",
+      "label": "Outstanding Amount",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "terms",
+      "label": "Notes",
+      "fieldtype": "Text"
+    },
+    {
+      "fieldname": "cancelled",
+      "label": "Cancelled",
+      "fieldtype": "Check",
+      "default": 0,
+      "readOnly": true
+    },
+    {
+      "fieldname": "numberSeries",
+      "label": "Number Series",
+      "fieldtype": "Link",
+      "target": "NumberSeries",
+      "required": true,
+      "default": "SINV-"
+    }
+  ],
+  "actions": [
+    {
+      "label": "Make Payment"
+    },
+    {
+      "label": "Print"
+    },
+    {
+      "label": "Ledger Entries"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/SalesInvoiceItem.json b/schemas/app/SalesInvoiceItem.json
new file mode 100644
index 00000000..d6d05c50
--- /dev/null
+++ b/schemas/app/SalesInvoiceItem.json
@@ -0,0 +1,93 @@
+{
+  "name": "SalesInvoiceItem",
+  "doctype": "DocType",
+  "isChild": true,
+  "regional": 1,
+  "keywordFields": [],
+  "tableFields": [
+    "item",
+    "tax",
+    "quantity",
+    "rate",
+    "amount"
+  ],
+  "fields": [
+    {
+      "fieldname": "item",
+      "label": "Item",
+      "fieldtype": "Link",
+      "target": "Item",
+      "required": true
+    },
+    {
+      "fieldname": "description",
+      "label": "Description",
+      "fieldtype": "Text",
+      "hidden": true,
+      "formulaDependsOn": [
+        "item"
+      ]
+    },
+    {
+      "fieldname": "quantity",
+      "label": "Quantity",
+      "fieldtype": "Float",
+      "required": true,
+      "default": 1
+    },
+    {
+      "fieldname": "rate",
+      "label": "Rate",
+      "fieldtype": "Currency",
+      "required": true,
+      "formulaDependsOn": [
+        "item"
+      ]
+    },
+    {
+      "fieldname": "baseRate",
+      "label": "Rate (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "account",
+      "label": "Account",
+      "hidden": true,
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true,
+      "readOnly": true
+    },
+    {
+      "fieldname": "tax",
+      "label": "Tax",
+      "fieldtype": "Link",
+      "target": "Tax",
+      "formulaDependsOn": [
+        "item"
+      ]
+    },
+    {
+      "fieldname": "amount",
+      "label": "Amount",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "baseAmount",
+      "label": "Amount (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    },
+    {
+      "fieldname": "hsnCode",
+      "label": "HSN/SAC",
+      "fieldtype": "Int",
+      "formulaDependsOn": [
+        "item"
+      ]
+    }
+  ],
+  "augmented": 1
+}
\ No newline at end of file
diff --git a/schemas/app/SalesInvoiceSettings.json b/schemas/app/SalesInvoiceSettings.json
new file mode 100644
index 00000000..20ff6ce8
--- /dev/null
+++ b/schemas/app/SalesInvoiceSettings.json
@@ -0,0 +1,45 @@
+{
+  "name": "SalesInvoiceSettings",
+  "label": "SalesInvoice Settings",
+  "doctype": "DocType",
+  "isSingle": true,
+  "isChild": false,
+  "keywordFields": [],
+  "fields": [
+    {
+      "fieldname": "template",
+      "label": "Template",
+      "placeholder": "Template",
+      "fieldtype": "Select",
+      "options": [
+        "Basic I",
+        "Basic II",
+        "Modern"
+      ],
+      "required": true,
+      "default": "Basic I"
+    },
+    {
+      "fieldname": "font",
+      "label": "Font",
+      "placeholder": "Font",
+      "fieldtype": "Select",
+      "options": [
+        "Montserrat",
+        "Open Sans",
+        "Oxygen",
+        "Merriweather"
+      ],
+      "required": true,
+      "default": "Montserrat"
+    },
+    {
+      "fieldname": "themeColor",
+      "label": "Theme Color",
+      "fieldtype": "Data",
+      "required": true,
+      "default": "#000000",
+      "hidden": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/SetupWizard.json b/schemas/app/SetupWizard.json
new file mode 100644
index 00000000..d70a6aae
--- /dev/null
+++ b/schemas/app/SetupWizard.json
@@ -0,0 +1,101 @@
+{
+  "name": "SetupWizard",
+  "label": "Setup Wizard",
+  "naming": "name",
+  "isSingle": true,
+  "isChild": false,
+  "isSubmittable": false,
+  "settings": null,
+  "keywordFields": [],
+  "fields": [
+    {
+      "fieldname": "companyLogo",
+      "label": "Company Logo",
+      "fieldtype": "AttachImage"
+    },
+    {
+      "fieldname": "country",
+      "label": "Country",
+      "fieldtype": "AutoComplete",
+      "placeholder": "Select Country",
+      "required": true
+    },
+    {
+      "fieldname": "fullname",
+      "label": "Your Name",
+      "fieldtype": "Data",
+      "placeholder": "John Doe",
+      "required": true
+    },
+    {
+      "fieldname": "email",
+      "label": "Email",
+      "fieldtype": "Data",
+      "placeholder": "john@doe.com",
+      "required": true,
+      "validate": {
+        "type": "email"
+      }
+    },
+    {
+      "fieldname": "companyName",
+      "label": "Company Name",
+      "placeholder": "Company Name",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "bankName",
+      "label": "Bank Name",
+      "fieldtype": "Data",
+      "placeholder": "Prime Bank",
+      "required": true
+    },
+    {
+      "fieldname": "fiscalYearStart",
+      "label": "Fiscal Year Start Date",
+      "placeholder": "Fiscal Year Start Date",
+      "fieldtype": "Date",
+      "formulaDependsOn": ["country"],
+      "required": true
+    },
+    {
+      "fieldname": "fiscalYearEnd",
+      "label": "Fiscal Year End Date",
+      "placeholder": "Fiscal Year End Date",
+      "fieldtype": "Date",
+      "formulaDependsOn": ["country"],
+      "required": true
+    },
+    {
+      "fieldname": "currency",
+      "label": "Currency",
+      "fieldtype": "Data",
+      "placeholder": "Currency",
+      "formulaDependsOn": ["country"],
+      "required": true
+    },
+    {
+      "fieldname": "completed",
+      "label": "Completed",
+      "fieldtype": "Check",
+      "readOnly": true
+    },
+    {
+      "fieldname": "chartOfAccounts",
+      "label": "Chart of Accounts",
+      "fieldtype": "AutoComplete",
+      "placeholder": "Select CoA",
+      "formulaDependsOn": ["country"]
+    }
+  ],
+  "quickEditFields": [
+    "fullname",
+    "bankName",
+    "country",
+    "currency",
+    "chartOfAccounts",
+    "fiscalYearStart",
+    "fiscalYearEnd"
+  ]
+}
diff --git a/schemas/app/Supplier.json b/schemas/app/Supplier.json
new file mode 100644
index 00000000..d67f746e
--- /dev/null
+++ b/schemas/app/Supplier.json
@@ -0,0 +1,121 @@
+{
+  "name": "Supplier",
+  "label": "Supplier",
+  "basedOn": "Party",
+  "filters": {
+    "supplier": 1
+  },
+  "actions": [
+    {
+      "label": "Create Bill"
+    },
+    {
+      "label": "View Bills"
+    }
+  ],
+  "regional": 1,
+  "keywordFields": [
+    "name"
+  ],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Name",
+      "fieldtype": "Data",
+      "required": true,
+      "placeholder": "Full Name"
+    },
+    {
+      "fieldname": "image",
+      "label": "Image",
+      "fieldtype": "AttachImage"
+    },
+    {
+      "fieldname": "customer",
+      "label": "Is Customer",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "gstin",
+      "label": "GSTIN No.",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "gstType",
+      "label": "GST Registration",
+      "placeholder": "GST Registration",
+      "fieldtype": "Select",
+      "default": "Unregistered",
+      "options": [
+        "Unregistered",
+        "Registered Regular",
+        "Consumer"
+      ]
+    },
+    {
+      "fieldname": "supplier",
+      "label": "Is Supplier",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "defaultAccount",
+      "label": "Default Account",
+      "fieldtype": "Link",
+      "target": "Account"
+    },
+    {
+      "fieldname": "outstandingAmount",
+      "label": "Outstanding Amount",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "currency",
+      "label": "Currency",
+      "fieldtype": "Link",
+      "target": "Currency",
+      "placeholder": "INR"
+    },
+    {
+      "fieldname": "email",
+      "label": "Email",
+      "fieldtype": "Data",
+      "placeholder": "john@doe.com",
+      "validate": {
+        "type": "email"
+      }
+    },
+    {
+      "fieldname": "phone",
+      "label": "Phone",
+      "fieldtype": "Data",
+      "placeholder": "Phone",
+      "validate": {
+        "type": "phone"
+      }
+    },
+    {
+      "fieldname": "address",
+      "label": "Address",
+      "fieldtype": "Link",
+      "target": "Address",
+      "placeholder": "Click to create",
+      "inline": true
+    },
+    {
+      "fieldname": "addressDisplay",
+      "label": "Address Display",
+      "fieldtype": "Text",
+      "readOnly": true
+    }
+  ],
+  "quickEditFields": [
+    "email",
+    "phone",
+    "address",
+    "defaultAccount",
+    "currency",
+    "gstType",
+    "gstin"
+  ],
+  "augmented": 1
+}
\ No newline at end of file
diff --git a/schemas/app/Tax.json b/schemas/app/Tax.json
new file mode 100644
index 00000000..1fa77c95
--- /dev/null
+++ b/schemas/app/Tax.json
@@ -0,0 +1,28 @@
+{
+  "name": "Tax",
+  "label": "Tax",
+  "doctype": "DocType",
+  "isSingle": false,
+  "isChild": false,
+  "keywordFields": [
+    "name"
+  ],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Name",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "details",
+      "label": "Details",
+      "fieldtype": "Table",
+      "childtype": "TaxDetail",
+      "required": true
+    }
+  ],
+  "quickEditFields": [
+    "details"
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/TaxDetail.json b/schemas/app/TaxDetail.json
new file mode 100644
index 00000000..d866d373
--- /dev/null
+++ b/schemas/app/TaxDetail.json
@@ -0,0 +1,28 @@
+{
+  "name": "TaxDetail",
+  "label": "Tax Detail",
+  "doctype": "DocType",
+  "isSingle": false,
+  "isChild": true,
+  "keywordFields": [],
+  "fields": [
+    {
+      "fieldname": "account",
+      "label": "Tax Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true
+    },
+    {
+      "fieldname": "rate",
+      "label": "Rate",
+      "fieldtype": "Float",
+      "required": true,
+      "placeholder": "0%"
+    }
+  ],
+  "tableFields": [
+    "account",
+    "rate"
+  ]
+}
\ No newline at end of file
diff --git a/schemas/app/TaxSummary.json b/schemas/app/TaxSummary.json
new file mode 100644
index 00000000..67cc63af
--- /dev/null
+++ b/schemas/app/TaxSummary.json
@@ -0,0 +1,32 @@
+{
+  "name": "TaxSummary",
+  "doctype": "DocType",
+  "isChild": true,
+  "fields": [
+    {
+      "fieldname": "account",
+      "label": "Tax Account",
+      "fieldtype": "Link",
+      "target": "Account",
+      "required": true
+    },
+    {
+      "fieldname": "rate",
+      "label": "Rate",
+      "fieldtype": "Float",
+      "required": true
+    },
+    {
+      "fieldname": "amount",
+      "label": "Amount",
+      "fieldtype": "Currency",
+      "required": true
+    },
+    {
+      "fieldname": "baseAmount",
+      "label": "Amount (Company Currency)",
+      "fieldtype": "Currency",
+      "readOnly": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/core/NumberSeries.json b/schemas/core/NumberSeries.json
new file mode 100644
index 00000000..b9dbafbd
--- /dev/null
+++ b/schemas/core/NumberSeries.json
@@ -0,0 +1,75 @@
+{
+  "name": "NumberSeries",
+  "label": "Number Series",
+  "doctype": "DocType",
+  "isSingle": false,
+  "isChild": false,
+  "keywordFields": [],
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Prefix",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "start",
+      "label": "Start",
+      "fieldtype": "Int",
+      "default": 1001,
+      "required": true,
+      "minvalue": 0
+    },
+    {
+      "fieldname": "padZeros",
+      "label": "Pad Zeros",
+      "fieldtype": "Int",
+      "default": 4,
+      "required": true
+    },
+    {
+      "fieldname": "referenceType",
+      "label": "Reference Type",
+      "fieldtype": "Select",
+      "options": [
+        "SalesInvoice",
+        "PurchaseInvoice",
+        "Payment",
+        "JournalEntry",
+        "Quotation",
+        "SalesOrder",
+        "Fulfillment",
+        "PurchaseOrder",
+        "PurchaseReceipt",
+        "-"
+      ],
+      "map": {
+        "SalesInvoice": "Invoice",
+        "PurchaseInvoice": "Bill",
+        "Payment": "Payment",
+        "JournalEntry": "Journal Entry",
+        "Quotation": "Quotation",
+        "SalesOrder": "SalesOrder",
+        "Fulfillment": "Fulfillment",
+        "PurchaseOrder": "PurchaseOrder",
+        "PurchaseReceipt": "PurchaseReceipt",
+        "-": "None"
+      },
+      "default": "-",
+      "required": true,
+      "readOnly": true
+    },
+    {
+      "fieldname": "current",
+      "label": "Current",
+      "fieldtype": "Int",
+      "required": true,
+      "readOnly": true
+    }
+  ],
+  "quickEditFields": [
+    "start",
+    "padZeros",
+    "referenceType"
+  ]
+}
\ No newline at end of file
diff --git a/schemas/core/PatchRun.json b/schemas/core/PatchRun.json
new file mode 100644
index 00000000..89383032
--- /dev/null
+++ b/schemas/core/PatchRun.json
@@ -0,0 +1,11 @@
+{
+  "name": "PatchRun",
+  "fields": [
+    {
+      "fieldname": "name",
+      "fieldtype": "Data",
+      "label": "Name",
+      "required": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/core/SingleValue.json b/schemas/core/SingleValue.json
new file mode 100644
index 00000000..459081c2
--- /dev/null
+++ b/schemas/core/SingleValue.json
@@ -0,0 +1,27 @@
+{
+  "name": "SingleValue",
+  "doctype": "DocType",
+  "isSingle": false,
+  "isChild": false,
+  "keywordFields": [],
+  "fields": [
+    {
+      "fieldname": "parent",
+      "label": "Parent",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "fieldname",
+      "label": "Fieldname",
+      "fieldtype": "Data",
+      "required": true
+    },
+    {
+      "fieldname": "value",
+      "label": "Value",
+      "fieldtype": "Data",
+      "required": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
new file mode 100644
index 00000000..38f6d939
--- /dev/null
+++ b/schemas/core/SystemSettings.json
@@ -0,0 +1,86 @@
+{
+  "name": "SystemSettings",
+  "label": "System Settings",
+  "doctype": "DocType",
+  "isSingle": true,
+  "isChild": false,
+  "keywordFields": [],
+  "fields": [
+    {
+      "fieldname": "dateFormat",
+      "label": "Date Format",
+      "fieldtype": "Select",
+      "options": [
+        {
+          "label": "23/03/2022",
+          "value": "dd/MM/yyyy"
+        },
+        {
+          "label": "03/23/2022",
+          "value": "MM/dd/yyyy"
+        },
+        {
+          "label": "23-03-2022",
+          "value": "dd-MM-yyyy"
+        },
+        {
+          "label": "03-23-2022",
+          "value": "MM-dd-yyyy"
+        },
+        {
+          "label": "2022-03-23",
+          "value": "yyyy-MM-dd"
+        },
+        {
+          "label": "23 Mar, 2022",
+          "value": "d MMM, y"
+        },
+        {
+          "label": "Mar 23, 2022",
+          "value": "MMM d, y"
+        }
+      ],
+      "default": "MMM d, y",
+      "required": true,
+      "description": "Sets the app-wide date display format."
+    },
+    {
+      "fieldname": "locale",
+      "label": "Locale",
+      "fieldtype": "Data",
+      "default": "en-IN",
+      "description": "Set the local code. This is used for number formatting."
+    },
+    {
+      "fieldname": "displayPrecision",
+      "label": "Display Precision",
+      "fieldtype": "Int",
+      "default": 2,
+      "required": true,
+      "minValue": 0,
+      "maxValue": 9,
+      "description": "Sets how many digits are shown after the decimal point."
+    },
+    {
+      "fieldname": "internalPrecision",
+      "label": "Internal Precision",
+      "fieldtype": "Int",
+      "minValue": 0,
+      "default": 11,
+      "description": "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies."
+    },
+    {
+      "fieldname": "hideGetStarted",
+      "label": "Hide Get Started",
+      "fieldtype": "Check",
+      "default": 0,
+      "description": "Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app."
+    }
+  ],
+  "quickEditFields": [
+    "locale",
+    "dateFormat",
+    "displayPrecision",
+    "hideGetStarted"
+  ]
+}
\ No newline at end of file

From 879b677b3b68355ba9db1a71764ff98a64392efc Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 23 Mar 2022 14:07:00 +0530
Subject: [PATCH 012/163] incr: cleanup and import schemas

---
 schemas/app/Account.json                    | 128 +++++++++++++++-----
 schemas/app/AccountingLedgerEntry.json      |  24 +---
 schemas/app/AccountingSettings.json         |  21 +---
 schemas/app/Address.json                    |  34 ++----
 schemas/app/Color.json                      |   7 +-
 schemas/app/CompanySettings.json            |  10 +-
 schemas/app/Contact.json                    |  87 -------------
 schemas/app/Currency.json                   |  15 +--
 schemas/app/Customer.json                   | 118 +-----------------
 schemas/app/GetStarted.json                 |   3 +-
 schemas/app/Item.json                       | 101 +++++++--------
 schemas/app/JournalEntry.json               |  84 +++++++------
 schemas/app/JournalEntryAccount.json        |   7 +-
 schemas/app/JournalEntrySettings.json       |   9 --
 schemas/{core => app}/NumberSeries.json     |  49 +++-----
 schemas/app/Party.json                      |  56 +--------
 schemas/app/Payment.json                    | 123 ++++---------------
 schemas/app/PaymentFor.json                 |  22 ++--
 schemas/app/PaymentSettings.json            |   8 --
 schemas/app/PrintSettings.json              |  53 +++++---
 schemas/app/PurchaseInvoice.json            |  50 ++------
 schemas/app/PurchaseInvoiceItem.json        |  14 +--
 schemas/app/PurchaseInvoiceSettings.json    |   9 --
 schemas/app/SalesInvoice.json               |  51 ++------
 schemas/app/SalesInvoiceItem.json           |  39 ++----
 schemas/app/SalesInvoiceSettings.json       |  41 +++++--
 schemas/app/SetupWizard.json                |  14 +--
 schemas/app/Supplier.json                   | 118 +-----------------
 schemas/app/Tax.json                        |   9 +-
 schemas/app/TaxDetail.json                  |   7 +-
 schemas/app/TaxSummary.json                 |   2 +-
 schemas/core/PatchRun.json                  |   3 +-
 schemas/core/SingleValue.json               |   6 +-
 schemas/core/SystemSettings.json            |   7 +-
 schemas/regional/in/AccountingSettings.json |  22 ++++
 schemas/regional/in/Address.json            |  20 +++
 schemas/regional/in/Party.json              |  27 +++++
 schemas/schemas.ts                          |  77 ++++++++++++
 schemas/types.ts                            |  81 +++++++++++++
 39 files changed, 626 insertions(+), 930 deletions(-)
 delete mode 100644 schemas/app/Contact.json
 delete mode 100644 schemas/app/JournalEntrySettings.json
 rename schemas/{core => app}/NumberSeries.json (54%)
 delete mode 100644 schemas/app/PaymentSettings.json
 delete mode 100644 schemas/app/PurchaseInvoiceSettings.json
 create mode 100644 schemas/regional/in/AccountingSettings.json
 create mode 100644 schemas/regional/in/Address.json
 create mode 100644 schemas/regional/in/Party.json
 create mode 100644 schemas/schemas.ts
 create mode 100644 schemas/types.ts

diff --git a/schemas/app/Account.json b/schemas/app/Account.json
index 42416775..75a03c30 100644
--- a/schemas/app/Account.json
+++ b/schemas/app/Account.json
@@ -4,11 +4,6 @@
   "doctype": "DocType",
   "isSingle": false,
   "isTree": true,
-  "keywordFields": [
-    "name",
-    "rootType",
-    "accountType"
-  ],
   "fields": [
     {
       "fieldname": "name",
@@ -22,11 +17,26 @@
       "fieldtype": "Select",
       "placeholder": "Root Type",
       "options": [
-        "Asset",
-        "Liability",
-        "Equity",
-        "Income",
-        "Expense"
+        {
+          "value": "Asset",
+          "label": "Asset"
+        },
+        {
+          "value": "Liability",
+          "label": "Liability"
+        },
+        {
+          "value": "Equity",
+          "label": "Equity"
+        },
+        {
+          "value": "Income",
+          "label": "Income"
+        },
+        {
+          "value": "Expense",
+          "label": "Expense"
+        }
       ],
       "required": true
     },
@@ -42,25 +52,82 @@
       "placeholder": "Account Type",
       "fieldtype": "Select",
       "options": [
-        "Accumulated Depreciation",
-        "Bank",
-        "Cash",
-        "Chargeable",
-        "Cost of Goods Sold",
-        "Depreciation",
-        "Equity",
-        "Expense Account",
-        "Expenses Included In Valuation",
-        "Fixed Asset",
-        "Income Account",
-        "Payable",
-        "Receivable",
-        "Round Off",
-        "Stock",
-        "Stock Adjustment",
-        "Stock Received But Not Billed",
-        "Tax",
-        "Temporary"
+        {
+          "value": "Accumulated Depreciation",
+          "label": "Accumulated Depreciation"
+        },
+        {
+          "value": "Bank",
+          "label": "Bank"
+        },
+        {
+          "value": "Cash",
+          "label": "Cash"
+        },
+        {
+          "value": "Chargeable",
+          "label": "Chargeable"
+        },
+        {
+          "value": "Cost of Goods Sold",
+          "label": "Cost of Goods Sold"
+        },
+        {
+          "value": "Depreciation",
+          "label": "Depreciation"
+        },
+        {
+          "value": "Equity",
+          "label": "Equity"
+        },
+        {
+          "value": "Expense Account",
+          "label": "Expense Account"
+        },
+        {
+          "value": "Expenses Included In Valuation",
+          "label": "Expenses Included In Valuation"
+        },
+        {
+          "value": "Fixed Asset",
+          "label": "Fixed Asset"
+        },
+        {
+          "value": "Income Account",
+          "label": "Income Account"
+        },
+        {
+          "value": "Payable",
+          "label": "Payable"
+        },
+        {
+          "value": "Receivable",
+          "label": "Receivable"
+        },
+        {
+          "value": "Round Off",
+          "label": "Round Off"
+        },
+        {
+          "value": "Stock",
+          "label": "Stock"
+        },
+        {
+          "value": "Stock Adjustment",
+          "label": "Stock Adjustment"
+        },
+        {
+          "value": "Stock Received But Not Billed",
+          "label": "Stock Received But Not Billed"
+        },
+        {
+          "value": "Tax",
+          "label": "Tax"
+        },
+        {
+          "value": "Temporary",
+          "label": "Temporary"
+        }
       ]
     },
     {
@@ -82,7 +149,8 @@
     "accountType",
     "isGroup"
   ],
+  "keywordFields": ["name", "rootType", "accountType"],
   "treeSettings": {
     "parentField": "parentAccount"
   }
-}
\ No newline at end of file
+}
diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index 6de20eae..a8480b0c 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -1,15 +1,8 @@
 {
   "name": "AccountingLedgerEntry",
   "label": "Ledger Entry",
-  "naming": "autoincrement",
-  "doctype": "DocType",
   "isSingle": false,
   "isChild": false,
-  "keywordFields": [
-    "account",
-    "party",
-    "referenceName"
-  ],
   "fields": [
     {
       "fieldname": "date",
@@ -23,11 +16,6 @@
       "target": "Account",
       "required": true
     },
-    {
-      "fieldname": "description",
-      "label": "Description",
-      "fieldtype": "Text"
-    },
     {
       "fieldname": "party",
       "label": "Party",
@@ -44,11 +32,6 @@
       "label": "Credit",
       "fieldtype": "Currency"
     },
-    {
-      "fieldname": "againstAccount",
-      "label": "Against Account",
-      "fieldtype": "Text"
-    },
     {
       "fieldname": "referenceType",
       "label": "Ref. Type",
@@ -69,19 +52,18 @@
       "fieldname": "reverted",
       "label": "Reverted",
       "fieldtype": "Check",
-      "default": 0
+      "default": false
     }
   ],
   "quickEditFields": [
     "date",
     "account",
-    "description",
     "party",
     "debit",
     "credit",
-    "againstAccount",
     "referenceType",
     "referenceName",
     "balance"
-  ]
+  ],
+  "keywordFields": ["account", "party", "referenceName"]
 }
\ No newline at end of file
diff --git a/schemas/app/AccountingSettings.json b/schemas/app/AccountingSettings.json
index 7b2998dc..c147814a 100644
--- a/schemas/app/AccountingSettings.json
+++ b/schemas/app/AccountingSettings.json
@@ -1,12 +1,9 @@
 {
   "name": "AccountingSettings",
   "label": "Accounting Settings",
-  "naming": "name",
   "isSingle": true,
   "isChild": false,
   "isSubmittable": false,
-  "settings": null,
-  "keywordFields": [],
   "fields": [
     {
       "label": "Company Name",
@@ -53,10 +50,7 @@
       "fieldname": "email",
       "label": "Email",
       "fieldtype": "Data",
-      "required": true,
-      "validate": {
-        "type": "email"
-      }
+      "required": true
     },
     {
       "fieldname": "bankName",
@@ -80,13 +74,7 @@
       "fieldname": "setupComplete",
       "label": "Setup Complete",
       "fieldtype": "Check",
-      "default": 0
-    },
-    {
-      "fieldname": "gstin",
-      "label": "GSTIN",
-      "fieldtype": "Data",
-      "placeholder": "27AAAAA0000A1Z5"
+      "default": false
     }
   ],
   "quickEditFields": [
@@ -96,7 +84,6 @@
     "country",
     "currency",
     "fiscalYearStart",
-    "fiscalYearEnd",
-    "gstin"
+    "fiscalYearEnd"
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/Address.json b/schemas/app/Address.json
index c1134297..12fd1071 100644
--- a/schemas/app/Address.json
+++ b/schemas/app/Address.json
@@ -1,16 +1,7 @@
 {
   "name": "Address",
-  "doctype": "DocType",
-  "regional": 1,
+  "label": "Address",
   "isSingle": false,
-  "keywordFields": [
-    "addressLine1",
-    "addressLine2",
-    "city",
-    "state",
-    "country",
-    "postalCode"
-  ],
   "fields": [
     {
       "fieldname": "addressLine1",
@@ -36,6 +27,7 @@
       "fieldname": "state",
       "label": "State",
       "placeholder": "State",
+      "options": [],
       "fieldtype": "AutoComplete"
     },
     {
@@ -43,6 +35,7 @@
       "label": "Country",
       "placeholder": "Country",
       "fieldtype": "AutoComplete",
+      "options": [],
       "required": true
     },
     {
@@ -73,12 +66,6 @@
       "fieldtype": "Text",
       "label": "Address Display",
       "readOnly": true
-    },
-    {
-      "fieldname": "pos",
-      "label": "Place of Supply",
-      "fieldtype": "AutoComplete",
-      "placeholder": "Place of Supply"
     }
   ],
   "quickEditFields": [
@@ -87,9 +74,14 @@
     "city",
     "state",
     "country",
-    "postalCode",
-    "pos"
+    "postalCode"
   ],
-  "inlineEditDisplayField": "addressDisplay",
-  "augmented": 1
-}
\ No newline at end of file
+  "keywordFields": [
+    "addressLine1",
+    "addressLine2",
+    "city",
+    "state",
+    "country",
+    "postalCode"
+  ]
+}
diff --git a/schemas/app/Color.json b/schemas/app/Color.json
index 8f6a2eb1..0e88ca16 100644
--- a/schemas/app/Color.json
+++ b/schemas/app/Color.json
@@ -1,6 +1,6 @@
 {
   "name": "Color",
-  "doctype": "DocType",
+  "label": "Color",
   "fields": [
     {
       "fieldname": "name",
@@ -11,7 +11,8 @@
     {
       "fieldname": "hexvalue",
       "fieldtype": "Data",
-      "label": "Hex Value"
+      "label": "Hex Value",
+      "required": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/CompanySettings.json b/schemas/app/CompanySettings.json
index 5f6ad6c6..db405430 100644
--- a/schemas/app/CompanySettings.json
+++ b/schemas/app/CompanySettings.json
@@ -4,24 +4,20 @@
   "naming": "autoincrement",
   "isSingle": true,
   "isChild": false,
-  "keywordFields": [
-    "companyName"
-  ],
   "fields": [
     {
       "fieldname": "companyName",
       "label": "Company Name",
       "fieldtype": "Data",
-      "disabled": false,
       "required": true
     },
     {
       "fieldname": "companyAddress",
       "label": "Company Address",
       "fieldtype": "Link",
-      "disabled": false,
       "required": true,
       "target": "Address"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "keywordFields": ["companyName"]
+}
diff --git a/schemas/app/Contact.json b/schemas/app/Contact.json
deleted file mode 100644
index d9e18d31..00000000
--- a/schemas/app/Contact.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "name": "Contact",
-  "doctype": "DocType",
-  "isSingle": false,
-  "naming": "autoincrement",
-  "pageSettings": {
-    "hideTitle": true
-  },
-  "titleField": "fullName",
-  "keywordFields": [
-    "fullName"
-  ],
-  "fields": [
-    {
-      "fieldname": "fullName",
-      "label": "Full Name",
-      "fieldtype": "Data",
-      "required": true
-    },
-    {
-      "fieldname": "emailAddress",
-      "label": "Email Address",
-      "fieldtype": "Data"
-    },
-    {
-      "fieldname": "userId",
-      "label": "User ID",
-      "fieldtype": "Link",
-      "target": "User",
-      "hidden": true
-    },
-    {
-      "fieldname": "status",
-      "label": "Status",
-      "fieldtype": "Select",
-      "options": [
-        "Passive",
-        "Open",
-        "Replied"
-      ]
-    },
-    {
-      "fieldname": "gender",
-      "label": "Gender",
-      "fieldtype": "Select",
-      "options": [
-        "Male",
-        "Female",
-        "Gender"
-      ]
-    },
-    {
-      "fieldname": "mobileNumber",
-      "label": "Mobile Number",
-      "fieldtype": "Data"
-    },
-    {
-      "fieldname": "phone",
-      "label": "Phone",
-      "fieldtype": "Data"
-    }
-  ],
-  "events": {},
-  "listSettings": {},
-  "layout": [
-    {
-      "columns": [
-        {
-          "fields": [
-            "fullName",
-            "emailAddress",
-            "userId",
-            "status"
-          ]
-        },
-        {
-          "fields": [
-            "postalCode",
-            "gender",
-            "phone",
-            "mobileNumber"
-          ]
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/schemas/app/Currency.json b/schemas/app/Currency.json
index 91055a4c..44c13664 100644
--- a/schemas/app/Currency.json
+++ b/schemas/app/Currency.json
@@ -1,16 +1,7 @@
 {
   "name": "Currency",
   "label": "Currency",
-  "doctype": "DocType",
   "isSingle": false,
-  "keywordFields": [
-    "name",
-    "symbol"
-  ],
-  "quickEditFields": [
-    "name",
-    "symbol"
-  ],
   "fields": [
     {
       "fieldname": "name",
@@ -38,5 +29,7 @@
       "fieldname": "symbol",
       "fieldtype": "Data"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "keywordFields": ["name", "symbol"],
+  "quickEditFields": ["name", "symbol"]
+}
diff --git a/schemas/app/Customer.json b/schemas/app/Customer.json
index ac72af24..e19524c0 100644
--- a/schemas/app/Customer.json
+++ b/schemas/app/Customer.json
@@ -1,121 +1,5 @@
 {
   "name": "Customer",
   "label": "Customer",
-  "basedOn": "Party",
-  "filters": {
-    "customer": 1
-  },
-  "actions": [
-    {
-      "label": "Create Invoice"
-    },
-    {
-      "label": "View Invoices"
-    }
-  ],
-  "regional": 1,
-  "keywordFields": [
-    "name"
-  ],
-  "fields": [
-    {
-      "fieldname": "name",
-      "label": "Name",
-      "fieldtype": "Data",
-      "required": true,
-      "placeholder": "Full Name"
-    },
-    {
-      "fieldname": "image",
-      "label": "Image",
-      "fieldtype": "AttachImage"
-    },
-    {
-      "fieldname": "customer",
-      "label": "Is Customer",
-      "fieldtype": "Check"
-    },
-    {
-      "fieldname": "gstin",
-      "label": "GSTIN No.",
-      "fieldtype": "Data"
-    },
-    {
-      "fieldname": "gstType",
-      "label": "GST Registration",
-      "placeholder": "GST Registration",
-      "fieldtype": "Select",
-      "default": "Unregistered",
-      "options": [
-        "Unregistered",
-        "Registered Regular",
-        "Consumer"
-      ]
-    },
-    {
-      "fieldname": "supplier",
-      "label": "Is Supplier",
-      "fieldtype": "Check"
-    },
-    {
-      "fieldname": "defaultAccount",
-      "label": "Default Account",
-      "fieldtype": "Link",
-      "target": "Account"
-    },
-    {
-      "fieldname": "outstandingAmount",
-      "label": "Outstanding Amount",
-      "fieldtype": "Currency"
-    },
-    {
-      "fieldname": "currency",
-      "label": "Currency",
-      "fieldtype": "Link",
-      "target": "Currency",
-      "placeholder": "INR"
-    },
-    {
-      "fieldname": "email",
-      "label": "Email",
-      "fieldtype": "Data",
-      "placeholder": "john@doe.com",
-      "validate": {
-        "type": "email"
-      }
-    },
-    {
-      "fieldname": "phone",
-      "label": "Phone",
-      "fieldtype": "Data",
-      "placeholder": "Phone",
-      "validate": {
-        "type": "phone"
-      }
-    },
-    {
-      "fieldname": "address",
-      "label": "Address",
-      "fieldtype": "Link",
-      "target": "Address",
-      "placeholder": "Click to create",
-      "inline": true
-    },
-    {
-      "fieldname": "addressDisplay",
-      "label": "Address Display",
-      "fieldtype": "Text",
-      "readOnly": true
-    }
-  ],
-  "quickEditFields": [
-    "email",
-    "phone",
-    "address",
-    "defaultAccount",
-    "currency",
-    "gstType",
-    "gstin"
-  ],
-  "augmented": 1
+  "extends": "Party"
 }
\ No newline at end of file
diff --git a/schemas/app/GetStarted.json b/schemas/app/GetStarted.json
index 9e4bf4f4..a0c0ce40 100644
--- a/schemas/app/GetStarted.json
+++ b/schemas/app/GetStarted.json
@@ -1,5 +1,6 @@
 {
   "name": "GetStarted",
+  "label": "Get Started",
   "isSingle": true,
   "fields": [
     {
@@ -63,4 +64,4 @@
       "fieldtype": "Check"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index 5053af5e..5f94526e 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -1,13 +1,7 @@
 {
   "name": "Item",
   "label": "Item",
-  "doctype": "DocType",
   "isSingle": false,
-  "regional": 1,
-  "keywordFields": [
-    "name",
-    "description"
-  ],
   "fields": [
     {
       "fieldname": "name",
@@ -16,12 +10,6 @@
       "placeholder": "Item Name",
       "required": true
     },
-    {
-      "fieldname": "hsnCode",
-      "label": "HSN/SAC",
-      "fieldtype": "Int",
-      "placeholder": "HSN/SAC Code"
-    },
     {
       "fieldname": "image",
       "label": "Image",
@@ -40,11 +28,26 @@
       "placeholder": "Unit Type",
       "default": "Unit",
       "options": [
-        "Unit",
-        "Kg",
-        "Gram",
-        "Hour",
-        "Day"
+        {
+          "value": "Unit",
+          "name": "Unit"
+        },
+        {
+          "value": "Kg",
+          "name": "Kg"
+        },
+        {
+          "value": "Gram",
+          "label": "Gram"
+        },
+        {
+          "value": "Hour",
+          "label": "Hour"
+        },
+        {
+          "value": "Day",
+          "label": "Day"
+        }
       ]
     },
     {
@@ -54,8 +57,14 @@
       "fieldtype": "Select",
       "default": "Product",
       "options": [
-        "Product",
-        "Service"
+        {
+          "value": "Product",
+          "label": "Product"
+        },
+        {
+          "value": "Service",
+          "label": "Service"
+        }
       ]
     },
     {
@@ -63,15 +72,19 @@
       "label": "For",
       "fieldtype": "Select",
       "options": [
-        "purchases",
-        "sales",
-        "both"
+        {
+          "value": "purchases",
+          "label": "Purchases"
+        },
+        {
+          "value": "sales",
+          "label": "Sales"
+        },
+        {
+          "value": "both",
+          "label": "Both"
+        }
       ],
-      "map": {
-        "purchases": "Purchases",
-        "sales": "Sales",
-        "both": "Both"
-      },
       "default": "both"
     },
     {
@@ -80,11 +93,7 @@
       "fieldtype": "Link",
       "target": "Account",
       "placeholder": "Income",
-      "required": true,
-      "disableCreation": true,
-      "formulaDependsOn": [
-        "itemType"
-      ]
+      "required": true
     },
     {
       "fieldname": "expenseAccount",
@@ -92,11 +101,7 @@
       "fieldtype": "Link",
       "target": "Account",
       "placeholder": "Expense",
-      "required": true,
-      "disableCreation": true,
-      "formulaDependsOn": [
-        "itemType"
-      ]
+      "required": true
     },
     {
       "fieldname": "tax",
@@ -109,10 +114,15 @@
       "fieldname": "rate",
       "label": "Rate",
       "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "hsnCode",
+      "label": "HSN/SAC",
+      "fieldtype": "Int",
+      "placeholder": "HSN/SAC Code"
     }
   ],
   "quickEditFields": [
-    "hsnCode",
     "rate",
     "unit",
     "itemType",
@@ -120,15 +130,8 @@
     "tax",
     "description",
     "incomeAccount",
-    "expenseAccount"
+    "expenseAccount",
+    "hsnCode"
   ],
-  "actions": [
-    {
-      "label": "New Invoice"
-    },
-    {
-      "label": "New Bill"
-    }
-  ],
-  "augmented": 1
-}
\ No newline at end of file
+  "keywordFields": ["name", "description"]
+}
diff --git a/schemas/app/JournalEntry.json b/schemas/app/JournalEntry.json
index bb84ed13..a53ba3dc 100644
--- a/schemas/app/JournalEntry.json
+++ b/schemas/app/JournalEntry.json
@@ -1,9 +1,7 @@
 {
   "label": "Journal Entry",
   "name": "JournalEntry",
-  "doctype": "DocType",
   "isSubmittable": true,
-  "settings": "JournalEntrySettings",
   "fields": [
     {
       "fieldname": "entryType",
@@ -11,31 +9,51 @@
       "fieldtype": "Select",
       "placeholder": "Entry Type",
       "options": [
-        "Journal Entry",
-        "Bank Entry",
-        "Cash Entry",
-        "Credit Card Entry",
-        "Debit Note",
-        "Credit Note",
-        "Contra Entry",
-        "Excise Entry",
-        "Write Off Entry",
-        "Opening Entry",
-        "Depreciation Entry"
+        {
+          "value": "Journal Entry",
+          "label": "Journal Entry"
+        },
+        {
+          "value": "Bank Entry",
+          "label": "Bank Entry"
+        },
+        {
+          "value": "Cash Entry",
+          "label": "Cash Entry"
+        },
+        {
+          "value": "Credit Card Entry",
+          "label": "Credit Card Entry"
+        },
+        {
+          "value": "Debit Note",
+          "label": "Debit Note"
+        },
+        {
+          "value": "Credit Note",
+          "label": "Credit Note"
+        },
+        {
+          "value": "Contra Entry",
+          "label": "Contra Entry"
+        },
+        {
+          "value": "Excise Entry",
+          "label": "Excise Entry"
+        },
+        {
+          "value": "Write Off Entry",
+          "label": "Write Off Entry"
+        },
+        {
+          "value": "Opening Entry",
+          "label": "Opening Entry"
+        },
+        {
+          "value": "Depreciation Entry",
+          "label": "Depreciation Entry"
+        }
       ],
-      "map": {
-        "Journal Entry": "Journal Entry",
-        "Bank Entry": "Bank Entry",
-        "Cash Entry": "Cash Entry",
-        "Credit Card Entry": "Credit Card Entry",
-        "Debit Note": "Debit Note",
-        "Credit Note": "Credit Note",
-        "Contra Entry": "Contra Entry",
-        "Excise Entry": "Excise Entry",
-        "Write Off Entry": "Write Off Entry",
-        "Opening Entry": "Opening Entry",
-        "Depreciation Entry": "Depreciation Entry"
-      },
       "required": true
     },
     {
@@ -54,7 +72,7 @@
       "fieldname": "accounts",
       "label": "Account Entries",
       "fieldtype": "Table",
-      "childtype": "JournalEntryAccount",
+      "target": "JournalEntryAccount",
       "required": true
     },
     {
@@ -73,13 +91,6 @@
       "fieldtype": "Text",
       "placeholder": "User Remark"
     },
-    {
-      "fieldname": "cancelled",
-      "label": "Cancelled",
-      "fieldtype": "Check",
-      "default": 0,
-      "readOnly": true
-    },
     {
       "fieldname": "numberSeries",
       "label": "Number Series",
@@ -88,10 +99,5 @@
       "required": true,
       "default": "JV-"
     }
-  ],
-  "actions": [
-    {
-      "label": "Ledger Entries"
-    }
   ]
 }
\ No newline at end of file
diff --git a/schemas/app/JournalEntryAccount.json b/schemas/app/JournalEntryAccount.json
index 2e3b6f4c..810caadc 100644
--- a/schemas/app/JournalEntryAccount.json
+++ b/schemas/app/JournalEntryAccount.json
@@ -1,5 +1,6 @@
 {
   "name": "JournalEntryAccount",
+  "label": "Journal Entry Account",
   "isChild": true,
   "fields": [
     {
@@ -22,9 +23,5 @@
       "fieldtype": "Currency"
     }
   ],
-  "tableFields": [
-    "account",
-    "debit",
-    "credit"
-  ]
+  "tableFields": ["account", "debit", "credit"]
 }
\ No newline at end of file
diff --git a/schemas/app/JournalEntrySettings.json b/schemas/app/JournalEntrySettings.json
deleted file mode 100644
index 9a365dfc..00000000
--- a/schemas/app/JournalEntrySettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "JournalEntrySettings",
-  "label": "Journal Entry Setting",
-  "doctype": "DocType",
-  "isSingle": true,
-  "isChild": false,
-  "keywordFields": [],
-  "fields": []
-}
\ No newline at end of file
diff --git a/schemas/core/NumberSeries.json b/schemas/app/NumberSeries.json
similarity index 54%
rename from schemas/core/NumberSeries.json
rename to schemas/app/NumberSeries.json
index b9dbafbd..90ede4e4 100644
--- a/schemas/core/NumberSeries.json
+++ b/schemas/app/NumberSeries.json
@@ -1,10 +1,8 @@
 {
   "name": "NumberSeries",
   "label": "Number Series",
-  "doctype": "DocType",
   "isSingle": false,
   "isChild": false,
-  "keywordFields": [],
   "fields": [
     {
       "fieldname": "name",
@@ -32,29 +30,23 @@
       "label": "Reference Type",
       "fieldtype": "Select",
       "options": [
-        "SalesInvoice",
-        "PurchaseInvoice",
-        "Payment",
-        "JournalEntry",
-        "Quotation",
-        "SalesOrder",
-        "Fulfillment",
-        "PurchaseOrder",
-        "PurchaseReceipt",
-        "-"
+        {
+          "value": "SalesInvoice",
+          "label": "Invoice"
+        },
+        {
+          "value": "PurchaseInvoice",
+          "label": "Bill"
+        },
+        {
+          "value": "Payment",
+          "label": "Payment"
+        },
+        {
+          "value": "JournalEntry",
+          "label": "Journal Entry"
+        }
       ],
-      "map": {
-        "SalesInvoice": "Invoice",
-        "PurchaseInvoice": "Bill",
-        "Payment": "Payment",
-        "JournalEntry": "Journal Entry",
-        "Quotation": "Quotation",
-        "SalesOrder": "SalesOrder",
-        "Fulfillment": "Fulfillment",
-        "PurchaseOrder": "PurchaseOrder",
-        "PurchaseReceipt": "PurchaseReceipt",
-        "-": "None"
-      },
       "default": "-",
       "required": true,
       "readOnly": true
@@ -67,9 +59,6 @@
       "readOnly": true
     }
   ],
-  "quickEditFields": [
-    "start",
-    "padZeros",
-    "referenceType"
-  ]
-}
\ No newline at end of file
+  "quickEditFields": ["start", "padZeros", "referenceType"],
+  "keywordFields": []
+}
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index effe5835..ae18d0fc 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -1,10 +1,7 @@
 {
   "name": "Party",
   "label": "Party",
-  "regional": 1,
-  "keywordFields": [
-    "name"
-  ],
+  "isAbstract": true,
   "fields": [
     {
       "fieldname": "name",
@@ -18,33 +15,6 @@
       "label": "Image",
       "fieldtype": "AttachImage"
     },
-    {
-      "fieldname": "customer",
-      "label": "Is Customer",
-      "fieldtype": "Check"
-    },
-    {
-      "fieldname": "gstin",
-      "label": "GSTIN No.",
-      "fieldtype": "Data"
-    },
-    {
-      "fieldname": "gstType",
-      "label": "GST Registration",
-      "placeholder": "GST Registration",
-      "fieldtype": "Select",
-      "default": "Unregistered",
-      "options": [
-        "Unregistered",
-        "Registered Regular",
-        "Consumer"
-      ]
-    },
-    {
-      "fieldname": "supplier",
-      "label": "Is Supplier",
-      "fieldtype": "Check"
-    },
     {
       "fieldname": "defaultAccount",
       "label": "Default Account",
@@ -67,19 +37,13 @@
       "fieldname": "email",
       "label": "Email",
       "fieldtype": "Data",
-      "placeholder": "john@doe.com",
-      "validate": {
-        "type": "email"
-      }
+      "placeholder": "john@doe.com"
     },
     {
       "fieldname": "phone",
       "label": "Phone",
       "fieldtype": "Data",
-      "placeholder": "Phone",
-      "validate": {
-        "type": "phone"
-      }
+      "placeholder": "Phone"
     },
     {
       "fieldname": "address",
@@ -88,12 +52,6 @@
       "target": "Address",
       "placeholder": "Click to create",
       "inline": true
-    },
-    {
-      "fieldname": "addressDisplay",
-      "label": "Address Display",
-      "fieldtype": "Text",
-      "readOnly": true
     }
   ],
   "quickEditFields": [
@@ -101,9 +59,7 @@
     "phone",
     "address",
     "defaultAccount",
-    "currency",
-    "gstType",
-    "gstin"
+    "currency"
   ],
-  "augmented": 1
-}
\ No newline at end of file
+  "keywordFields": ["name"]
+}
diff --git a/schemas/app/Payment.json b/schemas/app/Payment.json
index e2009c75..3e3344eb 100644
--- a/schemas/app/Payment.json
+++ b/schemas/app/Payment.json
@@ -4,7 +4,6 @@
   "isSingle": false,
   "isChild": false,
   "isSubmittable": true,
-  "keywordFields": [],
   "settings": "PaymentSettings",
   "fields": [
     {
@@ -18,7 +17,7 @@
       "fieldname": "party",
       "label": "Party",
       "fieldtype": "Link",
-      "target": "Party",
+      "target": ["Customer", "Supplier"],
       "required": true
     },
     {
@@ -39,13 +38,15 @@
       "fieldtype": "Select",
       "placeholder": "Payment Type",
       "options": [
-        "Receive",
-        "Pay"
+        {
+          "value": "Receive",
+          "label": "Receive"
+        },
+        {
+          "value": "Pay",
+          "label": "Pay"
+        }
       ],
-      "map": {
-        "Receive": "Receive",
-        "Pay": "Pay"
-      },
       "required": true
     },
     {
@@ -70,9 +71,18 @@
       "placeholder": "Payment Method",
       "fieldtype": "Select",
       "options": [
-        "Cash",
-        "Cheque",
-        "Transfer"
+        {
+          "value": "Cash",
+          "label": "Cash"
+        },
+        {
+          "value": "Cheque",
+          "label": "Cheque"
+        },
+        {
+          "value": "Transfer",
+          "label": "Transfer"
+        }
       ],
       "default": "Cash",
       "required": true
@@ -110,15 +120,8 @@
       "fieldname": "for",
       "label": "Payment Reference",
       "fieldtype": "Table",
-      "childtype": "PaymentFor",
+      "target": "PaymentFor",
       "required": false
-    },
-    {
-      "fieldname": "cancelled",
-      "label": "Cancelled",
-      "fieldtype": "Check",
-      "default": 0,
-      "readOnly": true
     }
   ],
   "quickEditFields": [
@@ -135,85 +138,5 @@
     "amount",
     "writeoff",
     "for"
-  ],
-  "layout": [
-    {
-      "columns": [
-        {
-          "fields": [
-            "party",
-            "account"
-          ]
-        },
-        {
-          "fields": [
-            "date",
-            "paymentAccount"
-          ]
-        }
-      ]
-    },
-    {
-      "columns": [
-        {
-          "fields": [
-            "paymentMethod"
-          ]
-        },
-        {
-          "fields": [
-            "paymentType"
-          ]
-        },
-        {
-          "fields": [
-            "referenceId"
-          ]
-        }
-      ]
-    },
-    {
-      "columns": [
-        {
-          "fields": [
-            "referenceDate"
-          ]
-        },
-        {
-          "fields": [
-            "clearanceDate"
-          ]
-        }
-      ]
-    },
-    {
-      "columns": [
-        {
-          "fields": [
-            "for"
-          ]
-        }
-      ]
-    },
-    {
-      "columns": [
-        {
-          "fields": [
-            "amount",
-            "writeoff"
-          ]
-        }
-      ]
-    }
-  ],
-  "actions": [
-    {
-      "label": "Ledger Entries"
-    }
-  ],
-  "links": [
-    {
-      "label": "Ledger Entries"
-    }
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/PaymentFor.json b/schemas/app/PaymentFor.json
index 8f475ca3..712ccf13 100644
--- a/schemas/app/PaymentFor.json
+++ b/schemas/app/PaymentFor.json
@@ -3,12 +3,6 @@
   "label": "Payment For",
   "isSingle": false,
   "isChild": true,
-  "keywordFields": [],
-  "tableFields": [
-    "referenceType",
-    "referenceName",
-    "amount"
-  ],
   "fields": [
     {
       "fieldname": "referenceType",
@@ -16,13 +10,15 @@
       "placeholder": "Type",
       "fieldtype": "Select",
       "options": [
-        "SalesInvoice",
-        "PurchaseInvoice"
+        {
+          "value": "SalesInvoice",
+          "label": "Sales Invoice"
+        },
+        {
+          "value": "PurchaseInvoice",
+          "label": "Purchase Invoice"
+        }
       ],
-      "map": {
-        "SalesInvoice": "Invoice",
-        "PurchaseInvoice": "Bill"
-      },
       "required": true
     },
     {
@@ -40,4 +36,4 @@
       "required": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/PaymentSettings.json b/schemas/app/PaymentSettings.json
deleted file mode 100644
index 964ccef4..00000000
--- a/schemas/app/PaymentSettings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "PaymentSettings",
-  "label": "Payment Settings",
-  "isSingle": true,
-  "isChild": false,
-  "keywordFields": [],
-  "fields": []
-}
\ No newline at end of file
diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json
index 32d3b02d..7c2570b3 100644
--- a/schemas/app/PrintSettings.json
+++ b/schemas/app/PrintSettings.json
@@ -17,10 +17,7 @@
       "fieldname": "email",
       "label": "Email",
       "fieldtype": "Data",
-      "placeholder": "john@doe.com",
-      "validate": {
-        "type": "email"
-      }
+      "placeholder": "john@doe.com"
     },
     {
       "fieldname": "displayLogo",
@@ -31,18 +28,14 @@
       "fieldname": "phone",
       "label": "Phone",
       "fieldtype": "Data",
-      "placeholder": "9888900000",
-      "validate": {
-        "type": "phone"
-      }
+      "placeholder": "9888900000"
     },
     {
       "fieldname": "address",
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "placeholder": "Click to create",
-      "inline": true
+      "placeholder": "Click to create"
     },
     {
       "fieldname": "template",
@@ -50,9 +43,18 @@
       "placeholder": "Template",
       "fieldtype": "Select",
       "options": [
-        "Basic",
-        "Minimal",
-        "Business"
+        {
+          "value": "Basic",
+          "label": "Basic"
+        },
+        {
+          "value": "Minimal",
+          "label": "Minimal"
+        },
+        {
+          "value": "Business",
+          "label": "Business"
+        }
       ],
       "default": "Basic"
     },
@@ -61,7 +63,8 @@
       "label": "Color",
       "placeholder": "Select Color",
       "fieldtype": "Color",
-      "colors": [
+      "default": "#112B42",
+      "options": [
         {
           "label": "Red",
           "value": "#f56565"
@@ -110,10 +113,22 @@
       "placeholder": "Font",
       "fieldtype": "Select",
       "options": [
-        "Inter",
-        "Times New Roman",
-        "Arial",
-        "Courier"
+        {
+          "value": "Inter",
+          "label": "Inter"
+        },
+        {
+          "value": "Times New Roman",
+          "label": "Times New Roman"
+        },
+        {
+          "value": "Arial",
+          "label": "Arial"
+        },
+        {
+          "value": "Courier",
+          "label": "Courier"
+        }
       ],
       "default": "Inter"
     }
@@ -128,4 +143,4 @@
     "phone",
     "address"
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 9aecaab6..73415488 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -1,25 +1,9 @@
 {
   "name": "PurchaseInvoice",
-  "doctype": "DocType",
-  "label": "Bill",
-  "printTemplate": {
-    "name": "InvoiceTemplate",
-    "props": [
-      "doc",
-      "printSettings"
-    ],
-    "computed": {},
-    "__file": "models/doctype/SalesInvoice/InvoiceTemplate.vue",
-    "__hmrId": "3d0cd49d"
-  },
+  "label": "Purchase Invoice",
   "isSingle": false,
   "isChild": false,
   "isSubmittable": true,
-  "keywordFields": [
-    "name",
-    "supplier"
-  ],
-  "settings": "PurchaseInvoiceSettings",
   "showTitle": true,
   "fields": [
     {
@@ -52,10 +36,7 @@
       "label": "Supplier Currency",
       "fieldtype": "Link",
       "target": "Currency",
-      "hidden": true,
-      "formulaDependsOn": [
-        "supplier"
-      ]
+      "hidden": true
     },
     {
       "fieldname": "exchangeRate",
@@ -67,38 +48,42 @@
       "fieldname": "items",
       "label": "Items",
       "fieldtype": "Table",
-      "childtype": "PurchaseInvoiceItem",
+      "target": "PurchaseInvoiceItem",
       "required": true
     },
     {
       "fieldname": "netTotal",
       "label": "Net Total",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseNetTotal",
       "label": "Net Total (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "taxes",
       "label": "Taxes",
       "fieldtype": "Table",
-      "childtype": "TaxSummary",
+      "target": "TaxSummary",
       "readOnly": true
     },
     {
       "fieldname": "grandTotal",
       "label": "Grand Total",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseGrandTotal",
       "label": "Grand Total (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
@@ -112,13 +97,6 @@
       "label": "Terms",
       "fieldtype": "Text"
     },
-    {
-      "fieldname": "cancelled",
-      "label": "Cancelled",
-      "fieldtype": "Check",
-      "default": 0,
-      "readOnly": true
-    },
     {
       "fieldname": "numberSeries",
       "label": "Number Series",
@@ -128,15 +106,5 @@
       "default": "PINV-"
     }
   ],
-  "actions": [
-    {
-      "label": "Make Payment"
-    },
-    {
-      "label": "Print"
-    },
-    {
-      "label": "Ledger Entries"
-    }
-  ]
+  "keywordFields": ["name", "supplier", "numberSeries"]
 }
\ No newline at end of file
diff --git a/schemas/app/PurchaseInvoiceItem.json b/schemas/app/PurchaseInvoiceItem.json
index 985013a1..c109ddbe 100644
--- a/schemas/app/PurchaseInvoiceItem.json
+++ b/schemas/app/PurchaseInvoiceItem.json
@@ -1,15 +1,8 @@
 {
   "name": "PurchaseInvoiceItem",
-  "doctype": "DocType",
+  "label": "Purchase Invoice Item",
   "isChild": true,
-  "keywordFields": [],
-  "tableFields": [
-    "item",
-    "tax",
-    "quantity",
-    "rate",
-    "amount"
-  ],
+  "tableFields": ["item", "tax", "quantity", "rate", "amount"],
   "fields": [
     {
       "fieldname": "item",
@@ -41,6 +34,7 @@
       "fieldname": "baseRate",
       "label": "Rate (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
@@ -61,12 +55,14 @@
       "fieldname": "amount",
       "label": "Amount",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseAmount",
       "label": "Amount (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     }
   ]
diff --git a/schemas/app/PurchaseInvoiceSettings.json b/schemas/app/PurchaseInvoiceSettings.json
deleted file mode 100644
index 1b21c546..00000000
--- a/schemas/app/PurchaseInvoiceSettings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "PurchaseInvoiceSettings",
-  "label": "Bills Settings",
-  "doctype": "DocType",
-  "isSingle": true,
-  "isChild": false,
-  "keywordFields": [],
-  "fields": []
-}
\ No newline at end of file
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index b1437a46..24f7d4f2 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -1,24 +1,10 @@
 {
   "name": "SalesInvoice",
-  "label": "Invoice",
-  "doctype": "DocType",
-  "printTemplate": {
-    "name": "InvoiceTemplate",
-    "props": [
-      "doc",
-      "printSettings"
-    ],
-    "computed": {},
-    "__file": "models/doctype/SalesInvoice/InvoiceTemplate.vue",
-    "__hmrId": "3d0cd49d"
-  },
+  "label": "Sales Invoice",
   "isSingle": false,
   "isChild": false,
   "isSubmittable": true,
-  "keywordFields": [
-    "name",
-    "customer"
-  ],
+  "keywordFields": ["name", "customer"],
   "settings": "SalesInvoiceSettings",
   "fields": [
     {
@@ -44,17 +30,13 @@
       "fieldname": "account",
       "label": "Account",
       "fieldtype": "Link",
-      "target": "Account",
-      "disableCreation": true
+      "target": "Account"
     },
     {
       "fieldname": "currency",
       "label": "Customer Currency",
       "fieldtype": "Link",
-      "target": "Currency",
-      "formulaDependsOn": [
-        "customer"
-      ]
+      "target": "Currency"
     },
     {
       "fieldname": "exchangeRate",
@@ -74,37 +56,42 @@
       "fieldname": "netTotal",
       "label": "Net Total",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseNetTotal",
       "label": "Net Total (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "taxes",
       "label": "Taxes",
       "fieldtype": "Table",
-      "childtype": "TaxSummary",
+      "target": "TaxSummary",
       "readOnly": true
     },
     {
       "fieldname": "grandTotal",
       "label": "Grand Total",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseGrandTotal",
       "label": "Grand Total (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "outstandingAmount",
       "label": "Outstanding Amount",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
@@ -112,13 +99,6 @@
       "label": "Notes",
       "fieldtype": "Text"
     },
-    {
-      "fieldname": "cancelled",
-      "label": "Cancelled",
-      "fieldtype": "Check",
-      "default": 0,
-      "readOnly": true
-    },
     {
       "fieldname": "numberSeries",
       "label": "Number Series",
@@ -127,16 +107,5 @@
       "required": true,
       "default": "SINV-"
     }
-  ],
-  "actions": [
-    {
-      "label": "Make Payment"
-    },
-    {
-      "label": "Print"
-    },
-    {
-      "label": "Ledger Entries"
-    }
   ]
 }
\ No newline at end of file
diff --git a/schemas/app/SalesInvoiceItem.json b/schemas/app/SalesInvoiceItem.json
index d6d05c50..2be59cd5 100644
--- a/schemas/app/SalesInvoiceItem.json
+++ b/schemas/app/SalesInvoiceItem.json
@@ -1,16 +1,7 @@
 {
   "name": "SalesInvoiceItem",
-  "doctype": "DocType",
+  "label": "Sales Invoice Item",
   "isChild": true,
-  "regional": 1,
-  "keywordFields": [],
-  "tableFields": [
-    "item",
-    "tax",
-    "quantity",
-    "rate",
-    "amount"
-  ],
   "fields": [
     {
       "fieldname": "item",
@@ -23,10 +14,7 @@
       "fieldname": "description",
       "label": "Description",
       "fieldtype": "Text",
-      "hidden": true,
-      "formulaDependsOn": [
-        "item"
-      ]
+      "hidden": true
     },
     {
       "fieldname": "quantity",
@@ -39,15 +27,13 @@
       "fieldname": "rate",
       "label": "Rate",
       "fieldtype": "Currency",
-      "required": true,
-      "formulaDependsOn": [
-        "item"
-      ]
+      "required": true
     },
     {
       "fieldname": "baseRate",
       "label": "Rate (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
@@ -63,31 +49,22 @@
       "fieldname": "tax",
       "label": "Tax",
       "fieldtype": "Link",
-      "target": "Tax",
-      "formulaDependsOn": [
-        "item"
-      ]
+      "target": "Tax"
     },
     {
       "fieldname": "amount",
       "label": "Amount",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseAmount",
       "label": "Amount (Company Currency)",
       "fieldtype": "Currency",
+      "computed": true,
       "readOnly": true
-    },
-    {
-      "fieldname": "hsnCode",
-      "label": "HSN/SAC",
-      "fieldtype": "Int",
-      "formulaDependsOn": [
-        "item"
-      ]
     }
   ],
-  "augmented": 1
+  "tableFields": ["item", "tax", "quantity", "rate", "amount"]
 }
\ No newline at end of file
diff --git a/schemas/app/SalesInvoiceSettings.json b/schemas/app/SalesInvoiceSettings.json
index 20ff6ce8..6779c82a 100644
--- a/schemas/app/SalesInvoiceSettings.json
+++ b/schemas/app/SalesInvoiceSettings.json
@@ -1,10 +1,8 @@
 {
   "name": "SalesInvoiceSettings",
-  "label": "SalesInvoice Settings",
-  "doctype": "DocType",
+  "label": "Sales Invoice Settings",
   "isSingle": true,
   "isChild": false,
-  "keywordFields": [],
   "fields": [
     {
       "fieldname": "template",
@@ -12,9 +10,18 @@
       "placeholder": "Template",
       "fieldtype": "Select",
       "options": [
-        "Basic I",
-        "Basic II",
-        "Modern"
+        {
+          "value": "Basic I",
+          "label": "Basic I"
+        },
+        {
+          "value": "Basic II",
+          "label": "Basic II"
+        },
+        {
+          "value": "Modern",
+          "label": "Modern"
+        }
       ],
       "required": true,
       "default": "Basic I"
@@ -25,10 +32,22 @@
       "placeholder": "Font",
       "fieldtype": "Select",
       "options": [
-        "Montserrat",
-        "Open Sans",
-        "Oxygen",
-        "Merriweather"
+        {
+          "value": "Montserrat",
+          "label": "Montserrat"
+        },
+        {
+          "value": "Open Sans",
+          "label": "Open Sans"
+        },
+        {
+          "value": "Oxygen",
+          "label": "Oxygen"
+        },
+        {
+          "value": "Merriweather",
+          "label": "Merriweather"
+        }
       ],
       "required": true,
       "default": "Montserrat"
@@ -42,4 +61,4 @@
       "hidden": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/SetupWizard.json b/schemas/app/SetupWizard.json
index d70a6aae..a7caab4c 100644
--- a/schemas/app/SetupWizard.json
+++ b/schemas/app/SetupWizard.json
@@ -1,12 +1,9 @@
 {
   "name": "SetupWizard",
   "label": "Setup Wizard",
-  "naming": "name",
   "isSingle": true,
   "isChild": false,
   "isSubmittable": false,
-  "settings": null,
-  "keywordFields": [],
   "fields": [
     {
       "fieldname": "companyLogo",
@@ -32,10 +29,7 @@
       "label": "Email",
       "fieldtype": "Data",
       "placeholder": "john@doe.com",
-      "required": true,
-      "validate": {
-        "type": "email"
-      }
+      "required": true
     },
     {
       "fieldname": "companyName",
@@ -56,7 +50,6 @@
       "label": "Fiscal Year Start Date",
       "placeholder": "Fiscal Year Start Date",
       "fieldtype": "Date",
-      "formulaDependsOn": ["country"],
       "required": true
     },
     {
@@ -64,7 +57,6 @@
       "label": "Fiscal Year End Date",
       "placeholder": "Fiscal Year End Date",
       "fieldtype": "Date",
-      "formulaDependsOn": ["country"],
       "required": true
     },
     {
@@ -72,7 +64,6 @@
       "label": "Currency",
       "fieldtype": "Data",
       "placeholder": "Currency",
-      "formulaDependsOn": ["country"],
       "required": true
     },
     {
@@ -85,8 +76,7 @@
       "fieldname": "chartOfAccounts",
       "label": "Chart of Accounts",
       "fieldtype": "AutoComplete",
-      "placeholder": "Select CoA",
-      "formulaDependsOn": ["country"]
+      "placeholder": "Select CoA"
     }
   ],
   "quickEditFields": [
diff --git a/schemas/app/Supplier.json b/schemas/app/Supplier.json
index d67f746e..7db93805 100644
--- a/schemas/app/Supplier.json
+++ b/schemas/app/Supplier.json
@@ -1,121 +1,5 @@
 {
   "name": "Supplier",
   "label": "Supplier",
-  "basedOn": "Party",
-  "filters": {
-    "supplier": 1
-  },
-  "actions": [
-    {
-      "label": "Create Bill"
-    },
-    {
-      "label": "View Bills"
-    }
-  ],
-  "regional": 1,
-  "keywordFields": [
-    "name"
-  ],
-  "fields": [
-    {
-      "fieldname": "name",
-      "label": "Name",
-      "fieldtype": "Data",
-      "required": true,
-      "placeholder": "Full Name"
-    },
-    {
-      "fieldname": "image",
-      "label": "Image",
-      "fieldtype": "AttachImage"
-    },
-    {
-      "fieldname": "customer",
-      "label": "Is Customer",
-      "fieldtype": "Check"
-    },
-    {
-      "fieldname": "gstin",
-      "label": "GSTIN No.",
-      "fieldtype": "Data"
-    },
-    {
-      "fieldname": "gstType",
-      "label": "GST Registration",
-      "placeholder": "GST Registration",
-      "fieldtype": "Select",
-      "default": "Unregistered",
-      "options": [
-        "Unregistered",
-        "Registered Regular",
-        "Consumer"
-      ]
-    },
-    {
-      "fieldname": "supplier",
-      "label": "Is Supplier",
-      "fieldtype": "Check"
-    },
-    {
-      "fieldname": "defaultAccount",
-      "label": "Default Account",
-      "fieldtype": "Link",
-      "target": "Account"
-    },
-    {
-      "fieldname": "outstandingAmount",
-      "label": "Outstanding Amount",
-      "fieldtype": "Currency"
-    },
-    {
-      "fieldname": "currency",
-      "label": "Currency",
-      "fieldtype": "Link",
-      "target": "Currency",
-      "placeholder": "INR"
-    },
-    {
-      "fieldname": "email",
-      "label": "Email",
-      "fieldtype": "Data",
-      "placeholder": "john@doe.com",
-      "validate": {
-        "type": "email"
-      }
-    },
-    {
-      "fieldname": "phone",
-      "label": "Phone",
-      "fieldtype": "Data",
-      "placeholder": "Phone",
-      "validate": {
-        "type": "phone"
-      }
-    },
-    {
-      "fieldname": "address",
-      "label": "Address",
-      "fieldtype": "Link",
-      "target": "Address",
-      "placeholder": "Click to create",
-      "inline": true
-    },
-    {
-      "fieldname": "addressDisplay",
-      "label": "Address Display",
-      "fieldtype": "Text",
-      "readOnly": true
-    }
-  ],
-  "quickEditFields": [
-    "email",
-    "phone",
-    "address",
-    "defaultAccount",
-    "currency",
-    "gstType",
-    "gstin"
-  ],
-  "augmented": 1
+  "extends": "Party"
 }
\ No newline at end of file
diff --git a/schemas/app/Tax.json b/schemas/app/Tax.json
index 1fa77c95..8ceaa260 100644
--- a/schemas/app/Tax.json
+++ b/schemas/app/Tax.json
@@ -1,12 +1,8 @@
 {
   "name": "Tax",
   "label": "Tax",
-  "doctype": "DocType",
   "isSingle": false,
   "isChild": false,
-  "keywordFields": [
-    "name"
-  ],
   "fields": [
     {
       "fieldname": "name",
@@ -22,7 +18,6 @@
       "required": true
     }
   ],
-  "quickEditFields": [
-    "details"
-  ]
+  "keywordFields": ["name"],
+  "quickEditFields": ["details"]
 }
\ No newline at end of file
diff --git a/schemas/app/TaxDetail.json b/schemas/app/TaxDetail.json
index d866d373..d98a1a1e 100644
--- a/schemas/app/TaxDetail.json
+++ b/schemas/app/TaxDetail.json
@@ -1,10 +1,8 @@
 {
   "name": "TaxDetail",
   "label": "Tax Detail",
-  "doctype": "DocType",
   "isSingle": false,
   "isChild": true,
-  "keywordFields": [],
   "fields": [
     {
       "fieldname": "account",
@@ -21,8 +19,5 @@
       "placeholder": "0%"
     }
   ],
-  "tableFields": [
-    "account",
-    "rate"
-  ]
+  "tableFields": ["account", "rate"]
 }
\ No newline at end of file
diff --git a/schemas/app/TaxSummary.json b/schemas/app/TaxSummary.json
index 67cc63af..71e23921 100644
--- a/schemas/app/TaxSummary.json
+++ b/schemas/app/TaxSummary.json
@@ -1,6 +1,6 @@
 {
   "name": "TaxSummary",
-  "doctype": "DocType",
+  "label": "Tax Summary",
   "isChild": true,
   "fields": [
     {
diff --git a/schemas/core/PatchRun.json b/schemas/core/PatchRun.json
index 89383032..a4617873 100644
--- a/schemas/core/PatchRun.json
+++ b/schemas/core/PatchRun.json
@@ -1,5 +1,6 @@
 {
   "name": "PatchRun",
+  "label": "Patch Run",
   "fields": [
     {
       "fieldname": "name",
@@ -8,4 +9,4 @@
       "required": true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/schemas/core/SingleValue.json b/schemas/core/SingleValue.json
index 459081c2..c34d2570 100644
--- a/schemas/core/SingleValue.json
+++ b/schemas/core/SingleValue.json
@@ -1,9 +1,8 @@
 {
   "name": "SingleValue",
-  "doctype": "DocType",
+  "label": "Single Value",
   "isSingle": false,
   "isChild": false,
-  "keywordFields": [],
   "fields": [
     {
       "fieldname": "parent",
@@ -23,5 +22,6 @@
       "fieldtype": "Data",
       "required": true
     }
-  ]
+  ],
+  "keywordFields": []
 }
\ No newline at end of file
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 38f6d939..730fad42 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -1,10 +1,8 @@
 {
   "name": "SystemSettings",
   "label": "System Settings",
-  "doctype": "DocType",
   "isSingle": true,
   "isChild": false,
-  "keywordFields": [],
   "fields": [
     {
       "fieldname": "dateFormat",
@@ -82,5 +80,6 @@
     "dateFormat",
     "displayPrecision",
     "hideGetStarted"
-  ]
-}
\ No newline at end of file
+  ],
+  "keywordFields": []
+}
diff --git a/schemas/regional/in/AccountingSettings.json b/schemas/regional/in/AccountingSettings.json
new file mode 100644
index 00000000..32391b55
--- /dev/null
+++ b/schemas/regional/in/AccountingSettings.json
@@ -0,0 +1,22 @@
+{
+  "name": "AccountingSettings",
+  "fields": [
+    {
+      "fieldname": "gstin",
+      "label": "GSTIN",
+      "fieldtype": "Data",
+      "placeholder": "27AAAAA0000A1Z5"
+    }
+  ],
+  "keywordFields": [],
+  "quickEditFields": [
+    "fullname",
+    "email",
+    "companyName",
+    "country",
+    "currency",
+    "fiscalYearStart",
+    "fiscalYearEnd",
+    "gstin"
+  ]
+}
diff --git a/schemas/regional/in/Address.json b/schemas/regional/in/Address.json
new file mode 100644
index 00000000..376ae771
--- /dev/null
+++ b/schemas/regional/in/Address.json
@@ -0,0 +1,20 @@
+{
+  "name": "Address",
+  "fields": [
+    {
+      "fieldname": "pos",
+      "label": "Place of Supply",
+      "fieldtype": "AutoComplete",
+      "placeholder": "Place of Supply"
+    }
+  ],
+  "quickEditFields": [
+    "addressLine1",
+    "addressLine2",
+    "city",
+    "state",
+    "country",
+    "postalCode",
+    "pos"
+  ]
+}
diff --git a/schemas/regional/in/Party.json b/schemas/regional/in/Party.json
new file mode 100644
index 00000000..82bd30f2
--- /dev/null
+++ b/schemas/regional/in/Party.json
@@ -0,0 +1,27 @@
+{
+  "name": "Party",
+  "fields": [
+    {
+      "fieldname": "gstin",
+      "label": "GSTIN No.",
+      "fieldtype": "Data"
+    },
+    {
+      "fieldname": "gstType",
+      "label": "GST Registration",
+      "placeholder": "GST Registration",
+      "fieldtype": "Select",
+      "default": "Unregistered",
+      "options": ["Unregistered", "Registered Regular", "Consumer"]
+    }
+  ],
+  "quickEditFields": [
+    "email",
+    "phone",
+    "address",
+    "defaultAccount",
+    "currency",
+    "gstType",
+    "gstin"
+  ]
+}
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
new file mode 100644
index 00000000..8eefb8c7
--- /dev/null
+++ b/schemas/schemas.ts
@@ -0,0 +1,77 @@
+import Account from './app/Account.json';
+import AccountingLedgerEntry from './app/AccountingLedgerEntry.json';
+import AccountingSettings from './app/AccountingSettings.json';
+import Address from './app/Address.json';
+import Color from './app/Color.json';
+import CompanySettings from './app/CompanySettings.json';
+import Currency from './app/Currency.json';
+import Customer from './app/Customer.json';
+import GetStarted from './app/GetStarted.json';
+import Item from './app/Item.json';
+import JournalEntry from './app/JournalEntry.json';
+import JournalEntryAccount from './app/JournalEntryAccount.json';
+import NumberSeries from './app/NumberSeries.json';
+import Party from './app/Party.json';
+import Payment from './app/Payment.json';
+import PaymentFor from './app/PaymentFor.json';
+import PrintSettings from './app/PrintSettings.json';
+import PurchaseInvoice from './app/PurchaseInvoice.json';
+import PurchaseInvoiceItem from './app/PurchaseInvoiceItem.json';
+import SalesInvoice from './app/SalesInvoice.json';
+import SalesInvoiceItem from './app/SalesInvoiceItem.json';
+import SalesInvoiceSettings from './app/SalesInvoiceSettings.json';
+import SetupWizard from './app/SetupWizard.json';
+import Supplier from './app/Supplier.json';
+import Tax from './app/Tax.json';
+import TaxDetail from './app/TaxDetail.json';
+import TaxSummary from './app/TaxSummary.json';
+import PatchRun from './core/PatchRun.json';
+import SingleValue from './core/SingleValue.json';
+import SystemSettings from './core/SystemSettings.json';
+import { Schema } from './types';
+
+export const coreSchemas: Schema[] = [
+  PatchRun as Schema,
+  SingleValue as Schema,
+  SystemSettings as Schema,
+];
+
+export const appSchemas: Schema[] = [
+  SetupWizard as Schema,
+  GetStarted as Schema,
+
+  Color as Schema,
+  Currency as Schema,
+  NumberSeries as Schema,
+
+  PrintSettings as Schema,
+  CompanySettings as Schema,
+
+  Account as Schema,
+  AccountingSettings as Schema,
+  AccountingLedgerEntry as Schema,
+
+  Party as Schema,
+  Supplier as Schema,
+  Customer as Schema,
+
+  Address as Schema,
+  Item as Schema,
+
+  Payment as Schema,
+  PaymentFor as Schema,
+
+  JournalEntry as Schema,
+  JournalEntryAccount as Schema,
+
+  PurchaseInvoice as Schema,
+  PurchaseInvoiceItem as Schema,
+
+  SalesInvoice as Schema,
+  SalesInvoiceItem as Schema,
+  SalesInvoiceSettings as Schema,
+
+  Tax as Schema,
+  TaxDetail as Schema,
+  TaxSummary as Schema,
+];
diff --git a/schemas/types.ts b/schemas/types.ts
new file mode 100644
index 00000000..4ba11b1f
--- /dev/null
+++ b/schemas/types.ts
@@ -0,0 +1,81 @@
+export enum FieldTypeEnum {
+  Data = 'Data',
+  Select = 'Select',
+  Link = 'Link',
+  Date = 'Date',
+  Table = 'Table',
+  AutoComplete = 'AutoComplete',
+  Check = 'Check',
+  AttachImage = 'AttachImage',
+  DynamicLink = 'DynamicLink',
+  Int = 'Int',
+  Float = 'Float',
+  Currency = 'Currency',
+  Text = 'Text',
+  Color = 'Color',
+  Code = 'Code',
+}
+
+export type FieldType = keyof typeof FieldTypeEnum;
+export type RawValue = string | number | boolean;
+
+export interface BaseField {
+  fieldname: string;
+  fieldtype: FieldType;
+  label: string;
+  hidden?: boolean;
+  required?: boolean;
+  readOnly?: boolean;
+  description?: string;
+  default?: RawValue;
+  placeholder?: string;
+  groupBy?: string;
+  computed?: boolean;
+}
+
+export type SelectOption = { value: string; label: string };
+export interface OptionField extends BaseField {
+  fieldtype:
+    | FieldTypeEnum.Select
+    | FieldTypeEnum.AutoComplete
+    | FieldTypeEnum.Color;
+  options: SelectOption[];
+}
+
+export interface TargetField extends BaseField {
+  fieldtype: FieldTypeEnum.Table | FieldTypeEnum.Link;
+  target: string | string[];
+}
+
+export interface DynamicLinkField extends BaseField {
+  fieldtype: FieldTypeEnum.DynamicLink;
+  references: string;
+}
+
+export interface NumberField extends BaseField {
+  fieldtype: FieldTypeEnum.Float | FieldTypeEnum.Int;
+  minvalue?: number;
+  maxvalue?: number;
+}
+
+export type Field =
+  | BaseField
+  | OptionField
+  | TargetField
+  | DynamicLinkField
+  | NumberField;
+
+export type TreeSettings = { parentField: string };
+export interface Schema {
+  name: string;
+  label: string;
+  fields: Field[];
+  isTree?: boolean;
+  extends?: string;
+  isChild?: boolean;
+  isSingle?: boolean;
+  isAbstract?: boolean;
+  isSubmittable?: boolean;
+  keywordFields?: string[];
+  treeSettings?: TreeSettings;
+}

From ef6e8d44abb93752a7624940dfc8c1ab2d19718d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 23 Mar 2022 20:16:19 +0530
Subject: [PATCH 013/163] incr: build schemas, add some notes

---
 schemas/core/SystemSettings.json            |   2 +-
 schemas/helpers.ts                          |  19 +++
 schemas/index.ts                            | 125 ++++++++++++++++++++
 schemas/regional/in/AccountingSettings.json |   1 -
 schemas/regional/in/Party.json              |  15 ++-
 schemas/regional/in/index.ts                |   6 +
 schemas/regional/index.ts                   |   6 +
 schemas/schemas.ts                          |   8 +-
 schemas/types.ts                            |  99 ++++++++++++----
 src/main.js                                 |   3 +
 10 files changed, 251 insertions(+), 33 deletions(-)
 create mode 100644 schemas/helpers.ts
 create mode 100644 schemas/index.ts
 create mode 100644 schemas/regional/in/index.ts
 create mode 100644 schemas/regional/index.ts

diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 730fad42..de638d9d 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -71,7 +71,7 @@
       "fieldname": "hideGetStarted",
       "label": "Hide Get Started",
       "fieldtype": "Check",
-      "default": 0,
+      "default": false,
       "description": "Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app."
     }
   ],
diff --git a/schemas/helpers.ts b/schemas/helpers.ts
new file mode 100644
index 00000000..65e7a570
--- /dev/null
+++ b/schemas/helpers.ts
@@ -0,0 +1,19 @@
+export function getMapFromList<T>(
+  list: T[],
+  name: string = 'name'
+): Record<string, T> {
+  const acc: Record<string, T> = {};
+  for (const t of list) {
+    const key = t[name] as string | undefined;
+    if (key === undefined) {
+      continue;
+    }
+
+    acc[key] = t;
+  }
+  return acc;
+}
+
+export function getListFromMap<T>(map: Record<string, T>): T[] {
+  return Object.keys(map).map((n) => map[n]);
+}
diff --git a/schemas/index.ts b/schemas/index.ts
new file mode 100644
index 00000000..17291fe9
--- /dev/null
+++ b/schemas/index.ts
@@ -0,0 +1,125 @@
+import { cloneDeep } from 'lodash';
+import { getListFromMap, getMapFromList } from './helpers';
+import regional from './regional';
+import { appSchemas, coreSchemas } from './schemas';
+import { Schema, SchemaMap, SchemaStub, SchemaStubMap } from './types';
+
+export function getSchemas(countryCode: string = '-'): SchemaMap {
+  const builtCoreSchemas = getCoreSchemas();
+  const builtAppSchemas = getAppSchemas(countryCode);
+
+  return Object.assign({}, builtAppSchemas, builtCoreSchemas);
+}
+
+function getCoreSchemas(): SchemaMap {
+  const rawSchemaMap = getMapFromList(coreSchemas);
+  const coreSchemaMap = getAbstractCombinedSchemas(rawSchemaMap);
+  return cleanSchemas(coreSchemaMap);
+}
+
+function getAppSchemas(countryCode: string): SchemaMap {
+  const combinedSchemas = getRegionalCombinedSchemas(countryCode);
+  const schemaMap = getAbstractCombinedSchemas(combinedSchemas);
+  return cleanSchemas(schemaMap);
+}
+
+function cleanSchemas(schemaMap: SchemaMap): SchemaMap {
+  for (const name in schemaMap) {
+    const schema = schemaMap[name];
+    if (schema.isAbstract && !schema.extends) {
+      delete schemaMap[name];
+      continue;
+    }
+
+    delete schema.extends;
+    delete schema.isAbstract;
+  }
+
+  return schemaMap;
+}
+
+function getCombined(
+  extendingSchema: SchemaStub,
+  abstractSchema: SchemaStub
+): SchemaStub {
+  abstractSchema = cloneDeep(abstractSchema);
+  extendingSchema = cloneDeep(extendingSchema);
+
+  const abstractFields = getMapFromList(
+    abstractSchema.fields ?? [],
+    'fieldname'
+  );
+  const extendingFields = getMapFromList(
+    extendingSchema.fields ?? [],
+    'fieldname'
+  );
+
+  const combined = Object.assign(abstractSchema, extendingSchema);
+
+  for (const fieldname in extendingFields) {
+    abstractFields[fieldname] = extendingFields[fieldname];
+  }
+
+  combined.fields = getListFromMap(abstractFields);
+  return combined;
+}
+
+function getAbstractCombinedSchemas(schemas: SchemaStubMap): SchemaMap {
+  const abstractSchemaNames: string[] = Object.keys(schemas).filter(
+    (n) => schemas[n].isAbstract
+  );
+
+  const extendingSchemaNames: string[] = Object.keys(schemas).filter((n) =>
+    abstractSchemaNames.includes(schemas[n].extends)
+  );
+
+  const completeSchemas: Schema[] = Object.keys(schemas)
+    .filter(
+      (n) =>
+        !abstractSchemaNames.includes(n) && !extendingSchemaNames.includes(n)
+    )
+    .map((n) => schemas[n] as Schema);
+
+  const schemaMap = getMapFromList(completeSchemas) as SchemaMap;
+
+  for (const name of extendingSchemaNames) {
+    const extendingSchema = schemas[name] as Schema;
+    const abstractSchema = schemas[extendingSchema.extends] as SchemaStub;
+
+    schemaMap[name] = getCombined(extendingSchema, abstractSchema) as Schema;
+  }
+
+  for (const name in abstractSchemaNames) {
+    delete schemaMap[name];
+  }
+
+  return schemaMap;
+}
+
+function getRegionalCombinedSchemas(countryCode: string): SchemaStubMap {
+  const regionalSchemaMap = getRegionalSchema(countryCode);
+  const appSchemaMap = getMapFromList(appSchemas);
+  const combined = { ...appSchemaMap };
+
+  for (const name in regionalSchemaMap) {
+    const regionalSchema = regionalSchemaMap[name];
+
+    if (!combined.hasOwnProperty(name)) {
+      combined[name] = regionalSchema;
+      continue;
+    }
+
+    combined[name] = getCombined(regionalSchema, combined[name]);
+  }
+
+  return combined;
+}
+
+function getRegionalSchema(countryCode: string): SchemaStubMap {
+  const regionalSchemas = regional[countryCode] as SchemaStub[] | undefined;
+  if (regionalSchemas === undefined) {
+    return {};
+  }
+
+  return getMapFromList(regionalSchemas);
+}
diff --git a/schemas/regional/in/AccountingSettings.json b/schemas/regional/in/AccountingSettings.json
index 32391b55..66de67ac 100644
--- a/schemas/regional/in/AccountingSettings.json
+++ b/schemas/regional/in/AccountingSettings.json
@@ -8,7 +8,6 @@
       "placeholder": "27AAAAA0000A1Z5"
     }
   ],
-  "keywordFields": [],
   "quickEditFields": [
     "fullname",
     "email",
diff --git a/schemas/regional/in/Party.json b/schemas/regional/in/Party.json
index 82bd30f2..7076ab27 100644
--- a/schemas/regional/in/Party.json
+++ b/schemas/regional/in/Party.json
@@ -12,7 +12,20 @@
       "placeholder": "GST Registration",
       "fieldtype": "Select",
       "default": "Unregistered",
-      "options": ["Unregistered", "Registered Regular", "Consumer"]
+      "options": [
+        {
+          "value": "Unregistered",
+          "label": "Unregistered"
+        },
+        {
+          "value": "Registered Regular",
+          "label": "Registered Regular"
+        },
+        {
+          "value": "Consumer",
+          "label": "Consumer"
+        }
+      ]
     }
   ],
   "quickEditFields": [
diff --git a/schemas/regional/in/index.ts b/schemas/regional/in/index.ts
new file mode 100644
index 00000000..835ca90a
--- /dev/null
+++ b/schemas/regional/in/index.ts
@@ -0,0 +1,6 @@
+import { SchemaStub } from '../../types';
+import AccountingSettings from './AccountingSettings.json';
+import Address from './Address.json';
+import Party from './Party.json';
+
+export default [AccountingSettings, Address, Party] as SchemaStub[];
diff --git a/schemas/regional/index.ts b/schemas/regional/index.ts
new file mode 100644
index 00000000..3616cca1
--- /dev/null
+++ b/schemas/regional/index.ts
@@ -0,0 +1,6 @@
+import IndianSchemas from './in';
+
+/**
+ * Regional Schemas are exported by country code.
+ */
+export default { in: IndianSchemas };
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index 8eefb8c7..171f1265 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -28,7 +28,7 @@ import TaxSummary from './app/TaxSummary.json';
 import PatchRun from './core/PatchRun.json';
 import SingleValue from './core/SingleValue.json';
 import SystemSettings from './core/SystemSettings.json';
-import { Schema } from './types';
+import { Schema, SchemaStub } from './types';
 
 export const coreSchemas: Schema[] = [
   PatchRun as Schema,
@@ -36,7 +36,7 @@ export const coreSchemas: Schema[] = [
   SystemSettings as Schema,
 ];
 
-export const appSchemas: Schema[] = [
+export const appSchemas: Schema[] | SchemaStub[] = [
   SetupWizard as Schema,
   GetStarted as Schema,
 
@@ -52,8 +52,8 @@ export const appSchemas: Schema[] = [
   AccountingLedgerEntry as Schema,
 
   Party as Schema,
-  Supplier as Schema,
-  Customer as Schema,
+  Supplier as SchemaStub,
+  Customer as SchemaStub,
 
   Address as Schema,
   Item as Schema,
diff --git a/schemas/types.ts b/schemas/types.ts
index 4ba11b1f..44095baa 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -1,3 +1,38 @@
+/**
+ * # Schema
+ *
+ * Main purpose of this is to describe the shape of the Models table in the
+ * database. But there is some irrelevant information in the schemas with
+ * respect to this goal. This is information is allowed as long as it is not
+ * dynamic, which is impossible anyways as the files are data (.json !.js)
+ *
+ * If any field has to have a dynamic value, it should be added to the controller
+ * file by the same name.
+ *
+ *
+ * There are a few types of schemas:
+ * - _Regional_: Schemas that are in the '../regional' subdirectories
+ *      these can be of any of the below types.
+ * - _Abstract_: Schemas that are not used as they are but only after they are
+ *      extended by Stub schemas. Indentified by the `isAbstract` field
+ * - _Subclass_: Schemas that have an "extends" field on them, the value of which
+ *      points to an Abstract schema.
+ * - _Complete_: Schemas which are neither abstract nor stub.
+ *
+ *
+ * ## Final Schema
+ *
+ * This is the schema which is used by the database and app code.
+ *
+ * The order in which a schema is built is:
+ * 1. Build _Regional_ schemas by overriding the fields and other properties of the
+ *      non regional variants.
+ * 2. Combine _Subclass_ schemas with _Abstract_ schemas to get complete schemas.
+ *
+ * Note: if a Regional schema is not present as a non regional variant it's used
+ * as it is.
+ */
+
 export enum FieldTypeEnum {
   Data = 'Data',
   Select = 'Select',
@@ -19,18 +54,19 @@ export enum FieldTypeEnum {
 export type FieldType = keyof typeof FieldTypeEnum;
 export type RawValue = string | number | boolean;
 
+// prettier-ignore
 export interface BaseField {
-  fieldname: string;
-  fieldtype: FieldType;
-  label: string;
-  hidden?: boolean;
-  required?: boolean;
-  readOnly?: boolean;
-  description?: string;
-  default?: RawValue;
-  placeholder?: string;
-  groupBy?: string;
-  computed?: boolean;
+  fieldname: string;             // Column name in the db
+  fieldtype: FieldType;          // UI Descriptive field types that map to column types
+  label: string;                 // Translateable UI facing name
+  required?: boolean;            // Implies Not Null
+  hidden?: boolean;              // UI Facing config, whether field is shown in a form
+  readOnly?: boolean;            // UI Facing config, whether field is editable
+  description?: string;          // UI Facing, translateable, used for inline documentation
+  default?: RawValue;            // Default value of a field, should match the db type
+  placeholder?: string;          // UI Facing config, form field placeholder
+  groupBy?: string;              // UI Facing used in dropdowns fields
+  computed?: boolean;            // Indicates whether a value is computed, implies readonly
 }
 
 export type SelectOption = { value: string; label: string };
@@ -42,20 +78,23 @@ export interface OptionField extends BaseField {
   options: SelectOption[];
 }
 
+// prettier-ignore
 export interface TargetField extends BaseField {
   fieldtype: FieldTypeEnum.Table | FieldTypeEnum.Link;
-  target: string | string[];
+  target: string | string[];     // Name of the table or group of tables to fetch values
 }
 
+// prettier-ignore
 export interface DynamicLinkField extends BaseField {
   fieldtype: FieldTypeEnum.DynamicLink;
-  references: string;
+  references: string;            // Reference to an option field that links to schema
 }
 
+// prettier-ignore
 export interface NumberField extends BaseField {
   fieldtype: FieldTypeEnum.Float | FieldTypeEnum.Int;
-  minvalue?: number;
-  maxvalue?: number;
+  minvalue?: number;             // UI Facing used to restrict lower bound
+  maxvalue?: number;             // UI Facing used to restrict upper bound
 }
 
 export type Field =
@@ -66,16 +105,24 @@ export type Field =
   | NumberField;
 
 export type TreeSettings = { parentField: string };
+
+// prettier-ignore
 export interface Schema {
-  name: string;
-  label: string;
-  fields: Field[];
-  isTree?: boolean;
-  extends?: string;
-  isChild?: boolean;
-  isSingle?: boolean;
-  isAbstract?: boolean;
-  isSubmittable?: boolean;
-  keywordFields?: string[];
-  treeSettings?: TreeSettings;
+  name: string;                  // Table PK
+  label: string;                 // Translateable UI facing name
+  fields: Field[];               // Maps to database columns
+  isTree?: boolean;              // Used for nested set, eg for Chart of Accounts
+  extends?: string;              // Value points to an Abstract schema. Indicates Subclass schema
+  isChild?: boolean;             // Indicates a child table, i.e table with "parent" FK column
+  isSingle?: boolean;            // Fields will be values in SingleValue, i.e. an Entity Attr. Value
+  isAbstract?: boolean;          // Not entered into db, used to extend a Subclass schema
+  isSubmittable?: boolean;       // For transactional types, values considered only after submit
+  keywordFields?: string[];      // Used for fields that are to be used for search.
+  treeSettings?: TreeSettings;   // Used to determine root nodes
 }
+
+export interface SchemaStub extends Partial<Schema> {
+  name: string;
+}
+export type SchemaMap = Record<string, Schema>;
+export type SchemaStubMap = Record<string, SchemaStub>;
diff --git a/src/main.js b/src/main.js
index 1ddf31b2..a0264169 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
 import { createApp } from 'vue';
+import { getSchemas } from '../schemas';
 import App from './App';
 import FeatherIcon from './components/FeatherIcon';
 import config, { ConfigKeys } from './config';
@@ -101,3 +102,5 @@ import { setLanguageMap, stringifyCircular } from './utils';
     handleError(true, error, {}, () => process.exit(1));
   });
 })();
+
+window.gs = getSchemas;

From 19278e92d60bacbbe6a810a857c16dcacb5aec77 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 23 Mar 2022 22:10:36 +0530
Subject: [PATCH 014/163] incr: add meta fields

---
 schemas/app/AccountingLedgerEntry.json |  6 ++--
 schemas/app/SalesInvoice.json          |  2 +-
 schemas/app/Tax.json                   |  2 +-
 schemas/index.ts                       | 47 ++++++++++++++++++++++----
 schemas/meta/base.json                 | 33 ++++++++++++++++++
 schemas/meta/child.json                | 29 ++++++++++++++++
 schemas/meta/submittable.json          | 19 +++++++++++
 schemas/meta/tree.json                 | 19 +++++++++++
 schemas/schemas.ts                     | 12 +++++++
 schemas/types.ts                       |  9 ++---
 10 files changed, 163 insertions(+), 15 deletions(-)
 create mode 100644 schemas/meta/base.json
 create mode 100644 schemas/meta/child.json
 create mode 100644 schemas/meta/submittable.json
 create mode 100644 schemas/meta/tree.json

diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index a8480b0c..bacffc0a 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -19,8 +19,8 @@
     {
       "fieldname": "party",
       "label": "Party",
-      "fieldtype": "Link",
-      "target": "Party"
+      "fieldtype": "DynamicLink",
+      "target": ["Customer", "Supplier"]
     },
     {
       "fieldname": "debit",
@@ -66,4 +66,4 @@
     "balance"
   ],
   "keywordFields": ["account", "party", "referenceName"]
-}
\ No newline at end of file
+}
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 24f7d4f2..76a74b62 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -49,7 +49,7 @@
       "fieldname": "items",
       "label": "Items",
       "fieldtype": "Table",
-      "childtype": "SalesInvoiceItem",
+      "target": "SalesInvoiceItem",
       "required": true
     },
     {
diff --git a/schemas/app/Tax.json b/schemas/app/Tax.json
index 8ceaa260..5f7d7b1e 100644
--- a/schemas/app/Tax.json
+++ b/schemas/app/Tax.json
@@ -14,7 +14,7 @@
       "fieldname": "details",
       "label": "Details",
       "fieldtype": "Table",
-      "childtype": "TaxDetail",
+      "target": "TaxDetail",
       "required": true
     }
   ],
diff --git a/schemas/index.ts b/schemas/index.ts
index 17291fe9..a71611cc 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -1,14 +1,47 @@
 import { cloneDeep } from 'lodash';
 import { getListFromMap, getMapFromList } from './helpers';
-import regional from './regional';
-import { appSchemas, coreSchemas } from './schemas';
+import regionalSchemas from './regional';
+import { appSchemas, coreSchemas, metaSchemas } from './schemas';
 import { Schema, SchemaMap, SchemaStub, SchemaStubMap } from './types';
 
 export function getSchemas(countryCode: string = '-'): SchemaMap {
   const builtCoreSchemas = getCoreSchemas();
   const builtAppSchemas = getAppSchemas(countryCode);
 
-  return Object.assign({}, builtAppSchemas, builtCoreSchemas);
+  let schemaMap = Object.assign({}, builtAppSchemas, builtCoreSchemas);
+  schemaMap = addMetaFields(schemaMap);
+  return schemaMap;
+}
+
+function addMetaFields(schemaMap: SchemaMap): SchemaMap {
+  const metaSchemaMap = getMapFromList(metaSchemas);
+
+  const base = metaSchemaMap.base;
+  const tree = getCombined(metaSchemaMap.tree, base);
+  const child = metaSchemaMap.child;
+  const submittable = getCombined(metaSchemaMap.submittable, base);
+  const submittableTree = getCombined(tree, metaSchemaMap.submittable);
+
+  for (const name in schemaMap) {
+    const schema = schemaMap[name];
+    if (schema.isSingle) {
+      continue;
+    }
+
+    if (schema.isTree && schema.isSubmittable) {
+      schema.fields = [...schema.fields, ...submittableTree.fields];
+    } else if (schema.isTree) {
+      schema.fields = [...schema.fields, ...tree.fields];
+    } else if (schema.isSubmittable) {
+      schema.fields = [...schema.fields, ...submittable.fields];
+    } else if (schema.isChild) {
+      schema.fields = [...schema.fields, ...child.fields];
+    } else {
+      schema.fields = [...schema.fields, ...base.fields];
+    }
+  }
+
+  return schemaMap;
 }
 
 function getCoreSchemas(): SchemaMap {
@@ -116,10 +149,12 @@ function getRegionalCombinedSchemas(countryCode: string): SchemaStubMap {
 }
 
 function getRegionalSchema(countryCode: string): SchemaStubMap {
-  const regionalSchemas = regional[countryCode] as SchemaStub[] | undefined;
-  if (regionalSchemas === undefined) {
+  const countrySchemas = regionalSchemas[countryCode] as
+    | SchemaStub[]
+    | undefined;
+  if (countrySchemas === undefined) {
     return {};
   }
 
-  return getMapFromList(regionalSchemas);
+  return getMapFromList(countrySchemas);
 }
diff --git a/schemas/meta/base.json b/schemas/meta/base.json
new file mode 100644
index 00000000..c596594b
--- /dev/null
+++ b/schemas/meta/base.json
@@ -0,0 +1,33 @@
+{
+  "name": "base",
+  "fields": [
+    {
+      "fieldname": "createdBy",
+      "label": "Created By",
+      "fieldtype": "Data",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "modifiedBy",
+      "label": "Modified By",
+      "fieldtype": "Data",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "created",
+      "label": "Created",
+      "fieldtype": "Datetime",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "modified",
+      "label": "Modified",
+      "fieldtype": "Datetime",
+      "required": true,
+      "meta": true
+    }
+  ]
+}
diff --git a/schemas/meta/child.json b/schemas/meta/child.json
new file mode 100644
index 00000000..89b522a8
--- /dev/null
+++ b/schemas/meta/child.json
@@ -0,0 +1,29 @@
+{
+  "name": "child",
+  "fields": [
+    {
+      "fieldname": "idx",
+      "fieldtype": "Int",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "parent",
+      "fieldtype": "Data",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "parentName",
+      "fieldtype": "Data",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "parentFieldname",
+      "fieldtype": "Data",
+      "required": true,
+      "meta": true
+    }
+  ]
+}
diff --git a/schemas/meta/submittable.json b/schemas/meta/submittable.json
new file mode 100644
index 00000000..dbe6e524
--- /dev/null
+++ b/schemas/meta/submittable.json
@@ -0,0 +1,19 @@
+{
+  "name": "submittable",
+  "fields": [
+    {
+      "fieldname": "submitted",
+      "label": "Submitted",
+      "fieldtype": "Check",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "cancelled",
+      "label": "Cancelled",
+      "fieldtype": "Check",
+      "required": true,
+      "meta": true
+    }
+  ]
+}
diff --git a/schemas/meta/tree.json b/schemas/meta/tree.json
new file mode 100644
index 00000000..bddd83e8
--- /dev/null
+++ b/schemas/meta/tree.json
@@ -0,0 +1,19 @@
+{
+  "name": "tree",
+  "fields": [
+    {
+      "fieldname": "lft",
+      "label": "Left Index",
+      "fieldtype": "Int",
+      "required": true,
+      "meta": true
+    },
+    {
+      "fieldname": "rgt",
+      "label": "Right Index",
+      "fieldtype": "Int",
+      "required": true,
+      "meta": true
+    }
+  ]
+}
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index 171f1265..189d012d 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -28,6 +28,11 @@ import TaxSummary from './app/TaxSummary.json';
 import PatchRun from './core/PatchRun.json';
 import SingleValue from './core/SingleValue.json';
 import SystemSettings from './core/SystemSettings.json';
+import base from './meta/base.json';
+import submittable from './meta/submittable.json';
+//asdf
+import child from './meta/child.json';
+import tree from './meta/tree.json';
 import { Schema, SchemaStub } from './types';
 
 export const coreSchemas: Schema[] = [
@@ -36,6 +41,13 @@ export const coreSchemas: Schema[] = [
   SystemSettings as Schema,
 ];
 
+export const metaSchemas: SchemaStub[] = [
+  base as SchemaStub,
+  child as SchemaStub,
+  submittable as SchemaStub,
+  tree as SchemaStub,
+];
+
 export const appSchemas: Schema[] | SchemaStub[] = [
   SetupWizard as Schema,
   GetStarted as Schema,
diff --git a/schemas/types.ts b/schemas/types.ts
index 44095baa..53f82371 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -54,7 +54,7 @@ export enum FieldTypeEnum {
 export type FieldType = keyof typeof FieldTypeEnum;
 export type RawValue = string | number | boolean;
 
-// prettier-ignore
+// @formatter:off
 export interface BaseField {
   fieldname: string;             // Column name in the db
   fieldtype: FieldType;          // UI Descriptive field types that map to column types
@@ -67,6 +67,7 @@ export interface BaseField {
   placeholder?: string;          // UI Facing config, form field placeholder
   groupBy?: string;              // UI Facing used in dropdowns fields
   computed?: boolean;            // Indicates whether a value is computed, implies readonly
+  meta?: boolean;                // Field is a meta field, i.e. only for the db, not UI
 }
 
 export type SelectOption = { value: string; label: string };
@@ -78,19 +79,19 @@ export interface OptionField extends BaseField {
   options: SelectOption[];
 }
 
-// prettier-ignore
+// @formatter:off
 export interface TargetField extends BaseField {
   fieldtype: FieldTypeEnum.Table | FieldTypeEnum.Link;
   target: string | string[];     // Name of the table or group of tables to fetch values
 }
 
-// prettier-ignore
+// @formatter:off
 export interface DynamicLinkField extends BaseField {
   fieldtype: FieldTypeEnum.DynamicLink;
   references: string;            // Reference to an option field that links to schema
 }
 
-// prettier-ignore
+// @formatter:off
 export interface NumberField extends BaseField {
   fieldtype: FieldTypeEnum.Float | FieldTypeEnum.Int;
   minvalue?: number;             // UI Facing used to restrict lower bound

From 74d173f682efb499db87881cbfeee5ff3cb7d76e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 24 Mar 2022 15:20:40 +0530
Subject: [PATCH 015/163] incr: refactor core.ts to use schema !meta

---
 backend/common.ts                      |   28 +-
 backend/database/core.ts               | 1463 +++++++++++-------------
 backend/database/types.ts              |   21 +-
 frappe/models/index.js                 |    2 -
 schemas/app/AccountingLedgerEntry.json |   14 +-
 schemas/app/Payment.json               |   13 +-
 schemas/meta/child.json                |    2 +-
 schemas/types.ts                       |    4 +-
 8 files changed, 748 insertions(+), 799 deletions(-)

diff --git a/backend/common.ts b/backend/common.ts
index 03b50842..58078c41 100644
--- a/backend/common.ts
+++ b/backend/common.ts
@@ -1,21 +1,4 @@
-import Document from '../frappe/model/document';
-import Meta from '../frappe/model/meta';
-import { Model } from '../src/types/model';
-
-export function getModels(): Record<string, Model> {
-  // TODO: complete this function
-  return {};
-}
-
-export function getMeta(doctype: string): Meta {
-  // TODO: compete this function
-  return new Meta();
-}
-
-export function getNewDoc(data: Record<string, unknown>): Document {
-  // TODO: compete this function
-  return new Document();
-}
+import { Field, FieldTypeEnum, SchemaMap } from '../schemas/types';
 
 export const sqliteTypeMap = {
   AutoComplete: 'text',
@@ -41,3 +24,12 @@ export const sqliteTypeMap = {
 };
 
 export const validTypes = Object.keys(sqliteTypeMap);
+
+export function getFieldsByType(
+  schemaName: string,
+  schemaMap: SchemaMap,
+  type: FieldTypeEnum
+): Field[] {
+  const fields = schemaMap[schemaName].fields ?? [];
+  return fields.filter((f) => f.fieldtype === type);
+}
diff --git a/backend/database/core.ts b/backend/database/core.ts
index a9e6d4ac..d9d0f989 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -1,5 +1,4 @@
 import { knex, Knex } from 'knex';
-import { pesa } from 'pesa';
 import { getRandomString } from '../../frappe/utils';
 import CacheManager from '../../frappe/utils/cacheManager';
 import {
@@ -7,30 +6,35 @@ import {
   DatabaseError,
   DuplicateEntryError,
   LinkValidationError,
+  NotFoundError,
   ValueError,
 } from '../../frappe/utils/errors';
-import Observable from '../../frappe/utils/observable';
-import { getMeta, getModels, getNewDoc, sqliteTypeMap } from '../common';
-import { GetQueryBuilderOptions, QueryFilter, RawData } from './types';
+import {
+  Field,
+  FieldTypeEnum,
+  RawValue,
+  SchemaMap,
+  TargetField,
+} from '../../schemas/types';
+import { getFieldsByType, sqliteTypeMap } from '../common';
+import {
+  ColumnDiff,
+  FieldValueMap,
+  GetAllOptions,
+  GetQueryBuilderOptions,
+  QueryFilter,
+} from './types';
 
-interface GetAllOptions {
-  doctype?: string;
-  fields?: string[];
-  filters?: Record<string, string>;
-  start?: number;
-  limit?: number;
-  groupBy?: string;
-  orderBy?: string;
-  order?: 'asc' | 'desc';
-}
-
-export default class Database extends Observable<never> {
+export default class Database {
   knex: Knex;
   cache: CacheManager;
   typeMap = sqliteTypeMap;
+  dbPath: string;
+  schemaMap: SchemaMap;
+  connectionParams: Knex.Config;
 
-  constructor(dbPath: string) {
-    super();
+  constructor(dbPath: string, schemaMap: SchemaMap) {
+    this.schemaMap = schemaMap;
     this.cache = new CacheManager();
     this.dbPath = dbPath;
     this.connectionParams = {
@@ -57,756 +61,28 @@ export default class Database extends Observable<never> {
   }
 
   close() {
-    //
+    this.knex.destroy();
   }
 
-  /**
-   * TODO: Refactor this
-   *
-   * essentially it's not models that are required by the database
-   * but the schema, all the information that is relevant to building
-   * tables needs to given to this function.
-   */
-  async migrate() {
-    const models = getModels();
-    for (const doctype in models) {
-      // check if controller module
-      const meta = getMeta(doctype);
-      const baseDoctype = meta.getBaseDocType();
-
-      if (!meta.isSingle) {
-        if (await this.tableExists(baseDoctype)) {
-          await this.alterTable(baseDoctype);
-        } else {
-          await this.createTable(baseDoctype);
-        }
-      }
-    }
-
-    await this.commit();
-    await this.initializeSingles();
+  async tableExists(schemaName: string) {
+    return await this.knex.schema.hasTable(schemaName);
   }
 
-  async initializeSingles() {
-    const models = getModels();
-    const singleDoctypes = Object.keys(models)
-      .filter((n) => models[n].isSingle)
-      .map((n) => models[n].name);
-
-    for (const doctype of singleDoctypes) {
-      if (await this.singleExists(doctype)) {
-        const singleValues = await this.getSingleFieldsToInsert(doctype);
-        singleValues.forEach(({ fieldname, value }) => {
-          const singleValue = getNewDoc({
-            doctype: 'SingleValue',
-            parent: doctype,
-            fieldname,
-            value,
-          });
-          singleValue.insert();
-        });
-        continue;
-      }
-      const meta = getMeta(doctype);
-      if (meta.fields.every((df) => df.default == null)) {
-        continue;
-      }
-      const defaultValues = meta.fields.reduce((doc, df) => {
-        if (df.default != null) {
-          doc[df.fieldname] = df.default;
-        }
-        return doc;
-      }, {});
-      await this.updateSingle(doctype, defaultValues);
-    }
-  }
-
-  async getSingleFieldsToInsert(doctype) {
-    const existingFields = (
-      await this.knex('SingleValue')
-        .where({ parent: doctype })
-        .select('fieldname')
-    ).map(({ fieldname }) => fieldname);
-
-    return getMeta(doctype)
-      .fields.map(({ fieldname, default: value }) => ({
-        fieldname,
-        value,
-      }))
-      .filter(
-        ({ fieldname, value }) =>
-          !existingFields.includes(fieldname) && value !== undefined
-      );
-  }
-
-  async createTable(doctype, tableName = null) {
-    const fields = this.getValidFields(doctype);
-    return await this.runCreateTableQuery(tableName || doctype, fields);
-  }
-
-  runCreateTableQuery(doctype, fields) {
-    return this.knex.schema.createTable(doctype, (table) => {
-      for (const field of fields) {
-        this.buildColumnForTable(table, field);
-      }
-    });
-  }
-
-  async alterTable(doctype) {
-    // get columns
-    const diff = await this.getColumnDiff(doctype);
-    const newForeignKeys = await this.getNewForeignKeys(doctype);
-
-    return this.knex.schema
-      .table(doctype, (table) => {
-        if (diff.added.length) {
-          for (const field of diff.added) {
-            this.buildColumnForTable(table, field);
-          }
-        }
-
-        if (diff.removed.length) {
-          this.removeColumns(doctype, diff.removed);
-        }
-      })
-      .then(() => {
-        if (newForeignKeys.length) {
-          return this.addForeignKeys(doctype, newForeignKeys);
-        }
-      });
-  }
-
-  buildColumnForTable(table, field) {
-    const columnType = this.typeMap[field.fieldtype];
-    if (!columnType) {
-      // In case columnType is "Table"
-      // childTable links are handled using the childTable's "parent" field
-      return;
-    }
-
-    const column = table[columnType](field.fieldname);
-
-    // primary key
-    if (field.fieldname === 'name') {
-      column.primary();
-    }
-
-    // default value
-    if (!!field.default && !(field.default instanceof Function)) {
-      column.defaultTo(field.default);
-    }
-
-    // required
-    if (
-      (!!field.required && !(field.required instanceof Function)) ||
-      field.fieldtype === 'Currency'
-    ) {
-      column.notNullable();
-    }
-
-    // link
-    if (field.fieldtype === 'Link' && field.target) {
-      const meta = getMeta(field.target);
-      table
-        .foreign(field.fieldname)
-        .references('name')
-        .inTable(meta.getBaseDocType())
-        .onUpdate('CASCADE')
-        .onDelete('RESTRICT');
-    }
-  }
-
-  async getColumnDiff(doctype) {
-    const tableColumns = await this.getTableColumns(doctype);
-    const validFields = this.getValidFields(doctype);
-    const diff = { added: [], removed: [] };
-
-    for (const field of validFields) {
-      if (
-        !tableColumns.includes(field.fieldname) &&
-        this.typeMap[field.fieldtype]
-      ) {
-        diff.added.push(field);
-      }
-    }
-
-    const validFieldNames = validFields.map((field) => field.fieldname);
-    for (const column of tableColumns) {
-      if (!validFieldNames.includes(column)) {
-        diff.removed.push(column);
-      }
-    }
-
-    return diff;
-  }
-
-  async getNewForeignKeys(doctype) {
-    const foreignKeys = await this.getForeignKeys(doctype);
-    const newForeignKeys = [];
-    const meta = getMeta(doctype);
-    for (const field of meta.getValidFields({ withChildren: false })) {
-      if (
-        field.fieldtype === 'Link' &&
-        !foreignKeys.includes(field.fieldname)
-      ) {
-        newForeignKeys.push(field);
-      }
-    }
-    return newForeignKeys;
-  }
-
-  async get(doctype, name = null, fields = '*') {
-    const meta = getMeta(doctype);
-    let doc;
-    if (meta.isSingle) {
-      doc = await this.getSingle(doctype);
-      doc.name = doctype;
-    } else {
-      if (!name) {
-        throw new ValueError('name is mandatory');
-      }
-      doc = await this.getOne(doctype, name, fields);
-    }
-    if (!doc) {
-      return;
-    }
-    await this.loadChildren(doc, meta);
-    return doc;
-  }
-
-  async loadChildren(doc, meta) {
-    // load children
-    const tableFields = meta.getTableFields();
-    for (const field of tableFields) {
-      doc[field.fieldname] = await this.getAll({
-        doctype: field.childtype,
-        fields: ['*'],
-        filters: { parent: doc.name },
-        orderBy: 'idx',
-        order: 'asc',
-      });
-    }
-  }
-
-  async getSingle(doctype) {
-    const values = await this.getAll({
-      doctype: 'SingleValue',
-      fields: ['fieldname', 'value'],
-      filters: { parent: doctype },
-      orderBy: 'fieldname',
-      order: 'asc',
-    });
-    const doc = {};
-    for (const row of values) {
-      doc[row.fieldname] = row.value;
-    }
-    return doc;
-  }
-
-  /**
-   * Get list of values from the singles table.
-   * @param  {...string | Object} fieldnames list of fieldnames to get the values of
-   * @returns {Array<Object>} array of {parent, value, fieldname}.
-   * @example
-   * Database.getSingleValues('internalPrecision');
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   * @example
-   * Database.getSingleValues({fieldname:'internalPrecision', parent: 'SystemSettings'});
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   */
-  async getSingleValues(...fieldnames) {
-    fieldnames = fieldnames.map((fieldname) => {
-      if (typeof fieldname === 'string') {
-        return { fieldname };
-      }
-      return fieldname;
-    });
-
-    let builder = this.knex('SingleValue');
-    builder = builder.where(fieldnames[0]);
-
-    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
-      if (typeof parent === 'undefined') {
-        builder = builder.orWhere({ fieldname });
-      } else {
-        builder = builder.orWhere({ fieldname, parent });
-      }
-    });
-
-    let values = [];
-    try {
-      values = await builder.select('fieldname', 'value', 'parent');
-    } catch (error) {
-      if (error.message.includes('no such table')) {
-        return [];
-      }
-      throw error;
-    }
-
-    return values.map((value) => {
-      const fields = getMeta(value.parent).fields;
-      return this.getDocFormattedDoc(fields, values);
-    });
-  }
-
-  async getOne(doctype, name, fields = '*') {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-
-    const doc = await this.knex
-      .select(fields)
-      .from(baseDoctype)
-      .where('name', name)
-      .first();
-
-    if (!doc) {
-      return doc;
-    }
-
-    return this.getDocFormattedDoc(meta.fields, doc);
-  }
-
-  getDocFormattedDoc(fields, doc) {
-    // format for usage, not going into the db
-    const docFields = Object.keys(doc);
-    const filteredFields = fields.filter(({ fieldname }) =>
-      docFields.includes(fieldname)
-    );
-
-    const formattedValues = filteredFields.reduce((d, field) => {
-      const { fieldname } = field;
-      d[fieldname] = this.getDocFormattedValues(field, doc[fieldname]);
-      return d;
-    }, {});
-
-    return Object.assign(doc, formattedValues);
-  }
-
-  getDocFormattedValues(field, value) {
-    // format for usage, not going into the db
-    try {
-      if (field.fieldtype === 'Currency') {
-        return pesa(value);
-      }
-    } catch (err) {
-      err.message += ` value: '${value}' of type: ${typeof value}, fieldname: '${
-        field.fieldname
-      }', label: '${field.label}'`;
-      throw err;
-    }
-    return value;
-  }
-
-  triggerChange(doctype, name) {
-    this.trigger(`change:${doctype}`, { name }, 500);
-    this.trigger(`change`, { doctype, name }, 500);
-    // also trigger change for basedOn doctype
-    const meta = getMeta(doctype);
-    if (meta.basedOn) {
-      this.triggerChange(meta.basedOn, name);
-    }
-  }
-
-  async insert(doctype, doc) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    doc = this.applyBaseDocTypeFilters(doctype, doc);
-
-    // insert parent
-    if (meta.isSingle) {
-      await this.updateSingle(doctype, doc);
-    } else {
-      await this.insertOne(baseDoctype, doc);
-    }
-
-    // insert children
-    await this.insertChildren(meta, doc, baseDoctype);
-
-    this.triggerChange(doctype, doc.name);
-
-    return doc;
-  }
-
-  async insertChildren(meta, doc, doctype) {
-    const tableFields = meta.getTableFields();
-    for (const field of tableFields) {
-      let idx = 0;
-      for (const child of doc[field.fieldname] || []) {
-        this.prepareChild(doctype, doc.name, child, field, idx);
-        await this.insertOne(field.childtype, child);
-        idx++;
-      }
-    }
-  }
-
-  insertOne(doctype, doc) {
-    const fields = this.getValidFields(doctype);
-
-    if (!doc.name) {
-      doc.name = getRandomString();
-    }
-
-    const formattedDoc = this.getFormattedDoc(fields, doc);
-    return this.knex(doctype).insert(formattedDoc);
-  }
-
-  async update(doctype, doc) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    doc = this.applyBaseDocTypeFilters(doctype, doc);
-
-    // update parent
-    if (meta.isSingle) {
-      await this.updateSingle(doctype, doc);
-    } else {
-      await this.updateOne(baseDoctype, doc);
-    }
-
-    // insert or update children
-    await this.updateChildren(meta, doc, baseDoctype);
-
-    this.triggerChange(doctype, doc.name);
-
-    return doc;
-  }
-
-  async updateChildren(meta, doc, doctype) {
-    const tableFields = meta.getTableFields();
-    for (const field of tableFields) {
-      const added = [];
-      for (const child of doc[field.fieldname] || []) {
-        this.prepareChild(doctype, doc.name, child, field, added.length);
-        if (await this.exists(field.childtype, child.name)) {
-          await this.updateOne(field.childtype, child);
-        } else {
-          await this.insertOne(field.childtype, child);
-        }
-        added.push(child.name);
-      }
-      await this.runDeleteOtherChildren(field, doc.name, added);
-    }
-  }
-
-  updateOne(doctype, doc) {
-    const validFields = this.getValidFields(doctype);
-    const fieldsToUpdate = Object.keys(doc).filter((f) => f !== 'name');
-    const fields = validFields.filter((df) =>
-      fieldsToUpdate.includes(df.fieldname)
-    );
-    const formattedDoc = this.getFormattedDoc(fields, doc);
-
-    return this.knex(doctype)
-      .where('name', doc.name)
-      .update(formattedDoc)
-      .then(() => {
-        const cacheKey = `${doctype}:${doc.name}`;
-        if (this.cache.hexists(cacheKey)) {
-          for (const fieldname in formattedDoc) {
-            const value = formattedDoc[fieldname];
-            this.cache.hset(cacheKey, fieldname, value);
-          }
-        }
-      });
-  }
-
-  runDeleteOtherChildren(field, parent, added) {
-    // delete other children
-    return this.knex(field.childtype)
-      .where('parent', parent)
-      .andWhere('name', 'not in', added)
-      .delete();
-  }
-
-  async updateSingle(doctype, doc) {
-    const meta = getMeta(doctype);
-    await this.deleteSingleValues(doctype);
-    for (const field of meta.getValidFields({ withChildren: false })) {
-      const value = doc[field.fieldname];
-      if (value != null) {
-        const singleValue = getNewDoc({
-          doctype: 'SingleValue',
-          parent: doctype,
-          fieldname: field.fieldname,
-          value: value,
-        });
-        await singleValue.insert();
-      }
-    }
-  }
-
-  async rename(doctype, oldName, newName) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    await this.knex(baseDoctype)
-      .update({ name: newName })
-      .where('name', oldName)
-      .then(() => {
-        this.clearValueCache(doctype, oldName);
-      });
-    await this.commit();
-
-    this.triggerChange(doctype, newName);
-  }
-
-  prepareChild(parenttype, parent, child, field, idx) {
-    if (!child.name) {
-      child.name = getRandomString();
-    }
-    child.parent = parent;
-    child.parenttype = parenttype;
-    child.parentfield = field.fieldname;
-    child.idx = idx;
-  }
-
-  getValidFields(doctype) {
-    return getMeta(doctype).getValidFields({ withChildren: false });
-  }
-
-  getFormattedDoc(fields, doc) {
-    // format for storage, going into the db
-    const formattedDoc = {};
-    fields.map((field) => {
-      const value = doc[field.fieldname];
-      formattedDoc[field.fieldname] = this.getFormattedValue(field, value);
-    });
-    return formattedDoc;
-  }
-
-  getFormattedValue(field, value) {
-    // format for storage, going into the db
-    const type = typeof value;
-    if (field.fieldtype === 'Currency') {
-      let currency = value;
-
-      if (type === 'number' || type === 'string') {
-        currency = pesa(value);
-      }
-
-      const currencyValue = currency.store;
-      if (typeof currencyValue !== 'string') {
-        throw new Error(
-          `invalid currencyValue '${currencyValue}' of type '${typeof currencyValue}' on converting from '${value}' of type '${type}'`
-        );
-      }
-
-      return currencyValue;
-    }
-
-    if (value instanceof Date) {
-      if (field.fieldtype === 'Date') {
-        // date
-        return value.toISOString().substr(0, 10);
-      } else {
-        // datetime
-        return value.toISOString();
-      }
-    } else if (field.fieldtype === 'Link' && !value) {
-      // empty value must be null to satisfy
-      // foreign key constraint
-      return null;
-    } else {
-      return value;
-    }
-  }
-
-  applyBaseDocTypeFilters(doctype, doc) {
-    const meta = getMeta(doctype);
-    if (meta.filters) {
-      for (const fieldname in meta.filters) {
-        const value = meta.filters[fieldname];
-        if (typeof value !== 'object') {
-          doc[fieldname] = value;
-        }
-      }
-    }
-    return doc;
-  }
-
-  async deleteMany(doctype, names) {
-    for (const name of names) {
-      await this.delete(doctype, name);
-    }
-  }
-
-  async delete(doctype, name) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    await this.deleteOne(baseDoctype, name);
-
-    // delete children
-    const tableFields = getMeta(doctype).getTableFields();
-    for (const field of tableFields) {
-      await this.deleteChildren(field.childtype, name);
-    }
-
-    this.triggerChange(doctype, name);
-  }
-
-  async deleteOne(doctype, name) {
-    return this.knex(doctype)
-      .where('name', name)
-      .delete()
-      .then(() => {
-        this.clearValueCache(doctype, name);
-      });
-  }
-
-  deleteChildren(parenttype, parent) {
-    return this.knex(parenttype).where('parent', parent).delete();
-  }
-
-  async exists(doctype, name) {
-    return (await this.getValue(doctype, name)) ? true : false;
-  }
-
-  async getValue(doctype, filters, fieldname = 'name') {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    if (typeof filters === 'string') {
-      filters = { name: filters };
-    }
-    if (meta.filters) {
-      Object.assign(filters, meta.filters);
-    }
-
-    const row = await this.getAll({
-      doctype: baseDoctype,
-      fields: [fieldname],
-      filters: filters,
-      start: 0,
-      limit: 1,
-      orderBy: 'name',
-      order: 'asc',
-    });
-    return row.length ? row[0][fieldname] : null;
-  }
-
-  async setValue(doctype, name, fieldname, value) {
-    return await this.setValues(doctype, name, {
-      [fieldname]: value,
-    });
-  }
-
-  async setValues(
-    doctype: string,
-    name: string,
-    fieldValuePair: Record<string, unknown>
-  ) {
-    const doc = Object.assign({}, fieldValuePair, { name });
-    return this.updateOne(doctype, doc);
-  }
-
-  async getCachedValue(doctype: string, name: string, fieldname: string) {
-    let value = this.cache.hget(`${doctype}:${name}`, fieldname);
-    if (value == null) {
-      value = await this.getValue(doctype, name, fieldname);
-    }
-    return value;
-  }
-
-  // TODO: Not in core
-  async getAll({
-    doctype,
-    fields,
-    filters,
-    start,
-    limit,
-    groupBy,
-    orderBy = 'creation',
-    order = 'desc',
-  }: GetAllOptions = {}) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    if (!fields) {
-      fields = meta.getKeywordFields();
-      fields.push('name');
-    }
-    if (typeof fields === 'string') {
-      fields = [fields];
-    }
-    if (meta.filters) {
-      filters = Object.assign({}, filters, meta.filters);
-    }
-
-    const docs = await this.getQueryBuilder(doctype, fields, filters, {
-      offset: start,
-      limit,
-      groupBy,
-      orderBy,
-      order,
-    });
-    return docs.map((doc) => this.getDocFormattedDoc(meta.fields, doc));
-  }
-
-  clearValueCache(doctype: string, name: string) {
-    const cacheKey = `${doctype}:${name}`;
-    this.cache.hclear(cacheKey);
-  }
-
-  async addForeignKeys(tableName: string, newForeignKeys: string[]) {
-    await this.sql('PRAGMA foreign_keys=OFF');
-    await this.sql('BEGIN TRANSACTION');
-
-    const tempName = 'TEMP' + tableName;
-
-    // create temp table
-    await this.createTable(tableName, tempName);
-
-    try {
-      // copy from old to new table
-      await this.knex(tempName).insert(this.knex.select().from(tableName));
-    } catch (err) {
-      await this.sql('ROLLBACK');
-      await this.sql('PRAGMA foreign_keys=ON');
-
-      const rows = await this.knex.select().from(tableName);
-      await this.prestigeTheTable(tableName, rows);
-      return;
-    }
-
-    // drop old table
-    await this.knex.schema.dropTable(tableName);
-
-    // rename new table
-    await this.knex.schema.renameTable(tempName, tableName);
-
-    await this.sql('COMMIT');
-    await this.sql('PRAGMA foreign_keys=ON');
-  }
-
-  /**
-   *
-   *
-   *
-   *
-   * Everything below this is a leaf node function in this file
-   * and is safe, doesn't reuqire refactors
-   *
-   *
-   *
-   *
-   *
-   */
-
-  async tableExists(tableName: string) {
-    return await this.knex.schema.hasTable(tableName);
-  }
-
-  async singleExists(singleDoctypeName: string) {
+  async singleExists(singleSchemaName: string) {
     const res = await this.knex('SingleValue')
       .count('parent as count')
-      .where('parent', singleDoctypeName)
+      .where('parent', singleSchemaName)
       .first();
     return res.count > 0;
   }
 
-  async removeColumns(tableName: string, targetColumns: string[]) {
+  async removeColumns(schemaName: string, targetColumns: string[]) {
     // TODO: Implement this for sqlite
   }
 
-  async deleteSingleValues(singleDoctypeName: string) {
+  async deleteSingleValues(singleSchemaName: string) {
     return await this.knex('SingleValue')
-      .where('parent', singleDoctypeName)
+      .where('parent', singleSchemaName)
       .delete();
   }
 
@@ -826,6 +102,9 @@ export default class Database extends Observable<never> {
 
   getError(err: Error) {
     let errorType = DatabaseError;
+    if (err.message.includes('SQLITE_ERROR: no such table')) {
+      errorType = NotFoundError;
+    }
     if (err.message.includes('FOREIGN KEY')) {
       errorType = LinkValidationError;
     }
@@ -838,15 +117,15 @@ export default class Database extends Observable<never> {
     return errorType;
   }
 
-  async prestigeTheTable(tableName: string, tableRows: RawData) {
+  async prestigeTheTable(schemaName: string, tableRows: FieldValueMap[]) {
     const max = 200;
 
     // Alter table hacx for sqlite in case of schema change.
-    const tempName = `__${tableName}`;
+    const tempName = `__${schemaName}`;
     await this.knex.schema.dropTableIfExists(tempName);
 
     await this.knex.raw('PRAGMA foreign_keys=OFF');
-    await this.createTable(tableName, tempName);
+    await this.createTable(schemaName, tempName);
 
     if (tableRows.length > 200) {
       const fi = Math.floor(tableRows.length / max);
@@ -861,30 +140,30 @@ export default class Database extends Observable<never> {
       await this.knex.batchInsert(tempName, tableRows);
     }
 
-    await this.knex.schema.dropTable(tableName);
-    await this.knex.schema.renameTable(tempName, tableName);
+    await this.knex.schema.dropTable(schemaName);
+    await this.knex.schema.renameTable(tempName, schemaName);
     await this.knex.raw('PRAGMA foreign_keys=ON');
   }
 
-  async getTableColumns(doctype: string) {
-    const info = await this.sql(`PRAGMA table_info(${doctype})`);
+  async getTableColumns(schemaName: string): Promise<string[]> {
+    const info = await this.sql(`PRAGMA table_info(${schemaName})`);
     return info.map((d) => d.name);
   }
 
-  async getForeignKeys(doctype: string) {
+  async getForeignKeys(schemaName: string): Promise<string[]> {
     const foreignKeyList = await this.sql(
-      `PRAGMA foreign_key_list(${doctype})`
+      `PRAGMA foreign_key_list(${schemaName})`
     );
     return foreignKeyList.map((d) => d.from);
   }
 
   getQueryBuilder(
-    tableName: string,
+    schemaName: string,
     fields: string[],
     filters: QueryFilter,
     options: GetQueryBuilderOptions
-  ) {
-    const builder = this.knex.select(fields).from(tableName);
+  ): Knex.QueryBuilder {
+    const builder = this.knex.select(fields).from(schemaName);
 
     this.applyFiltersToBuilder(builder, filters);
 
@@ -956,4 +235,656 @@ export default class Database extends Observable<never> {
       }
     });
   }
+
+  async getColumnDiff(schemaName: string): Promise<ColumnDiff> {
+    const tableColumns = await this.getTableColumns(schemaName);
+    const validFields = this.schemaMap[schemaName].fields;
+    const diff: ColumnDiff = { added: [], removed: [] };
+
+    for (const field of validFields) {
+      if (
+        !tableColumns.includes(field.fieldname) &&
+        this.typeMap[field.fieldtype]
+      ) {
+        diff.added.push(field);
+      }
+    }
+
+    const validFieldNames = validFields.map((field) => field.fieldname);
+    for (const column of tableColumns) {
+      if (!validFieldNames.includes(column)) {
+        diff.removed.push(column);
+      }
+    }
+
+    return diff;
+  }
+
+  async getNewForeignKeys(schemaName): Promise<Field[]> {
+    const foreignKeys = await this.getForeignKeys(schemaName);
+    const newForeignKeys: Field[] = [];
+    const schema = this.schemaMap[schemaName];
+    for (const field of schema.fields) {
+      if (
+        field.fieldtype === 'Link' &&
+        !foreignKeys.includes(field.fieldname)
+      ) {
+        newForeignKeys.push(field);
+      }
+    }
+    return newForeignKeys;
+  }
+
+  buildColumnForTable(table: Knex.AlterTableBuilder, field: Field) {
+    if (field.fieldtype === FieldTypeEnum.Table) {
+      // In case columnType is "Table"
+      // childTable links are handled using the childTable's "parent" field
+      return;
+    }
+
+    const columnType = this.typeMap[field.fieldtype];
+    if (!columnType) {
+      return;
+    }
+
+    const column = table[columnType](field.fieldname);
+
+    // primary key
+    if (field.fieldname === 'name') {
+      column.primary();
+    }
+
+    // iefault value
+    if (field.default !== undefined) {
+      column.defaultTo(field.default);
+    }
+
+    // required
+    if (field.required || field.fieldtype === 'Currency') {
+      column.notNullable();
+    }
+
+    // link
+    if (field.fieldtype === 'Link' && (field as TargetField).target) {
+      const targetschemaName = (field as TargetField).target as string;
+      const schema = this.schemaMap[targetschemaName];
+      table
+        .foreign(field.fieldname)
+        .references('name')
+        .inTable(schema.name)
+        .onUpdate('CASCADE')
+        .onDelete('RESTRICT');
+    }
+  }
+
+  async alterTable(schemaName: string) {
+    // get columns
+    const diff: ColumnDiff = await this.getColumnDiff(schemaName);
+    const newForeignKeys: Field[] = await this.getNewForeignKeys(schemaName);
+
+    return this.knex.schema
+      .table(schemaName, (table) => {
+        if (diff.added.length) {
+          for (const field of diff.added) {
+            this.buildColumnForTable(table, field);
+          }
+        }
+
+        if (diff.removed.length) {
+          this.removeColumns(schemaName, diff.removed);
+        }
+      })
+      .then(() => {
+        if (newForeignKeys.length) {
+          return this.addForeignKeys(schemaName, newForeignKeys);
+        }
+      });
+  }
+
+  async createTable(schemaName: string, tableName?: string) {
+    tableName ??= schemaName;
+    const fields = this.schemaMap[schemaName].fields;
+    return await this.runCreateTableQuery(tableName, fields);
+  }
+
+  runCreateTableQuery(schemaName: string, fields: Field[]) {
+    return this.knex.schema.createTable(schemaName, (table) => {
+      for (const field of fields) {
+        this.buildColumnForTable(table, field);
+      }
+    });
+  }
+
+  async getNonExtantSingleValues(singleSchemaName: string) {
+    const existingFields = (
+      await this.knex('SingleValue')
+        .where({ parent: singleSchemaName })
+        .select('fieldname')
+    ).map(({ fieldname }) => fieldname);
+
+    return this.schemaMap[singleSchemaName].fields
+      .map(({ fieldname, default: value }) => ({
+        fieldname,
+        value: value as RawValue | undefined,
+      }))
+      .filter(
+        ({ fieldname, value }) =>
+          !existingFields.includes(fieldname) && value !== undefined
+      );
+  }
+
+  async delete(schemaName: string, name: string) {
+    await this.deleteOne(schemaName, name);
+
+    // delete children
+    const tableFields = getFieldsByType(
+      schemaName,
+      this.schemaMap,
+      FieldTypeEnum.Table
+    ) as TargetField[];
+
+    for (const field of tableFields) {
+      await this.deleteChildren(field.target, name);
+    }
+  }
+
+  async deleteMany(schemaName: string, names: string[]) {
+    for (const name of names) {
+      await this.delete(schemaName, name);
+    }
+  }
+
+  async deleteOne(schemaName: string, name: string) {
+    return this.knex(schemaName)
+      .where('name', name)
+      .delete()
+      .then(() => {
+        this.clearValueCache(schemaName, name);
+      });
+  }
+
+  deleteChildren(schemaName: string, parentName: string) {
+    return this.knex(schemaName).where('parent', parentName).delete();
+  }
+
+  runDeleteOtherChildren(
+    field: TargetField,
+    parentName: string,
+    added: string[]
+  ) {
+    // delete other children
+    return this.knex(field.target)
+      .where('parent', parentName)
+      .andWhere('name', 'not in', added)
+      .delete();
+  }
+
+  async rename(schemaName: string, oldName: string, newName: string) {
+    await this.knex(schemaName)
+      .update({ name: newName })
+      .where('name', oldName)
+      .then(() => {
+        this.clearValueCache(schemaName, oldName);
+      });
+    await this.commit();
+  }
+
+  prepareChild(
+    parentSchemaName: string,
+    parentName: string,
+    child: FieldValueMap,
+    field: Field,
+    idx: number
+  ) {
+    if (!child.name) {
+      child.name = getRandomString();
+    }
+    child.parentName = parentName;
+    child.parentSchemaName = parentSchemaName;
+    child.parentFieldname = field.fieldname;
+    child.idx = idx;
+  }
+
+  clearValueCache(schemaName: string, name: string) {
+    const cacheKey = `${schemaName}:${name}`;
+    this.cache.hclear(cacheKey);
+  }
+
+  async addForeignKeys(schemaName: string, newForeignKeys: Field[]) {
+    await this.sql('PRAGMA foreign_keys=OFF');
+    await this.sql('BEGIN TRANSACTION');
+
+    const tempName = 'TEMP' + schemaName;
+
+    // create temp table
+    await this.createTable(schemaName, tempName);
+
+    try {
+      // copy from old to new table
+      await this.knex(tempName).insert(this.knex.select().from(schemaName));
+    } catch (err) {
+      await this.sql('ROLLBACK');
+      await this.sql('PRAGMA foreign_keys=ON');
+
+      const rows = await this.knex.select().from(schemaName);
+      await this.prestigeTheTable(schemaName, rows);
+      return;
+    }
+
+    // drop old table
+    await this.knex.schema.dropTable(schemaName);
+
+    // rename new table
+    await this.knex.schema.renameTable(tempName, schemaName);
+
+    await this.sql('COMMIT');
+    await this.sql('PRAGMA foreign_keys=ON');
+  }
+
+  async getAll({
+    schemaName,
+    fields,
+    filters,
+    start,
+    limit,
+    groupBy,
+    orderBy = 'creation',
+    order = 'desc',
+  }: GetAllOptions = {}): Promise<FieldValueMap[]> {
+    const schema = this.schemaMap[schemaName];
+    if (!fields) {
+      fields = ['name', ...(schema.keywordFields ?? [])];
+    }
+
+    if (typeof fields === 'string') {
+      fields = [fields];
+    }
+
+    return (await this.getQueryBuilder(schemaName, fields, filters, {
+      offset: start,
+      limit,
+      groupBy,
+      orderBy,
+      order,
+    })) as FieldValueMap[];
+  }
+
+  async get(
+    schemaName: string,
+    name: string = '',
+    fields: string | string[] = '*'
+  ) {
+    const schema = this.schemaMap[schemaName];
+    let fieldValueMap: FieldValueMap;
+    if (schema.isSingle) {
+      fieldValueMap = await this.getSingle(schemaName);
+      fieldValueMap.name = schemaName;
+    } else {
+      if (!name) {
+        throw new ValueError('name is mandatory');
+      }
+      fieldValueMap = await this.getOne(schemaName, name, fields);
+    }
+    if (!fieldValueMap) {
+      return;
+    }
+    await this.loadChildren(fieldValueMap, schemaName);
+    return fieldValueMap;
+  }
+
+  async getOne(
+    schemaName: string,
+    name: string,
+    fields: string | string[] = '*'
+  ) {
+    const fieldValueMap: FieldValueMap = await this.knex
+      .select(fields)
+      .from(schemaName)
+      .where('name', name)
+      .first();
+    return fieldValueMap;
+  }
+
+  async getSingle(schemaName: string): Promise<FieldValueMap> {
+    const values = await this.getAll({
+      schemaName: 'SingleValue',
+      fields: ['fieldname', 'value'],
+      filters: { parent: schemaName },
+      orderBy: 'fieldname',
+      order: 'asc',
+    });
+
+    const fieldValueMap: FieldValueMap = {};
+    for (const row of values) {
+      fieldValueMap[row.fieldname as string] = row.value as RawValue;
+    }
+
+    return fieldValueMap;
+  }
+
+  async loadChildren(fieldValueMap: FieldValueMap, schemaName: string) {
+    // Sets children on a field
+    const tableFields = getFieldsByType(
+      schemaName,
+      this.schemaMap,
+      FieldTypeEnum.Table
+    ) as TargetField[];
+
+    for (const field of tableFields) {
+      fieldValueMap[field.fieldname] = await this.getAll({
+        schemaName: field.target,
+        fields: ['*'],
+        filters: { parent: fieldValueMap.name as string },
+        orderBy: 'idx',
+        order: 'asc',
+      });
+    }
+  }
+
+  async insert(schemaName: string, fieldValueMap: FieldValueMap) {
+    // insert parent
+    if (this.schemaMap[schemaName].isSingle) {
+      await this.updateSingleValues(schemaName, fieldValueMap);
+    } else {
+      await this.insertOne(schemaName, fieldValueMap);
+    }
+
+    // insert children
+    await this.insertOrUpdateChildren(schemaName, fieldValueMap, false);
+    return fieldValueMap;
+  }
+
+  insertOne(schemaName: string, fieldValueMap: FieldValueMap) {
+    const fields = this.schemaMap[schemaName].fields;
+    if (!fieldValueMap.name) {
+      fieldValueMap.name = getRandomString();
+    }
+
+    const validMap = {};
+    for (const { fieldname, fieldtype } of fields) {
+      if (fieldtype === FieldTypeEnum.Table) {
+        continue;
+      }
+
+      validMap[fieldname] = fieldValueMap[fieldname];
+    }
+
+    return this.knex(schemaName).insert(fieldValueMap);
+  }
+
+  async updateSingleValues(
+    singleSchemaName: string,
+    fieldValueMap: FieldValueMap
+  ) {
+    const fields = this.schemaMap[singleSchemaName].fields;
+    await this.deleteSingleValues(singleSchemaName);
+
+    for (const field of fields) {
+      const value = fieldValueMap[field.fieldname] as RawValue | undefined;
+      if (value === undefined) {
+        continue;
+      }
+
+      await this.updateSingleValue(singleSchemaName, field.fieldname, value);
+    }
+  }
+
+  async updateSingleValue(
+    singleSchemaName: string,
+    fieldname: string,
+    value: RawValue
+  ) {
+    return await this.knex('SingleValue')
+      .where({
+        parent: singleSchemaName,
+        fieldname,
+      })
+      .update({ value });
+  }
+
+  async migrate() {
+    for (const schemaName in this.schemaMap) {
+      const schema = this.schemaMap[schemaName];
+      if (schema.isSingle) {
+        continue;
+      }
+
+      if (await this.tableExists(schemaName)) {
+        await this.alterTable(schemaName);
+      } else {
+        await this.createTable(schemaName);
+      }
+    }
+
+    await this.commit();
+    await this.initializeSingles();
+  }
+
+  async initializeSingles() {
+    const singleSchemaNames = Object.keys(this.schemaMap).filter(
+      (n) => this.schemaMap[n].isSingle
+    );
+
+    for (const schemaName of singleSchemaNames) {
+      if (await this.singleExists(schemaName)) {
+        await this.updateNonExtantSingleValues(schemaName);
+        continue;
+      }
+
+      const fields = this.schemaMap[schemaName].fields;
+      if (fields.every((f) => f.default === undefined)) {
+        continue;
+      }
+
+      const defaultValues: FieldValueMap = fields.reduce((acc, f) => {
+        if (f.default !== undefined) {
+          acc[f.fieldname] = f.default;
+        }
+
+        return acc;
+      }, {});
+
+      await this.updateSingleValues(schemaName, defaultValues);
+    }
+  }
+
+  async updateNonExtantSingleValues(schemaName: string) {
+    const singleValues = await this.getNonExtantSingleValues(schemaName);
+    for (const sv of singleValues) {
+      await this.updateSingleValue(schemaName, sv.fieldname, sv.value);
+    }
+  }
+
+  async updateOne(schemaName: string, fieldValueMap: FieldValueMap) {
+    const updateMap = { ...fieldValueMap };
+    delete updateMap.name;
+
+    return await this.knex(schemaName)
+      .where('name', fieldValueMap.name as string)
+      .update(updateMap)
+      .then(() => {
+        const cacheKey = `${schemaName}:${fieldValueMap.name}`;
+        if (!this.cache.hexists(cacheKey)) {
+          return;
+        }
+
+        for (const fieldname in updateMap) {
+          const value = updateMap[fieldname];
+          this.cache.hset(cacheKey, fieldname, value);
+        }
+      });
+  }
+
+  async update(schemaName: string, fieldValueMap: FieldValueMap) {
+    // update parent
+    if (this.schemaMap[schemaName].isSingle) {
+      await this.updateSingleValues(schemaName, fieldValueMap);
+    } else {
+      await this.updateOne(schemaName, fieldValueMap);
+    }
+
+    // insert or update children
+    await this.insertOrUpdateChildren(schemaName, fieldValueMap, true);
+  }
+
+  async insertOrUpdateChildren(
+    schemaName: string,
+    fieldValueMap: FieldValueMap,
+    isUpdate: boolean
+  ) {
+    const tableFields = getFieldsByType(
+      schemaName,
+      this.schemaMap,
+      FieldTypeEnum.Table
+    ) as TargetField[];
+
+    const parentName = fieldValueMap.name as string;
+    for (const field of tableFields) {
+      const added: string[] = [];
+
+      const tableFieldValue = (fieldValueMap[field.fieldname] ??
+        []) as FieldValueMap[];
+      for (const child of tableFieldValue) {
+        this.prepareChild(schemaName, parentName, child, field, added.length);
+
+        if (
+          isUpdate &&
+          (await this.exists(field.target, child.name as string))
+        ) {
+          await this.updateOne(field.target, child);
+        } else {
+          await this.insertOne(field.target, child);
+        }
+
+        added.push(child.name as string);
+      }
+
+      if (isUpdate) {
+        await this.runDeleteOtherChildren(field, parentName, added);
+      }
+    }
+  }
+
+  async exists(schemaName: string, name?: string): Promise<boolean> {
+    const schema = this.schemaMap[schemaName];
+    if (schema.isSingle) {
+      return this.singleExists(schemaName);
+    }
+
+    let row = [];
+    try {
+      const qb = this.knex(schemaName);
+      if (name !== undefined) {
+        qb.where({ name });
+      }
+      row = await qb.limit(1);
+    } catch (err) {
+      if (this.getError(err as Error) !== NotFoundError) {
+        throw err;
+      }
+    }
+    return row.length > 0;
+  }
+
+  /**
+   * Get list of values from the singles table.
+   * @param  {...string | Object} fieldnames list of fieldnames to get the values of
+   * @returns {Array<Object>} array of {parent, value, fieldname}.
+   * @example
+   * Database.getSingleValues('internalPrecision');
+   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
+   * @example
+   * Database.getSingleValues({fieldname:'internalPrecision', parent: 'SystemSettings'});
+   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
+   */
+  async getSingleValues(
+    ...fieldnames: { fieldname: string; parent?: string }[]
+  ) {
+    fieldnames = fieldnames.map((fieldname) => {
+      if (typeof fieldname === 'string') {
+        return { fieldname };
+      }
+      return fieldname;
+    });
+
+    let builder = this.knex('SingleValue');
+    builder = builder.where(fieldnames[0]);
+
+    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
+      if (typeof parent === 'undefined') {
+        builder = builder.orWhere({ fieldname });
+      } else {
+        builder = builder.orWhere({ fieldname, parent });
+      }
+    });
+
+    let values: { fieldname: string; parent: string; value: RawValue }[] = [];
+    try {
+      values = await builder.select('fieldname', 'value', 'parent');
+    } catch (err) {
+      if (this.getError(err as Error) === NotFoundError) {
+        return [];
+      }
+
+      throw err;
+    }
+
+    return values;
+  }
+
+  async getValue(
+    schemaName: string,
+    filters: string | Record<string, string>,
+    fieldname = 'name'
+  ): Promise<RawValue | undefined> {
+    if (typeof filters === 'string') {
+      filters = { name: filters };
+    }
+
+    const row = await this.getAll({
+      schemaName,
+      fields: [fieldname],
+      filters: filters,
+      start: 0,
+      limit: 1,
+      orderBy: 'name',
+      order: 'asc',
+    });
+
+    if (row.length === 1) {
+      return row[0][fieldname] as RawValue;
+    }
+
+    return undefined;
+  }
+
+  async setValue(
+    schemaName: string,
+    name: string,
+    fieldname: string,
+    value: RawValue
+  ) {
+    return await this.setValues(schemaName, name, {
+      [fieldname]: value,
+    });
+  }
+
+  async setValues(
+    schemaName: string,
+    name: string,
+    fieldValueMap: FieldValueMap
+  ) {
+    return this.updateOne(
+      schemaName,
+      Object.assign({}, fieldValueMap, { name })
+    );
+  }
+
+  async getCachedValue(schemaName: string, name: string, fieldname: string) {
+    let value = this.cache.hget(`${schemaName}:${name}`, fieldname);
+    if (value == null) {
+      value = await this.getValue(schemaName, name, fieldname);
+    }
+    return value;
+  }
 }
diff --git a/backend/database/types.ts b/backend/database/types.ts
index 39e62812..25f30fbc 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -1,5 +1,5 @@
-export type RawType = string | number | boolean;
-export type RawData = Record<string, RawType>[];
+import { Field, RawValue } from '../../schemas/types';
+
 export type QueryFilter = Record<string, string | string[]>;
 
 export interface GetQueryBuilderOptions {
@@ -9,3 +9,20 @@ export interface GetQueryBuilderOptions {
   orderBy: string;
   order: 'desc' | 'asc';
 }
+
+export interface GetAllOptions {
+  schemaName?: string;
+  fields?: string[];
+  filters?: Record<string, string>;
+  start?: number;
+  limit?: number;
+  groupBy?: string;
+  orderBy?: string;
+  order?: 'asc' | 'desc';
+}
+
+export type ColumnDiff = { added: Field[]; removed: string[] };
+export type FieldValueMap = Record<
+  string,
+  RawValue | undefined | FieldValueMap[]
+>;
diff --git a/frappe/models/index.js b/frappe/models/index.js
index 49fa70a0..b24843d0 100644
--- a/frappe/models/index.js
+++ b/frappe/models/index.js
@@ -1,12 +1,10 @@
 import NumberSeries from './doctype/NumberSeries/NumberSeries.js';
 import PatchRun from './doctype/PatchRun/PatchRun.js';
-import PrintFormat from './doctype/PrintFormat/PrintFormat.js';
 import SingleValue from './doctype/SingleValue/SingleValue.js';
 import SystemSettings from './doctype/SystemSettings/SystemSettings.js';
 
 export default {
   NumberSeries,
-  PrintFormat,
   SingleValue,
   SystemSettings,
   PatchRun,
diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index bacffc0a..ac540180 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -17,10 +17,16 @@
       "required": true
     },
     {
-      "fieldname": "party",
-      "label": "Party",
-      "fieldtype": "DynamicLink",
-      "target": ["Customer", "Supplier"]
+      "fieldname": "customer",
+      "label": "Customer",
+      "fieldtype": "Link",
+      "target": "Customer"
+    },
+    {
+      "fieldname": "supplier",
+      "label": "Supplier",
+      "fieldtype": "Link",
+      "target": "Supplier"
     },
     {
       "fieldname": "debit",
diff --git a/schemas/app/Payment.json b/schemas/app/Payment.json
index 3e3344eb..7d614385 100644
--- a/schemas/app/Payment.json
+++ b/schemas/app/Payment.json
@@ -14,11 +14,16 @@
       "readOnly": true
     },
     {
-      "fieldname": "party",
-      "label": "Party",
+      "fieldname": "customer",
+      "label": "Customer",
       "fieldtype": "Link",
-      "target": ["Customer", "Supplier"],
-      "required": true
+      "target": "Customer"
+    },
+    {
+      "fieldname": "supplier",
+      "label": "Supplier",
+      "fieldtype": "Link",
+      "target": "Supplier"
     },
     {
       "fieldname": "date",
diff --git a/schemas/meta/child.json b/schemas/meta/child.json
index 89b522a8..290ca5ef 100644
--- a/schemas/meta/child.json
+++ b/schemas/meta/child.json
@@ -14,7 +14,7 @@
       "meta": true
     },
     {
-      "fieldname": "parentName",
+      "fieldname": "parentSchemaName",
       "fieldtype": "Data",
       "required": true,
       "meta": true
diff --git a/schemas/types.ts b/schemas/types.ts
index 53f82371..1e531ac7 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -79,10 +79,10 @@ export interface OptionField extends BaseField {
   options: SelectOption[];
 }
 
-// @formatter:off
+// prettier-ignore
 export interface TargetField extends BaseField {
   fieldtype: FieldTypeEnum.Table | FieldTypeEnum.Link;
-  target: string | string[];     // Name of the table or group of tables to fetch values
+  target: string;                // Name of the table or group of tables to fetch values
 }
 
 // @formatter:off

From e9fab0cf83058f4d09654f9922a363d1b66333c3 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 24 Mar 2022 18:43:59 +0530
Subject: [PATCH 016/163] incr: add databaseManager, privitize methods

---
 backend/common.ts                             |  17 +-
 backend/database/core.ts                      | 680 ++++++-------
 backend/database/database.ts                  | 925 ------------------
 backend/database/manager.ts                   |  79 ++
 backend/database/runPatch.ts                  |  31 +
 backend/database/types.ts                     |   9 +
 backend/patches/index.ts                      |   6 +
 backend/patches/testPatch.ts                  |  10 +
 models/doctype/Account/AccountDocument.js     |   7 +-
 .../doctype/Transaction/TransactionServer.js  |  10 +-
 schemas/core/SystemSettings.json              |   6 +
 src/initialization.js                         |   4 +-
 src/utils.js                                  |   3 +-
 13 files changed, 463 insertions(+), 1324 deletions(-)
 delete mode 100644 backend/database/database.ts
 create mode 100644 backend/database/manager.ts
 create mode 100644 backend/database/runPatch.ts
 create mode 100644 backend/patches/index.ts
 create mode 100644 backend/patches/testPatch.ts

diff --git a/backend/common.ts b/backend/common.ts
index 58078c41..a5832ebe 100644
--- a/backend/common.ts
+++ b/backend/common.ts
@@ -1,5 +1,3 @@
-import { Field, FieldTypeEnum, SchemaMap } from '../schemas/types';
-
 export const sqliteTypeMap = {
   AutoComplete: 'text',
   Currency: 'text',
@@ -24,12 +22,11 @@ export const sqliteTypeMap = {
 };
 
 export const validTypes = Object.keys(sqliteTypeMap);
-
-export function getFieldsByType(
-  schemaName: string,
-  schemaMap: SchemaMap,
-  type: FieldTypeEnum
-): Field[] {
-  const fields = schemaMap[schemaName].fields ?? [];
-  return fields.filter((f) => f.fieldtype === type);
+export function getDefaultMetaFieldValueMap() {
+  return {
+    createdBy: '__SYSTEM__',
+    modifiedBy: '__SYSTEM__',
+    created: new Date().toISOString(),
+    modified: new Date().toISOString(),
+  };
 }
diff --git a/backend/database/core.ts b/backend/database/core.ts
index d9d0f989..063bb5e6 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -1,6 +1,5 @@
 import { knex, Knex } from 'knex';
 import { getRandomString } from '../../frappe/utils';
-import CacheManager from '../../frappe/utils/cacheManager';
 import {
   CannotCommitError,
   DatabaseError,
@@ -16,7 +15,7 @@ import {
   SchemaMap,
   TargetField,
 } from '../../schemas/types';
-import { getFieldsByType, sqliteTypeMap } from '../common';
+import { sqliteTypeMap } from '../common';
 import {
   ColumnDiff,
   FieldValueMap,
@@ -25,18 +24,15 @@ import {
   QueryFilter,
 } from './types';
 
-export default class Database {
+export default class DatabaseCore {
   knex: Knex;
-  cache: CacheManager;
   typeMap = sqliteTypeMap;
   dbPath: string;
-  schemaMap: SchemaMap;
+  schemaMap: SchemaMap = {};
   connectionParams: Knex.Config;
 
-  constructor(dbPath: string, schemaMap: SchemaMap) {
-    this.schemaMap = schemaMap;
-    this.cache = new CacheManager();
-    this.dbPath = dbPath;
+  constructor(dbPath?: string) {
+    this.dbPath = dbPath ?? ':memory:';
     this.connectionParams = {
       client: 'sqlite3',
       connection: {
@@ -53,10 +49,14 @@ export default class Database {
     };
   }
 
+  setSchemaMap(schemaMap: SchemaMap) {
+    this.schemaMap = schemaMap;
+  }
+
   connect() {
     this.knex = knex(this.connectionParams);
     this.knex.on('query-error', (error) => {
-      error.type = this.getError(error);
+      error.type = this.#getError(error);
     });
   }
 
@@ -64,11 +64,228 @@ export default class Database {
     this.knex.destroy();
   }
 
-  async tableExists(schemaName: string) {
+  async commit() {
+    try {
+      await this.raw('commit');
+    } catch (err) {
+      if (err.type !== CannotCommitError) {
+        throw err;
+      }
+    }
+  }
+
+  async raw(query: string, params: Knex.RawBinding[] = []) {
+    return await this.knex.raw(query, params);
+  }
+
+  async migrate() {
+    for (const schemaName in this.schemaMap) {
+      const schema = this.schemaMap[schemaName];
+      if (schema.isSingle) {
+        continue;
+      }
+
+      if (await this.#tableExists(schemaName)) {
+        await this.#alterTable(schemaName);
+      } else {
+        await this.#createTable(schemaName);
+      }
+    }
+
+    await this.commit();
+    await this.#initializeSingles();
+  }
+
+  async exists(schemaName: string, name?: string): Promise<boolean> {
+    const schema = this.schemaMap[schemaName];
+    if (schema.isSingle) {
+      return this.#singleExists(schemaName);
+    }
+
+    let row = [];
+    try {
+      const qb = this.knex(schemaName);
+      if (name !== undefined) {
+        qb.where({ name });
+      }
+      row = await qb.limit(1);
+    } catch (err) {
+      if (this.#getError(err as Error) !== NotFoundError) {
+        throw err;
+      }
+    }
+    return row.length > 0;
+  }
+
+  async insert(schemaName: string, fieldValueMap: FieldValueMap) {
+    // insert parent
+    if (this.schemaMap[schemaName].isSingle) {
+      await this.#updateSingleValues(schemaName, fieldValueMap);
+    } else {
+      await this.#insertOne(schemaName, fieldValueMap);
+    }
+
+    // insert children
+    await this.#insertOrUpdateChildren(schemaName, fieldValueMap, false);
+    return fieldValueMap;
+  }
+
+  async get(
+    schemaName: string,
+    name: string = '',
+    fields: string | string[] = '*'
+  ): Promise<FieldValueMap> {
+    const isSingle = this.schemaMap[schemaName].isSingle;
+    if (!isSingle && !name) {
+      throw new ValueError('name is mandatory');
+    }
+
+    /**
+     * If schema is single return all the values
+     * of the single type schema, in this case field
+     * is ignored.
+     */
+    let fieldValueMap: FieldValueMap = {};
+    if (isSingle) {
+      fieldValueMap = await this.#getSingle(schemaName);
+      fieldValueMap.name = schemaName;
+      return fieldValueMap;
+    }
+
+    if (fields !== '*' && typeof fields === 'string') {
+      fields = [fields];
+    }
+
+    /**
+     * Separate table fields and non table fields
+     */
+    const allTableFields = this.#getTableFields(schemaName);
+    const allTableFieldNames = allTableFields.map((f) => f.fieldname);
+
+    let tableFields: TargetField[] = [];
+    let nonTableFieldNames: string[] = [];
+
+    if (Array.isArray(fields)) {
+      tableFields = tableFields.filter((f) => fields.includes(f.fieldname));
+      nonTableFieldNames = fields.filter(
+        (f) => !allTableFieldNames.includes(f)
+      );
+    } else if (fields === '*') {
+      tableFields = allTableFields;
+    }
+
+    /**
+     * If schema is not single then return specific fields
+     * if child fields are selected, all child fields are returned.
+     */
+    if (nonTableFieldNames.length) {
+      fieldValueMap = (await this.#getOne(schemaName, name, fields)) ?? {};
+    }
+
+    if (tableFields.length) {
+      await this.#loadChildren(fieldValueMap, tableFields);
+    }
+    return fieldValueMap;
+  }
+
+  async getAll({
+    schemaName,
+    fields,
+    filters,
+    start,
+    limit,
+    groupBy,
+    orderBy = 'creation',
+    order = 'desc',
+  }: GetAllOptions = {}): Promise<FieldValueMap[]> {
+    const schema = this.schemaMap[schemaName];
+    if (!fields) {
+      fields = ['name', ...(schema.keywordFields ?? [])];
+    }
+
+    if (typeof fields === 'string') {
+      fields = [fields];
+    }
+
+    return (await this.#getQueryBuilder(schemaName, fields, filters, {
+      offset: start,
+      limit,
+      groupBy,
+      orderBy,
+      order,
+    })) as FieldValueMap[];
+  }
+
+  async getSingleValues(
+    ...fieldnames: { fieldname: string; parent?: string }[]
+  ): Promise<{ fieldname: string; parent: string; value: RawValue }[]> {
+    fieldnames = fieldnames.map((fieldname) => {
+      if (typeof fieldname === 'string') {
+        return { fieldname };
+      }
+      return fieldname;
+    });
+
+    let builder = this.knex('SingleValue');
+    builder = builder.where(fieldnames[0]);
+
+    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
+      if (typeof parent === 'undefined') {
+        builder = builder.orWhere({ fieldname });
+      } else {
+        builder = builder.orWhere({ fieldname, parent });
+      }
+    });
+
+    let values: { fieldname: string; parent: string; value: RawValue }[] = [];
+    try {
+      values = await builder.select('fieldname', 'value', 'parent');
+    } catch (err) {
+      if (this.#getError(err as Error) === NotFoundError) {
+        return [];
+      }
+
+      throw err;
+    }
+
+    return values;
+  }
+
+  async rename(schemaName: string, oldName: string, newName: string) {
+    await this.knex(schemaName)
+      .update({ name: newName })
+      .where('name', oldName);
+    await this.commit();
+  }
+
+  async update(schemaName: string, fieldValueMap: FieldValueMap) {
+    // update parent
+    if (this.schemaMap[schemaName].isSingle) {
+      await this.#updateSingleValues(schemaName, fieldValueMap);
+    } else {
+      await this.#updateOne(schemaName, fieldValueMap);
+    }
+
+    // insert or update children
+    await this.#insertOrUpdateChildren(schemaName, fieldValueMap, true);
+  }
+
+  async delete(schemaName: string, name: string) {
+    await this.#deleteOne(schemaName, name);
+
+    // delete children
+    const tableFields = this.#getTableFields(schemaName);
+
+    for (const field of tableFields) {
+      await this.#deleteChildren(field.target, name);
+    }
+  }
+
+  async #tableExists(schemaName: string) {
     return await this.knex.schema.hasTable(schemaName);
   }
 
-  async singleExists(singleSchemaName: string) {
+  async #singleExists(singleSchemaName: string) {
     const res = await this.knex('SingleValue')
       .count('parent as count')
       .where('parent', singleSchemaName)
@@ -76,31 +293,17 @@ export default class Database {
     return res.count > 0;
   }
 
-  async removeColumns(schemaName: string, targetColumns: string[]) {
+  async #removeColumns(schemaName: string, targetColumns: string[]) {
     // TODO: Implement this for sqlite
   }
 
-  async deleteSingleValues(singleSchemaName: string) {
+  async #deleteSingleValues(singleSchemaName: string) {
     return await this.knex('SingleValue')
       .where('parent', singleSchemaName)
       .delete();
   }
 
-  async sql(query: string, params: Knex.RawBinding[] = []) {
-    return await this.knex.raw(query, params);
-  }
-
-  async commit() {
-    try {
-      await this.sql('commit');
-    } catch (e) {
-      if (e.type !== CannotCommitError) {
-        throw e;
-      }
-    }
-  }
-
-  getError(err: Error) {
+  #getError(err: Error) {
     let errorType = DatabaseError;
     if (err.message.includes('SQLITE_ERROR: no such table')) {
       errorType = NotFoundError;
@@ -125,7 +328,7 @@ export default class Database {
     await this.knex.schema.dropTableIfExists(tempName);
 
     await this.knex.raw('PRAGMA foreign_keys=OFF');
-    await this.createTable(schemaName, tempName);
+    await this.#createTable(schemaName, tempName);
 
     if (tableRows.length > 200) {
       const fi = Math.floor(tableRows.length / max);
@@ -145,19 +348,19 @@ export default class Database {
     await this.knex.raw('PRAGMA foreign_keys=ON');
   }
 
-  async getTableColumns(schemaName: string): Promise<string[]> {
-    const info = await this.sql(`PRAGMA table_info(${schemaName})`);
+  async #getTableColumns(schemaName: string): Promise<string[]> {
+    const info = await this.raw(`PRAGMA table_info(${schemaName})`);
     return info.map((d) => d.name);
   }
 
-  async getForeignKeys(schemaName: string): Promise<string[]> {
-    const foreignKeyList = await this.sql(
+  async #getForeignKeys(schemaName: string): Promise<string[]> {
+    const foreignKeyList = await this.raw(
       `PRAGMA foreign_key_list(${schemaName})`
     );
     return foreignKeyList.map((d) => d.from);
   }
 
-  getQueryBuilder(
+  #getQueryBuilder(
     schemaName: string,
     fields: string[],
     filters: QueryFilter,
@@ -165,7 +368,7 @@ export default class Database {
   ): Knex.QueryBuilder {
     const builder = this.knex.select(fields).from(schemaName);
 
-    this.applyFiltersToBuilder(builder, filters);
+    this.#applyFiltersToBuilder(builder, filters);
 
     if (options.orderBy) {
       builder.orderBy(options.orderBy, options.order);
@@ -186,7 +389,7 @@ export default class Database {
     return builder;
   }
 
-  applyFiltersToBuilder(builder: Knex.QueryBuilder, filters: QueryFilter) {
+  #applyFiltersToBuilder(builder: Knex.QueryBuilder, filters: QueryFilter) {
     // {"status": "Open"} => `status = "Open"`
 
     // {"status": "Open", "name": ["like", "apple%"]}
@@ -236,8 +439,8 @@ export default class Database {
     });
   }
 
-  async getColumnDiff(schemaName: string): Promise<ColumnDiff> {
-    const tableColumns = await this.getTableColumns(schemaName);
+  async #getColumnDiff(schemaName: string): Promise<ColumnDiff> {
+    const tableColumns = await this.#getTableColumns(schemaName);
     const validFields = this.schemaMap[schemaName].fields;
     const diff: ColumnDiff = { added: [], removed: [] };
 
@@ -260,8 +463,8 @@ export default class Database {
     return diff;
   }
 
-  async getNewForeignKeys(schemaName): Promise<Field[]> {
-    const foreignKeys = await this.getForeignKeys(schemaName);
+  async #getNewForeignKeys(schemaName): Promise<Field[]> {
+    const foreignKeys = await this.#getForeignKeys(schemaName);
     const newForeignKeys: Field[] = [];
     const schema = this.schemaMap[schemaName];
     for (const field of schema.fields) {
@@ -275,7 +478,7 @@ export default class Database {
     return newForeignKeys;
   }
 
-  buildColumnForTable(table: Knex.AlterTableBuilder, field: Field) {
+  #buildColumnForTable(table: Knex.AlterTableBuilder, field: Field) {
     if (field.fieldtype === FieldTypeEnum.Table) {
       // In case columnType is "Table"
       // childTable links are handled using the childTable's "parent" field
@@ -317,45 +520,45 @@ export default class Database {
     }
   }
 
-  async alterTable(schemaName: string) {
+  async #alterTable(schemaName: string) {
     // get columns
-    const diff: ColumnDiff = await this.getColumnDiff(schemaName);
-    const newForeignKeys: Field[] = await this.getNewForeignKeys(schemaName);
+    const diff: ColumnDiff = await this.#getColumnDiff(schemaName);
+    const newForeignKeys: Field[] = await this.#getNewForeignKeys(schemaName);
 
     return this.knex.schema
       .table(schemaName, (table) => {
         if (diff.added.length) {
           for (const field of diff.added) {
-            this.buildColumnForTable(table, field);
+            this.#buildColumnForTable(table, field);
           }
         }
 
         if (diff.removed.length) {
-          this.removeColumns(schemaName, diff.removed);
+          this.#removeColumns(schemaName, diff.removed);
         }
       })
       .then(() => {
         if (newForeignKeys.length) {
-          return this.addForeignKeys(schemaName, newForeignKeys);
+          return this.#addForeignKeys(schemaName, newForeignKeys);
         }
       });
   }
 
-  async createTable(schemaName: string, tableName?: string) {
+  async #createTable(schemaName: string, tableName?: string) {
     tableName ??= schemaName;
     const fields = this.schemaMap[schemaName].fields;
-    return await this.runCreateTableQuery(tableName, fields);
+    return await this.#runCreateTableQuery(tableName, fields);
   }
 
-  runCreateTableQuery(schemaName: string, fields: Field[]) {
+  #runCreateTableQuery(schemaName: string, fields: Field[]) {
     return this.knex.schema.createTable(schemaName, (table) => {
       for (const field of fields) {
-        this.buildColumnForTable(table, field);
+        this.#buildColumnForTable(table, field);
       }
     });
   }
 
-  async getNonExtantSingleValues(singleSchemaName: string) {
+  async #getNonExtantSingleValues(singleSchemaName: string) {
     const existingFields = (
       await this.knex('SingleValue')
         .where({ parent: singleSchemaName })
@@ -373,41 +576,15 @@ export default class Database {
       );
   }
 
-  async delete(schemaName: string, name: string) {
-    await this.deleteOne(schemaName, name);
-
-    // delete children
-    const tableFields = getFieldsByType(
-      schemaName,
-      this.schemaMap,
-      FieldTypeEnum.Table
-    ) as TargetField[];
-
-    for (const field of tableFields) {
-      await this.deleteChildren(field.target, name);
-    }
+  async #deleteOne(schemaName: string, name: string) {
+    return this.knex(schemaName).where('name', name).delete();
   }
 
-  async deleteMany(schemaName: string, names: string[]) {
-    for (const name of names) {
-      await this.delete(schemaName, name);
-    }
-  }
-
-  async deleteOne(schemaName: string, name: string) {
-    return this.knex(schemaName)
-      .where('name', name)
-      .delete()
-      .then(() => {
-        this.clearValueCache(schemaName, name);
-      });
-  }
-
-  deleteChildren(schemaName: string, parentName: string) {
+  #deleteChildren(schemaName: string, parentName: string) {
     return this.knex(schemaName).where('parent', parentName).delete();
   }
 
-  runDeleteOtherChildren(
+  #runDeleteOtherChildren(
     field: TargetField,
     parentName: string,
     added: string[]
@@ -419,17 +596,7 @@ export default class Database {
       .delete();
   }
 
-  async rename(schemaName: string, oldName: string, newName: string) {
-    await this.knex(schemaName)
-      .update({ name: newName })
-      .where('name', oldName)
-      .then(() => {
-        this.clearValueCache(schemaName, oldName);
-      });
-    await this.commit();
-  }
-
-  prepareChild(
+  #prepareChild(
     parentSchemaName: string,
     parentName: string,
     child: FieldValueMap,
@@ -445,26 +612,21 @@ export default class Database {
     child.idx = idx;
   }
 
-  clearValueCache(schemaName: string, name: string) {
-    const cacheKey = `${schemaName}:${name}`;
-    this.cache.hclear(cacheKey);
-  }
-
-  async addForeignKeys(schemaName: string, newForeignKeys: Field[]) {
-    await this.sql('PRAGMA foreign_keys=OFF');
-    await this.sql('BEGIN TRANSACTION');
+  async #addForeignKeys(schemaName: string, newForeignKeys: Field[]) {
+    await this.raw('PRAGMA foreign_keys=OFF');
+    await this.raw('BEGIN TRANSACTION');
 
     const tempName = 'TEMP' + schemaName;
 
     // create temp table
-    await this.createTable(schemaName, tempName);
+    await this.#createTable(schemaName, tempName);
 
     try {
       // copy from old to new table
       await this.knex(tempName).insert(this.knex.select().from(schemaName));
     } catch (err) {
-      await this.sql('ROLLBACK');
-      await this.sql('PRAGMA foreign_keys=ON');
+      await this.raw('ROLLBACK');
+      await this.raw('PRAGMA foreign_keys=ON');
 
       const rows = await this.knex.select().from(schemaName);
       await this.prestigeTheTable(schemaName, rows);
@@ -477,62 +639,26 @@ export default class Database {
     // rename new table
     await this.knex.schema.renameTable(tempName, schemaName);
 
-    await this.sql('COMMIT');
-    await this.sql('PRAGMA foreign_keys=ON');
+    await this.raw('COMMIT');
+    await this.raw('PRAGMA foreign_keys=ON');
   }
 
-  async getAll({
-    schemaName,
-    fields,
-    filters,
-    start,
-    limit,
-    groupBy,
-    orderBy = 'creation',
-    order = 'desc',
-  }: GetAllOptions = {}): Promise<FieldValueMap[]> {
-    const schema = this.schemaMap[schemaName];
-    if (!fields) {
-      fields = ['name', ...(schema.keywordFields ?? [])];
-    }
-
-    if (typeof fields === 'string') {
-      fields = [fields];
-    }
-
-    return (await this.getQueryBuilder(schemaName, fields, filters, {
-      offset: start,
-      limit,
-      groupBy,
-      orderBy,
-      order,
-    })) as FieldValueMap[];
-  }
-
-  async get(
-    schemaName: string,
-    name: string = '',
-    fields: string | string[] = '*'
+  async #loadChildren(
+    fieldValueMap: FieldValueMap,
+    tableFields: TargetField[]
   ) {
-    const schema = this.schemaMap[schemaName];
-    let fieldValueMap: FieldValueMap;
-    if (schema.isSingle) {
-      fieldValueMap = await this.getSingle(schemaName);
-      fieldValueMap.name = schemaName;
-    } else {
-      if (!name) {
-        throw new ValueError('name is mandatory');
-      }
-      fieldValueMap = await this.getOne(schemaName, name, fields);
+    for (const field of tableFields) {
+      fieldValueMap[field.fieldname] = await this.getAll({
+        schemaName: field.target,
+        fields: ['*'],
+        filters: { parent: fieldValueMap.name as string },
+        orderBy: 'idx',
+        order: 'asc',
+      });
     }
-    if (!fieldValueMap) {
-      return;
-    }
-    await this.loadChildren(fieldValueMap, schemaName);
-    return fieldValueMap;
   }
 
-  async getOne(
+  async #getOne(
     schemaName: string,
     name: string,
     fields: string | string[] = '*'
@@ -545,7 +671,7 @@ export default class Database {
     return fieldValueMap;
   }
 
-  async getSingle(schemaName: string): Promise<FieldValueMap> {
+  async #getSingle(schemaName: string): Promise<FieldValueMap> {
     const values = await this.getAll({
       schemaName: 'SingleValue',
       fields: ['fieldname', 'value'],
@@ -562,39 +688,7 @@ export default class Database {
     return fieldValueMap;
   }
 
-  async loadChildren(fieldValueMap: FieldValueMap, schemaName: string) {
-    // Sets children on a field
-    const tableFields = getFieldsByType(
-      schemaName,
-      this.schemaMap,
-      FieldTypeEnum.Table
-    ) as TargetField[];
-
-    for (const field of tableFields) {
-      fieldValueMap[field.fieldname] = await this.getAll({
-        schemaName: field.target,
-        fields: ['*'],
-        filters: { parent: fieldValueMap.name as string },
-        orderBy: 'idx',
-        order: 'asc',
-      });
-    }
-  }
-
-  async insert(schemaName: string, fieldValueMap: FieldValueMap) {
-    // insert parent
-    if (this.schemaMap[schemaName].isSingle) {
-      await this.updateSingleValues(schemaName, fieldValueMap);
-    } else {
-      await this.insertOne(schemaName, fieldValueMap);
-    }
-
-    // insert children
-    await this.insertOrUpdateChildren(schemaName, fieldValueMap, false);
-    return fieldValueMap;
-  }
-
-  insertOne(schemaName: string, fieldValueMap: FieldValueMap) {
+  #insertOne(schemaName: string, fieldValueMap: FieldValueMap) {
     const fields = this.schemaMap[schemaName].fields;
     if (!fieldValueMap.name) {
       fieldValueMap.name = getRandomString();
@@ -612,12 +706,12 @@ export default class Database {
     return this.knex(schemaName).insert(fieldValueMap);
   }
 
-  async updateSingleValues(
+  async #updateSingleValues(
     singleSchemaName: string,
     fieldValueMap: FieldValueMap
   ) {
     const fields = this.schemaMap[singleSchemaName].fields;
-    await this.deleteSingleValues(singleSchemaName);
+    await this.#deleteSingleValues(singleSchemaName);
 
     for (const field of fields) {
       const value = fieldValueMap[field.fieldname] as RawValue | undefined;
@@ -625,11 +719,11 @@ export default class Database {
         continue;
       }
 
-      await this.updateSingleValue(singleSchemaName, field.fieldname, value);
+      await this.#updateSingleValue(singleSchemaName, field.fieldname, value);
     }
   }
 
-  async updateSingleValue(
+  async #updateSingleValue(
     singleSchemaName: string,
     fieldname: string,
     value: RawValue
@@ -642,32 +736,14 @@ export default class Database {
       .update({ value });
   }
 
-  async migrate() {
-    for (const schemaName in this.schemaMap) {
-      const schema = this.schemaMap[schemaName];
-      if (schema.isSingle) {
-        continue;
-      }
-
-      if (await this.tableExists(schemaName)) {
-        await this.alterTable(schemaName);
-      } else {
-        await this.createTable(schemaName);
-      }
-    }
-
-    await this.commit();
-    await this.initializeSingles();
-  }
-
-  async initializeSingles() {
+  async #initializeSingles() {
     const singleSchemaNames = Object.keys(this.schemaMap).filter(
       (n) => this.schemaMap[n].isSingle
     );
 
     for (const schemaName of singleSchemaNames) {
-      if (await this.singleExists(schemaName)) {
-        await this.updateNonExtantSingleValues(schemaName);
+      if (await this.#singleExists(schemaName)) {
+        await this.#updateNonExtantSingleValues(schemaName);
         continue;
       }
 
@@ -684,59 +760,32 @@ export default class Database {
         return acc;
       }, {});
 
-      await this.updateSingleValues(schemaName, defaultValues);
+      await this.#updateSingleValues(schemaName, defaultValues);
     }
   }
 
-  async updateNonExtantSingleValues(schemaName: string) {
-    const singleValues = await this.getNonExtantSingleValues(schemaName);
+  async #updateNonExtantSingleValues(schemaName: string) {
+    const singleValues = await this.#getNonExtantSingleValues(schemaName);
     for (const sv of singleValues) {
-      await this.updateSingleValue(schemaName, sv.fieldname, sv.value);
+      await this.#updateSingleValue(schemaName, sv.fieldname, sv.value);
     }
   }
 
-  async updateOne(schemaName: string, fieldValueMap: FieldValueMap) {
+  async #updateOne(schemaName: string, fieldValueMap: FieldValueMap) {
     const updateMap = { ...fieldValueMap };
     delete updateMap.name;
 
     return await this.knex(schemaName)
       .where('name', fieldValueMap.name as string)
-      .update(updateMap)
-      .then(() => {
-        const cacheKey = `${schemaName}:${fieldValueMap.name}`;
-        if (!this.cache.hexists(cacheKey)) {
-          return;
-        }
-
-        for (const fieldname in updateMap) {
-          const value = updateMap[fieldname];
-          this.cache.hset(cacheKey, fieldname, value);
-        }
-      });
+      .update(updateMap);
   }
 
-  async update(schemaName: string, fieldValueMap: FieldValueMap) {
-    // update parent
-    if (this.schemaMap[schemaName].isSingle) {
-      await this.updateSingleValues(schemaName, fieldValueMap);
-    } else {
-      await this.updateOne(schemaName, fieldValueMap);
-    }
-
-    // insert or update children
-    await this.insertOrUpdateChildren(schemaName, fieldValueMap, true);
-  }
-
-  async insertOrUpdateChildren(
+  async #insertOrUpdateChildren(
     schemaName: string,
     fieldValueMap: FieldValueMap,
     isUpdate: boolean
   ) {
-    const tableFields = getFieldsByType(
-      schemaName,
-      this.schemaMap,
-      FieldTypeEnum.Table
-    ) as TargetField[];
+    const tableFields = this.#getTableFields(schemaName);
 
     const parentName = fieldValueMap.name as string;
     for (const field of tableFields) {
@@ -745,146 +794,29 @@ export default class Database {
       const tableFieldValue = (fieldValueMap[field.fieldname] ??
         []) as FieldValueMap[];
       for (const child of tableFieldValue) {
-        this.prepareChild(schemaName, parentName, child, field, added.length);
+        this.#prepareChild(schemaName, parentName, child, field, added.length);
 
         if (
           isUpdate &&
           (await this.exists(field.target, child.name as string))
         ) {
-          await this.updateOne(field.target, child);
+          await this.#updateOne(field.target, child);
         } else {
-          await this.insertOne(field.target, child);
+          await this.#insertOne(field.target, child);
         }
 
         added.push(child.name as string);
       }
 
       if (isUpdate) {
-        await this.runDeleteOtherChildren(field, parentName, added);
+        await this.#runDeleteOtherChildren(field, parentName, added);
       }
     }
   }
 
-  async exists(schemaName: string, name?: string): Promise<boolean> {
-    const schema = this.schemaMap[schemaName];
-    if (schema.isSingle) {
-      return this.singleExists(schemaName);
-    }
-
-    let row = [];
-    try {
-      const qb = this.knex(schemaName);
-      if (name !== undefined) {
-        qb.where({ name });
-      }
-      row = await qb.limit(1);
-    } catch (err) {
-      if (this.getError(err as Error) !== NotFoundError) {
-        throw err;
-      }
-    }
-    return row.length > 0;
-  }
-
-  /**
-   * Get list of values from the singles table.
-   * @param  {...string | Object} fieldnames list of fieldnames to get the values of
-   * @returns {Array<Object>} array of {parent, value, fieldname}.
-   * @example
-   * Database.getSingleValues('internalPrecision');
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   * @example
-   * Database.getSingleValues({fieldname:'internalPrecision', parent: 'SystemSettings'});
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   */
-  async getSingleValues(
-    ...fieldnames: { fieldname: string; parent?: string }[]
-  ) {
-    fieldnames = fieldnames.map((fieldname) => {
-      if (typeof fieldname === 'string') {
-        return { fieldname };
-      }
-      return fieldname;
-    });
-
-    let builder = this.knex('SingleValue');
-    builder = builder.where(fieldnames[0]);
-
-    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
-      if (typeof parent === 'undefined') {
-        builder = builder.orWhere({ fieldname });
-      } else {
-        builder = builder.orWhere({ fieldname, parent });
-      }
-    });
-
-    let values: { fieldname: string; parent: string; value: RawValue }[] = [];
-    try {
-      values = await builder.select('fieldname', 'value', 'parent');
-    } catch (err) {
-      if (this.getError(err as Error) === NotFoundError) {
-        return [];
-      }
-
-      throw err;
-    }
-
-    return values;
-  }
-
-  async getValue(
-    schemaName: string,
-    filters: string | Record<string, string>,
-    fieldname = 'name'
-  ): Promise<RawValue | undefined> {
-    if (typeof filters === 'string') {
-      filters = { name: filters };
-    }
-
-    const row = await this.getAll({
-      schemaName,
-      fields: [fieldname],
-      filters: filters,
-      start: 0,
-      limit: 1,
-      orderBy: 'name',
-      order: 'asc',
-    });
-
-    if (row.length === 1) {
-      return row[0][fieldname] as RawValue;
-    }
-
-    return undefined;
-  }
-
-  async setValue(
-    schemaName: string,
-    name: string,
-    fieldname: string,
-    value: RawValue
-  ) {
-    return await this.setValues(schemaName, name, {
-      [fieldname]: value,
-    });
-  }
-
-  async setValues(
-    schemaName: string,
-    name: string,
-    fieldValueMap: FieldValueMap
-  ) {
-    return this.updateOne(
-      schemaName,
-      Object.assign({}, fieldValueMap, { name })
-    );
-  }
-
-  async getCachedValue(schemaName: string, name: string, fieldname: string) {
-    let value = this.cache.hget(`${schemaName}:${name}`, fieldname);
-    if (value == null) {
-      value = await this.getValue(schemaName, name, fieldname);
-    }
-    return value;
+  #getTableFields(schemaName: string): TargetField[] {
+    return this.schemaMap[schemaName].fields.filter(
+      (f) => f.fieldtype === FieldTypeEnum.Table
+    ) as TargetField[];
   }
 }
diff --git a/backend/database/database.ts b/backend/database/database.ts
deleted file mode 100644
index 183a2841..00000000
--- a/backend/database/database.ts
+++ /dev/null
@@ -1,925 +0,0 @@
-import { knex, Knex } from 'knex';
-import { pesa } from 'pesa';
-import { getRandomString } from '../../frappe/utils';
-import CacheManager from '../../frappe/utils/cacheManager';
-import {
-  CannotCommitError,
-  DatabaseError,
-  DuplicateEntryError,
-  LinkValidationError,
-  ValueError,
-} from '../../frappe/utils/errors';
-import Observable from '../../frappe/utils/observable';
-import { getMeta, getModels, getNewDoc, sqliteTypeMap } from '../common';
-
-interface GetAllOptions {
-  doctype?: string;
-  fields?: string[];
-  filters?: Record<string, string>;
-  start?: number;
-  limit?: number;
-  groupBy?: string;
-  orderBy?: string;
-  order?: string;
-}
-
-export default class Database extends Observable<never> {
-  knex: Knex;
-  cache: CacheManager;
-
-  constructor(dbPath: string) {
-    super();
-    this.typeMap = sqliteTypeMap;
-    this.cache = new CacheManager();
-    this.dbPath = dbPath;
-    this.connectionParams = {
-      client: 'sqlite3',
-      connection: {
-        filename: this.dbPath,
-      },
-      pool: {
-        afterCreate(conn, done) {
-          conn.run('PRAGMA foreign_keys=ON');
-          done();
-        },
-      },
-      useNullAsDefault: true,
-      asyncStackTraces: process.env.NODE_ENV === 'development',
-    };
-  }
-
-  connect() {
-    this.knex = knex(this.connectionParams);
-    this.knex.on('query-error', (error) => {
-      error.type = this.getError(error);
-    });
-  }
-
-  close() {
-    //
-  }
-
-  /**
-   * TODO: Refactor this
-   *
-   * essentially it's not models that are required by the database
-   * but the schema, all the information that is relevant to building
-   * tables needs to given to this function.
-   */
-  async migrate() {
-    const models = getModels();
-    for (const doctype in models) {
-      // check if controller module
-      const meta = getMeta(doctype);
-      const baseDoctype = meta.getBaseDocType();
-
-      if (!meta.isSingle) {
-        if (await this.tableExists(baseDoctype)) {
-          await this.alterTable(baseDoctype);
-        } else {
-          await this.createTable(baseDoctype);
-        }
-      }
-    }
-
-    await this.commit();
-    await this.initializeSingles();
-  }
-
-  async initializeSingles() {
-    const models = getModels();
-    const singleDoctypes = Object.keys(models)
-      .filter((n) => models[n].isSingle)
-      .map((n) => models[n].name);
-
-    for (const doctype of singleDoctypes) {
-      if (await this.singleExists(doctype)) {
-        const singleValues = await this.getSingleFieldsToInsert(doctype);
-        singleValues.forEach(({ fieldname, value }) => {
-          const singleValue = getNewDoc({
-            doctype: 'SingleValue',
-            parent: doctype,
-            fieldname,
-            value,
-          });
-          singleValue.insert();
-        });
-        continue;
-      }
-      const meta = getMeta(doctype);
-      if (meta.fields.every((df) => df.default == null)) {
-        continue;
-      }
-      const defaultValues = meta.fields.reduce((doc, df) => {
-        if (df.default != null) {
-          doc[df.fieldname] = df.default;
-        }
-        return doc;
-      }, {});
-      await this.updateSingle(doctype, defaultValues);
-    }
-  }
-
-  async singleExists(doctype) {
-    const res = await this.knex('SingleValue')
-      .count('parent as count')
-      .where('parent', doctype)
-      .first();
-    return res.count > 0;
-  }
-
-  async getSingleFieldsToInsert(doctype) {
-    const existingFields = (
-      await this.knex('SingleValue')
-        .where({ parent: doctype })
-        .select('fieldname')
-    ).map(({ fieldname }) => fieldname);
-
-    return getMeta(doctype)
-      .fields.map(({ fieldname, default: value }) => ({
-        fieldname,
-        value,
-      }))
-      .filter(
-        ({ fieldname, value }) =>
-          !existingFields.includes(fieldname) && value !== undefined
-      );
-  }
-
-  tableExists(table) {
-    return this.knex.schema.hasTable(table);
-  }
-
-  async createTable(doctype, tableName = null) {
-    const fields = this.getValidFields(doctype);
-    return await this.runCreateTableQuery(tableName || doctype, fields);
-  }
-
-  runCreateTableQuery(doctype, fields) {
-    return this.knex.schema.createTable(doctype, (table) => {
-      for (const field of fields) {
-        this.buildColumnForTable(table, field);
-      }
-    });
-  }
-
-  async alterTable(doctype) {
-    // get columns
-    const diff = await this.getColumnDiff(doctype);
-    const newForeignKeys = await this.getNewForeignKeys(doctype);
-
-    return this.knex.schema
-      .table(doctype, (table) => {
-        if (diff.added.length) {
-          for (const field of diff.added) {
-            this.buildColumnForTable(table, field);
-          }
-        }
-
-        if (diff.removed.length) {
-          this.removeColumns(doctype, diff.removed);
-        }
-      })
-      .then(() => {
-        if (newForeignKeys.length) {
-          return this.addForeignKeys(doctype, newForeignKeys);
-        }
-      });
-  }
-
-  buildColumnForTable(table, field) {
-    const columnType = this.getColumnType(field);
-    if (!columnType) {
-      // In case columnType is "Table"
-      // childTable links are handled using the childTable's "parent" field
-      return;
-    }
-
-    const column = table[columnType](field.fieldname);
-
-    // primary key
-    if (field.fieldname === 'name') {
-      column.primary();
-    }
-
-    // default value
-    if (!!field.default && !(field.default instanceof Function)) {
-      column.defaultTo(field.default);
-    }
-
-    // required
-    if (
-      (!!field.required && !(field.required instanceof Function)) ||
-      field.fieldtype === 'Currency'
-    ) {
-      column.notNullable();
-    }
-
-    // link
-    if (field.fieldtype === 'Link' && field.target) {
-      const meta = getMeta(field.target);
-      table
-        .foreign(field.fieldname)
-        .references('name')
-        .inTable(meta.getBaseDocType())
-        .onUpdate('CASCADE')
-        .onDelete('RESTRICT');
-    }
-  }
-
-  async getColumnDiff(doctype) {
-    const tableColumns = await this.getTableColumns(doctype);
-    const validFields = this.getValidFields(doctype);
-    const diff = { added: [], removed: [] };
-
-    for (const field of validFields) {
-      if (
-        !tableColumns.includes(field.fieldname) &&
-        this.getColumnType(field)
-      ) {
-        diff.added.push(field);
-      }
-    }
-
-    const validFieldNames = validFields.map((field) => field.fieldname);
-    for (const column of tableColumns) {
-      if (!validFieldNames.includes(column)) {
-        diff.removed.push(column);
-      }
-    }
-
-    return diff;
-  }
-
-  async removeColumns(doctype: string, removed: string[]) {
-    // TODO: Implement this for sqlite
-  }
-
-  async getNewForeignKeys(doctype) {
-    const foreignKeys = await this.getForeignKeys(doctype);
-    const newForeignKeys = [];
-    const meta = getMeta(doctype);
-    for (const field of meta.getValidFields({ withChildren: false })) {
-      if (
-        field.fieldtype === 'Link' &&
-        !foreignKeys.includes(field.fieldname)
-      ) {
-        newForeignKeys.push(field);
-      }
-    }
-    return newForeignKeys;
-  }
-
-  async get(doctype, name = null, fields = '*') {
-    const meta = getMeta(doctype);
-    let doc;
-    if (meta.isSingle) {
-      doc = await this.getSingle(doctype);
-      doc.name = doctype;
-    } else {
-      if (!name) {
-        throw new ValueError('name is mandatory');
-      }
-      doc = await this.getOne(doctype, name, fields);
-    }
-    if (!doc) {
-      return;
-    }
-    await this.loadChildren(doc, meta);
-    return doc;
-  }
-
-  async loadChildren(doc, meta) {
-    // load children
-    const tableFields = meta.getTableFields();
-    for (const field of tableFields) {
-      doc[field.fieldname] = await this.getAll({
-        doctype: field.childtype,
-        fields: ['*'],
-        filters: { parent: doc.name },
-        orderBy: 'idx',
-        order: 'asc',
-      });
-    }
-  }
-
-  async getSingle(doctype) {
-    const values = await this.getAll({
-      doctype: 'SingleValue',
-      fields: ['fieldname', 'value'],
-      filters: { parent: doctype },
-      orderBy: 'fieldname',
-      order: 'asc',
-    });
-    const doc = {};
-    for (const row of values) {
-      doc[row.fieldname] = row.value;
-    }
-    return doc;
-  }
-
-  /**
-   * Get list of values from the singles table.
-   * @param  {...string | Object} fieldnames list of fieldnames to get the values of
-   * @returns {Array<Object>} array of {parent, value, fieldname}.
-   * @example
-   * Database.getSingleValues('internalPrecision');
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   * @example
-   * Database.getSingleValues({fieldname:'internalPrecision', parent: 'SystemSettings'});
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   */
-  async getSingleValues(...fieldnames) {
-    fieldnames = fieldnames.map((fieldname) => {
-      if (typeof fieldname === 'string') {
-        return { fieldname };
-      }
-      return fieldname;
-    });
-
-    let builder = this.knex('SingleValue');
-    builder = builder.where(fieldnames[0]);
-
-    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
-      if (typeof parent === 'undefined') {
-        builder = builder.orWhere({ fieldname });
-      } else {
-        builder = builder.orWhere({ fieldname, parent });
-      }
-    });
-
-    let values = [];
-    try {
-      values = await builder.select('fieldname', 'value', 'parent');
-    } catch (error) {
-      if (error.message.includes('no such table')) {
-        return [];
-      }
-      throw error;
-    }
-
-    return values.map((value) => {
-      const fields = getMeta(value.parent).fields;
-      return this.getDocFormattedDoc(fields, values);
-    });
-  }
-
-  async getOne(doctype, name, fields = '*') {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-
-    const doc = await this.knex
-      .select(fields)
-      .from(baseDoctype)
-      .where('name', name)
-      .first();
-
-    if (!doc) {
-      return doc;
-    }
-
-    return this.getDocFormattedDoc(meta.fields, doc);
-  }
-
-  getDocFormattedDoc(fields, doc) {
-    // format for usage, not going into the db
-    const docFields = Object.keys(doc);
-    const filteredFields = fields.filter(({ fieldname }) =>
-      docFields.includes(fieldname)
-    );
-
-    const formattedValues = filteredFields.reduce((d, field) => {
-      const { fieldname } = field;
-      d[fieldname] = this.getDocFormattedValues(field, doc[fieldname]);
-      return d;
-    }, {});
-
-    return Object.assign(doc, formattedValues);
-  }
-
-  getDocFormattedValues(field, value) {
-    // format for usage, not going into the db
-    try {
-      if (field.fieldtype === 'Currency') {
-        return pesa(value);
-      }
-    } catch (err) {
-      err.message += ` value: '${value}' of type: ${typeof value}, fieldname: '${
-        field.fieldname
-      }', label: '${field.label}'`;
-      throw err;
-    }
-    return value;
-  }
-
-  triggerChange(doctype, name) {
-    this.trigger(`change:${doctype}`, { name }, 500);
-    this.trigger(`change`, { doctype, name }, 500);
-    // also trigger change for basedOn doctype
-    const meta = getMeta(doctype);
-    if (meta.basedOn) {
-      this.triggerChange(meta.basedOn, name);
-    }
-  }
-
-  async insert(doctype, doc) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    doc = this.applyBaseDocTypeFilters(doctype, doc);
-
-    // insert parent
-    if (meta.isSingle) {
-      await this.updateSingle(doctype, doc);
-    } else {
-      await this.insertOne(baseDoctype, doc);
-    }
-
-    // insert children
-    await this.insertChildren(meta, doc, baseDoctype);
-
-    this.triggerChange(doctype, doc.name);
-
-    return doc;
-  }
-
-  async insertChildren(meta, doc, doctype) {
-    const tableFields = meta.getTableFields();
-    for (const field of tableFields) {
-      let idx = 0;
-      for (const child of doc[field.fieldname] || []) {
-        this.prepareChild(doctype, doc.name, child, field, idx);
-        await this.insertOne(field.childtype, child);
-        idx++;
-      }
-    }
-  }
-
-  insertOne(doctype, doc) {
-    const fields = this.getValidFields(doctype);
-
-    if (!doc.name) {
-      doc.name = getRandomString();
-    }
-
-    const formattedDoc = this.getFormattedDoc(fields, doc);
-    return this.knex(doctype).insert(formattedDoc);
-  }
-
-  async update(doctype, doc) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    doc = this.applyBaseDocTypeFilters(doctype, doc);
-
-    // update parent
-    if (meta.isSingle) {
-      await this.updateSingle(doctype, doc);
-    } else {
-      await this.updateOne(baseDoctype, doc);
-    }
-
-    // insert or update children
-    await this.updateChildren(meta, doc, baseDoctype);
-
-    this.triggerChange(doctype, doc.name);
-
-    return doc;
-  }
-
-  async updateChildren(meta, doc, doctype) {
-    const tableFields = meta.getTableFields();
-    for (const field of tableFields) {
-      const added = [];
-      for (const child of doc[field.fieldname] || []) {
-        this.prepareChild(doctype, doc.name, child, field, added.length);
-        if (await this.exists(field.childtype, child.name)) {
-          await this.updateOne(field.childtype, child);
-        } else {
-          await this.insertOne(field.childtype, child);
-        }
-        added.push(child.name);
-      }
-      await this.runDeleteOtherChildren(field, doc.name, added);
-    }
-  }
-
-  updateOne(doctype, doc) {
-    const validFields = this.getValidFields(doctype);
-    const fieldsToUpdate = Object.keys(doc).filter((f) => f !== 'name');
-    const fields = validFields.filter((df) =>
-      fieldsToUpdate.includes(df.fieldname)
-    );
-    const formattedDoc = this.getFormattedDoc(fields, doc);
-
-    return this.knex(doctype)
-      .where('name', doc.name)
-      .update(formattedDoc)
-      .then(() => {
-        const cacheKey = `${doctype}:${doc.name}`;
-        if (this.cache.hexists(cacheKey)) {
-          for (const fieldname in formattedDoc) {
-            const value = formattedDoc[fieldname];
-            this.cache.hset(cacheKey, fieldname, value);
-          }
-        }
-      });
-  }
-
-  runDeleteOtherChildren(field, parent, added) {
-    // delete other children
-    return this.knex(field.childtype)
-      .where('parent', parent)
-      .andWhere('name', 'not in', added)
-      .delete();
-  }
-
-  async updateSingle(doctype, doc) {
-    const meta = getMeta(doctype);
-    await this.deleteSingleValues(doctype);
-    for (const field of meta.getValidFields({ withChildren: false })) {
-      const value = doc[field.fieldname];
-      if (value != null) {
-        const singleValue = getNewDoc({
-          doctype: 'SingleValue',
-          parent: doctype,
-          fieldname: field.fieldname,
-          value: value,
-        });
-        await singleValue.insert();
-      }
-    }
-  }
-
-  deleteSingleValues(name) {
-    return this.knex('SingleValue').where('parent', name).delete();
-  }
-
-  async rename(doctype, oldName, newName) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    await this.knex(baseDoctype)
-      .update({ name: newName })
-      .where('name', oldName)
-      .then(() => {
-        this.clearValueCache(doctype, oldName);
-      });
-    await this.commit();
-
-    this.triggerChange(doctype, newName);
-  }
-
-  prepareChild(parenttype, parent, child, field, idx) {
-    if (!child.name) {
-      child.name = getRandomString();
-    }
-    child.parent = parent;
-    child.parenttype = parenttype;
-    child.parentfield = field.fieldname;
-    child.idx = idx;
-  }
-
-  getValidFields(doctype) {
-    return getMeta(doctype).getValidFields({ withChildren: false });
-  }
-
-  getFormattedDoc(fields, doc) {
-    // format for storage, going into the db
-    const formattedDoc = {};
-    fields.map((field) => {
-      const value = doc[field.fieldname];
-      formattedDoc[field.fieldname] = this.getFormattedValue(field, value);
-    });
-    return formattedDoc;
-  }
-
-  getFormattedValue(field, value) {
-    // format for storage, going into the db
-    const type = typeof value;
-    if (field.fieldtype === 'Currency') {
-      let currency = value;
-
-      if (type === 'number' || type === 'string') {
-        currency = pesa(value);
-      }
-
-      const currencyValue = currency.store;
-      if (typeof currencyValue !== 'string') {
-        throw new Error(
-          `invalid currencyValue '${currencyValue}' of type '${typeof currencyValue}' on converting from '${value}' of type '${type}'`
-        );
-      }
-
-      return currencyValue;
-    }
-
-    if (value instanceof Date) {
-      if (field.fieldtype === 'Date') {
-        // date
-        return value.toISOString().substr(0, 10);
-      } else {
-        // datetime
-        return value.toISOString();
-      }
-    } else if (field.fieldtype === 'Link' && !value) {
-      // empty value must be null to satisfy
-      // foreign key constraint
-      return null;
-    } else {
-      return value;
-    }
-  }
-
-  applyBaseDocTypeFilters(doctype, doc) {
-    const meta = getMeta(doctype);
-    if (meta.filters) {
-      for (const fieldname in meta.filters) {
-        const value = meta.filters[fieldname];
-        if (typeof value !== 'object') {
-          doc[fieldname] = value;
-        }
-      }
-    }
-    return doc;
-  }
-
-  async deleteMany(doctype, names) {
-    for (const name of names) {
-      await this.delete(doctype, name);
-    }
-  }
-
-  async delete(doctype, name) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    await this.deleteOne(baseDoctype, name);
-
-    // delete children
-    const tableFields = getMeta(doctype).getTableFields();
-    for (const field of tableFields) {
-      await this.deleteChildren(field.childtype, name);
-    }
-
-    this.triggerChange(doctype, name);
-  }
-
-  async deleteOne(doctype, name) {
-    return this.knex(doctype)
-      .where('name', name)
-      .delete()
-      .then(() => {
-        this.clearValueCache(doctype, name);
-      });
-  }
-
-  deleteChildren(parenttype, parent) {
-    return this.knex(parenttype).where('parent', parent).delete();
-  }
-
-  async exists(doctype, name) {
-    return (await this.getValue(doctype, name)) ? true : false;
-  }
-
-  async getValue(doctype, filters, fieldname = 'name') {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    if (typeof filters === 'string') {
-      filters = { name: filters };
-    }
-    if (meta.filters) {
-      Object.assign(filters, meta.filters);
-    }
-
-    const row = await this.getAll({
-      doctype: baseDoctype,
-      fields: [fieldname],
-      filters: filters,
-      start: 0,
-      limit: 1,
-      orderBy: 'name',
-      order: 'asc',
-    });
-    return row.length ? row[0][fieldname] : null;
-  }
-
-  async setValue(doctype, name, fieldname, value) {
-    return await this.setValues(doctype, name, {
-      [fieldname]: value,
-    });
-  }
-
-  async setValues(doctype, name, fieldValuePair) {
-    const doc = Object.assign({}, fieldValuePair, { name });
-    return this.updateOne(doctype, doc);
-  }
-
-  async getCachedValue(doctype, name, fieldname) {
-    let value = this.cache.hget(`${doctype}:${name}`, fieldname);
-    if (value == null) {
-      value = await this.getValue(doctype, name, fieldname);
-    }
-    return value;
-  }
-
-  async getAll({
-    doctype,
-    fields,
-    filters,
-    start,
-    limit,
-    groupBy,
-    orderBy = 'creation',
-    order = 'desc',
-  }: GetAllOptions = {}) {
-    const meta = getMeta(doctype);
-    const baseDoctype = meta.getBaseDocType();
-    if (!fields) {
-      fields = meta.getKeywordFields();
-      fields.push('name');
-    }
-    if (typeof fields === 'string') {
-      fields = [fields];
-    }
-    if (meta.filters) {
-      filters = Object.assign({}, filters, meta.filters);
-    }
-
-    const builder = this.knex.select(fields).from(baseDoctype);
-
-    this.applyFiltersToBuilder(builder, filters);
-
-    if (orderBy) {
-      builder.orderBy(orderBy, order);
-    }
-
-    if (groupBy) {
-      builder.groupBy(groupBy);
-    }
-
-    if (start) {
-      builder.offset(start);
-    }
-
-    if (limit) {
-      builder.limit(limit);
-    }
-
-    const docs = await builder;
-    return docs.map((doc) => this.getDocFormattedDoc(meta.fields, doc));
-  }
-
-  applyFiltersToBuilder(builder, filters) {
-    // {"status": "Open"} => `status = "Open"`
-
-    // {"status": "Open", "name": ["like", "apple%"]}
-    // => `status="Open" and name like "apple%"
-
-    // {"date": [">=", "2017-09-09", "<=", "2017-11-01"]}
-    // => `date >= 2017-09-09 and date <= 2017-11-01`
-
-    const filtersArray = [];
-
-    for (const field in filters) {
-      const value = filters[field];
-      let operator = '=';
-      let comparisonValue = value;
-
-      if (Array.isArray(value)) {
-        operator = value[0];
-        comparisonValue = value[1];
-        operator = operator.toLowerCase();
-
-        if (operator === 'includes') {
-          operator = 'like';
-        }
-
-        if (operator === 'like' && !comparisonValue.includes('%')) {
-          comparisonValue = `%${comparisonValue}%`;
-        }
-      }
-
-      filtersArray.push([field, operator, comparisonValue]);
-
-      if (Array.isArray(value) && value.length > 2) {
-        // multiple conditions
-        const operator = value[2];
-        const comparisonValue = value[3];
-        filtersArray.push([field, operator, comparisonValue]);
-      }
-    }
-
-    filtersArray.map((filter) => {
-      const [field, operator, comparisonValue] = filter;
-      if (operator === '=') {
-        builder.where(field, comparisonValue);
-      } else {
-        builder.where(field, operator, comparisonValue);
-      }
-    });
-  }
-
-  sql(query: string, params: Knex.RawBinding[] = []) {
-    // run raw query
-    return this.knex.raw(query, params);
-  }
-
-  async commit() {
-    try {
-      await this.sql('commit');
-    } catch (e) {
-      if (e.type !== CannotCommitError) {
-        throw e;
-      }
-    }
-  }
-
-  clearValueCache(doctype, name) {
-    const cacheKey = `${doctype}:${name}`;
-    this.cache.hclear(cacheKey);
-  }
-
-  getColumnType(field) {
-    return this.typeMap[field.fieldtype];
-  }
-
-  async addForeignKeys(doctype, newForeignKeys) {
-    await this.sql('PRAGMA foreign_keys=OFF');
-    await this.sql('BEGIN TRANSACTION');
-
-    const tempName = 'TEMP' + doctype;
-
-    // create temp table
-    await this.createTable(doctype, tempName);
-
-    try {
-      // copy from old to new table
-      await this.knex(tempName).insert(this.knex.select().from(doctype));
-    } catch (err) {
-      await this.sql('ROLLBACK');
-      await this.sql('PRAGMA foreign_keys=ON');
-
-      const rows = await this.knex.select().from(doctype);
-      await this.prestigeTheTable(doctype, rows);
-      return;
-    }
-
-    // drop old table
-    await this.knex.schema.dropTable(doctype);
-
-    // rename new table
-    await this.knex.schema.renameTable(tempName, doctype);
-
-    await this.sql('COMMIT');
-    await this.sql('PRAGMA foreign_keys=ON');
-  }
-
-  async getTableColumns(doctype: string) {
-    return (await this.sql(`PRAGMA table_info(${doctype})`)).map((d) => d.name);
-  }
-
-  async getForeignKeys(doctype: string) {
-    return (await this.sql(`PRAGMA foreign_key_list(${doctype})`)).map(
-      (d) => d.from
-    );
-  }
-
-  getError(err) {
-    let errorType = DatabaseError;
-    if (err.message.includes('FOREIGN KEY')) {
-      errorType = LinkValidationError;
-    }
-    if (err.message.includes('SQLITE_ERROR: cannot commit')) {
-      errorType = CannotCommitError;
-    }
-    if (err.message.includes('SQLITE_CONSTRAINT: UNIQUE constraint failed:')) {
-      errorType = DuplicateEntryError;
-    }
-    return errorType;
-  }
-
-  async prestigeTheTable(tableName, tableRows) {
-    const max = 200;
-
-    // Alter table hacx for sqlite in case of schema change.
-    const tempName = `__${tableName}`;
-    await this.knex.schema.dropTableIfExists(tempName);
-
-    await this.knex.raw('PRAGMA foreign_keys=OFF');
-    await this.createTable(tableName, tempName);
-
-    if (tableRows.length > 200) {
-      const fi = Math.floor(tableRows.length / max);
-      for (let i = 0; i <= fi; i++) {
-        const rowSlice = tableRows.slice(i * max, i + 1 * max);
-        if (rowSlice.length === 0) {
-          break;
-        }
-        await this.knex.batchInsert(tempName, rowSlice);
-      }
-    } else {
-      await this.knex.batchInsert(tempName, tableRows);
-    }
-
-    await this.knex.schema.dropTable(tableName);
-    await this.knex.schema.renameTable(tempName, tableName);
-    await this.knex.raw('PRAGMA foreign_keys=ON');
-  }
-}
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
new file mode 100644
index 00000000..ce5ed3af
--- /dev/null
+++ b/backend/database/manager.ts
@@ -0,0 +1,79 @@
+import fs from 'fs/promises';
+import { getSchemas } from '../../schemas';
+import patches from '../patches';
+import DatabaseCore from './core';
+import { runPatches } from './runPatch';
+import { Patch } from './types';
+
+export class DatabaseManager {
+  db: DatabaseCore;
+  constructor() {}
+
+  async createNewDatabase(dbPath: string, countryCode: string) {
+    await this.#unlinkIfExists(dbPath);
+    this.connectToDatabase(dbPath, countryCode);
+  }
+
+  async connectToDatabase(dbPath: string, countryCode?: string) {
+    this.db = new DatabaseCore(dbPath);
+    this.db.connect();
+
+    countryCode ??= await this.#getCountryCode();
+    const schemaMap = getSchemas(countryCode);
+    this.db.setSchemaMap(schemaMap);
+
+    await this.migrate();
+  }
+
+  async migrate() {
+    const patchesToExecute = await this.#getPatchesToExecute();
+    const preMigrationPatches = patchesToExecute.filter(
+      (p) => p.patch.beforeMigrate
+    );
+    const postMigrationPatches = patchesToExecute.filter(
+      (p) => !p.patch.beforeMigrate
+    );
+
+    await runPatches(preMigrationPatches, this);
+    await this.db.migrate();
+    await runPatches(postMigrationPatches, this);
+  }
+
+  async #getPatchesToExecute(): Promise<Patch[]> {
+    const query: { name: string }[] = await this.db
+      .knex('PatchRun')
+      .select('name');
+    const executedPatches = query.map((q) => q.name);
+    return patches.filter((p) => !executedPatches.includes(p.name));
+  }
+
+  async #getCountryCode(): Promise<string | undefined> {
+    if (!this.db) {
+      return undefined;
+    }
+
+    const query = await this.db
+      .knex('SingleValue')
+      .where({ fieldname: 'countryCode', parent: 'SystemSettings' });
+
+    if (query.length > 0) {
+      return query[0].countryCode as string;
+    }
+
+    return undefined;
+  }
+
+  async #unlinkIfExists(dbPath: string) {
+    try {
+      fs.unlink(dbPath);
+    } catch (err) {
+      if (err.code === 'ENOENT') {
+        return;
+      }
+
+      throw err;
+    }
+  }
+}
+
+export default new DatabaseManager();
diff --git a/backend/database/runPatch.ts b/backend/database/runPatch.ts
new file mode 100644
index 00000000..39cf5ece
--- /dev/null
+++ b/backend/database/runPatch.ts
@@ -0,0 +1,31 @@
+import { getDefaultMetaFieldValueMap } from '../common';
+import { DatabaseManager } from './manager';
+import { FieldValueMap, Patch } from './types';
+
+export async function runPatches(patches: Patch[], dm: DatabaseManager) {
+  const list: { name: string; success: boolean }[] = [];
+  for (const patch of patches) {
+    const success = await runPatch(patch, dm);
+    list.push({ name: patch.name, success });
+  }
+  return list;
+}
+
+async function runPatch(patch: Patch, dm: DatabaseManager): Promise<boolean> {
+  try {
+    await patch.patch.execute(dm);
+  } catch (err) {
+    console.error('PATCH FAILED: ', patch.name);
+    console.error(err);
+    return false;
+  }
+
+  await makeEntry(patch.name, dm);
+  return true;
+}
+
+async function makeEntry(patchName: string, dm: DatabaseManager) {
+  const defaultFieldValueMap = getDefaultMetaFieldValueMap() as FieldValueMap;
+  defaultFieldValueMap.name = patchName;
+  await dm.db.insert('PatchRun', defaultFieldValueMap);
+}
diff --git a/backend/database/types.ts b/backend/database/types.ts
index 25f30fbc..45547423 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -26,3 +26,12 @@ export type FieldValueMap = Record<
   string,
   RawValue | undefined | FieldValueMap[]
 >;
+
+export interface Patch {
+  name: string;
+  version: string;
+  patch: {
+    execute: (DatabaseManager) => Promise<void>;
+    beforeMigrate?: boolean;
+  };
+}
diff --git a/backend/patches/index.ts b/backend/patches/index.ts
new file mode 100644
index 00000000..779c69a8
--- /dev/null
+++ b/backend/patches/index.ts
@@ -0,0 +1,6 @@
+import { Patch } from '../database/types';
+import testPatch from './testPatch';
+
+export default [
+  { name: 'testPatch', version: '0.4.2-beta.0', patch: testPatch },
+] as Patch[];
diff --git a/backend/patches/testPatch.ts b/backend/patches/testPatch.ts
new file mode 100644
index 00000000..a18f9635
--- /dev/null
+++ b/backend/patches/testPatch.ts
@@ -0,0 +1,10 @@
+import { DatabaseManager } from '../database/manager';
+
+async function execute(dm: DatabaseManager) {
+  /**
+   * Execute function will receive the DatabaseManager which is to be used
+   * to apply database patches.
+   */
+}
+
+export default { execute, beforeMigrate: true };
diff --git a/models/doctype/Account/AccountDocument.js b/models/doctype/Account/AccountDocument.js
index f2fa2abb..d83a7129 100644
--- a/models/doctype/Account/AccountDocument.js
+++ b/models/doctype/Account/AccountDocument.js
@@ -4,11 +4,8 @@ import Document from 'frappe/model/document';
 export default class Account extends Document {
   async validate() {
     if (!this.accountType && this.parentAccount) {
-      this.accountType = await frappe.db.getValue(
-        'Account',
-        this.parentAccount,
-        'accountType'
-      );
+      const account = frappe.db.get('Account', this.parentAccount);
+      this.accountType = account.accountType;
     }
   }
 }
diff --git a/models/doctype/Transaction/TransactionServer.js b/models/doctype/Transaction/TransactionServer.js
index 3f0623a0..c2ddb296 100644
--- a/models/doctype/Transaction/TransactionServer.js
+++ b/models/doctype/Transaction/TransactionServer.js
@@ -30,12 +30,10 @@ export default {
     await entries.post();
 
     // update outstanding amounts
-    await frappe.db.setValue(
-      this.doctype,
-      this.name,
-      'outstandingAmount',
-      this.baseGrandTotal
-    );
+    await frappe.db.update(this.doctype, {
+      name: this.name,
+      outstandingAmount: this.baseGrandTotal,
+    });
 
     let party = await frappe.getDoc('Party', this.customer || this.supplier);
     await party.updateOutstandingAmount();
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index de638d9d..06e5dbaa 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -73,6 +73,12 @@
       "fieldtype": "Check",
       "default": false,
       "description": "Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app."
+    },
+    {
+      "fieldname": "countryCode",
+      "label": "Country Code",
+      "fieldtype": "Data",
+      "description": "Country code used to initialize regional settings."
     }
   ],
   "quickEditFields": [
diff --git a/src/initialization.js b/src/initialization.js
index a95287e6..9c2213f3 100644
--- a/src/initialization.js
+++ b/src/initialization.js
@@ -27,9 +27,7 @@ async function runRegionalModelUpdates() {
     return;
   }
 
-  const { country, setupComplete } = await frappe.db.getSingle(
-    'AccountingSettings'
-  );
+  const { country, setupComplete } = await frappe.db.get('AccountingSettings');
   if (!parseInt(setupComplete)) return;
   await regionalModelUpdates({ country });
 }
diff --git a/src/utils.js b/src/utils.js
index 677639c9..af2a1587 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -124,7 +124,8 @@ export function partyWithAvatar(party) {
       Avatar,
     },
     async mounted() {
-      this.imageURL = await frappe.db.getValue('Party', party, 'image');
+      const p = await frappe.db.get('Party', party);
+      this.imageURL = p.image;
       this.label = party;
     },
     template: `

From 7514c9588329f84922e44f62e40d7973cf7fa067 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 25 Mar 2022 14:39:52 +0530
Subject: [PATCH 017/163] chore: add mocha and deps

---
 package.json |   8 +-
 yarn.lock    | 369 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 299 insertions(+), 78 deletions(-)

diff --git a/package.json b/package.json
index 5b9af4ec..f8f3f6ae 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "electron:serve": "vue-cli-service electron:serve",
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
-    "script:translate": "node scripts/generateTranslations.js"
+    "script:translate": "node scripts/generateTranslations.js",
+    "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --reporter nyan --require ts-node/register ./**/tests/**/*.spec.ts"
   },
   "dependencies": {
     "@popperjs/core": "^2.10.2",
@@ -35,8 +36,11 @@
   "devDependencies": {
     "@babel/core": "^7.16.0",
     "@babel/eslint-parser": "^7.16.0",
+    "@types/assert": "^1.5.6",
     "@types/electron-devtools-installer": "^2.2.0",
     "@types/lodash": "^4.14.179",
+    "@types/mocha": "^9.1.0",
+    "@types/node": "^17.0.23",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
     "@vue/cli-plugin-babel": "^4.5.0",
@@ -56,10 +60,12 @@
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-vue": "^7.0.0",
     "lint-staged": "^11.2.6",
+    "mocha": "^9.2.2",
     "postcss": "^8",
     "prettier": "^2.4.1",
     "raw-loader": "^4.0.2",
     "tailwindcss": "npm:@tailwindcss/postcss7-compat",
+    "ts-node": "^10.7.0",
     "tslib": "^2.3.1",
     "typescript": "^4.6.2",
     "vue-cli-plugin-electron-builder": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index b935e531..5f4f31ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -953,6 +953,18 @@
     "@babel/helper-validator-identifier" "^7.15.7"
     to-fast-properties "^2.0.0"
 
+"@cspotcode/source-map-consumer@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
+  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
+
+"@cspotcode/source-map-support@0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
+  integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
+  dependencies:
+    "@cspotcode/source-map-consumer" "0.8.0"
+
 "@develar/schema-utils@~2.6.5":
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
@@ -1191,6 +1203,31 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@tsconfig/node10@^1.0.7":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
+  integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
+  integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
+  integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+
+"@tsconfig/node16@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
+  integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+
+"@types/assert@^1.5.6":
+  version "1.5.6"
+  resolved "https://registry.yarnpkg.com/@types/assert/-/assert-1.5.6.tgz#a8b5a94ce5fb8f4ba65fdc37fc9507609114189e"
+  integrity sha512-Y7gDJiIqb9qKUHfBQYOWGngUpLORtirAVPuj/CWJrU2C6ZM4/y3XLwuwfGMF8s7QzW746LQZx23m0+1FSgjfug==
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -1321,6 +1358,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
+"@types/mocha@^9.1.0":
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-9.1.0.tgz#baf17ab2cca3fcce2d322ebc30454bff487efad5"
+  integrity sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==
+
 "@types/ms@*":
   version "0.7.31"
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
@@ -1336,6 +1378,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.32.tgz#2ca61c9ef8c77f6fa1733be9e623ceb0d372ad96"
   integrity sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==
 
+"@types/node@^17.0.23":
+  version "17.0.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da"
+  integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
@@ -1523,6 +1570,11 @@
     "@typescript-eslint/types" "4.33.0"
     eslint-visitor-keys "^2.0.0"
 
+"@ungap/promise-all-settled@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+
 "@vue/babel-helper-vue-jsx-merge-props@^1.2.1":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81"
@@ -2240,6 +2292,11 @@ acorn-walk@^7.0.0, acorn-walk@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
+acorn-walk@^8.1.1:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+
 acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
@@ -2327,16 +2384,16 @@ ansi-align@^3.0.0:
   dependencies:
     string-width "^4.1.0"
 
+ansi-colors@4.1.1, ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
-
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
@@ -2454,6 +2511,11 @@ arch@^2.1.1:
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
+arg@^4.1.0:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
+
 arg@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb"
@@ -2902,6 +2964,11 @@ brorand@^1.0.1, brorand@^1.1.0:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -3325,6 +3392,21 @@ check-types@^8.0.3:
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
   integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==
 
+chokidar@3.5.3, chokidar@^3.3.0:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chokidar@^2.1.8:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -3359,21 +3441,6 @@ chokidar@^3.0.2, chokidar@^3.4.1, chokidar@^3.5.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chokidar@^3.3.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
-  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -3955,6 +4022,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+create-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -4223,6 +4295,13 @@ debug@4.3.2:
   dependencies:
     ms "2.1.2"
 
+debug@4.3.3, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
 debug@^3.1.1, debug@^3.2.6:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -4230,18 +4309,16 @@ debug@^3.1.1, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+decamelize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -4407,6 +4484,11 @@ didyoumean@^1.2.2:
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
   integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
 
+diff@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -4915,16 +4997,16 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
+escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-escape-string-regexp@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
-  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
-
 eslint-config-prettier@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
@@ -5521,6 +5603,14 @@ find-cache-dir@^3.0.0, find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
+find-up@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -5544,6 +5634,11 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
 flatted@^3.1.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
@@ -5838,7 +5933,7 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
+glob@7.2.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -5991,6 +6086,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
 gzip-size@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -6121,7 +6221,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.2.x, he@^1.1.0:
+he@1.2.0, he@1.2.x, he@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -6849,6 +6949,11 @@ is-plain-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
 is-plain-obj@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
@@ -7052,6 +7157,13 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@4.1.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -7060,13 +7172,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -7380,6 +7485,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -7450,14 +7562,7 @@ lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
-  dependencies:
-    chalk "^2.0.1"
-
-log-symbols@^4.1.0:
+log-symbols@4.1.0, log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -7465,6 +7570,13 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
+log-symbols@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  dependencies:
+    chalk "^2.0.1"
+
 log-update@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
@@ -7544,6 +7656,11 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   dependencies:
     semver "^6.0.0"
 
+make-error@^1.1.1:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -7758,6 +7875,13 @@ minimatch@3.0.4, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4"
+  integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
@@ -7835,6 +7959,36 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+mocha@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9"
+  integrity sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==
+  dependencies:
+    "@ungap/promise-all-settled" "1.1.2"
+    ansi-colors "4.1.1"
+    browser-stdout "1.3.1"
+    chokidar "3.5.3"
+    debug "4.3.3"
+    diff "5.0.0"
+    escape-string-regexp "4.0.0"
+    find-up "5.0.0"
+    glob "7.2.0"
+    growl "1.10.5"
+    he "1.2.0"
+    js-yaml "4.1.0"
+    log-symbols "4.1.0"
+    minimatch "4.2.1"
+    ms "2.1.3"
+    nanoid "3.3.1"
+    serialize-javascript "6.0.0"
+    strip-json-comments "3.1.1"
+    supports-color "8.1.1"
+    which "2.0.2"
+    workerpool "6.2.0"
+    yargs "16.2.0"
+    yargs-parser "20.2.4"
+    yargs-unparser "2.0.0"
+
 modern-normalize@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.1.0.tgz#da8e80140d9221426bd4f725c6e11283d34f90b7"
@@ -7904,6 +8058,11 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
   integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
 
+nanoid@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
+  integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
+
 nanoid@^3.1.22, nanoid@^3.1.30:
   version "3.1.32"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.32.tgz#8f96069e6239cc0a9ae8c0d3b41a3b4933a88c0a"
@@ -8372,6 +8531,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
@@ -9942,6 +10108,13 @@ serialize-error@^7.0.1:
   dependencies:
     type-fest "^0.13.1"
 
+serialize-javascript@6.0.0, serialize-javascript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -9949,13 +10122,6 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
-  dependencies:
-    randombytes "^2.1.0"
-
 serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
@@ -10554,7 +10720,7 @@ strip-indent@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
   integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -10987,6 +11153,25 @@ ts-loader@^6.2.2:
     micromatch "^4.0.0"
     semver "^6.0.0"
 
+ts-node@^10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
+  integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
+  dependencies:
+    "@cspotcode/source-map-support" "0.7.0"
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.2"
+    acorn "^8.4.1"
+    acorn-walk "^8.1.1"
+    arg "^4.1.0"
+    create-require "^1.1.0"
+    diff "^4.0.1"
+    make-error "^1.1.1"
+    v8-compile-cache-lib "^3.0.0"
+    yn "3.1.1"
+
 ts-pnp@^1.1.6:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
@@ -11388,6 +11573,11 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+v8-compile-cache-lib@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8"
+  integrity sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==
+
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -11818,6 +12008,13 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
+which@2.0.2, which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -11825,13 +12022,6 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 widest-line@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
@@ -11858,6 +12048,11 @@ worker-rpc@^0.1.0:
   dependencies:
     microevent.ts "~0.1.1"
 
+workerpool@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
+  integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
+
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -11962,6 +12157,11 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yargs-parser@20.2.4:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
 yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -11983,6 +12183,29 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
+yargs-unparser@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
+  dependencies:
+    camelcase "^6.0.0"
+    decamelize "^4.0.0"
+    flat "^5.0.2"
+    is-plain-obj "^2.1.0"
+
+yargs@16.2.0, yargs@^16.0.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
@@ -12016,19 +12239,6 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^16.0.0:
-  version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
-  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yargs@^17.0.1:
   version "17.2.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea"
@@ -12050,6 +12260,11 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
+yn@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

From 74bfe7931cee3c9469d7eb2cc525a3037df5c53c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 25 Mar 2022 15:42:39 +0530
Subject: [PATCH 018/163] chore: fix types

---
 backend/common.ts            |  14 ++--
 backend/database/core.ts     | 138 +++++++++++++++++------------------
 backend/database/manager.ts  |  27 ++++---
 backend/database/runPatch.ts |   2 +-
 backend/database/types.ts    |  27 +++++--
 schemas/helpers.ts           |   8 +-
 schemas/index.ts             |  44 ++++++-----
 schemas/regional/index.ts    |   3 +-
 tsconfig.json                |   5 +-
 9 files changed, 149 insertions(+), 119 deletions(-)

diff --git a/backend/common.ts b/backend/common.ts
index a5832ebe..79a885cb 100644
--- a/backend/common.ts
+++ b/backend/common.ts
@@ -1,21 +1,23 @@
-export const sqliteTypeMap = {
+import { KnexColumnType } from './database/types';
+
+export const sqliteTypeMap: Record<string, KnexColumnType> = {
   AutoComplete: 'text',
   Currency: 'text',
   Int: 'integer',
   Float: 'float',
   Percent: 'float',
-  Check: 'integer',
+  Check: 'boolean',
   Code: 'text',
-  Date: 'text',
-  Datetime: 'text',
-  Time: 'text',
+  Date: 'date',
+  Datetime: 'datetime',
+  Time: 'time',
   Text: 'text',
   Data: 'text',
   Link: 'text',
   DynamicLink: 'text',
   Password: 'text',
   Select: 'text',
-  File: 'text',
+  File: 'binary',
   Attach: 'text',
   AttachImage: 'text',
   Color: 'text',
diff --git a/backend/database/core.ts b/backend/database/core.ts
index 063bb5e6..65fe7415 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -6,14 +6,14 @@ import {
   DuplicateEntryError,
   LinkValidationError,
   NotFoundError,
-  ValueError,
+  ValueError
 } from '../../frappe/utils/errors';
 import {
   Field,
   FieldTypeEnum,
   RawValue,
   SchemaMap,
-  TargetField,
+  TargetField
 } from '../../schemas/types';
 import { sqliteTypeMap } from '../common';
 import {
@@ -21,11 +21,11 @@ import {
   FieldValueMap,
   GetAllOptions,
   GetQueryBuilderOptions,
-  QueryFilter,
+  QueryFilter
 } from './types';
 
 export default class DatabaseCore {
-  knex: Knex;
+  knex?: Knex;
   typeMap = sqliteTypeMap;
   dbPath: string;
   schemaMap: SchemaMap = {};
@@ -39,7 +39,7 @@ export default class DatabaseCore {
         filename: this.dbPath,
       },
       pool: {
-        afterCreate(conn, done) {
+        afterCreate(conn: { run: (query: string) => void }, done: () => void) {
           conn.run('PRAGMA foreign_keys=ON');
           done();
         },
@@ -61,21 +61,22 @@ export default class DatabaseCore {
   }
 
   close() {
-    this.knex.destroy();
+    this.knex!.destroy();
   }
 
   async commit() {
     try {
       await this.raw('commit');
     } catch (err) {
-      if (err.type !== CannotCommitError) {
+      const type = this.#getError(err as Error);
+      if (type !== CannotCommitError) {
         throw err;
       }
     }
   }
 
   async raw(query: string, params: Knex.RawBinding[] = []) {
-    return await this.knex.raw(query, params);
+    return await this.knex!.raw(query, params);
   }
 
   async migrate() {
@@ -104,7 +105,7 @@ export default class DatabaseCore {
 
     let row = [];
     try {
-      const qb = this.knex(schemaName);
+      const qb = this.knex!(schemaName);
       if (name !== undefined) {
         qb.where({ name });
       }
@@ -197,7 +198,7 @@ export default class DatabaseCore {
     groupBy,
     orderBy = 'creation',
     order = 'desc',
-  }: GetAllOptions = {}): Promise<FieldValueMap[]> {
+  }: GetAllOptions): Promise<FieldValueMap[]> {
     const schema = this.schemaMap[schemaName];
     if (!fields) {
       fields = ['name', ...(schema.keywordFields ?? [])];
@@ -207,7 +208,7 @@ export default class DatabaseCore {
       fields = [fields];
     }
 
-    return (await this.#getQueryBuilder(schemaName, fields, filters, {
+    return (await this.#getQueryBuilder(schemaName, fields, filters ?? {}, {
       offset: start,
       limit,
       groupBy,
@@ -226,7 +227,7 @@ export default class DatabaseCore {
       return fieldname;
     });
 
-    let builder = this.knex('SingleValue');
+    let builder = this.knex!('SingleValue');
     builder = builder.where(fieldnames[0]);
 
     fieldnames.slice(1).forEach(({ fieldname, parent }) => {
@@ -252,7 +253,7 @@ export default class DatabaseCore {
   }
 
   async rename(schemaName: string, oldName: string, newName: string) {
-    await this.knex(schemaName)
+    await this.knex!(schemaName)
       .update({ name: newName })
       .where('name', oldName);
     await this.commit();
@@ -282,15 +283,15 @@ export default class DatabaseCore {
   }
 
   async #tableExists(schemaName: string) {
-    return await this.knex.schema.hasTable(schemaName);
+    return await this.knex!.schema.hasTable(schemaName);
   }
 
   async #singleExists(singleSchemaName: string) {
-    const res = await this.knex('SingleValue')
+    const res = await this.knex!('SingleValue')
       .count('parent as count')
       .where('parent', singleSchemaName)
       .first();
-    return res.count > 0;
+    return (res?.count ?? 0) > 0;
   }
 
   async #removeColumns(schemaName: string, targetColumns: string[]) {
@@ -298,7 +299,7 @@ export default class DatabaseCore {
   }
 
   async #deleteSingleValues(singleSchemaName: string) {
-    return await this.knex('SingleValue')
+    return await this.knex!('SingleValue')
       .where('parent', singleSchemaName)
       .delete();
   }
@@ -325,9 +326,9 @@ export default class DatabaseCore {
 
     // Alter table hacx for sqlite in case of schema change.
     const tempName = `__${schemaName}`;
-    await this.knex.schema.dropTableIfExists(tempName);
+    await this.knex!.schema.dropTableIfExists(tempName);
 
-    await this.knex.raw('PRAGMA foreign_keys=OFF');
+    await this.knex!.raw('PRAGMA foreign_keys=OFF');
     await this.#createTable(schemaName, tempName);
 
     if (tableRows.length > 200) {
@@ -337,27 +338,29 @@ export default class DatabaseCore {
         if (rowSlice.length === 0) {
           break;
         }
-        await this.knex.batchInsert(tempName, rowSlice);
+        await this.knex!.batchInsert(tempName, rowSlice);
       }
     } else {
-      await this.knex.batchInsert(tempName, tableRows);
+      await this.knex!.batchInsert(tempName, tableRows);
     }
 
-    await this.knex.schema.dropTable(schemaName);
-    await this.knex.schema.renameTable(tempName, schemaName);
-    await this.knex.raw('PRAGMA foreign_keys=ON');
+    await this.knex!.schema.dropTable(schemaName);
+    await this.knex!.schema.renameTable(tempName, schemaName);
+    await this.knex!.raw('PRAGMA foreign_keys=ON');
   }
 
   async #getTableColumns(schemaName: string): Promise<string[]> {
-    const info = await this.raw(`PRAGMA table_info(${schemaName})`);
-    return info.map((d) => d.name);
+    const info: FieldValueMap[] = await this.raw(
+      `PRAGMA table_info(${schemaName})`
+    );
+    return info.map((d) => d.name as string);
   }
 
   async #getForeignKeys(schemaName: string): Promise<string[]> {
-    const foreignKeyList = await this.raw(
+    const foreignKeyList: FieldValueMap[] = await this.raw(
       `PRAGMA foreign_key_list(${schemaName})`
     );
-    return foreignKeyList.map((d) => d.from);
+    return foreignKeyList.map((d) => d.from as string);
   }
 
   #getQueryBuilder(
@@ -366,7 +369,7 @@ export default class DatabaseCore {
     filters: QueryFilter,
     options: GetQueryBuilderOptions
   ): Knex.QueryBuilder {
-    const builder = this.knex.select(fields).from(schemaName);
+    const builder = this.knex!.select(fields).from(schemaName);
 
     this.#applyFiltersToBuilder(builder, filters);
 
@@ -432,9 +435,9 @@ export default class DatabaseCore {
     filtersArray.map((filter) => {
       const [field, operator, comparisonValue] = filter;
       if (operator === '=') {
-        builder.where(field, comparisonValue);
+        builder.where(field as string, comparisonValue);
       } else {
-        builder.where(field, operator, comparisonValue);
+        builder.where(field as string, operator as string, comparisonValue);
       }
     });
   }
@@ -445,10 +448,8 @@ export default class DatabaseCore {
     const diff: ColumnDiff = { added: [], removed: [] };
 
     for (const field of validFields) {
-      if (
-        !tableColumns.includes(field.fieldname) &&
-        this.typeMap[field.fieldtype]
-      ) {
+      const hasDbType = this.typeMap.hasOwnProperty(field.fieldtype);
+      if (!tableColumns.includes(field.fieldname) && hasDbType) {
         diff.added.push(field);
       }
     }
@@ -463,7 +464,7 @@ export default class DatabaseCore {
     return diff;
   }
 
-  async #getNewForeignKeys(schemaName): Promise<Field[]> {
+  async #getNewForeignKeys(schemaName: string): Promise<Field[]> {
     const foreignKeys = await this.#getForeignKeys(schemaName);
     const newForeignKeys: Field[] = [];
     const schema = this.schemaMap[schemaName];
@@ -490,7 +491,9 @@ export default class DatabaseCore {
       return;
     }
 
-    const column = table[columnType](field.fieldname);
+    const column = table[columnType](
+      field.fieldname
+    ) as Knex.SqlLiteColumnBuilder;
 
     // primary key
     if (field.fieldname === 'name') {
@@ -525,23 +528,21 @@ export default class DatabaseCore {
     const diff: ColumnDiff = await this.#getColumnDiff(schemaName);
     const newForeignKeys: Field[] = await this.#getNewForeignKeys(schemaName);
 
-    return this.knex.schema
-      .table(schemaName, (table) => {
-        if (diff.added.length) {
-          for (const field of diff.added) {
-            this.#buildColumnForTable(table, field);
-          }
+    return this.knex!.schema.table(schemaName, (table) => {
+      if (diff.added.length) {
+        for (const field of diff.added) {
+          this.#buildColumnForTable(table, field);
         }
+      }
 
-        if (diff.removed.length) {
-          this.#removeColumns(schemaName, diff.removed);
-        }
-      })
-      .then(() => {
-        if (newForeignKeys.length) {
-          return this.#addForeignKeys(schemaName, newForeignKeys);
-        }
-      });
+      if (diff.removed.length) {
+        this.#removeColumns(schemaName, diff.removed);
+      }
+    }).then(() => {
+      if (newForeignKeys.length) {
+        return this.#addForeignKeys(schemaName, newForeignKeys);
+      }
+    });
   }
 
   async #createTable(schemaName: string, tableName?: string) {
@@ -551,7 +552,7 @@ export default class DatabaseCore {
   }
 
   #runCreateTableQuery(schemaName: string, fields: Field[]) {
-    return this.knex.schema.createTable(schemaName, (table) => {
+    return this.knex!.schema.createTable(schemaName, (table) => {
       for (const field of fields) {
         this.#buildColumnForTable(table, field);
       }
@@ -560,7 +561,7 @@ export default class DatabaseCore {
 
   async #getNonExtantSingleValues(singleSchemaName: string) {
     const existingFields = (
-      await this.knex('SingleValue')
+      await this.knex!('SingleValue')
         .where({ parent: singleSchemaName })
         .select('fieldname')
     ).map(({ fieldname }) => fieldname);
@@ -577,11 +578,11 @@ export default class DatabaseCore {
   }
 
   async #deleteOne(schemaName: string, name: string) {
-    return this.knex(schemaName).where('name', name).delete();
+    return this.knex!(schemaName).where('name', name).delete();
   }
 
   #deleteChildren(schemaName: string, parentName: string) {
-    return this.knex(schemaName).where('parent', parentName).delete();
+    return this.knex!(schemaName).where('parent', parentName).delete();
   }
 
   #runDeleteOtherChildren(
@@ -590,7 +591,7 @@ export default class DatabaseCore {
     added: string[]
   ) {
     // delete other children
-    return this.knex(field.target)
+    return this.knex!(field.target)
       .where('parent', parentName)
       .andWhere('name', 'not in', added)
       .delete();
@@ -623,21 +624,21 @@ export default class DatabaseCore {
 
     try {
       // copy from old to new table
-      await this.knex(tempName).insert(this.knex.select().from(schemaName));
+      await this.knex!(tempName).insert(this.knex!.select().from(schemaName));
     } catch (err) {
       await this.raw('ROLLBACK');
       await this.raw('PRAGMA foreign_keys=ON');
 
-      const rows = await this.knex.select().from(schemaName);
+      const rows = await this.knex!.select().from(schemaName);
       await this.prestigeTheTable(schemaName, rows);
       return;
     }
 
     // drop old table
-    await this.knex.schema.dropTable(schemaName);
+    await this.knex!.schema.dropTable(schemaName);
 
     // rename new table
-    await this.knex.schema.renameTable(tempName, schemaName);
+    await this.knex!.schema.renameTable(tempName, schemaName);
 
     await this.raw('COMMIT');
     await this.raw('PRAGMA foreign_keys=ON');
@@ -663,8 +664,7 @@ export default class DatabaseCore {
     name: string,
     fields: string | string[] = '*'
   ) {
-    const fieldValueMap: FieldValueMap = await this.knex
-      .select(fields)
+    const fieldValueMap: FieldValueMap = await this.knex!.select(fields)
       .from(schemaName)
       .where('name', name)
       .first();
@@ -694,7 +694,7 @@ export default class DatabaseCore {
       fieldValueMap.name = getRandomString();
     }
 
-    const validMap = {};
+    const validMap: FieldValueMap = {};
     for (const { fieldname, fieldtype } of fields) {
       if (fieldtype === FieldTypeEnum.Table) {
         continue;
@@ -703,7 +703,7 @@ export default class DatabaseCore {
       validMap[fieldname] = fieldValueMap[fieldname];
     }
 
-    return this.knex(schemaName).insert(fieldValueMap);
+    return this.knex!(schemaName).insert(fieldValueMap);
   }
 
   async #updateSingleValues(
@@ -728,7 +728,7 @@ export default class DatabaseCore {
     fieldname: string,
     value: RawValue
   ) {
-    return await this.knex('SingleValue')
+    return await this.knex!('SingleValue')
       .where({
         parent: singleSchemaName,
         fieldname,
@@ -758,7 +758,7 @@ export default class DatabaseCore {
         }
 
         return acc;
-      }, {});
+      }, {} as FieldValueMap);
 
       await this.#updateSingleValues(schemaName, defaultValues);
     }
@@ -767,7 +767,7 @@ export default class DatabaseCore {
   async #updateNonExtantSingleValues(schemaName: string) {
     const singleValues = await this.#getNonExtantSingleValues(schemaName);
     for (const sv of singleValues) {
-      await this.#updateSingleValue(schemaName, sv.fieldname, sv.value);
+      await this.#updateSingleValue(schemaName, sv.fieldname, sv.value!);
     }
   }
 
@@ -775,7 +775,7 @@ export default class DatabaseCore {
     const updateMap = { ...fieldValueMap };
     delete updateMap.name;
 
-    return await this.knex(schemaName)
+    return await this.knex!(schemaName)
       .where('name', fieldValueMap.name as string)
       .update(updateMap);
   }
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index ce5ed3af..51d142b8 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -6,7 +6,7 @@ import { runPatches } from './runPatch';
 import { Patch } from './types';
 
 export class DatabaseManager {
-  db: DatabaseCore;
+  db?: DatabaseCore;
   constructor() {}
 
   async createNewDatabase(dbPath: string, countryCode: string) {
@@ -26,6 +26,10 @@ export class DatabaseManager {
   }
 
   async migrate() {
+    if (this.db === undefined) {
+      return;
+    }
+
     const patchesToExecute = await this.#getPatchesToExecute();
     const preMigrationPatches = patchesToExecute.filter(
       (p) => p.patch.beforeMigrate
@@ -40,21 +44,26 @@ export class DatabaseManager {
   }
 
   async #getPatchesToExecute(): Promise<Patch[]> {
-    const query: { name: string }[] = await this.db
-      .knex('PatchRun')
-      .select('name');
+    if (this.db === undefined) {
+      return [];
+    }
+
+    const query: { name: string }[] = await this.db.knex!('PatchRun').select(
+      'name'
+    );
     const executedPatches = query.map((q) => q.name);
     return patches.filter((p) => !executedPatches.includes(p.name));
   }
 
   async #getCountryCode(): Promise<string | undefined> {
-    if (!this.db) {
+    if (this.db === undefined) {
       return undefined;
     }
 
-    const query = await this.db
-      .knex('SingleValue')
-      .where({ fieldname: 'countryCode', parent: 'SystemSettings' });
+    const query = await this.db.knex!('SingleValue').where({
+      fieldname: 'countryCode',
+      parent: 'SystemSettings',
+    });
 
     if (query.length > 0) {
       return query[0].countryCode as string;
@@ -67,7 +76,7 @@ export class DatabaseManager {
     try {
       fs.unlink(dbPath);
     } catch (err) {
-      if (err.code === 'ENOENT') {
+      if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
         return;
       }
 
diff --git a/backend/database/runPatch.ts b/backend/database/runPatch.ts
index 39cf5ece..8c521700 100644
--- a/backend/database/runPatch.ts
+++ b/backend/database/runPatch.ts
@@ -27,5 +27,5 @@ async function runPatch(patch: Patch, dm: DatabaseManager): Promise<boolean> {
 async function makeEntry(patchName: string, dm: DatabaseManager) {
   const defaultFieldValueMap = getDefaultMetaFieldValueMap() as FieldValueMap;
   defaultFieldValueMap.name = patchName;
-  await dm.db.insert('PatchRun', defaultFieldValueMap);
+  await dm.db!.insert('PatchRun', defaultFieldValueMap);
 }
diff --git a/backend/database/types.ts b/backend/database/types.ts
index 45547423..11f50ee0 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -1,19 +1,20 @@
 import { Field, RawValue } from '../../schemas/types';
+import { DatabaseManager } from './manager';
 
 export type QueryFilter = Record<string, string | string[]>;
 
 export interface GetQueryBuilderOptions {
-  offset: number;
-  limit: number;
-  groupBy: string;
-  orderBy: string;
-  order: 'desc' | 'asc';
+  offset?: number;
+  limit?: number;
+  groupBy?: string;
+  orderBy?: string;
+  order?: 'desc' | 'asc';
 }
 
 export interface GetAllOptions {
-  schemaName?: string;
+  schemaName: string;
   fields?: string[];
-  filters?: Record<string, string>;
+  filters?: QueryFilter;
   start?: number;
   limit?: number;
   groupBy?: string;
@@ -31,7 +32,17 @@ export interface Patch {
   name: string;
   version: string;
   patch: {
-    execute: (DatabaseManager) => Promise<void>;
+    execute: (dm: DatabaseManager) => Promise<void>;
     beforeMigrate?: boolean;
   };
 }
+
+export type KnexColumnType =
+  | 'text'
+  | 'integer'
+  | 'float'
+  | 'boolean'
+  | 'date'
+  | 'datetime'
+  | 'time'
+  | 'binary';
diff --git a/schemas/helpers.ts b/schemas/helpers.ts
index 65e7a570..93fce200 100644
--- a/schemas/helpers.ts
+++ b/schemas/helpers.ts
@@ -1,15 +1,15 @@
-export function getMapFromList<T>(
+export function getMapFromList<T, K extends keyof T>(
   list: T[],
-  name: string = 'name'
+  name: K
 ): Record<string, T> {
   const acc: Record<string, T> = {};
   for (const t of list) {
-    const key = t[name] as string | undefined;
+    const key = t[name];
     if (key === undefined) {
       continue;
     }
 
-    acc[key] = t;
+    acc[String(key)] = t;
   }
   return acc;
 }
diff --git a/schemas/index.ts b/schemas/index.ts
index a71611cc..59f2a443 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -13,8 +13,8 @@ export function getSchemas(countryCode: string = '-'): SchemaMap {
   return schemaMap;
 }
 
-function addMetaFields(schemaMap: SchemaMap): SchemaMap {
-  const metaSchemaMap = getMapFromList(metaSchemas);
+export function addMetaFields(schemaMap: SchemaMap): SchemaMap {
+  const metaSchemaMap = getMapFromList(metaSchemas, 'name');
 
   const base = metaSchemaMap.base;
   const tree = getCombined(metaSchemaMap.tree, base);
@@ -29,15 +29,15 @@ function addMetaFields(schemaMap: SchemaMap): SchemaMap {
     }
 
     if (schema.isTree && schema.isSubmittable) {
-      schema.fields = [...schema.fields, ...submittableTree.fields];
+      schema.fields = [...schema.fields, ...submittableTree.fields!];
     } else if (schema.isTree) {
-      schema.fields = [...schema.fields, ...tree.fields];
+      schema.fields = [...schema.fields, ...tree.fields!];
     } else if (schema.isSubmittable) {
-      schema.fields = [...schema.fields, ...submittable.fields];
+      schema.fields = [...schema.fields, ...submittable.fields!];
     } else if (schema.isChild) {
-      schema.fields = [...schema.fields, ...child.fields];
+      schema.fields = [...schema.fields, ...child.fields!];
     } else {
-      schema.fields = [...schema.fields, ...base.fields];
+      schema.fields = [...schema.fields, ...base.fields!];
     }
   }
 
@@ -45,18 +45,23 @@ function addMetaFields(schemaMap: SchemaMap): SchemaMap {
 }
 
 function getCoreSchemas(): SchemaMap {
-  const rawSchemaMap = getMapFromList(coreSchemas);
+  const rawSchemaMap = getMapFromList(coreSchemas, 'name');
   const coreSchemaMap = getAbstractCombinedSchemas(rawSchemaMap);
   return cleanSchemas(coreSchemaMap);
 }
 
 function getAppSchemas(countryCode: string): SchemaMap {
-  const combinedSchemas = getRegionalCombinedSchemas(countryCode);
+  const appSchemaMap = getMapFromList(appSchemas, 'name');
+  const regionalSchemaMap = getRegionalSchemaMap(countryCode);
+  const combinedSchemas = getRegionalCombinedSchemas(
+    appSchemaMap,
+    regionalSchemaMap
+  );
   const schemaMap = getAbstractCombinedSchemas(combinedSchemas);
   return cleanSchemas(schemaMap);
 }
 
-function cleanSchemas(schemaMap: SchemaMap): SchemaMap {
+export function cleanSchemas(schemaMap: SchemaMap): SchemaMap {
   for (const name in schemaMap) {
     const schema = schemaMap[name];
     if (schema.isAbstract && !schema.extends) {
@@ -97,13 +102,13 @@ function getCombined(
   return combined;
 }
 
-function getAbstractCombinedSchemas(schemas: SchemaStubMap): SchemaMap {
+export function getAbstractCombinedSchemas(schemas: SchemaStubMap): SchemaMap {
   const abstractSchemaNames: string[] = Object.keys(schemas).filter(
     (n) => schemas[n].isAbstract
   );
 
   const extendingSchemaNames: string[] = Object.keys(schemas).filter((n) =>
-    abstractSchemaNames.includes(schemas[n].extends)
+    abstractSchemaNames.includes(schemas[n].extends ?? '')
   );
 
   const completeSchemas: Schema[] = Object.keys(schemas)
@@ -113,11 +118,11 @@ function getAbstractCombinedSchemas(schemas: SchemaStubMap): SchemaMap {
     )
     .map((n) => schemas[n] as Schema);
 
-  const schemaMap = getMapFromList(completeSchemas) as SchemaMap;
+  const schemaMap = getMapFromList(completeSchemas, 'name') as SchemaMap;
 
   for (const name of extendingSchemaNames) {
     const extendingSchema = schemas[name] as Schema;
-    const abstractSchema = schemas[extendingSchema.extends] as SchemaStub;
+    const abstractSchema = schemas[extendingSchema.extends!] as SchemaStub;
 
     schemaMap[name] = getCombined(extendingSchema, abstractSchema) as Schema;
   }
@@ -129,9 +134,10 @@ function getAbstractCombinedSchemas(schemas: SchemaStubMap): SchemaMap {
   return schemaMap;
 }
 
-function getRegionalCombinedSchemas(countryCode: string): SchemaStubMap {
-  const regionalSchemaMap = getRegionalSchema(countryCode);
-  const appSchemaMap = getMapFromList(appSchemas);
+export function getRegionalCombinedSchemas(
+  appSchemaMap: SchemaStubMap,
+  regionalSchemaMap: SchemaStubMap
+): SchemaStubMap {
   const combined = { ...appSchemaMap };
 
   for (const name in regionalSchemaMap) {
@@ -148,7 +154,7 @@ function getRegionalCombinedSchemas(countryCode: string): SchemaStubMap {
   return combined;
 }
 
-function getRegionalSchema(countryCode: string): SchemaStubMap {
+function getRegionalSchemaMap(countryCode: string): SchemaStubMap {
   const countrySchemas = regionalSchemas[countryCode] as
     | SchemaStub[]
     | undefined;
@@ -156,5 +162,5 @@ function getRegionalSchema(countryCode: string): SchemaStubMap {
     return {};
   }
 
-  return getMapFromList(countrySchemas);
+  return getMapFromList(countrySchemas, 'name');
 }
diff --git a/schemas/regional/index.ts b/schemas/regional/index.ts
index 3616cca1..de55493e 100644
--- a/schemas/regional/index.ts
+++ b/schemas/regional/index.ts
@@ -1,6 +1,7 @@
+import { SchemaStub } from 'schemas/types';
 import IndianSchemas from './in';
 
 /**
  * Regional Schemas are exported by country code.
  */
-export default { in: IndianSchemas };
+export default { in: IndianSchemas } as Record<string, SchemaStub[]>;
diff --git a/tsconfig.json b/tsconfig.json
index 560cf708..e06233d2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,6 +10,7 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
+    "resolveJsonModule": true,
     "sourceMap": true,
     "baseUrl": ".",
     "types": ["webpack-env"],
@@ -23,8 +24,8 @@
     "src/**/*.tsx",
     "src/**/*.vue",
 
-    "tests/**/*.ts",
-    "tests/**/*.tsx",
+    "schemas/**/*.ts",
+    "backend/**/*.ts",
 
     "frappe/**/*.ts",
     "models/**/*.ts",

From 4800112ff408c54feeaf4d307076823fdd492dcd Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 25 Mar 2022 18:02:37 +0530
Subject: [PATCH 019/163] test: schema builder

---
 schemas/tests/helpers.ts                |  63 +++++++
 schemas/tests/testSchemaBuilder.spec.ts | 213 ++++++++++++++++++++++++
 schemas/types.ts                        |   5 +-
 3 files changed, 279 insertions(+), 2 deletions(-)
 create mode 100644 schemas/tests/helpers.ts
 create mode 100644 schemas/tests/testSchemaBuilder.spec.ts

diff --git a/schemas/tests/helpers.ts b/schemas/tests/helpers.ts
new file mode 100644
index 00000000..bf512333
--- /dev/null
+++ b/schemas/tests/helpers.ts
@@ -0,0 +1,63 @@
+import Account from '../app/Account.json';
+import Customer from '../app/Customer.json';
+import JournalEntry from '../app/JournalEntry.json';
+import JournalEntryAccount from '../app/JournalEntryAccount.json';
+import Party from '../app/Party.json';
+import PartyRegional from '../regional/in/Party.json';
+import { Schema, SchemaStub, SchemaStubMap } from '../types';
+
+interface AppSchemaMap extends SchemaStubMap {
+  Account: SchemaStub;
+  JournalEntry: SchemaStub;
+  JournalEntryAccount: SchemaStub;
+  Party: SchemaStub;
+  Customer: SchemaStub;
+}
+
+interface RegionalSchemaMap extends SchemaStubMap {
+  Party: SchemaStub;
+}
+
+export function getTestSchemaMap(): {
+  appSchemaMap: AppSchemaMap;
+  regionalSchemaMap: RegionalSchemaMap;
+} {
+  const appSchemaMap = {
+    Account,
+    JournalEntry,
+    JournalEntryAccount,
+    Party,
+    Customer,
+  } as AppSchemaMap;
+  const regionalSchemaMap = { Party: PartyRegional } as RegionalSchemaMap;
+
+  return {
+    appSchemaMap,
+    regionalSchemaMap,
+  };
+}
+
+export function everyFieldExists(fieldList: string[], schema: Schema): boolean {
+  return fieldsExist(fieldList, schema, 'every');
+}
+
+export function someFieldExists(fieldList: string[], schema: Schema): boolean {
+  return fieldsExist(fieldList, schema, 'some');
+}
+
+function fieldsExist(
+  fieldList: string[],
+  schema: Schema,
+  type: 'every' | 'some'
+): boolean {
+  const schemaFieldNames = schema.fields.map((f) => f.fieldname);
+  return fieldList.map((f) => schemaFieldNames.includes(f))[type](Boolean);
+}
+
+export function subtract(
+  targetList: string[],
+  ...removalLists: string[][]
+): string[] {
+  const removalList = removalLists.flat();
+  return targetList.filter((f) => !removalList.includes(f));
+}
diff --git a/schemas/tests/testSchemaBuilder.spec.ts b/schemas/tests/testSchemaBuilder.spec.ts
new file mode 100644
index 00000000..eeabafb9
--- /dev/null
+++ b/schemas/tests/testSchemaBuilder.spec.ts
@@ -0,0 +1,213 @@
+import * as assert from 'assert';
+import { cloneDeep, isEqual } from 'lodash';
+import { describe } from 'mocha';
+import { getMapFromList } from '../helpers';
+import {
+  addMetaFields,
+  cleanSchemas,
+  getAbstractCombinedSchemas,
+  getRegionalCombinedSchemas,
+} from '../index';
+import { metaSchemas } from '../schemas';
+import {
+  everyFieldExists,
+  getTestSchemaMap,
+  someFieldExists,
+  subtract,
+} from './helpers';
+
+describe('Schema Builder', function () {
+  const { appSchemaMap, regionalSchemaMap } = getTestSchemaMap();
+  describe('Raw Schemas', function () {
+    specify('Meta Properties', function () {
+      assert.strictEqual(appSchemaMap.Party.isAbstract, true);
+      assert.strictEqual(appSchemaMap.Customer.extends, 'Party');
+      assert.strictEqual(appSchemaMap.Account.isTree, true);
+      assert.strictEqual(appSchemaMap.JournalEntryAccount.isChild, true);
+    });
+
+    specify('Field Counts', function () {
+      assert.strictEqual(appSchemaMap.Account.fields?.length, 6);
+      assert.strictEqual(appSchemaMap.JournalEntry.fields?.length, 8);
+      assert.strictEqual(appSchemaMap.JournalEntryAccount.fields?.length, 3);
+      assert.strictEqual(appSchemaMap.Party.fields?.length, 8);
+      assert.strictEqual(appSchemaMap.Customer.fields?.length, undefined);
+      assert.strictEqual(regionalSchemaMap.Party.fields?.length, 2);
+    });
+
+    specify('Quick Edit Field Counts', function () {
+      assert.strictEqual(appSchemaMap.Party.quickEditFields?.length, 5);
+      assert.strictEqual(regionalSchemaMap.Party.quickEditFields?.length, 7);
+    });
+  });
+
+  const regionalCombined = getRegionalCombinedSchemas(
+    appSchemaMap,
+    regionalSchemaMap
+  );
+  describe('Regional Combined Schemas', function () {
+    specify('Field Counts', function () {
+      assert.strictEqual(regionalCombined.Party.fields?.length, 10);
+    });
+
+    specify('Quick Edit Field Counts', function () {
+      assert.strictEqual(regionalSchemaMap.Party.quickEditFields?.length, 7);
+    });
+
+    specify('Schema Equality with App Schemas', function () {
+      assert.strictEqual(
+        isEqual(regionalCombined.Account, appSchemaMap.Account),
+        true
+      );
+      assert.strictEqual(
+        isEqual(regionalCombined.JournalEntry, appSchemaMap.JournalEntry),
+        true
+      );
+      assert.strictEqual(
+        isEqual(
+          regionalCombined.JournalEntryAccount,
+          appSchemaMap.JournalEntryAccount
+        ),
+        true
+      );
+      assert.strictEqual(
+        isEqual(regionalCombined.Customer, appSchemaMap.Customer),
+        true
+      );
+      assert.strictEqual(
+        isEqual(regionalCombined.Party, appSchemaMap.Party),
+        false
+      );
+    });
+  });
+
+  const abstractCombined = cleanSchemas(
+    getAbstractCombinedSchemas(regionalCombined)
+  );
+  describe('Abstract Combined Schemas', function () {
+    specify('Meta Properties', function () {
+      assert.strictEqual(abstractCombined.Customer.extends, undefined);
+    });
+
+    specify('Abstract Schema Existance', function () {
+      assert.strictEqual(abstractCombined.Party, undefined);
+    });
+
+    specify('Field Counts', function () {
+      assert.strictEqual(abstractCombined.Customer.fields?.length, 10);
+    });
+
+    specify('Quick Edit Field Counts', function () {
+      assert.strictEqual(abstractCombined.Customer.quickEditFields?.length, 7);
+    });
+
+    specify('Schema Equality with App Schemas', function () {
+      assert.strictEqual(
+        isEqual(abstractCombined.Account, appSchemaMap.Account),
+        true
+      );
+      assert.strictEqual(
+        isEqual(abstractCombined.JournalEntry, appSchemaMap.JournalEntry),
+        true
+      );
+      assert.strictEqual(
+        isEqual(
+          abstractCombined.JournalEntryAccount,
+          appSchemaMap.JournalEntryAccount
+        ),
+        true
+      );
+      assert.strictEqual(
+        isEqual(abstractCombined.Customer, appSchemaMap.Customer),
+        false
+      );
+    });
+
+    specify('Schema Field Existance', function () {
+      assert.strictEqual(
+        everyFieldExists(
+          regionalSchemaMap.Party.quickEditFields ?? [],
+          abstractCombined.Customer
+        ),
+        true
+      );
+    });
+  });
+
+  const finalSchemas = addMetaFields(cloneDeep(abstractCombined));
+  const metaSchemaMap = getMapFromList(metaSchemas, 'name');
+  const baseFieldNames = metaSchemaMap.base.fields!.map((f) => f.fieldname);
+  const childFieldNames = metaSchemaMap.child.fields!.map((f) => f.fieldname);
+  const treeFieldNames = metaSchemaMap.tree.fields!.map((f) => f.fieldname);
+  const submittableFieldNames = metaSchemaMap.submittable.fields!.map(
+    (f) => f.fieldname
+  );
+  const allFieldNames = [
+    ...baseFieldNames,
+    ...childFieldNames,
+    ...treeFieldNames,
+    ...submittableFieldNames,
+  ];
+
+  describe('Final Schemas', function () {
+    specify('Schema Field Existance', function () {
+      assert.strictEqual(
+        everyFieldExists(baseFieldNames, finalSchemas.Customer),
+        true
+      );
+
+      assert.strictEqual(
+        someFieldExists(
+          subtract(allFieldNames, baseFieldNames),
+          finalSchemas.Customer
+        ),
+        false
+      );
+
+      assert.strictEqual(
+        everyFieldExists(
+          [...baseFieldNames, ...submittableFieldNames],
+          finalSchemas.JournalEntry
+        ),
+        true
+      );
+
+      assert.strictEqual(
+        someFieldExists(
+          subtract(allFieldNames, baseFieldNames, submittableFieldNames),
+          finalSchemas.JournalEntry
+        ),
+        false
+      );
+
+      assert.strictEqual(
+        everyFieldExists(childFieldNames, finalSchemas.JournalEntryAccount),
+        true
+      );
+
+      assert.strictEqual(
+        someFieldExists(
+          subtract(allFieldNames, childFieldNames),
+          finalSchemas.JournalEntryAccount
+        ),
+        false
+      );
+
+      assert.strictEqual(
+        everyFieldExists(
+          [...treeFieldNames, ...baseFieldNames],
+          finalSchemas.Account
+        ),
+        true
+      );
+
+      assert.strictEqual(
+        someFieldExists(
+          subtract(allFieldNames, treeFieldNames, baseFieldNames),
+          finalSchemas.Account
+        ),
+        false
+      );
+    });
+  });
+});
diff --git a/schemas/types.ts b/schemas/types.ts
index 1e531ac7..269e3f44 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -107,7 +107,7 @@ export type Field =
 
 export type TreeSettings = { parentField: string };
 
-// prettier-ignore
+// @formattoer:off
 export interface Schema {
   name: string;                  // Table PK
   label: string;                 // Translateable UI facing name
@@ -118,7 +118,8 @@ export interface Schema {
   isSingle?: boolean;            // Fields will be values in SingleValue, i.e. an Entity Attr. Value
   isAbstract?: boolean;          // Not entered into db, used to extend a Subclass schema
   isSubmittable?: boolean;       // For transactional types, values considered only after submit
-  keywordFields?: string[];      // Used for fields that are to be used for search.
+  keywordFields?: string[];      // Used to get fields that are to be used for search.
+  quickEditFields?: string[];    // Used to get fields for the quickEditForm
   treeSettings?: TreeSettings;   // Used to determine root nodes
 }
 

From f7a2dd8f2b342135ff413bac2e2e24eb1bedf750 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 28 Mar 2022 15:31:29 +0530
Subject: [PATCH 020/163] test: start with dbCore tests

---
 backend/database/core.ts                |  48 ++++---
 backend/database/tests/helpers.ts       | 164 ++++++++++++++++++++++++
 backend/database/tests/testCore.spec.ts | 126 ++++++++++++++++++
 backend/database/types.ts               |  10 ++
 package.json                            |   3 +-
 schemas/app/Payment.json                |   1 -
 schemas/app/SalesInvoice.json           |   1 -
 schemas/index.ts                        |  27 +++-
 schemas/schemas.ts                      |   3 +-
 schemas/tests/helpers.ts                |   5 +-
 schemas/types.ts                        |  11 +-
 src/main.js                             |   2 +
 tsconfig.json                           |   5 +-
 vue.config.js                           |   3 +
 yarn.lock                               |  25 ++++
 15 files changed, 403 insertions(+), 31 deletions(-)
 create mode 100644 backend/database/tests/helpers.ts
 create mode 100644 backend/database/tests/testCore.spec.ts

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 65fe7415..11077980 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -24,6 +24,17 @@ import {
   QueryFilter
 } from './types';
 
+/**
+ * Db Core Call Sequence
+ *
+ * 1. Init core: `const db = new DatabaseCore(dbPath)`.
+ * 2. Connect db: `db.connect()`. This will allow for raw queries to be executed.
+ * 3. Set schemas: `bb.setSchemaMap(schemaMap)`. This will allow for ORM functions to be executed.
+ * 4. Migrate: `await db.migrate()`. This will create absent tables and update the tables' shape.
+ * 5. ORM function execution: `db.get(...)`, `db.insert(...)`, etc.
+ * 6. Close connection: `await db.close()`.
+ */
+
 export default class DatabaseCore {
   knex?: Knex;
   typeMap = sqliteTypeMap;
@@ -60,13 +71,13 @@ export default class DatabaseCore {
     });
   }
 
-  close() {
-    this.knex!.destroy();
+  async close() {
+    await this.knex!.destroy();
   }
 
   async commit() {
     try {
-      await this.raw('commit');
+      await this.knex!.raw('commit');
     } catch (err) {
       const type = this.#getError(err as Error);
       if (type !== CannotCommitError) {
@@ -75,10 +86,6 @@ export default class DatabaseCore {
     }
   }
 
-  async raw(query: string, params: Knex.RawBinding[] = []) {
-    return await this.knex!.raw(query, params);
-  }
-
   async migrate() {
     for (const schemaName in this.schemaMap) {
       const schema = this.schemaMap[schemaName];
@@ -350,14 +357,14 @@ export default class DatabaseCore {
   }
 
   async #getTableColumns(schemaName: string): Promise<string[]> {
-    const info: FieldValueMap[] = await this.raw(
+    const info: FieldValueMap[] = await this.knex!.raw(
       `PRAGMA table_info(${schemaName})`
     );
     return info.map((d) => d.name as string);
   }
 
   async #getForeignKeys(schemaName: string): Promise<string[]> {
-    const foreignKeyList: FieldValueMap[] = await this.raw(
+    const foreignKeyList: FieldValueMap[] = await this.knex!.raw(
       `PRAGMA foreign_key_list(${schemaName})`
     );
     return foreignKeyList.map((d) => d.from as string);
@@ -506,14 +513,17 @@ export default class DatabaseCore {
     }
 
     // required
-    if (field.required || field.fieldtype === 'Currency') {
+    if (field.required) {
       column.notNullable();
     }
 
     // link
-    if (field.fieldtype === 'Link' && (field as TargetField).target) {
-      const targetschemaName = (field as TargetField).target as string;
-      const schema = this.schemaMap[targetschemaName];
+    if (
+      field.fieldtype === FieldTypeEnum.Link &&
+      (field as TargetField).target
+    ) {
+      const targetSchemaName = (field as TargetField).target as string;
+      const schema = this.schemaMap[targetSchemaName];
       table
         .foreign(field.fieldname)
         .references('name')
@@ -614,8 +624,8 @@ export default class DatabaseCore {
   }
 
   async #addForeignKeys(schemaName: string, newForeignKeys: Field[]) {
-    await this.raw('PRAGMA foreign_keys=OFF');
-    await this.raw('BEGIN TRANSACTION');
+    await this.knex!.raw('PRAGMA foreign_keys=OFF');
+    await this.knex!.raw('BEGIN TRANSACTION');
 
     const tempName = 'TEMP' + schemaName;
 
@@ -626,8 +636,8 @@ export default class DatabaseCore {
       // copy from old to new table
       await this.knex!(tempName).insert(this.knex!.select().from(schemaName));
     } catch (err) {
-      await this.raw('ROLLBACK');
-      await this.raw('PRAGMA foreign_keys=ON');
+      await this.knex!.raw('ROLLBACK');
+      await this.knex!.raw('PRAGMA foreign_keys=ON');
 
       const rows = await this.knex!.select().from(schemaName);
       await this.prestigeTheTable(schemaName, rows);
@@ -640,8 +650,8 @@ export default class DatabaseCore {
     // rename new table
     await this.knex!.schema.renameTable(tempName, schemaName);
 
-    await this.raw('COMMIT');
-    await this.raw('PRAGMA foreign_keys=ON');
+    await this.knex!.raw('COMMIT');
+    await this.knex!.raw('PRAGMA foreign_keys=ON');
   }
 
   async #loadChildren(
diff --git a/backend/database/tests/helpers.ts b/backend/database/tests/helpers.ts
new file mode 100644
index 00000000..f9c86206
--- /dev/null
+++ b/backend/database/tests/helpers.ts
@@ -0,0 +1,164 @@
+import { cloneDeep } from 'lodash';
+import { SchemaMap, SchemaStub, SchemaStubMap } from 'schemas/types';
+import {
+  addMetaFields,
+  cleanSchemas,
+  getAbstractCombinedSchemas,
+} from '../../../schemas';
+import SingleValue from '../../../schemas/core/SingleValue.json';
+
+const Customer = {
+  name: 'Customer',
+  label: 'Customer',
+  fields: [
+    {
+      fieldname: 'name',
+      label: 'Name',
+      fieldtype: 'Data',
+      default: 'John Thoe',
+      required: true,
+    },
+    {
+      fieldname: 'email',
+      label: 'Email',
+      fieldtype: 'Data',
+      placeholder: 'john@thoe.com',
+    },
+  ],
+  quickEditFields: ['email'],
+  keywordFields: ['name'],
+};
+
+const SalesInvoiceItem = {
+  name: 'SalesInvoiceItem',
+  label: 'Sales Invoice Item',
+  isChild: true,
+  fields: [
+    {
+      fieldname: 'item',
+      label: 'Item',
+      fieldtype: 'Data',
+      required: true,
+    },
+    {
+      fieldname: 'quantity',
+      label: 'Quantity',
+      fieldtype: 'Float',
+      required: true,
+      default: 1,
+    },
+    {
+      fieldname: 'rate',
+      label: 'Rate',
+      fieldtype: 'Currency',
+      required: true,
+    },
+    {
+      fieldname: 'amount',
+      label: 'Amount',
+      fieldtype: 'Currency',
+      computed: true,
+      readOnly: true,
+    },
+  ],
+  tableFields: ['item', 'quantity', 'rate', 'amount'],
+};
+
+const SalesInvoice = {
+  name: 'SalesInvoice',
+  label: 'Sales Invoice',
+  isSingle: false,
+  isChild: false,
+  isSubmittable: true,
+  keywordFields: ['name', 'customer'],
+  fields: [
+    {
+      label: 'Invoice No',
+      fieldname: 'name',
+      fieldtype: 'Data',
+      required: true,
+      readOnly: true,
+    },
+    {
+      fieldname: 'date',
+      label: 'Date',
+      fieldtype: 'Date',
+    },
+    {
+      fieldname: 'customer',
+      label: 'Customer',
+      fieldtype: 'Link',
+      target: 'Customer',
+      required: true,
+    },
+    {
+      fieldname: 'account',
+      label: 'Account',
+      fieldtype: 'Data',
+      required: true,
+    },
+    {
+      fieldname: 'items',
+      label: 'Items',
+      fieldtype: 'Table',
+      target: 'SalesInvoiceItem',
+      required: true,
+    },
+    {
+      fieldname: 'grandTotal',
+      label: 'Grand Total',
+      fieldtype: 'Currency',
+      computed: true,
+      readOnly: true,
+    },
+  ],
+};
+
+const SystemSettings = {
+  name: 'SystemSettings',
+  label: 'System Settings',
+  isSingle: true,
+  isChild: false,
+  fields: [
+    {
+      fieldname: 'dateFormat',
+      label: 'Date Format',
+      fieldtype: 'Select',
+      options: [
+        {
+          label: '23/03/2022',
+          value: 'dd/MM/yyyy',
+        },
+        {
+          label: '03/23/2022',
+          value: 'MM/dd/yyyy',
+        },
+      ],
+      default: 'dd/MM/yyyy',
+      required: true,
+    },
+    {
+      fieldname: 'locale',
+      label: 'Locale',
+      fieldtype: 'Data',
+      default: 'en-IN',
+    },
+  ],
+  quickEditFields: ['locale', 'dateFormat'],
+  keywordFields: [],
+};
+
+export function getBuiltTestSchemaMap(): SchemaMap {
+  const testSchemaMap: SchemaStubMap = {
+    SingleValue: SingleValue as SchemaStub,
+    Customer: Customer as SchemaStub,
+    SalesInvoice: SalesInvoice as SchemaStub,
+    SalesInvoiceItem: SalesInvoiceItem as SchemaStub,
+    SystemSettings: SystemSettings as SchemaStub,
+  };
+
+  const schemaMapClone = cloneDeep(testSchemaMap);
+  const abstractCombined = getAbstractCombinedSchemas(schemaMapClone);
+  const cleanedSchemas = cleanSchemas(abstractCombined);
+  return addMetaFields(cleanedSchemas);
+}
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
new file mode 100644
index 00000000..810a526e
--- /dev/null
+++ b/backend/database/tests/testCore.spec.ts
@@ -0,0 +1,126 @@
+import * as assert from 'assert';
+import 'mocha';
+import { getMapFromList } from 'schemas/helpers';
+import { FieldTypeEnum } from 'schemas/types';
+import { sqliteTypeMap } from '../../common';
+import DatabaseCore from '../core';
+import { SqliteTableInfo } from '../types';
+import { getBuiltTestSchemaMap } from './helpers';
+
+describe('DatabaseCore: Connect Migrate Close', async function () {
+  const db = new DatabaseCore();
+  specify('dbPath', function () {
+    assert.strictEqual(db.dbPath, ':memory:');
+  });
+
+  const schemaMap = getBuiltTestSchemaMap();
+  db.setSchemaMap(schemaMap);
+  specify('schemaMap', function () {
+    assert.strictEqual(schemaMap, db.schemaMap);
+  });
+
+  specify('connect', function () {
+    assert.doesNotThrow(() => db.connect());
+    assert.notStrictEqual(db.knex, undefined);
+  });
+
+  specify('migrate and close', async function () {
+    // Does not throw
+    await db.migrate();
+    // Does not throw
+    await db.close();
+  });
+});
+
+describe('DatabaseCore: Migrate and Check Db', function () {
+  let db: DatabaseCore;
+  const schemaMap = getBuiltTestSchemaMap();
+
+  this.beforeEach(async function () {
+    db = new DatabaseCore();
+    db.connect();
+    db.setSchemaMap(schemaMap);
+  });
+
+  this.afterEach(async function () {
+    await db.close();
+  });
+
+  specify(`Pre Migrate TableInfo`, async function () {
+    for (const schemaName in schemaMap) {
+      const columns = await db.knex?.raw('pragma table_info(??)', schemaName);
+      assert.strictEqual(columns.length, 0, `column count ${schemaName}`);
+    }
+  });
+
+  specify('Post Migrate TableInfo', async function () {
+    await db.migrate();
+    for (const schemaName in schemaMap) {
+      const schema = schemaMap[schemaName];
+      const fieldMap = getMapFromList(schema.fields, 'fieldname');
+      const columns: SqliteTableInfo[] = await db.knex!.raw(
+        'pragma table_info(??)',
+        schemaName
+      );
+
+      let columnCount = schema.fields.filter(
+        (f) => f.fieldtype !== FieldTypeEnum.Table
+      ).length;
+
+      if (schema.isSingle) {
+        columnCount = 0;
+      }
+
+      assert.strictEqual(
+        columns.length,
+        columnCount,
+        `${schemaName}:: column count: ${columns.length}, ${columnCount}`
+      );
+
+      for (const column of columns) {
+        const field = fieldMap[column.name];
+        const dbColType = sqliteTypeMap[field.fieldtype];
+
+        assert.strictEqual(
+          column.name,
+          field.fieldname,
+          `${schemaName}.${column.name}:: name check: ${column.name}, ${field.fieldname}`
+        );
+
+        assert.strictEqual(
+          column.type,
+          dbColType,
+          `${schemaName}.${column.name}:: type check: ${column.type}, ${dbColType}`
+        );
+
+        if (field.required !== undefined) {
+          assert.strictEqual(
+            !!column.notnull,
+            field.required,
+            `${schemaName}.${column.name}:: notnull check: ${column.notnull}, ${field.required}`
+          );
+        } else {
+          assert.strictEqual(
+            column.notnull,
+            0,
+            `${schemaName}.${column.name}:: notnull check: ${column.notnull}, ${field.required}`
+          );
+        }
+
+        if (column.dflt_value === null) {
+          assert.strictEqual(
+            field.default,
+            undefined,
+            `${schemaName}.${column.name}:: dflt_value check: ${column.dflt_value}, ${field.default}`
+          );
+        } else {
+          assert.strictEqual(
+            column.dflt_value.slice(1, -1),
+            String(field.default),
+            `${schemaName}.${column.name}:: dflt_value check: ${column.type}, ${dbColType}`
+          );
+        }
+      }
+    }
+  });
+});
diff --git a/backend/database/types.ts b/backend/database/types.ts
index 11f50ee0..b7aba7f0 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -46,3 +46,13 @@ export type KnexColumnType =
   | 'datetime'
   | 'time'
   | 'binary';
+
+// Returned by pragma table_info
+export interface SqliteTableInfo {
+  pk: number;
+  cid: number;
+  name: string;
+  type: string;
+  notnull: number; // 0 | 1
+  dflt_value: string | null;
+}
diff --git a/package.json b/package.json
index f8f3f6ae..25e5b7e7 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
     "script:translate": "node scripts/generateTranslations.js",
-    "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --reporter nyan --require ts-node/register ./**/tests/**/*.spec.ts"
+    "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --reporter nyan --require ts-node/register --require tsconfig-paths/register ./**/tests/**/*.spec.ts"
   },
   "dependencies": {
     "@popperjs/core": "^2.10.2",
@@ -66,6 +66,7 @@
     "raw-loader": "^4.0.2",
     "tailwindcss": "npm:@tailwindcss/postcss7-compat",
     "ts-node": "^10.7.0",
+    "tsconfig-paths": "^3.14.1",
     "tslib": "^2.3.1",
     "typescript": "^4.6.2",
     "vue-cli-plugin-electron-builder": "^2.0.0",
diff --git a/schemas/app/Payment.json b/schemas/app/Payment.json
index 7d614385..7aa1463e 100644
--- a/schemas/app/Payment.json
+++ b/schemas/app/Payment.json
@@ -4,7 +4,6 @@
   "isSingle": false,
   "isChild": false,
   "isSubmittable": true,
-  "settings": "PaymentSettings",
   "fields": [
     {
       "label": "Payment No",
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 76a74b62..11b93d6a 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -5,7 +5,6 @@
   "isChild": false,
   "isSubmittable": true,
   "keywordFields": ["name", "customer"],
-  "settings": "SalesInvoiceSettings",
   "fields": [
     {
       "label": "Invoice No",
diff --git a/schemas/index.ts b/schemas/index.ts
index 59f2a443..2ce1e138 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -2,7 +2,15 @@ import { cloneDeep } from 'lodash';
 import { getListFromMap, getMapFromList } from './helpers';
 import regionalSchemas from './regional';
 import { appSchemas, coreSchemas, metaSchemas } from './schemas';
-import { Schema, SchemaMap, SchemaStub, SchemaStubMap } from './types';
+import { Field, Schema, SchemaMap, SchemaStub, SchemaStubMap } from './types';
+
+const NAME_FIELD = {
+  fieldname: 'name',
+  label: `ID`,
+  fieldtype: 'Data',
+  required: true,
+  readOnly: true,
+};
 
 export function getSchemas(countryCode: string = '-'): SchemaMap {
   const builtCoreSchemas = getCoreSchemas();
@@ -41,9 +49,26 @@ export function addMetaFields(schemaMap: SchemaMap): SchemaMap {
     }
   }
 
+  addNameField(schemaMap);
   return schemaMap;
 }
 
+function addNameField(schemaMap: SchemaMap) {
+  for (const name in schemaMap) {
+    const schema = schemaMap[name];
+    if (schema.isSingle) {
+      continue;
+    }
+
+    const pkField = schema.fields.find((f) => f.fieldname === 'name');
+    if (pkField !== undefined) {
+      continue;
+    }
+
+    schema.fields.push(NAME_FIELD as Field);
+  }
+}
+
 function getCoreSchemas(): SchemaMap {
   const rawSchemaMap = getMapFromList(coreSchemas, 'name');
   const coreSchemaMap = getAbstractCombinedSchemas(rawSchemaMap);
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index 189d012d..1eeae100 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -29,9 +29,8 @@ import PatchRun from './core/PatchRun.json';
 import SingleValue from './core/SingleValue.json';
 import SystemSettings from './core/SystemSettings.json';
 import base from './meta/base.json';
-import submittable from './meta/submittable.json';
-//asdf
 import child from './meta/child.json';
+import submittable from './meta/submittable.json';
 import tree from './meta/tree.json';
 import { Schema, SchemaStub } from './types';
 
diff --git a/schemas/tests/helpers.ts b/schemas/tests/helpers.ts
index bf512333..0d9cd837 100644
--- a/schemas/tests/helpers.ts
+++ b/schemas/tests/helpers.ts
@@ -1,3 +1,4 @@
+import { cloneDeep } from 'lodash';
 import Account from '../app/Account.json';
 import Customer from '../app/Customer.json';
 import JournalEntry from '../app/JournalEntry.json';
@@ -31,10 +32,10 @@ export function getTestSchemaMap(): {
   } as AppSchemaMap;
   const regionalSchemaMap = { Party: PartyRegional } as RegionalSchemaMap;
 
-  return {
+  return cloneDeep({
     appSchemaMap,
     regionalSchemaMap,
-  };
+  });
 }
 
 export function everyFieldExists(fieldList: string[], schema: Schema): boolean {
diff --git a/schemas/types.ts b/schemas/types.ts
index 269e3f44..2dfbf271 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -9,7 +9,6 @@
  * If any field has to have a dynamic value, it should be added to the controller
  * file by the same name.
  *
- *
  * There are a few types of schemas:
  * - _Regional_: Schemas that are in the '../regional' subdirectories
  *      these can be of any of the below types.
@@ -31,6 +30,11 @@
  *
  * Note: if a Regional schema is not present as a non regional variant it's used
  * as it is.
+ * 
+ * ## Additional Notes
+ * 
+ * In all the schemas, the 'name' field/column is the primary key. If it isn't
+ * explicitly added, the schema builder will add it in.
  */
 
 export enum FieldTypeEnum {
@@ -107,9 +111,9 @@ export type Field =
 
 export type TreeSettings = { parentField: string };
 
-// @formattoer:off
+// @formatter:off
 export interface Schema {
-  name: string;                  // Table PK
+  name: string;                  // Table name
   label: string;                 // Translateable UI facing name
   fields: Field[];               // Maps to database columns
   isTree?: boolean;              // Used for nested set, eg for Chart of Accounts
@@ -117,6 +121,7 @@ export interface Schema {
   isChild?: boolean;             // Indicates a child table, i.e table with "parent" FK column
   isSingle?: boolean;            // Fields will be values in SingleValue, i.e. an Entity Attr. Value
   isAbstract?: boolean;          // Not entered into db, used to extend a Subclass schema
+  tableFields?: string[]         // Used for displaying childTableFields
   isSubmittable?: boolean;       // For transactional types, values considered only after submit
   keywordFields?: string[];      // Used to get fields that are to be used for search.
   quickEditFields?: string[];    // Used to get fields for the quickEditForm
diff --git a/src/main.js b/src/main.js
index a0264169..33bb2f59 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
 import { createApp } from 'vue';
+import { getBuiltTestSchemaMap } from '../backend/database/tests/helpers';
 import { getSchemas } from '../schemas';
 import App from './App';
 import FeatherIcon from './components/FeatherIcon';
@@ -104,3 +105,4 @@ import { setLanguageMap, stringifyCircular } from './utils';
 })();
 
 window.gs = getSchemas;
+window.gst = getBuiltTestSchemaMap;
diff --git a/tsconfig.json b/tsconfig.json
index e06233d2..c890372a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,10 @@
     "baseUrl": ".",
     "types": ["webpack-env"],
     "paths": {
-      "@/*": ["src/*"]
+      "@/*": ["src/*"],
+      "schemas/*": ["schemas/*"],
+      "backend/*": ["backend/*"],
+      "common/*": ["common/*"]
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },
diff --git a/vue.config.js b/vue.config.js
index 890a3e37..04f17139 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,6 +40,9 @@ module.exports = {
     Object.assign(config.resolve.alias, {
       frappe: path.resolve(__dirname, './frappe'),
       '~': path.resolve('.'),
+      schemas: path.resolve(__dirname, './schemas'),
+      backend: path.resolve(__dirname, './backend'),
+      common: path.resolve(__dirname, './common'),
     });
 
     config.plugins.push(
diff --git a/yarn.lock b/yarn.lock
index 5f4f31ac..f591ad28 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1338,6 +1338,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
 "@types/lodash@^4.14.179":
   version "4.14.179"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.179.tgz#490ec3288088c91295780237d2497a3aa9dfb5c5"
@@ -7887,6 +7892,11 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -10705,6 +10715,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -11177,6 +11192,16 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
+tsconfig-paths@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"

From f5d795d95b88f8ba61b116af2675ed469df20415 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 29 Mar 2022 13:48:39 +0530
Subject: [PATCH 021/163] test: add tests for singlevalue CRUD - add utils

---
 backend/common.ts                       |  10 +-
 backend/database/core.ts                |  78 ++++++++----
 backend/database/tests/helpers.ts       |   9 ++
 backend/database/tests/testCore.spec.ts | 156 +++++++++++++++++++++++-
 tsconfig.json                           |   3 +-
 utils/index.ts                          |  29 +++++
 vue.config.js                           |   1 +
 7 files changed, 253 insertions(+), 33 deletions(-)
 create mode 100644 utils/index.ts

diff --git a/backend/common.ts b/backend/common.ts
index 79a885cb..9eb9cb60 100644
--- a/backend/common.ts
+++ b/backend/common.ts
@@ -23,12 +23,14 @@ export const sqliteTypeMap: Record<string, KnexColumnType> = {
   Color: 'text',
 };
 
+export const SYSTEM = '__SYSTEM__';
 export const validTypes = Object.keys(sqliteTypeMap);
 export function getDefaultMetaFieldValueMap() {
+  const now = new Date().toISOString();
   return {
-    createdBy: '__SYSTEM__',
-    modifiedBy: '__SYSTEM__',
-    created: new Date().toISOString(),
-    modified: new Date().toISOString(),
+    createdBy: SYSTEM,
+    modifiedBy: SYSTEM,
+    created: now,
+    modified: now,
   };
 }
diff --git a/backend/database/core.ts b/backend/database/core.ts
index 11077980..c371e07b 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -1,5 +1,5 @@
 import { knex, Knex } from 'knex';
-import { getRandomString } from '../../frappe/utils';
+import { getRandomString, getValueMapFromList } from 'utils';
 import {
   CannotCommitError,
   DatabaseError,
@@ -15,7 +15,7 @@ import {
   SchemaMap,
   TargetField
 } from '../../schemas/types';
-import { sqliteTypeMap } from '../common';
+import { getDefaultMetaFieldValueMap, sqliteTypeMap, SYSTEM } from '../common';
 import {
   ColumnDiff,
   FieldValueMap,
@@ -155,9 +155,7 @@ export default class DatabaseCore {
      */
     let fieldValueMap: FieldValueMap = {};
     if (isSingle) {
-      fieldValueMap = await this.#getSingle(schemaName);
-      fieldValueMap.name = schemaName;
-      return fieldValueMap;
+      return await this.#getSingle(schemaName);
     }
 
     if (fields !== '*' && typeof fields === 'string') {
@@ -203,7 +201,7 @@ export default class DatabaseCore {
     start,
     limit,
     groupBy,
-    orderBy = 'creation',
+    orderBy = 'created',
     order = 'desc',
   }: GetAllOptions): Promise<FieldValueMap[]> {
     const schema = this.schemaMap[schemaName];
@@ -225,9 +223,9 @@ export default class DatabaseCore {
   }
 
   async getSingleValues(
-    ...fieldnames: { fieldname: string; parent?: string }[]
+    ...fieldnames: ({ fieldname: string; parent?: string } | string)[]
   ): Promise<{ fieldname: string; parent: string; value: RawValue }[]> {
-    fieldnames = fieldnames.map((fieldname) => {
+    const fieldnameList = fieldnames.map((fieldname) => {
       if (typeof fieldname === 'string') {
         return { fieldname };
       }
@@ -235,9 +233,9 @@ export default class DatabaseCore {
     });
 
     let builder = this.knex!('SingleValue');
-    builder = builder.where(fieldnames[0]);
+    builder = builder.where(fieldnameList[0]);
 
-    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
+    fieldnameList.slice(1).forEach(({ fieldname, parent }) => {
       if (typeof parent === 'undefined') {
         builder = builder.orWhere({ fieldname });
       } else {
@@ -279,6 +277,12 @@ export default class DatabaseCore {
   }
 
   async delete(schemaName: string, name: string) {
+    const schema = this.schemaMap[schemaName];
+    if (schema.isSingle) {
+      await this.#deleteSingle(schemaName, name);
+      return;
+    }
+
     await this.#deleteOne(schemaName, name);
 
     // delete children
@@ -305,12 +309,6 @@ export default class DatabaseCore {
     // TODO: Implement this for sqlite
   }
 
-  async #deleteSingleValues(singleSchemaName: string) {
-    return await this.knex!('SingleValue')
-      .where('parent', singleSchemaName)
-      .delete();
-  }
-
   #getError(err: Error) {
     let errorType = DatabaseError;
     if (err.message.includes('SQLITE_ERROR: no such table')) {
@@ -588,7 +586,13 @@ export default class DatabaseCore {
   }
 
   async #deleteOne(schemaName: string, name: string) {
-    return this.knex!(schemaName).where('name', name).delete();
+    return await this.knex!(schemaName).where('name', name).delete();
+  }
+
+  async #deleteSingle(schemaName: string, fieldname: string) {
+    return await this.knex!('SingleValue')
+      .where({ parent: schemaName, fieldname })
+      .delete();
   }
 
   #deleteChildren(schemaName: string, parentName: string) {
@@ -690,12 +694,7 @@ export default class DatabaseCore {
       order: 'asc',
     });
 
-    const fieldValueMap: FieldValueMap = {};
-    for (const row of values) {
-      fieldValueMap[row.fieldname as string] = row.value as RawValue;
-    }
-
-    return fieldValueMap;
+    return getValueMapFromList(values, 'fieldname', 'value') as FieldValueMap;
   }
 
   #insertOne(schemaName: string, fieldValueMap: FieldValueMap) {
@@ -721,7 +720,6 @@ export default class DatabaseCore {
     fieldValueMap: FieldValueMap
   ) {
     const fields = this.schemaMap[singleSchemaName].fields;
-    await this.#deleteSingleValues(singleSchemaName);
 
     for (const field of fields) {
       const value = fieldValueMap[field.fieldname] as RawValue | undefined;
@@ -738,12 +736,38 @@ export default class DatabaseCore {
     fieldname: string,
     value: RawValue
   ) {
-    return await this.knex!('SingleValue')
+    const names: { name: string }[] = await this.knex!('SingleValue')
+      .select('name')
       .where({
         parent: singleSchemaName,
         fieldname,
-      })
-      .update({ value });
+      });
+    const name = names?.[0]?.name as string | undefined;
+
+    if (name === undefined) {
+      this.#insertSingleValue(singleSchemaName, fieldname, value);
+    } else {
+      return await this.knex!('SingleValue').where({ name }).update({
+        value,
+        modifiedBy: SYSTEM,
+        modified: new Date().toISOString(),
+      });
+    }
+  }
+
+  async #insertSingleValue(
+    singleSchemaName: string,
+    fieldname: string,
+    value: RawValue
+  ) {
+    const updateMap = getDefaultMetaFieldValueMap();
+    const fieldValueMap: FieldValueMap = Object.assign({}, updateMap, {
+      parent: singleSchemaName,
+      fieldname,
+      value,
+      name: getRandomString(),
+    });
+    return await this.knex!('SingleValue').insert(fieldValueMap);
   }
 
   async #initializeSingles() {
diff --git a/backend/database/tests/helpers.ts b/backend/database/tests/helpers.ts
index f9c86206..1852a4e2 100644
--- a/backend/database/tests/helpers.ts
+++ b/backend/database/tests/helpers.ts
@@ -162,3 +162,12 @@ export function getBuiltTestSchemaMap(): SchemaMap {
   const cleanedSchemas = cleanSchemas(abstractCombined);
   return addMetaFields(cleanedSchemas);
 }
+
+export function getBaseMeta() {
+  return {
+    createdBy: 'Administrator',
+    modifiedBy: 'Administrator',
+    created: new Date().toISOString(),
+    modified: new Date().toISOString(),
+  };
+}
\ No newline at end of file
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index 810a526e..68c4c0f9 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -1,7 +1,8 @@
 import * as assert from 'assert';
 import 'mocha';
 import { getMapFromList } from 'schemas/helpers';
-import { FieldTypeEnum } from 'schemas/types';
+import { FieldTypeEnum, RawValue } from 'schemas/types';
+import { getValueMapFromList } from 'utils';
 import { sqliteTypeMap } from '../../common';
 import DatabaseCore from '../core';
 import { SqliteTableInfo } from '../types';
@@ -124,3 +125,156 @@ describe('DatabaseCore: Migrate and Check Db', function () {
     }
   });
 });
+
+describe('DatabaseCore: CRUD', function () {
+  let db: DatabaseCore;
+  const schemaMap = getBuiltTestSchemaMap();
+
+  this.beforeEach(async function () {
+    db = new DatabaseCore();
+    db.connect();
+    db.setSchemaMap(schemaMap);
+    await db.migrate();
+  });
+
+  this.afterEach(async function () {
+    await db.close();
+  });
+
+  specify('exists() before insertion', async function () {
+    for (const schemaName in schemaMap) {
+      const doesExist = await db.exists(schemaName);
+      if (['SingleValue', 'SystemSettings'].includes(schemaName)) {
+        assert.strictEqual(doesExist, true, `${schemaName} exists`);
+      } else {
+        assert.strictEqual(doesExist, false, `${schemaName} exists`);
+      }
+    }
+  });
+
+  specify('CRUD single values', async function () {
+    /**
+     * Checking default values which are created when db.migrate
+     * takes place.
+     */
+    let rows: Record<string, RawValue>[] = await db.knex!.raw(
+      'select * from SingleValue'
+    );
+    const defaultMap = getValueMapFromList(
+      schemaMap.SystemSettings.fields,
+      'fieldname',
+      'default'
+    );
+    for (const row of rows) {
+      assert.strictEqual(
+        row.value,
+        defaultMap[row.fieldname as string],
+        `${row.fieldname} default values equality`
+      );
+    }
+
+    /**
+     * Insertion and updation for single values call the same function.
+     *
+     * Insert
+     */
+
+    let localeRow = rows.find((r) => r.fieldname === 'locale');
+    const localeEntryName = localeRow?.name as string;
+    const localeEntryCreated = localeRow?.created as string;
+
+    let locale = 'hi-IN';
+    await db.insert('SystemSettings', { locale });
+    rows = await db.knex!.raw('select * from SingleValue');
+    localeRow = rows.find((r) => r.fieldname === 'locale');
+
+    assert.notStrictEqual(localeEntryName, undefined, 'localeEntryName');
+    assert.strictEqual(rows.length, 2, 'row length');
+    assert.strictEqual(
+      localeRow?.name as string,
+      localeEntryName,
+      `localeEntryName ${localeRow?.name}, ${localeEntryName}`
+    );
+    assert.strictEqual(
+      localeRow?.value,
+      locale,
+      `locale ${localeRow?.value}, ${locale}`
+    );
+    assert.strictEqual(
+      localeRow?.created,
+      localeEntryCreated,
+      `locale ${localeRow?.value}, ${locale}`
+    );
+
+    /**
+     * Update
+     */
+    locale = 'ca-ES';
+    await db.update('SystemSettings', { locale });
+    rows = await db.knex!.raw('select * from SingleValue');
+    localeRow = rows.find((r) => r.fieldname === 'locale');
+
+    assert.notStrictEqual(localeEntryName, undefined, 'localeEntryName');
+    assert.strictEqual(rows.length, 2, 'row length');
+    assert.strictEqual(
+      localeRow?.name as string,
+      localeEntryName,
+      `localeEntryName ${localeRow?.name}, ${localeEntryName}`
+    );
+    assert.strictEqual(
+      localeRow?.value,
+      locale,
+      `locale ${localeRow?.value}, ${locale}`
+    );
+    assert.strictEqual(
+      localeRow?.created,
+      localeEntryCreated,
+      `locale ${localeRow?.value}, ${locale}`
+    );
+
+    /**
+     * Delete
+     */
+    await db.delete('SystemSettings', 'locale');
+    rows = await db.knex!.raw('select * from SingleValue');
+    assert.strictEqual(rows.length, 1, 'delete one');
+    await db.delete('SystemSettings', 'dateFormat');
+    rows = await db.knex!.raw('select * from SingleValue');
+    assert.strictEqual(rows.length, 0, 'delete two');
+
+    const dateFormat = 'dd/mm/yy';
+    await db.insert('SystemSettings', { locale, dateFormat });
+    rows = await db.knex!.raw('select * from SingleValue');
+    assert.strictEqual(rows.length, 2, 'delete two');
+
+    /**
+     * Read
+     *
+     * getSingleValues
+     */
+    const svl = await db.getSingleValues('locale', 'dateFormat');
+    assert.strictEqual(svl.length, 2, 'getSingleValues length');
+    for (const sv of svl) {
+      assert.strictEqual(
+        sv.parent,
+        'SystemSettings',
+        `singleValue parent ${sv.parent}`
+      );
+      assert.strictEqual(
+        sv.value,
+        { locale, dateFormat }[sv.fieldname],
+        `singleValue value ${sv.value}`
+      );
+
+      /**
+       * get
+       */
+      const svlMap = await db.get('SystemSettings');
+      assert.strictEqual(Object.keys(svlMap).length, 2, 'get key length');
+      assert.strictEqual(svlMap.locale, locale, 'get locale');
+      assert.strictEqual(svlMap.dateFormat, dateFormat, 'get locale');
+    }
+  });
+
+  specify('CRUD simple nondependent schema', async function () {});
+});
diff --git a/tsconfig.json b/tsconfig.json
index c890372a..6330a185 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,8 @@
       "@/*": ["src/*"],
       "schemas/*": ["schemas/*"],
       "backend/*": ["backend/*"],
-      "common/*": ["common/*"]
+      "common/*": ["common/*"],
+      "utils/*": ["utils/*"]
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },
diff --git a/utils/index.ts b/utils/index.ts
new file mode 100644
index 00000000..dcac32b4
--- /dev/null
+++ b/utils/index.ts
@@ -0,0 +1,29 @@
+/**
+ * Functions in utils/*.ts can be used by the frontend or the backends
+ * And so should not contain and platforma specific imports.
+ */
+export function getValueMapFromList<T, K extends keyof T, V extends keyof T>(
+  list: T[],
+  key: K,
+  valueKey: V,
+  filterUndefined: boolean = true
+): Record<string, unknown> {
+  if (filterUndefined) {
+    list = list.filter(
+      (f) =>
+        (f[valueKey] as unknown) !== undefined &&
+        (f[key] as unknown) !== undefined
+    );
+  }
+
+  return list.reduce((acc, f) => {
+    const keyValue = String(f[key]);
+    const value = f[valueKey];
+    acc[keyValue] = value;
+    return acc;
+  }, {} as Record<string, unknown>);
+}
+
+export function getRandomString(): string {
+  return Math.random().toString(36).slice(2, 8);
+}
diff --git a/vue.config.js b/vue.config.js
index 04f17139..bc2e0e95 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -43,6 +43,7 @@ module.exports = {
       schemas: path.resolve(__dirname, './schemas'),
       backend: path.resolve(__dirname, './backend'),
       common: path.resolve(__dirname, './common'),
+      utils: path.resolve(__dirname, './utils'),
     });
 
     config.plugins.push(

From 18dd3f8518d8d0a6521889a606c3d0b2d2e3dd11 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 30 Mar 2022 12:46:01 +0530
Subject: [PATCH 022/163] test: add more dbcore tests - fix bugs in core.ts

---
 backend/database/core.ts                | 148 ++++++-----
 backend/database/tests/helpers.ts       |  43 ++-
 backend/database/tests/testCore.spec.ts | 332 +++++++++++++++++++++++-
 backend/database/types.ts               |   3 +-
 utils/index.ts                          |   4 +
 5 files changed, 451 insertions(+), 79 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index c371e07b..4468715f 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -6,14 +6,14 @@ import {
   DuplicateEntryError,
   LinkValidationError,
   NotFoundError,
-  ValueError
+  ValueError,
 } from '../../frappe/utils/errors';
 import {
   Field,
   FieldTypeEnum,
   RawValue,
   SchemaMap,
-  TargetField
+  TargetField,
 } from '../../schemas/types';
 import { getDefaultMetaFieldValueMap, sqliteTypeMap, SYSTEM } from '../common';
 import {
@@ -21,11 +21,15 @@ import {
   FieldValueMap,
   GetAllOptions,
   GetQueryBuilderOptions,
-  QueryFilter
+  QueryFilter,
 } from './types';
 
 /**
- * Db Core Call Sequence
+ * # DatabaseCore
+ * This is the ORM, the DatabaseCore interface (function signatures) should be
+ * replicated by the frontend demuxes and all the backend muxes.
+ *
+ * ## Db Core Call Sequence
  *
  * 1. Init core: `const db = new DatabaseCore(dbPath)`.
  * 2. Connect db: `db.connect()`. This will allow for raw queries to be executed.
@@ -33,6 +37,10 @@ import {
  * 4. Migrate: `await db.migrate()`. This will create absent tables and update the tables' shape.
  * 5. ORM function execution: `db.get(...)`, `db.insert(...)`, etc.
  * 6. Close connection: `await db.close()`.
+ *
+ * Note: Meta values: created, modified, createdBy, modifiedBy are set by DatabaseCore
+ * only for schemas that are SingleValue. Else they have to be passed by the caller in
+ * the `fieldValueMap`.
  */
 
 export default class DatabaseCore {
@@ -141,10 +149,10 @@ export default class DatabaseCore {
   async get(
     schemaName: string,
     name: string = '',
-    fields: string | string[] = '*'
+    fields?: string | string[]
   ): Promise<FieldValueMap> {
-    const isSingle = this.schemaMap[schemaName].isSingle;
-    if (!isSingle && !name) {
+    const schema = this.schemaMap[schemaName];
+    if (!schema.isSingle && !name) {
       throw new ValueError('name is mandatory');
     }
 
@@ -154,38 +162,37 @@ export default class DatabaseCore {
      * is ignored.
      */
     let fieldValueMap: FieldValueMap = {};
-    if (isSingle) {
+    if (schema.isSingle) {
       return await this.#getSingle(schemaName);
     }
 
-    if (fields !== '*' && typeof fields === 'string') {
+    if (typeof fields === 'string') {
       fields = [fields];
     }
 
+    if (fields === undefined) {
+      fields = schema.fields.map((f) => f.fieldname);
+    }
+
     /**
      * Separate table fields and non table fields
      */
-    const allTableFields = this.#getTableFields(schemaName);
-    const allTableFieldNames = allTableFields.map((f) => f.fieldname);
-
-    let tableFields: TargetField[] = [];
-    let nonTableFieldNames: string[] = [];
-
-    if (Array.isArray(fields)) {
-      tableFields = tableFields.filter((f) => fields.includes(f.fieldname));
-      nonTableFieldNames = fields.filter(
-        (f) => !allTableFieldNames.includes(f)
-      );
-    } else if (fields === '*') {
-      tableFields = allTableFields;
-    }
+    const allTableFields: TargetField[] = this.#getTableFields(schemaName);
+    const allTableFieldNames: string[] = allTableFields.map((f) => f.fieldname);
+    const tableFields: TargetField[] = allTableFields.filter((f) =>
+      fields!.includes(f.fieldname)
+    );
+    const nonTableFieldNames: string[] = fields.filter(
+      (f) => !allTableFieldNames.includes(f)
+    );
 
     /**
      * If schema is not single then return specific fields
      * if child fields are selected, all child fields are returned.
      */
     if (nonTableFieldNames.length) {
-      fieldValueMap = (await this.#getOne(schemaName, name, fields)) ?? {};
+      fieldValueMap =
+        (await this.#getOne(schemaName, name, nonTableFieldNames)) ?? {};
     }
 
     if (tableFields.length) {
@@ -194,32 +201,34 @@ export default class DatabaseCore {
     return fieldValueMap;
   }
 
-  async getAll({
-    schemaName,
-    fields,
-    filters,
-    start,
-    limit,
-    groupBy,
-    orderBy = 'created',
-    order = 'desc',
-  }: GetAllOptions): Promise<FieldValueMap[]> {
+  async getAll(
+    schemaName: string,
+    options: GetAllOptions = {}
+  ): Promise<FieldValueMap[]> {
     const schema = this.schemaMap[schemaName];
-    if (!fields) {
-      fields = ['name', ...(schema.keywordFields ?? [])];
-    }
-
-    if (typeof fields === 'string') {
-      fields = [fields];
-    }
-
-    return (await this.#getQueryBuilder(schemaName, fields, filters ?? {}, {
-      offset: start,
+    const hasCreated = !!schema.fields.find((f) => f.fieldname === 'created');
+    const {
+      fields = ['name', ...(schema.keywordFields ?? [])],
+      filters,
+      offset,
       limit,
       groupBy,
-      orderBy,
-      order,
-    })) as FieldValueMap[];
+      orderBy = hasCreated ? 'created' : undefined,
+      order = 'desc',
+    } = options;
+
+    return (await this.#getQueryBuilder(
+      schemaName,
+      typeof fields === 'string' ? [fields] : fields,
+      filters ?? {},
+      {
+        offset,
+        limit,
+        groupBy,
+        orderBy,
+        order,
+      }
+    )) as FieldValueMap[];
   }
 
   async getSingleValues(
@@ -258,6 +267,11 @@ export default class DatabaseCore {
   }
 
   async rename(schemaName: string, oldName: string, newName: string) {
+    /**
+     * Rename is expensive mostly won't allow it.
+     * TODO: rename all links
+     * TODO: rename in childtables
+     */
     await this.knex!(schemaName)
       .update({ name: newName })
       .where('name', oldName);
@@ -621,7 +635,7 @@ export default class DatabaseCore {
     if (!child.name) {
       child.name = getRandomString();
     }
-    child.parentName = parentName;
+    child.parent = parentName;
     child.parentSchemaName = parentSchemaName;
     child.parentFieldname = field.fieldname;
     child.idx = idx;
@@ -663,8 +677,7 @@ export default class DatabaseCore {
     tableFields: TargetField[]
   ) {
     for (const field of tableFields) {
-      fieldValueMap[field.fieldname] = await this.getAll({
-        schemaName: field.target,
+      fieldValueMap[field.fieldname] = await this.getAll(field.target, {
         fields: ['*'],
         filters: { parent: fieldValueMap.name as string },
         orderBy: 'idx',
@@ -673,11 +686,7 @@ export default class DatabaseCore {
     }
   }
 
-  async #getOne(
-    schemaName: string,
-    name: string,
-    fields: string | string[] = '*'
-  ) {
+  async #getOne(schemaName: string, name: string, fields: string[]) {
     const fieldValueMap: FieldValueMap = await this.knex!.select(fields)
       .from(schemaName)
       .where('name', name)
@@ -686,8 +695,7 @@ export default class DatabaseCore {
   }
 
   async #getSingle(schemaName: string): Promise<FieldValueMap> {
-    const values = await this.getAll({
-      schemaName: 'SingleValue',
+    const values = await this.getAll('SingleValue', {
       fields: ['fieldname', 'value'],
       filters: { parent: schemaName },
       orderBy: 'fieldname',
@@ -698,21 +706,21 @@ export default class DatabaseCore {
   }
 
   #insertOne(schemaName: string, fieldValueMap: FieldValueMap) {
-    const fields = this.schemaMap[schemaName].fields;
     if (!fieldValueMap.name) {
       fieldValueMap.name = getRandomString();
     }
 
-    const validMap: FieldValueMap = {};
-    for (const { fieldname, fieldtype } of fields) {
-      if (fieldtype === FieldTypeEnum.Table) {
-        continue;
-      }
+    // Non Table Fields
+    const fields = this.schemaMap[schemaName].fields.filter(
+      (f) => f.fieldtype !== FieldTypeEnum.Table
+    );
 
+    const validMap: FieldValueMap = {};
+    for (const { fieldname } of fields) {
       validMap[fieldname] = fieldValueMap[fieldname];
     }
 
-    return this.knex!(schemaName).insert(fieldValueMap);
+    return this.knex!(schemaName).insert(validMap);
   }
 
   async #updateSingleValues(
@@ -808,6 +816,18 @@ export default class DatabaseCore {
   async #updateOne(schemaName: string, fieldValueMap: FieldValueMap) {
     const updateMap = { ...fieldValueMap };
     delete updateMap.name;
+    const schema = this.schemaMap[schemaName];
+    for (const { fieldname, fieldtype } of schema.fields) {
+      if (fieldtype !== FieldTypeEnum.Table) {
+        continue;
+      }
+
+      delete updateMap[fieldname];
+    }
+
+    if (Object.keys(updateMap).length === 0) {
+      return;
+    }
 
     return await this.knex!(schemaName)
       .where('name', fieldValueMap.name as string)
diff --git a/backend/database/tests/helpers.ts b/backend/database/tests/helpers.ts
index 1852a4e2..448816e1 100644
--- a/backend/database/tests/helpers.ts
+++ b/backend/database/tests/helpers.ts
@@ -1,3 +1,4 @@
+import assert from 'assert';
 import { cloneDeep } from 'lodash';
 import { SchemaMap, SchemaStub, SchemaStubMap } from 'schemas/types';
 import {
@@ -15,7 +16,6 @@ const Customer = {
       fieldname: 'name',
       label: 'Name',
       fieldtype: 'Data',
-      default: 'John Thoe',
       required: true,
     },
     {
@@ -50,13 +50,13 @@ const SalesInvoiceItem = {
     {
       fieldname: 'rate',
       label: 'Rate',
-      fieldtype: 'Currency',
+      fieldtype: 'Float',
       required: true,
     },
     {
       fieldname: 'amount',
       label: 'Amount',
-      fieldtype: 'Currency',
+      fieldtype: 'Float',
       computed: true,
       readOnly: true,
     },
@@ -170,4 +170,39 @@ export function getBaseMeta() {
     created: new Date().toISOString(),
     modified: new Date().toISOString(),
   };
-}
\ No newline at end of file
+}
+
+export async function assertThrows(
+  func: () => Promise<unknown>,
+  message?: string
+) {
+  let threw = true;
+  try {
+    await func();
+    threw = false;
+  } catch {
+  } finally {
+    if (!threw) {
+      throw new assert.AssertionError({
+        message: `Missing expected exception: ${message}`,
+      });
+    }
+  }
+}
+
+export async function assertDoesNotThrow(
+  func: () => Promise<unknown>,
+  message?: string
+) {
+  try {
+    await func();
+  } catch (err) {
+    throw new assert.AssertionError({
+      message: `Missing expected exception: ${message} Error: ${
+        (err as Error).message
+      }`,
+    });
+  }
+}
+
+export type BaseMetaKey = 'created' | 'modified' | 'createdBy' | 'modifiedBy';
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index 68c4c0f9..9f0d926b 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -2,13 +2,29 @@ import * as assert from 'assert';
 import 'mocha';
 import { getMapFromList } from 'schemas/helpers';
 import { FieldTypeEnum, RawValue } from 'schemas/types';
-import { getValueMapFromList } from 'utils';
-import { sqliteTypeMap } from '../../common';
+import { getValueMapFromList, sleep } from 'utils';
+import { getDefaultMetaFieldValueMap, sqliteTypeMap } from '../../common';
 import DatabaseCore from '../core';
-import { SqliteTableInfo } from '../types';
-import { getBuiltTestSchemaMap } from './helpers';
+import { FieldValueMap, SqliteTableInfo } from '../types';
+import {
+  assertDoesNotThrow,
+  assertThrows,
+  BaseMetaKey,
+  getBuiltTestSchemaMap,
+} from './helpers';
 
-describe('DatabaseCore: Connect Migrate Close', async function () {
+/**
+ * Note: these tests have a strange structure where multiple tests are
+ * inside a `specify`, this is cause `describe` doesn't support `async` or waiting
+ * on promises.
+ *
+ * Due to this `async` db operations need to be handled in `specify`. And `specify`
+ * can't be nested in the `describe` can, hence the strange structure.
+ *
+ * This also implies that assert calls should have discriptive
+ */
+
+describe('DatabaseCore: Connect Migrate Close', function () {
   const db = new DatabaseCore();
   specify('dbPath', function () {
     assert.strictEqual(db.dbPath, ':memory:');
@@ -98,7 +114,7 @@ describe('DatabaseCore: Migrate and Check Db', function () {
           assert.strictEqual(
             !!column.notnull,
             field.required,
-            `${schemaName}.${column.name}:: notnull check: ${column.notnull}, ${field.required}`
+            `${schemaName}.${column.name}:: iotnull iheck: ${column.notnull}, ${field.required}`
           );
         } else {
           assert.strictEqual(
@@ -189,7 +205,7 @@ describe('DatabaseCore: CRUD', function () {
     localeRow = rows.find((r) => r.fieldname === 'locale');
 
     assert.notStrictEqual(localeEntryName, undefined, 'localeEntryName');
-    assert.strictEqual(rows.length, 2, 'row length');
+    assert.strictEqual(rows.length, 2, 'rows length insert');
     assert.strictEqual(
       localeRow?.name as string,
       localeEntryName,
@@ -215,7 +231,7 @@ describe('DatabaseCore: CRUD', function () {
     localeRow = rows.find((r) => r.fieldname === 'locale');
 
     assert.notStrictEqual(localeEntryName, undefined, 'localeEntryName');
-    assert.strictEqual(rows.length, 2, 'row length');
+    assert.strictEqual(rows.length, 2, 'rows length update');
     assert.strictEqual(
       localeRow?.name as string,
       localeEntryName,
@@ -276,5 +292,303 @@ describe('DatabaseCore: CRUD', function () {
     }
   });
 
-  specify('CRUD simple nondependent schema', async function () {});
+  specify('CRUD nondependent schema', async function () {
+    const schemaName = 'Customer';
+    let rows = await db.knex!(schemaName);
+    assert.strictEqual(rows.length, 0, 'rows length before insertion');
+
+    /**
+     * Insert
+     */
+    const metaValues = getDefaultMetaFieldValueMap();
+    const name = 'John Thoe';
+
+    await assertThrows(
+      async () => await db.insert(schemaName, { name }),
+      'insert() did not throw without meta values'
+    );
+
+    const updateMap = Object.assign({}, metaValues, { name });
+    await db.insert(schemaName, updateMap);
+    rows = await db.knex!(schemaName);
+    let firstRow = rows?.[0];
+    assert.strictEqual(rows.length, 1, `rows length insert ${rows.length}`);
+    assert.strictEqual(
+      firstRow.name,
+      name,
+      `name check ${firstRow.name}, ${name}`
+    );
+    assert.strictEqual(firstRow.email, null, `email check ${firstRow.email}`);
+
+    for (const key in metaValues) {
+      assert.strictEqual(
+        firstRow[key],
+        metaValues[key as BaseMetaKey],
+        `${key} check`
+      );
+    }
+
+    /**
+     * Update
+     */
+    const email = 'john@thoe.com';
+    await sleep(1); // required for modified to change
+    await db.update(schemaName, {
+      name,
+      email,
+      modified: new Date().toISOString(),
+    });
+    rows = await db.knex!(schemaName);
+    firstRow = rows?.[0];
+    assert.strictEqual(rows.length, 1, `rows length update ${rows.length}`);
+    assert.strictEqual(
+      firstRow.name,
+      name,
+      `name check update ${firstRow.name}, ${name}`
+    );
+    assert.strictEqual(
+      firstRow.email,
+      email,
+      `email check update ${firstRow.email}`
+    );
+
+    for (const key in metaValues) {
+      const val = firstRow[key];
+      const expected = metaValues[key as BaseMetaKey];
+      if (key !== 'modified') {
+        assert.strictEqual(val, expected, `${key} check ${val}, ${expected}`);
+      } else {
+        assert.notStrictEqual(
+          val,
+          expected,
+          `${key} check ${val}, ${expected}`
+        );
+      }
+    }
+
+    /**
+     * Delete
+     */
+    await db.delete(schemaName, name);
+    rows = await db.knex!(schemaName);
+    assert.strictEqual(rows.length, 0, `rows length delete ${rows.length}`);
+
+    /**
+     * Get
+     */
+    let fvMap = await db.get(schemaName, name);
+    assert.strictEqual(
+      Object.keys(fvMap).length,
+      0,
+      `key count get ${JSON.stringify(fvMap)}`
+    );
+
+    /**
+     * > 1 entries
+     */
+
+    const cOne = { name: 'John Whoe', ...getDefaultMetaFieldValueMap() };
+    const cTwo = { name: 'Jane Whoe', ...getDefaultMetaFieldValueMap() };
+
+    // Insert
+    await db.insert(schemaName, cOne);
+    assert.strictEqual(
+      (await db.knex!(schemaName)).length,
+      1,
+      `rows length minsert`
+    );
+    await db.insert(schemaName, cTwo);
+    rows = await db.knex!(schemaName);
+    assert.strictEqual(rows.length, 2, `rows length minsert`);
+
+    const cs = [cOne, cTwo];
+    for (const i in cs) {
+      for (const k in cs[i]) {
+        const val = cs[i][k as BaseMetaKey];
+        assert.strictEqual(
+          rows?.[i]?.[k],
+          val,
+          `equality check ${i} ${k} ${val} ${rows?.[i]?.[k]}`
+        );
+      }
+    }
+
+    // Update
+    await db.update(schemaName, { name: cOne.name, email });
+    const cOneEmail = await db.get(schemaName, cOne.name, 'email');
+    assert.strictEqual(
+      cOneEmail.email,
+      email,
+      `mi update check one ${cOneEmail}`
+    );
+    const cTwoEmail = await db.get(schemaName, cTwo.name, 'email');
+    assert.strictEqual(
+      cOneEmail.email,
+      email,
+      `mi update check two ${cTwoEmail}`
+    );
+
+    // Rename
+    const newName = 'Johnny Whoe';
+    await db.rename(schemaName, cOne.name, newName);
+
+    fvMap = await db.get(schemaName, cOne.name);
+    assert.strictEqual(
+      Object.keys(fvMap).length,
+      0,
+      `mi rename check old ${JSON.stringify(fvMap)}`
+    );
+
+    fvMap = await db.get(schemaName, newName);
+    assert.strictEqual(
+      fvMap.email,
+      email,
+      `mi rename check new ${JSON.stringify(fvMap)}`
+    );
+
+    // Delete
+    await db.delete(schemaName, newName);
+    rows = await db.knex!(schemaName);
+    assert.strictEqual(rows.length, 1, `mi delete length ${rows.length}`);
+    assert.strictEqual(
+      rows[0].name,
+      cTwo.name,
+      `mi delete name ${rows[0].name}`
+    );
+  });
+
+  specify('CRUD dependent schema', async function () {
+    const Customer = 'Customer';
+    const SalesInvoice = 'SalesInvoice';
+    const SalesInvoiceItem = 'SalesInvoiceItem';
+
+    const customer: FieldValueMap = {
+      name: 'John Whoe',
+      email: 'john@whoe.com',
+      ...getDefaultMetaFieldValueMap(),
+    };
+
+    const invoice: FieldValueMap = {
+      name: 'SINV-1001',
+      date: '2022-01-21',
+      customer: customer.name,
+      account: 'Debtors',
+      submitted: false,
+      cancelled: false,
+      ...getDefaultMetaFieldValueMap(),
+    };
+
+    await assertThrows(
+      async () => await db.insert(SalesInvoice, invoice),
+      'foreign key constraint fail failed'
+    );
+
+    await assertDoesNotThrow(async () => {
+      await db.insert(Customer, customer);
+      await db.insert(SalesInvoice, invoice);
+    }, 'insertion failed');
+
+    await assertThrows(
+      async () => await db.delete(Customer, customer.name as string),
+      'foreign key constraint fail failed'
+    );
+
+    await assertDoesNotThrow(async () => {
+      await db.delete(SalesInvoice, invoice.name as string);
+      await db.delete(Customer, customer.name as string);
+    }, 'deletion failed');
+
+    await db.insert(Customer, customer);
+    await db.insert(SalesInvoice, invoice);
+
+    let fvMap = await db.get(SalesInvoice, invoice.name as string);
+    for (const key in invoice) {
+      let expected = invoice[key];
+      if (typeof expected === 'boolean') {
+        expected = +expected;
+      }
+
+      assert.strictEqual(
+        fvMap[key],
+        expected,
+        `equality check ${key}: ${fvMap[key]}, ${invoice[key]}`
+      );
+    }
+
+    assert.strictEqual(
+      (fvMap.items as unknown[])?.length,
+      0,
+      'empty items check'
+    );
+
+    const items: FieldValueMap[] = [
+      {
+        item: 'Bottle Caps',
+        quantity: 2,
+        rate: 100,
+        amount: 200,
+      },
+    ];
+
+    await assertThrows(
+      async () => await db.insert(SalesInvoice, { name: invoice.name, items }),
+      'invoice insertion with ct did not fail'
+    );
+    await assertDoesNotThrow(
+      async () => await db.update(SalesInvoice, { name: invoice.name, items }),
+      'ct insertion failed'
+    );
+
+    fvMap = await db.get(SalesInvoice, invoice.name as string);
+    const ct = fvMap.items as FieldValueMap[];
+    assert.strictEqual(ct.length, 1, `ct length ${ct.length}`);
+    assert.strictEqual(ct[0].parent, invoice.name, `ct parent ${ct[0].parent}`);
+    assert.strictEqual(
+      ct[0].parentFieldname,
+      'items',
+      `ct parentFieldname ${ct[0].parentFieldname}`
+    );
+    assert.strictEqual(
+      ct[0].parentSchemaName,
+      SalesInvoice,
+      `ct parentSchemaName ${ct[0].parentSchemaName}`
+    );
+    for (const key in items[0]) {
+      assert.strictEqual(
+        ct[0][key],
+        items[0][key],
+        `ct values ${key}: ${ct[0][key]}, ${items[0][key]}`
+      );
+    }
+
+    items.push({
+      item: 'Mentats',
+      quantity: 4,
+      rate: 200,
+      amount: 800,
+    });
+    await assertDoesNotThrow(
+      async () => await db.update(SalesInvoice, { name: invoice.name, items }),
+      'ct updation failed'
+    );
+
+    let rows = await db.getAll(SalesInvoiceItem, {
+      fields: ['item', 'quantity', 'rate', 'amount'],
+    });
+    assert.strictEqual(rows.length, 2, `ct length update ${rows.length}`);
+
+    for (const i in rows) {
+      for (const key in rows[i]) {
+        assert.strictEqual(
+          rows[i][key],
+          items[i][key],
+          `ct values ${i},${key}: ${rows[i][key]}`
+        );
+      }
+    }
+
+    await db.delete(SalesInvoice, invoice.name as string);
+    rows = await db.getAll(SalesInvoiceItem);
+    assert.strictEqual(rows.length, 0, `ct length delete ${rows.length}`);
+  });
 });
diff --git a/backend/database/types.ts b/backend/database/types.ts
index b7aba7f0..e91d7694 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -12,10 +12,9 @@ export interface GetQueryBuilderOptions {
 }
 
 export interface GetAllOptions {
-  schemaName: string;
   fields?: string[];
   filters?: QueryFilter;
-  start?: number;
+  offset?: number;
   limit?: number;
   groupBy?: string;
   orderBy?: string;
diff --git a/utils/index.ts b/utils/index.ts
index dcac32b4..2bef4b69 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -27,3 +27,7 @@ export function getValueMapFromList<T, K extends keyof T, V extends keyof T>(
 export function getRandomString(): string {
   return Math.random().toString(36).slice(2, 8);
 }
+
+export async function sleep(durationMilliseconds: number = 1000) {
+  return new Promise((r) => setTimeout(() => r(null), durationMilliseconds));
+}

From 9765707d21b8381affc80f388b2e8ef50e46d840 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 31 Mar 2022 12:48:32 +0530
Subject: [PATCH 023/163] incr: add DatabaseManager.call

---
 backend/database/core.ts                | 19 ++++---
 backend/database/manager.ts             | 66 ++++++++++++++++++++-----
 backend/database/runPatch.ts            |  2 +-
 backend/database/tests/testCore.spec.ts |  2 +-
 backend/database/types.ts               | 12 -----
 backend/{common.ts => helpers.ts}       | 13 +++++
 common/model.ts                         |  6 ---
 tsconfig.json                           |  1 -
 utils/db/types.ts                       | 63 +++++++++++++++++++++++
 vue.config.js                           |  1 -
 10 files changed, 142 insertions(+), 43 deletions(-)
 rename backend/{common.ts => helpers.ts} (77%)
 delete mode 100644 common/model.ts
 create mode 100644 utils/db/types.ts

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 4468715f..26a95a84 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -1,5 +1,6 @@
 import { knex, Knex } from 'knex';
 import { getRandomString, getValueMapFromList } from 'utils';
+import { DatabaseBase, GetAllOptions, QueryFilter } from 'utils/db/types';
 import {
   CannotCommitError,
   DatabaseError,
@@ -15,14 +16,8 @@ import {
   SchemaMap,
   TargetField,
 } from '../../schemas/types';
-import { getDefaultMetaFieldValueMap, sqliteTypeMap, SYSTEM } from '../common';
-import {
-  ColumnDiff,
-  FieldValueMap,
-  GetAllOptions,
-  GetQueryBuilderOptions,
-  QueryFilter,
-} from './types';
+import { getDefaultMetaFieldValueMap, sqliteTypeMap, SYSTEM } from '../helpers';
+import { ColumnDiff, FieldValueMap, GetQueryBuilderOptions } from './types';
 
 /**
  * # DatabaseCore
@@ -43,7 +38,7 @@ import {
  * the `fieldValueMap`.
  */
 
-export default class DatabaseCore {
+export default class DatabaseCore extends DatabaseBase {
   knex?: Knex;
   typeMap = sqliteTypeMap;
   dbPath: string;
@@ -51,6 +46,7 @@ export default class DatabaseCore {
   connectionParams: Knex.Config;
 
   constructor(dbPath?: string) {
+    super();
     this.dbPath = dbPath ?? ':memory:';
     this.connectionParams = {
       client: 'sqlite3',
@@ -133,7 +129,10 @@ export default class DatabaseCore {
     return row.length > 0;
   }
 
-  async insert(schemaName: string, fieldValueMap: FieldValueMap) {
+  async insert(
+    schemaName: string,
+    fieldValueMap: FieldValueMap
+  ): Promise<FieldValueMap> {
     // insert parent
     if (this.schemaMap[schemaName].isSingle) {
       await this.#updateSingleValues(schemaName, fieldValueMap);
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 51d142b8..8a9590c6 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -1,4 +1,6 @@
+import { databaseMethodSet } from 'backend/helpers';
 import fs from 'fs/promises';
+import { DatabaseMethod } from 'utils/db/types';
 import { getSchemas } from '../../schemas';
 import patches from '../patches';
 import DatabaseCore from './core';
@@ -7,11 +9,14 @@ import { Patch } from './types';
 
 export class DatabaseManager {
   db?: DatabaseCore;
-  constructor() {}
 
-  async createNewDatabase(dbPath: string, countryCode: string) {
+  get #isInitialized(): boolean {
+    return this.db !== undefined && this.db.knex !== undefined;
+  }
+
+  async createNewDatabase(dbPath: string, countryCode?: string) {
     await this.#unlinkIfExists(dbPath);
-    this.connectToDatabase(dbPath, countryCode);
+    await this.connectToDatabase(dbPath, countryCode);
   }
 
   async connectToDatabase(dbPath: string, countryCode?: string) {
@@ -22,14 +27,37 @@ export class DatabaseManager {
     const schemaMap = getSchemas(countryCode);
     this.db.setSchemaMap(schemaMap);
 
-    await this.migrate();
+    await this.#migrate();
   }
 
-  async migrate() {
-    if (this.db === undefined) {
+  async call(method: DatabaseMethod, ...args: unknown[]) {
+    if (!this.#isInitialized) {
       return;
     }
 
+    if (!databaseMethodSet.has(method)) {
+      return;
+    }
+
+    // @ts-ignore
+    const response = await this.db[method](...args);
+    if (method === 'close') {
+      delete this.db;
+    }
+
+    return response;
+  }
+
+  async #migrate(): Promise<void> {
+    if (!this.#isInitialized) {
+      return;
+    }
+
+    const isFirstRun = await this.#getIsFirstRun();
+    if (isFirstRun) {
+      await this.db!.migrate();
+    }
+
     const patchesToExecute = await this.#getPatchesToExecute();
     const preMigrationPatches = patchesToExecute.filter(
       (p) => p.patch.beforeMigrate
@@ -39,7 +67,7 @@ export class DatabaseManager {
     );
 
     await runPatches(preMigrationPatches, this);
-    await this.db.migrate();
+    await this.db!.migrate();
     await runPatches(postMigrationPatches, this);
   }
 
@@ -60,10 +88,15 @@ export class DatabaseManager {
       return undefined;
     }
 
-    const query = await this.db.knex!('SingleValue').where({
-      fieldname: 'countryCode',
-      parent: 'SystemSettings',
-    });
+    let query: { countryCode: string }[] = [];
+    try {
+      query = await this.db.knex!('SingleValue').where({
+        fieldname: 'countryCode',
+        parent: 'SystemSettings',
+      });
+    } catch {
+      // Database not inialized and no countryCode passed
+    }
 
     if (query.length > 0) {
       return query[0].countryCode as string;
@@ -83,6 +116,17 @@ export class DatabaseManager {
       throw err;
     }
   }
+
+  async #getIsFirstRun(): Promise<boolean> {
+    if (!this.#isInitialized) {
+      return true;
+    }
+
+    const tableList: unknown[] = await this.db!.knex!.raw(
+      "SELECT name FROM sqlite_master WHERE type='table'"
+    );
+    return tableList.length === 0;
+  }
 }
 
 export default new DatabaseManager();
diff --git a/backend/database/runPatch.ts b/backend/database/runPatch.ts
index 8c521700..f93704fd 100644
--- a/backend/database/runPatch.ts
+++ b/backend/database/runPatch.ts
@@ -1,4 +1,4 @@
-import { getDefaultMetaFieldValueMap } from '../common';
+import { getDefaultMetaFieldValueMap } from '../helpers';
 import { DatabaseManager } from './manager';
 import { FieldValueMap, Patch } from './types';
 
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index 9f0d926b..2b1ddd80 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -3,7 +3,7 @@ import 'mocha';
 import { getMapFromList } from 'schemas/helpers';
 import { FieldTypeEnum, RawValue } from 'schemas/types';
 import { getValueMapFromList, sleep } from 'utils';
-import { getDefaultMetaFieldValueMap, sqliteTypeMap } from '../../common';
+import { getDefaultMetaFieldValueMap, sqliteTypeMap } from '../../helpers';
 import DatabaseCore from '../core';
 import { FieldValueMap, SqliteTableInfo } from '../types';
 import {
diff --git a/backend/database/types.ts b/backend/database/types.ts
index e91d7694..ff521c53 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -1,8 +1,6 @@
 import { Field, RawValue } from '../../schemas/types';
 import { DatabaseManager } from './manager';
 
-export type QueryFilter = Record<string, string | string[]>;
-
 export interface GetQueryBuilderOptions {
   offset?: number;
   limit?: number;
@@ -11,16 +9,6 @@ export interface GetQueryBuilderOptions {
   order?: 'desc' | 'asc';
 }
 
-export interface GetAllOptions {
-  fields?: string[];
-  filters?: QueryFilter;
-  offset?: number;
-  limit?: number;
-  groupBy?: string;
-  orderBy?: string;
-  order?: 'asc' | 'desc';
-}
-
 export type ColumnDiff = { added: Field[]; removed: string[] };
 export type FieldValueMap = Record<
   string,
diff --git a/backend/common.ts b/backend/helpers.ts
similarity index 77%
rename from backend/common.ts
rename to backend/helpers.ts
index 9eb9cb60..4e480160 100644
--- a/backend/common.ts
+++ b/backend/helpers.ts
@@ -1,3 +1,4 @@
+import { DatabaseMethod } from 'utils/db/types';
 import { KnexColumnType } from './database/types';
 
 export const sqliteTypeMap: Record<string, KnexColumnType> = {
@@ -34,3 +35,15 @@ export function getDefaultMetaFieldValueMap() {
     modified: now,
   };
 }
+
+export const databaseMethodSet: Set<DatabaseMethod> = new Set([
+  'insert',
+  'get',
+  'getAll',
+  'getSingleValues',
+  'rename',
+  'update',
+  'delete',
+  'close',
+  'exists',
+]);
diff --git a/common/model.ts b/common/model.ts
deleted file mode 100644
index 278a6696..00000000
--- a/common/model.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import models from '../models';
-import coreModels from '../frappe/models';
-
-export function getModel() {
-  console.log(models, coreModels);
-}
diff --git a/tsconfig.json b/tsconfig.json
index 6330a185..462722a4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,6 @@
       "@/*": ["src/*"],
       "schemas/*": ["schemas/*"],
       "backend/*": ["backend/*"],
-      "common/*": ["common/*"],
       "utils/*": ["utils/*"]
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
diff --git a/utils/db/types.ts b/utils/db/types.ts
new file mode 100644
index 00000000..f25170bb
--- /dev/null
+++ b/utils/db/types.ts
@@ -0,0 +1,63 @@
+/**
+ * The types in this file will be used by the main db class (core.ts) in the
+ * backend process and the the frontend db class (dbHandler.ts).
+ *
+ * DatabaseBase is an abstract class so that the function signatures
+ * match on both ends.
+ */
+
+type UnknownMap = Record<string, unknown>;
+export abstract class DatabaseBase {
+  // Create
+  abstract insert(
+    schemaName: string,
+    fieldValueMap: UnknownMap
+  ): Promise<UnknownMap>;
+
+  // Read
+  abstract get(
+    schemaName: string,
+    name: string,
+    fields?: string | string[]
+  ): Promise<UnknownMap>;
+
+  abstract getAll(
+    schemaName: string,
+    options: GetAllOptions
+  ): Promise<UnknownMap[]>;
+
+  abstract getSingleValues(
+    ...fieldnames: ({ fieldname: string; parent?: string } | string)[]
+  ): Promise<{ fieldname: string; parent: string; value: unknown }[]>;
+
+  // Update
+  abstract rename(
+    schemaName: string,
+    oldName: string,
+    newName: string
+  ): Promise<void>;
+
+  abstract update(schemaName: string, fieldValueMap: UnknownMap): Promise<void>;
+
+  // Delete
+  abstract delete(schemaName: string, name: string): Promise<void>;
+
+  // Other
+  abstract close(): Promise<void>;
+
+  abstract exists(schemaName: string, name?: string): Promise<boolean>;
+}
+
+export type DatabaseMethod = keyof DatabaseBase;
+
+export interface GetAllOptions {
+  fields?: string[];
+  filters?: QueryFilter;
+  offset?: number;
+  limit?: number;
+  groupBy?: string;
+  orderBy?: string;
+  order?: 'asc' | 'desc';
+}
+
+export type QueryFilter = Record<string, string | string[]>;
diff --git a/vue.config.js b/vue.config.js
index bc2e0e95..80a8bfd2 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,7 +42,6 @@ module.exports = {
       '~': path.resolve('.'),
       schemas: path.resolve(__dirname, './schemas'),
       backend: path.resolve(__dirname, './backend'),
-      common: path.resolve(__dirname, './common'),
       utils: path.resolve(__dirname, './utils'),
     });
 

From 804d8414661a5d20e06f65746b3e6f9273649fed Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 31 Mar 2022 13:03:58 +0530
Subject: [PATCH 024/163] incr: move messages, add DB_ actions

---
 backend/database/core.ts                     |  4 +-
 backend/database/manager.ts                  |  2 +-
 main.ts                                      |  2 +-
 main/registerAutoUpdaterListeners.ts         |  2 +-
 main/registerIpcMainActionListeners.ts       | 29 ++++++++++-
 main/registerIpcMainMessageListeners.ts      |  2 +-
 src/App.vue                                  |  2 +-
 src/components/Controls/AttachImage.vue      |  2 +-
 src/components/HowTo.vue                     |  2 +-
 src/components/WindowsTitleBar.vue           |  2 +-
 src/errorHandling.ts                         |  2 +-
 src/initialization.js                        |  2 +-
 src/main.js                                  |  4 --
 src/messages.js                              | 47 ------------------
 src/pages/DataImport.vue                     |  2 +-
 src/pages/DatabaseSelector.vue               |  2 +-
 src/pages/GetStarted.vue                     |  2 +-
 src/pages/PrintView/PrintView.vue            |  2 +-
 src/pages/Settings/Settings.vue              |  2 +-
 src/pages/Settings/TabInvoice.vue            |  2 +-
 src/pages/SetupWizard/SetupWizard.vue        |  2 +-
 src/renderer/registerIpcRendererListeners.ts |  2 +-
 src/telemetry/helpers.ts                     |  2 +-
 src/utils.js                                 |  2 +-
 utils/messages.ts                            | 51 ++++++++++++++++++++
 vue.config.js                                |  1 +
 26 files changed, 102 insertions(+), 74 deletions(-)
 delete mode 100644 src/messages.js
 create mode 100644 utils/messages.ts

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 26a95a84..874fa826 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -1,6 +1,4 @@
 import { knex, Knex } from 'knex';
-import { getRandomString, getValueMapFromList } from 'utils';
-import { DatabaseBase, GetAllOptions, QueryFilter } from 'utils/db/types';
 import {
   CannotCommitError,
   DatabaseError,
@@ -16,6 +14,8 @@ import {
   SchemaMap,
   TargetField,
 } from '../../schemas/types';
+import { getRandomString, getValueMapFromList } from '../../utils';
+import { DatabaseBase, GetAllOptions, QueryFilter } from '../../utils/db/types';
 import { getDefaultMetaFieldValueMap, sqliteTypeMap, SYSTEM } from '../helpers';
 import { ColumnDiff, FieldValueMap, GetQueryBuilderOptions } from './types';
 
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 8a9590c6..80519c79 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -1,7 +1,7 @@
-import { databaseMethodSet } from 'backend/helpers';
 import fs from 'fs/promises';
 import { DatabaseMethod } from 'utils/db/types';
 import { getSchemas } from '../../schemas';
+import { databaseMethodSet } from '../helpers';
 import patches from '../patches';
 import DatabaseCore from './core';
 import { runPatches } from './runPatch';
diff --git a/main.ts b/main.ts
index 3c666bfa..39ee7b9a 100644
--- a/main.ts
+++ b/main.ts
@@ -16,7 +16,7 @@ import registerAutoUpdaterListeners from './main/registerAutoUpdaterListeners';
 import registerIpcMainActionListeners from './main/registerIpcMainActionListeners';
 import registerIpcMainMessageListeners from './main/registerIpcMainMessageListeners';
 import registerProcessListeners from './main/registerProcessListeners';
-import { IPC_CHANNELS } from './src/messages';
+import { IPC_CHANNELS } from './utils/messages';
 
 export class Main {
   title: string = 'Frappe Books';
diff --git a/main/registerAutoUpdaterListeners.ts b/main/registerAutoUpdaterListeners.ts
index a334656f..4137c970 100644
--- a/main/registerAutoUpdaterListeners.ts
+++ b/main/registerAutoUpdaterListeners.ts
@@ -1,6 +1,6 @@
 import { autoUpdater, UpdateInfo } from 'electron-updater';
 import { Main } from '../main';
-import { IPC_CHANNELS } from '../src/messages';
+import { IPC_CHANNELS } from '../utils/messages';
 
 export default function registerAutoUpdaterListeners(main: Main) {
   autoUpdater.autoDownload = false;
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 5260800d..4b06857c 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -2,11 +2,13 @@ import { app, dialog, ipcMain } from 'electron';
 import { autoUpdater } from 'electron-updater';
 import fs from 'fs/promises';
 import path from 'path';
+import databaseManager from '../backend/database/manager';
 import { Main } from '../main';
 import { getUrlAndTokenString, sendError } from '../src/contactMothership';
 import { getLanguageMap } from '../src/getLanguageMap';
-import { IPC_ACTIONS } from '../src/messages';
 import saveHtmlAsPdf from '../src/saveHtmlAsPdf';
+import { DatabaseMethod } from '../utils/db/types';
+import { IPC_ACTIONS } from '../utils/messages';
 import { getMainWindowSize } from './helpers';
 
 export default function registerIpcMainActionListeners(main: Main) {
@@ -116,4 +118,29 @@ export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(IPC_ACTIONS.GET_VERSION, (_) => {
     return app.getVersion();
   });
+
+  /**
+   * Database Related Actions
+   */
+
+  ipcMain.handle(
+    IPC_ACTIONS.DB_CREATE,
+    async (_, dbPath: string, countryCode?: string) => {
+      return databaseManager.createNewDatabase(dbPath, countryCode);
+    }
+  );
+
+  ipcMain.handle(
+    IPC_ACTIONS.DB_CONNECT,
+    async (_, dbPath: string, countryCode?: string) => {
+      return databaseManager.createNewDatabase(dbPath, countryCode);
+    }
+  );
+
+  ipcMain.handle(
+    IPC_ACTIONS.DB_CALL,
+    async (_, method: DatabaseMethod, ...args: unknown[]) => {
+      return databaseManager.call(method, ...args);
+    }
+  );
 }
diff --git a/main/registerIpcMainMessageListeners.ts b/main/registerIpcMainMessageListeners.ts
index b178edb7..aa5da057 100644
--- a/main/registerIpcMainMessageListeners.ts
+++ b/main/registerIpcMainMessageListeners.ts
@@ -1,7 +1,7 @@
 import { ipcMain, Menu, shell } from 'electron';
 import { autoUpdater } from 'electron-updater';
 import { Main } from '../main';
-import { IPC_MESSAGES } from '../src/messages';
+import { IPC_MESSAGES } from '../utils/messages';
 
 export default function registerIpcMainMessageListeners(main: Main) {
   ipcMain.on(IPC_MESSAGES.OPEN_MENU, (event) => {
diff --git a/src/App.vue b/src/App.vue
index c8350880..285cbbf2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -37,7 +37,7 @@ import {
   postSetup,
   purgeCache,
 } from '@/initialization';
-import { IPC_ACTIONS, IPC_MESSAGES } from '@/messages';
+import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
 import fs from 'fs/promises';
diff --git a/src/components/Controls/AttachImage.vue b/src/components/Controls/AttachImage.vue
index f25210cb..d3b14237 100644
--- a/src/components/Controls/AttachImage.vue
+++ b/src/components/Controls/AttachImage.vue
@@ -59,7 +59,7 @@
 import frappe from 'frappe';
 import { ipcRenderer } from 'electron';
 import Base from './Base';
-import { IPC_ACTIONS } from '@/messages';
+import { IPC_ACTIONS } from 'utils/messages';
 import fs from 'fs';
 import path from 'path';
 
diff --git a/src/components/HowTo.vue b/src/components/HowTo.vue
index 749a3d55..131767c8 100644
--- a/src/components/HowTo.vue
+++ b/src/components/HowTo.vue
@@ -9,7 +9,7 @@
   </button>
 </template>
 <script>
-import { IPC_MESSAGES } from '@/messages';
+import { IPC_MESSAGES } from 'utils/messages';
 import { ipcRenderer } from 'electron';
 import FeatherIcon from './FeatherIcon.vue';
 
diff --git a/src/components/WindowsTitleBar.vue b/src/components/WindowsTitleBar.vue
index 7b4fa384..0a0c1c10 100644
--- a/src/components/WindowsTitleBar.vue
+++ b/src/components/WindowsTitleBar.vue
@@ -32,7 +32,7 @@
 <script>
 import { ipcRenderer } from 'electron';
 import { runWindowAction } from '@/utils';
-import { IPC_MESSAGES } from '@/messages';
+import { IPC_MESSAGES } from 'utils/messages';
 
 export default {
   name: 'WindowsTitleBar',
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 769f586a..8bf1075e 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -7,8 +7,8 @@ import {
   MandatoryError,
   ValidationError,
 } from 'frappe/utils/errors';
+import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import config, { ConfigKeys, TelemetrySetting } from './config';
-import { IPC_ACTIONS, IPC_MESSAGES } from './messages';
 import telemetry from './telemetry/telemetry';
 import { showMessageDialog, showToast } from './utils';
 
diff --git a/src/initialization.js b/src/initialization.js
index 9c2213f3..13d77cb1 100644
--- a/src/initialization.js
+++ b/src/initialization.js
@@ -3,7 +3,7 @@ import SQLiteDatabase from 'frappe/backends/sqlite';
 import fs from 'fs';
 import regionalModelUpdates from '../models/regionalModelUpdates';
 import postStart, { setCurrencySymbols } from '../server/postStart';
-import { DB_CONN_FAILURE } from './messages';
+import { DB_CONN_FAILURE } from '../utils/messages';
 import runMigrate from './migrate';
 import { getId } from './telemetry/helpers';
 import telemetry from './telemetry/telemetry';
diff --git a/src/main.js b/src/main.js
index 33bb2f59..6e564444 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,8 +1,6 @@
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
 import { createApp } from 'vue';
-import { getBuiltTestSchemaMap } from '../backend/database/tests/helpers';
-import { getSchemas } from '../schemas';
 import App from './App';
 import FeatherIcon from './components/FeatherIcon';
 import config, { ConfigKeys } from './config';
@@ -104,5 +102,3 @@ import { setLanguageMap, stringifyCircular } from './utils';
   });
 })();
 
-window.gs = getSchemas;
-window.gst = getBuiltTestSchemaMap;
diff --git a/src/messages.js b/src/messages.js
deleted file mode 100644
index ed82cb7b..00000000
--- a/src/messages.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// ipcRenderer.send(...)
-export const IPC_MESSAGES = {
-  OPEN_MENU: 'open-menu',
-  OPEN_SETTINGS: 'open-settings',
-  OPEN_EXTERNAL: 'open-external',
-  SHOW_ITEM_IN_FOLDER: 'show-item-in-folder',
-  RELOAD_MAIN_WINDOW: 'reload-main-window',
-  RESIZE_MAIN_WINDOW: 'resize-main-window',
-  CLOSE_CURRENT_WINDOW: 'close-current-window',
-  MINIMIZE_CURRENT_WINDOW: 'minimize-current-window',
-  DOWNLOAD_UPDATE: 'download-update',
-  INSTALL_UPDATE: 'install-update',
-};
-
-// ipcRenderer.invoke(...)
-export const IPC_ACTIONS = {
-  TOGGLE_MAXIMIZE_CURRENT_WINDOW: 'toggle-maximize-current-window',
-  GET_OPEN_FILEPATH: 'open-dialog',
-  GET_SAVE_FILEPATH: 'save-dialog',
-  GET_DIALOG_RESPONSE: 'show-message-box',
-  GET_PRIMARY_DISPLAY_SIZE: 'get-primary-display-size',
-  SAVE_HTML_AS_PDF: 'save-html-as-pdf',
-  SAVE_DATA: 'save-data',
-  SHOW_ERROR: 'show-error',
-  SEND_ERROR: 'send-error',
-  GET_LANGUAGE_MAP: 'get-language-map',
-  CHECK_FOR_UPDATES: 'check-for-updates',
-  GET_FILE: 'get-file',
-  GET_CREDS: 'get-creds',
-  GET_VERSION: 'get-version',
-};
-
-// ipcMain.send(...)
-export const IPC_CHANNELS = {
-  STORE_ON_WINDOW: 'store-on-window',
-  CHECKING_FOR_UPDATE: 'checking-for-update',
-  UPDATE_AVAILABLE: 'update-available',
-  UPDATE_NOT_AVAILABLE: 'update-not-available',
-  UPDATE_DOWNLOADED: 'update-downloaded',
-  UPDATE_ERROR: 'update-error',
-};
-
-export const DB_CONN_FAILURE = {
-  INVALID_FILE: 'invalid-file',
-  CANT_OPEN: 'cant-open',
-  CANT_CONNECT: 'cant-connect',
-};
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index 03a22816..393548a4 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -343,7 +343,7 @@ import FeatherIcon from '@/components/FeatherIcon.vue';
 import HowTo from '@/components/HowTo.vue';
 import PageHeader from '@/components/PageHeader.vue';
 import { importable, Importer } from '@/dataImport';
-import { IPC_ACTIONS } from '@/messages';
+import { IPC_ACTIONS } from 'utils/messages';
 import { getSavePath, saveData, showMessageDialog } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index a00b0226..058f0abc 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -165,7 +165,7 @@ import { ipcRenderer } from 'electron';
 import fs from 'fs';
 import { DateTime } from 'luxon';
 import { showErrorDialog } from '../errorHandling';
-import { DB_CONN_FAILURE, IPC_ACTIONS } from '../messages';
+import { DB_CONN_FAILURE, IPC_ACTIONS } from '../../utils/messages';
 
 export default {
   name: 'DatabaseSelector',
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index 495945c2..167e2da1 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -87,7 +87,7 @@
 import Button from '@/components/Button';
 import Icon from '@/components/Icon';
 import PageHeader from '@/components/PageHeader';
-import { IPC_MESSAGES } from '@/messages';
+import { IPC_MESSAGES } from 'utils/messages';
 import { openSettings, routeTo } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'frappe';
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index eec4f7bb..c3bf8093 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -56,7 +56,7 @@ import Button from '@/components/Button';
 import PageHeader from '@/components/PageHeader';
 import SearchBar from '@/components/SearchBar';
 import TwoColumnForm from '@/components/TwoColumnForm';
-import { IPC_ACTIONS } from '@/messages';
+import { IPC_ACTIONS } from 'utils/messages';
 import telemetry from '@/telemetry/telemetry';
 import { Verb } from '@/telemetry/types';
 import { makePDF } from '@/utils';
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 6d1c4481..07a39a12 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -66,7 +66,7 @@ import { callInitializeMoneyMaker } from '../../utils';
 import { showToast } from '../../utils';
 import { h, markRaw } from 'vue';
 import { ipcRenderer } from 'electron';
-import { IPC_MESSAGES } from '@/messages';
+import { IPC_MESSAGES } from 'utils/messages';
 
 export default {
   name: 'Settings',
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index ef882499..02a89a35 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -50,7 +50,7 @@ import frappe from 'frappe';
 import { ipcRenderer } from 'electron';
 import TwoColumnForm from '@/components/TwoColumnForm';
 import FormControl from '@/components/Controls/FormControl';
-import { IPC_ACTIONS } from '@/messages';
+import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
   name: 'TabInvoice',
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index bfa87108..650951c6 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -95,7 +95,7 @@ import Popover from '@/components/Popover';
 import TwoColumnForm from '@/components/TwoColumnForm';
 import config from '@/config';
 import { connectToLocalDatabase, purgeCache } from '@/initialization';
-import { IPC_MESSAGES } from '@/messages';
+import { IPC_MESSAGES } from 'utils/messages';
 import { setLanguageMap, showMessageDialog } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
diff --git a/src/renderer/registerIpcRendererListeners.ts b/src/renderer/registerIpcRendererListeners.ts
index 1987b14b..10171ad0 100644
--- a/src/renderer/registerIpcRendererListeners.ts
+++ b/src/renderer/registerIpcRendererListeners.ts
@@ -1,5 +1,5 @@
 import { handleError } from '@/errorHandling';
-import { IPC_CHANNELS, IPC_MESSAGES } from '@/messages';
+import { IPC_CHANNELS, IPC_MESSAGES } from 'utils/messages';
 import telemetry from '@/telemetry/telemetry';
 import { showToast } from '@/utils';
 import { ipcRenderer } from 'electron';
diff --git a/src/telemetry/helpers.ts b/src/telemetry/helpers.ts
index 6fb8dd1a..0f16487f 100644
--- a/src/telemetry/helpers.ts
+++ b/src/telemetry/helpers.ts
@@ -1,5 +1,5 @@
 import config, { ConfigFile, ConfigKeys, TelemetrySetting } from '@/config';
-import { IPC_ACTIONS } from '@/messages';
+import { IPC_ACTIONS } from 'utils/messages';
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'frappe';
 import { DoctypeName } from '../../models/types';
diff --git a/src/utils.js b/src/utils.js
index af2a1587..e23947f4 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -6,11 +6,11 @@ import frappe, { t } from 'frappe';
 import { isPesa } from 'frappe/utils';
 import { DEFAULT_LANGUAGE } from 'frappe/utils/consts';
 import { setLanguageMapOnTranslationString } from 'frappe/utils/translation';
+import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { createApp, h } from 'vue';
 import config from './config';
 import { handleErrorWithDialog } from './errorHandling';
 import { languageCodeMap } from './languageCodeMap';
-import { IPC_ACTIONS, IPC_MESSAGES } from './messages';
 
 export async function showMessageDialog({
   message,
diff --git a/utils/messages.ts b/utils/messages.ts
new file mode 100644
index 00000000..b3745872
--- /dev/null
+++ b/utils/messages.ts
@@ -0,0 +1,51 @@
+// ipcRenderer.send(...)
+export enum IPC_MESSAGES {
+  OPEN_MENU = 'open-menu',
+  OPEN_SETTINGS = 'open-settings',
+  OPEN_EXTERNAL = 'open-external',
+  SHOW_ITEM_IN_FOLDER = 'show-item-in-folder',
+  RELOAD_MAIN_WINDOW = 'reload-main-window',
+  RESIZE_MAIN_WINDOW = 'resize-main-window',
+  CLOSE_CURRENT_WINDOW = 'close-current-window',
+  MINIMIZE_CURRENT_WINDOW = 'minimize-current-window',
+  DOWNLOAD_UPDATE = 'download-update',
+  INSTALL_UPDATE = 'install-update',
+}
+
+// ipcRenderer.invoke(...)
+export enum IPC_ACTIONS {
+  TOGGLE_MAXIMIZE_CURRENT_WINDOW = 'toggle-maximize-current-window',
+  GET_OPEN_FILEPATH = 'open-dialog',
+  GET_SAVE_FILEPATH = 'save-dialog',
+  GET_DIALOG_RESPONSE = 'show-message-box',
+  GET_PRIMARY_DISPLAY_SIZE = 'get-primary-display-size',
+  SAVE_HTML_AS_PDF = 'save-html-as-pdf',
+  SAVE_DATA = 'save-data',
+  SHOW_ERROR = 'show-error',
+  SEND_ERROR = 'send-error',
+  GET_LANGUAGE_MAP = 'get-language-map',
+  CHECK_FOR_UPDATES = 'check-for-updates',
+  GET_FILE = 'get-file',
+  GET_CREDS = 'get-creds',
+  GET_VERSION = 'get-version',
+  // Database messages
+  DB_CREATE = 'db-create',
+  DB_CONNECT = 'db-connect',
+  DB_CALL = 'db-call',
+}
+
+// ipcMain.send(...)
+export enum IPC_CHANNELS {
+  STORE_ON_WINDOW = 'store-on-window',
+  CHECKING_FOR_UPDATE = 'checking-for-update',
+  UPDATE_AVAILABLE = 'update-available',
+  UPDATE_NOT_AVAILABLE = 'update-not-available',
+  UPDATE_DOWNLOADED = 'update-downloaded',
+  UPDATE_ERROR = 'update-error',
+}
+
+export enum DB_CONN_FAILURE {
+  INVALID_FILE = 'invalid-file',
+  CANT_OPEN = 'cant-open',
+  CANT_CONNECT = 'cant-connect',
+}
diff --git a/vue.config.js b/vue.config.js
index 80a8bfd2..ab48daa1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,6 +4,7 @@ const webpack = require('webpack');
 module.exports = {
   pluginOptions: {
     electronBuilder: {
+      externals: ['knex', 'sqlite3'],
       nodeIntegration: true,
       mainProcessFile: 'main.ts',
       // rendererProcessFile: 'src/renderer.js',

From 4dbecad1cbd6944b70f2324291e05f5d98a93d37 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 31 Mar 2022 14:34:30 +0530
Subject: [PATCH 025/163] incr: add error messaging

---
 frappe/core/dbHandler.ts               | 114 ++++++++++++++++++++++---
 frappe/core/frappe.ts                  |   6 +-
 frappe/core/types.ts                   |   7 ++
 main/registerIpcMainActionListeners.ts |  34 +++++++-
 schemas/types.ts                       |   4 +-
 src/demux/db.ts                        |  63 ++++++++++++++
 utils/ipc/types.ts                     |   4 +
 7 files changed, 214 insertions(+), 18 deletions(-)
 create mode 100644 frappe/core/types.ts
 create mode 100644 src/demux/db.ts
 create mode 100644 utils/ipc/types.ts

diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index 8faff14e..b92aeee2 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -1,20 +1,114 @@
+import { DatabaseDemux } from '@/demux/db';
 import { Frappe } from 'frappe/core/frappe';
+import { DatabaseBase, GetAllOptions } from 'utils/db/types';
+import { DocValueMap, RawValueMap } from './types';
 
-type SingleValue = { fieldname: string; parent: string; value: unknown };
+export class DatabaseHandler extends DatabaseBase {
+  #frappe: Frappe;
+  #demux: DatabaseDemux;
 
-export class DbHandler {
-  frappe: Frappe;
   constructor(frappe: Frappe) {
-    this.frappe = frappe;
+    super();
+    this.#frappe = frappe;
+    this.#demux = new DatabaseDemux(frappe.isElectron);
   }
 
-  init() {}
-  close() {}
-  exists(doctype: string, name: string): boolean {
-    return false;
+  async createNewDatabase(dbPath: string, countryCode?: string) {
+    await this.#demux.createNewDatabase(dbPath, countryCode);
   }
 
-  getSingleValues(...fieldnames: Omit<SingleValue, 'value'>[]): SingleValue[] {
-    return [];
+  async connectToDatabase(dbPath: string, countryCode?: string) {
+    await this.#demux.connectToDatabase(dbPath, countryCode);
   }
+
+  init() {
+    // do nothing
+  }
+
+  async insert(
+    schemaName: string,
+    docValueMap: DocValueMap
+  ): Promise<DocValueMap> {
+    let rawValueMap = this.toRawValueMap(
+      schemaName,
+      docValueMap
+    ) as RawValueMap;
+    rawValueMap = (await this.#demux.call(
+      'insert',
+      schemaName,
+      rawValueMap
+    )) as RawValueMap;
+    return this.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
+  }
+
+  // Read
+  async get(
+    schemaName: string,
+    name: string,
+    fields?: string | string[]
+  ): Promise<DocValueMap> {
+    const rawValueMap = (await this.#demux.call(
+      'get',
+      schemaName,
+      name,
+      fields
+    )) as RawValueMap;
+    return this.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
+  }
+
+  async getAll(
+    schemaName: string,
+    options: GetAllOptions
+  ): Promise<DocValueMap[]> {
+    const rawValueMap = (await this.#demux.call(
+      'getAll',
+      schemaName,
+      options
+    )) as RawValueMap[];
+
+    return this.toDocValueMap(schemaName, rawValueMap) as DocValueMap[];
+  }
+
+  async getSingleValues(
+    ...fieldnames: ({ fieldname: string; parent?: string } | string)[]
+  ): Promise<{ fieldname: string; parent: string; value: unknown }[]> {
+    await this.#demux.call('getSingleValues', ...fieldnames);
+  }
+
+  // Update
+  async rename(
+    schemaName: string,
+    oldName: string,
+    newName: string
+  ): Promise<void> {
+    await this.#demux.call('rename', schemaName, oldName, newName);
+  }
+
+  async update(schemaName: string, docValueMap: DocValueMap): Promise<void> {
+    const rawValueMap = this.toRawValueMap(schemaName, docValueMap);
+    await this.#demux.call('update', schemaName, rawValueMap);
+  }
+
+  // Delete
+  async delete(schemaName: string, name: string): Promise<void> {
+    await this.#demux.call('delete', schemaName, name);
+  }
+
+  // Other
+  async close(): Promise<void> {
+    await this.#demux.call('close');
+  }
+
+  async exists(schemaName: string, name?: string): Promise<boolean> {
+    return (await this.#demux.call('exists', schemaName, name)) as boolean;
+  }
+
+  toDocValueMap(
+    schemaName: string,
+    rawValueMap: RawValueMap | RawValueMap[]
+  ): DocValueMap | DocValueMap[] {}
+  toRawValueMap(
+    schemaName: string,
+    docValueMap: DocValueMap | DocValueMap[]
+  ): RawValueMap | RawValueMap[] {}
 }
diff --git a/frappe/core/frappe.ts b/frappe/core/frappe.ts
index 0a20febf..8eb51342 100644
--- a/frappe/core/frappe.ts
+++ b/frappe/core/frappe.ts
@@ -12,7 +12,7 @@ import * as errors from '../utils/errors';
 import { format } from '../utils/format';
 import { t, T } from '../utils/translation';
 import { AuthHandler } from './authHandler';
-import { DbHandler } from './dbHandler';
+import { DatabaseHandler } from './dbHandler';
 import { DocHandler } from './docHandler';
 
 export class Frappe {
@@ -28,7 +28,7 @@ export class Frappe {
 
   auth: AuthHandler;
   doc: DocHandler;
-  db: DbHandler;
+  db: DatabaseHandler;
 
   Meta?: typeof Meta;
   Document?: typeof Doc;
@@ -42,7 +42,7 @@ export class Frappe {
   constructor() {
     this.auth = new AuthHandler(this);
     this.doc = new DocHandler(this);
-    this.db = new DbHandler(this);
+    this.db = new DatabaseHandler(this);
     this.pesa = getMoneyMaker({
       currency: 'XXX',
       precision: DEFAULT_INTERNAL_PRECISION,
diff --git a/frappe/core/types.ts b/frappe/core/types.ts
new file mode 100644
index 00000000..042f916d
--- /dev/null
+++ b/frappe/core/types.ts
@@ -0,0 +1,7 @@
+import Money from 'pesa/dist/types/src/money';
+import { RawValue } from 'schemas/types';
+
+export type DocValue = string | number | boolean | Date | Money;
+
+export type DocValueMap = Record<string, DocValue | DocValueMap[]>;
+export type RawValueMap = Record<string, RawValue | RawValueMap[]>;
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 4b06857c..dd7387ba 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -8,6 +8,7 @@ import { getUrlAndTokenString, sendError } from '../src/contactMothership';
 import { getLanguageMap } from '../src/getLanguageMap';
 import saveHtmlAsPdf from '../src/saveHtmlAsPdf';
 import { DatabaseMethod } from '../utils/db/types';
+import { DatabaseResponse } from '../utils/ipc/types';
 import { IPC_ACTIONS } from '../utils/messages';
 import { getMainWindowSize } from './helpers';
 
@@ -126,21 +127,48 @@ export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(
     IPC_ACTIONS.DB_CREATE,
     async (_, dbPath: string, countryCode?: string) => {
-      return databaseManager.createNewDatabase(dbPath, countryCode);
+      const response: DatabaseResponse = { error: '', data: undefined };
+      try {
+        response.data = await databaseManager.createNewDatabase(
+          dbPath,
+          countryCode
+        );
+      } catch (error) {
+        response.error = error.toString();
+      }
+
+      return response;
     }
   );
 
   ipcMain.handle(
     IPC_ACTIONS.DB_CONNECT,
     async (_, dbPath: string, countryCode?: string) => {
-      return databaseManager.createNewDatabase(dbPath, countryCode);
+      const response: DatabaseResponse = { error: '', data: undefined };
+      try {
+        response.data = await databaseManager.createNewDatabase(
+          dbPath,
+          countryCode
+        );
+      } catch (error) {
+        response.error = error.toString();
+      }
+
+      return response;
     }
   );
 
   ipcMain.handle(
     IPC_ACTIONS.DB_CALL,
     async (_, method: DatabaseMethod, ...args: unknown[]) => {
-      return databaseManager.call(method, ...args);
+      const response: DatabaseResponse = { error: '', data: undefined };
+      try {
+        response.data = await databaseManager.call(method, ...args);
+      } catch (error) {
+        response.error = error.toString();
+      }
+
+      return response;
     }
   );
 }
diff --git a/schemas/types.ts b/schemas/types.ts
index 2dfbf271..cbfb6f37 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -56,9 +56,9 @@ export enum FieldTypeEnum {
 }
 
 export type FieldType = keyof typeof FieldTypeEnum;
-export type RawValue = string | number | boolean;
+export type RawValue = string | number | boolean | null;
 
-// @formatter:off
+// prettier-ignore
 export interface BaseField {
   fieldname: string;             // Column name in the db
   fieldtype: FieldType;          // UI Descriptive field types that map to column types
diff --git a/src/demux/db.ts b/src/demux/db.ts
new file mode 100644
index 00000000..99119110
--- /dev/null
+++ b/src/demux/db.ts
@@ -0,0 +1,63 @@
+import { ipcRenderer } from 'electron';
+import { DatabaseMethod } from 'utils/db/types';
+import { IPC_ACTIONS } from 'utils/messages';
+import { DatabaseResponse } from '../../utils/ipc/types';
+
+export class DatabaseDemux {
+  #isElectron: boolean = false;
+  constructor(isElectron: boolean) {
+    this.#isElectron = isElectron;
+  }
+
+  async createNewDatabase(dbPath: string, countryCode?: string): Promise<void> {
+    let response: DatabaseResponse;
+    if (this.#isElectron) {
+      response = await ipcRenderer.invoke(
+        IPC_ACTIONS.DB_CREATE,
+        dbPath,
+        countryCode
+      );
+    } else {
+      // TODO: API Call
+      response = { error: '', data: undefined };
+    }
+
+    if (response.error) {
+      throw new Error(response.error);
+    }
+  }
+
+  async connectToDatabase(dbPath: string, countryCode?: string): Promise<void> {
+    let response: DatabaseResponse;
+    if (this.#isElectron) {
+      response = await ipcRenderer.invoke(
+        IPC_ACTIONS.DB_CONNECT,
+        dbPath,
+        countryCode
+      );
+    } else {
+      // TODO: API Call
+      response = { error: '', data: undefined };
+    }
+
+    if (response.error) {
+      throw new Error(response.error);
+    }
+  }
+
+  async call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown> {
+    let response: DatabaseResponse;
+    if (this.#isElectron) {
+      response = await ipcRenderer.invoke(IPC_ACTIONS.DB_CALL, method, ...args);
+    } else {
+      // TODO: API Call
+      response = { error: '', data: undefined };
+    }
+
+    if (response.error) {
+      throw new Error(response.error);
+    }
+
+    return response.data;
+  }
+}
diff --git a/utils/ipc/types.ts b/utils/ipc/types.ts
new file mode 100644
index 00000000..c86fc084
--- /dev/null
+++ b/utils/ipc/types.ts
@@ -0,0 +1,4 @@
+export interface DatabaseResponse {
+  error: string;
+  data?: unknown;
+}

From 1567dc762fc06849c6a37676f3c09c66ed7cadc4 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 31 Mar 2022 17:13:20 +0530
Subject: [PATCH 026/163] incr: add type converters

---
 frappe/core/dbHandler.ts | 76 ++++++++++++++++++++++++++++++++++------
 frappe/core/types.ts     |  6 ++++
 schemas/index.ts         | 18 +++++++++-
 schemas/types.ts         |  1 +
 4 files changed, 90 insertions(+), 11 deletions(-)

diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index b92aeee2..4a20d117 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -1,11 +1,15 @@
 import { DatabaseDemux } from '@/demux/db';
 import { Frappe } from 'frappe/core/frappe';
+import Money from 'pesa/dist/types/src/money';
+import { getSchemas } from 'schemas';
+import { FieldType, FieldTypeEnum, RawValue, SchemaMap } from 'schemas/types';
 import { DatabaseBase, GetAllOptions } from 'utils/db/types';
-import { DocValueMap, RawValueMap } from './types';
+import { DocValue, DocValueMap, RawValueMap, SingleValue } from './types';
 
 export class DatabaseHandler extends DatabaseBase {
   #frappe: Frappe;
   #demux: DatabaseDemux;
+  // #schemaMap: Readonly<SchemaMap>;
 
   constructor(frappe: Frappe) {
     super();
@@ -23,13 +27,14 @@ export class DatabaseHandler extends DatabaseBase {
 
   init() {
     // do nothing
+    // this.#schemaMap = getSchemas();
   }
 
   async insert(
     schemaName: string,
     docValueMap: DocValueMap
   ): Promise<DocValueMap> {
-    let rawValueMap = this.toRawValueMap(
+    let rawValueMap = this.#toRawValueMap(
       schemaName,
       docValueMap
     ) as RawValueMap;
@@ -38,7 +43,7 @@ export class DatabaseHandler extends DatabaseBase {
       schemaName,
       rawValueMap
     )) as RawValueMap;
-    return this.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
+    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap;
   }
 
   // Read
@@ -53,7 +58,7 @@ export class DatabaseHandler extends DatabaseBase {
       name,
       fields
     )) as RawValueMap;
-    return this.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
+    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap;
   }
 
   async getAll(
@@ -66,13 +71,16 @@ export class DatabaseHandler extends DatabaseBase {
       options
     )) as RawValueMap[];
 
-    return this.toDocValueMap(schemaName, rawValueMap) as DocValueMap[];
+    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap[];
   }
 
   async getSingleValues(
     ...fieldnames: ({ fieldname: string; parent?: string } | string)[]
-  ): Promise<{ fieldname: string; parent: string; value: unknown }[]> {
-    await this.#demux.call('getSingleValues', ...fieldnames);
+  ): Promise<SingleValue<DocValue>> {
+    const rawSingleValue = (await this.#demux.call(
+      'getSingleValues',
+      ...fieldnames
+    )) as SingleValue<RawValue>;
   }
 
   // Update
@@ -85,7 +93,7 @@ export class DatabaseHandler extends DatabaseBase {
   }
 
   async update(schemaName: string, docValueMap: DocValueMap): Promise<void> {
-    const rawValueMap = this.toRawValueMap(schemaName, docValueMap);
+    const rawValueMap = this.#toRawValueMap(schemaName, docValueMap);
     await this.#demux.call('update', schemaName, rawValueMap);
   }
 
@@ -103,12 +111,60 @@ export class DatabaseHandler extends DatabaseBase {
     return (await this.#demux.call('exists', schemaName, name)) as boolean;
   }
 
-  toDocValueMap(
+  #toDocValueMap(
     schemaName: string,
     rawValueMap: RawValueMap | RawValueMap[]
   ): DocValueMap | DocValueMap[] {}
-  toRawValueMap(
+  #toRawValueMap(
     schemaName: string,
     docValueMap: DocValueMap | DocValueMap[]
   ): RawValueMap | RawValueMap[] {}
+
+  #toDocValue(value: RawValue, fieldtype: FieldType): DocValue {
+    switch (fieldtype) {
+      case FieldTypeEnum.Currency:
+        return this.#frappe.pesa((value ?? 0) as string | number);
+      case FieldTypeEnum.Date:
+        return new Date(value as string);
+      case FieldTypeEnum.Datetime:
+        return new Date(value as string);
+      case FieldTypeEnum.Int:
+        return +(value as string | number);
+      case FieldTypeEnum.Float:
+        return +(value as string | number);
+      case FieldTypeEnum.Check:
+        return Boolean(value as number);
+      default:
+        return String(value);
+    }
+  }
+
+  #toRawValue(value: DocValue, fieldtype: FieldType): RawValue {
+    switch (fieldtype) {
+      case FieldTypeEnum.Currency:
+        return (value as Money).store;
+      case FieldTypeEnum.Date:
+        return (value as Date).toISOString().split('T')[0];
+      case FieldTypeEnum.Datetime:
+        return (value as Date).toISOString();
+      case FieldTypeEnum.Int: {
+        if (typeof value === 'string') {
+          return parseInt(value);
+        }
+
+        return Math.floor(value as number);
+      }
+      case FieldTypeEnum.Float: {
+        if (typeof value === 'string') {
+          return parseFloat(value);
+        }
+
+        return value as number;
+      }
+      case FieldTypeEnum.Check:
+        return Number(value);
+      default:
+        return String(value);
+    }
+  }
 }
diff --git a/frappe/core/types.ts b/frappe/core/types.ts
index 042f916d..4a8beaa6 100644
--- a/frappe/core/types.ts
+++ b/frappe/core/types.ts
@@ -5,3 +5,9 @@ export type DocValue = string | number | boolean | Date | Money;
 
 export type DocValueMap = Record<string, DocValue | DocValueMap[]>;
 export type RawValueMap = Record<string, RawValue | RawValueMap[]>;
+
+export type SingleValue<T> = {
+  fieldname: string;
+  parent: string;
+  value: T;
+}[];
diff --git a/schemas/index.ts b/schemas/index.ts
index 2ce1e138..10d89ac6 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -12,15 +12,31 @@ const NAME_FIELD = {
   readOnly: true,
 };
 
-export function getSchemas(countryCode: string = '-'): SchemaMap {
+export function getSchemas(countryCode: string = '-'): Readonly<SchemaMap> {
   const builtCoreSchemas = getCoreSchemas();
   const builtAppSchemas = getAppSchemas(countryCode);
 
   let schemaMap = Object.assign({}, builtAppSchemas, builtCoreSchemas);
   schemaMap = addMetaFields(schemaMap);
+  deepFreeze(schemaMap);
   return schemaMap;
 }
 
+function deepFreeze(schemaMap: SchemaMap) {
+  Object.freeze(schemaMap);
+  for (const schemaName in schemaMap) {
+    Object.freeze(schemaMap[schemaName]);
+    for (const key in schemaMap[schemaName]) {
+      // @ts-ignore
+      Object.freeze(schemaMap[schemaName][key]);
+    }
+
+    for (const field of schemaMap[schemaName].fields ?? []) {
+      Object.freeze(field);
+    }
+  }
+}
+
 export function addMetaFields(schemaMap: SchemaMap): SchemaMap {
   const metaSchemaMap = getMapFromList(metaSchemas, 'name');
 
diff --git a/schemas/types.ts b/schemas/types.ts
index cbfb6f37..d3de2233 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -42,6 +42,7 @@ export enum FieldTypeEnum {
   Select = 'Select',
   Link = 'Link',
   Date = 'Date',
+  Datetime = 'Datetime',
   Table = 'Table',
   AutoComplete = 'AutoComplete',
   Check = 'Check',

From c9cac7410fa3cb7c7d51504bf0d4605d75b160e1 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 22 Mar 2022 11:30:33 +0530
Subject: [PATCH 027/163] chore: rename getNewDoc, newDoc - delete irrelevant
 tests

---
 src/pages/Dashboard/UnpaidInvoices.vue |  4 ++++
 src/pages/SetupWizard/SetupWizard.vue  | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index 3ce9c415..85de82c8 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -1,3 +1,7 @@
+import Button from '@/components/Button'; import { routeTo } from '@/utils';
+import frappe from 'frappe'; import { getDatesAndPeriodicity } from
+'./getDatesAndPeriodicity'; import PeriodSelector from './PeriodSelector';
+import SectionHeader from './SectionHeader';
 <template>
   <div class="flex justify-between gap-10">
     <div
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 650951c6..96e8214b 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -1,3 +1,20 @@
+import FormControl from '@/components/Controls/FormControl';
+import LanguageSelector from '@/components/Controls/LanguageSelector.vue';
+import Popover from '@/components/Popover';
+import TwoColumnForm from '@/components/TwoColumnForm';
+import config from '@/config';
+import { connectToLocalDatabase, purgeCache } from '@/initialization';
+import { IPC_MESSAGES } from '@/messages';
+import { setLanguageMap, showMessageDialog } from '@/utils';
+import { ipcRenderer } from 'electron';
+import frappe from 'frappe';
+import fs from 'fs';
+import path from 'path';
+import {
+getErrorMessage, handleErrorWithDialog, showErrorDialog
+} from '../../errorHandling';
+import setupCompany from './setupCompany';
+import Slide from './Slide.vue';
 <template>
   <div>
     <Slide

From 98e1a446861ad6189a63ed6c658ee4e38bad4bd7 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 31 Mar 2022 17:34:30 +0530
Subject: [PATCH 028/163] incr: get `schemaMap` on db handler init

---
 backend/database/manager.ts            |  4 ++++
 frappe/core/dbHandler.ts               | 21 ++++++++++++++-------
 frappe/core/frappe.ts                  | 10 +++++-----
 main/registerIpcMainActionListeners.ts |  6 ++++++
 src/demux/db.ts                        | 17 +++++++++++++++++
 utils/messages.ts                      |  1 +
 6 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 80519c79..33d7e434 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -14,6 +14,10 @@ export class DatabaseManager {
     return this.db !== undefined && this.db.knex !== undefined;
   }
 
+  getSchemaMap() {
+    return this.db?.schemaMap ?? {};
+  }
+
   async createNewDatabase(dbPath: string, countryCode?: string) {
     await this.#unlinkIfExists(dbPath);
     await this.connectToDatabase(dbPath, countryCode);
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index 4a20d117..5957b903 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -1,7 +1,6 @@
 import { DatabaseDemux } from '@/demux/db';
 import { Frappe } from 'frappe/core/frappe';
 import Money from 'pesa/dist/types/src/money';
-import { getSchemas } from 'schemas';
 import { FieldType, FieldTypeEnum, RawValue, SchemaMap } from 'schemas/types';
 import { DatabaseBase, GetAllOptions } from 'utils/db/types';
 import { DocValue, DocValueMap, RawValueMap, SingleValue } from './types';
@@ -9,7 +8,7 @@ import { DocValue, DocValueMap, RawValueMap, SingleValue } from './types';
 export class DatabaseHandler extends DatabaseBase {
   #frappe: Frappe;
   #demux: DatabaseDemux;
-  // #schemaMap: Readonly<SchemaMap>;
+  schemaMap: Readonly<SchemaMap> = {};
 
   constructor(frappe: Frappe) {
     super();
@@ -25,9 +24,8 @@ export class DatabaseHandler extends DatabaseBase {
     await this.#demux.connectToDatabase(dbPath, countryCode);
   }
 
-  init() {
-    // do nothing
-    // this.#schemaMap = getSchemas();
+  async init() {
+    this.schemaMap = (await this.#demux.getSchemaMap()) as Readonly<SchemaMap>;
   }
 
   async insert(
@@ -81,6 +79,9 @@ export class DatabaseHandler extends DatabaseBase {
       'getSingleValues',
       ...fieldnames
     )) as SingleValue<RawValue>;
+
+    // TODO: Complete this
+    throw new Error('Not implemented');
   }
 
   // Update
@@ -114,11 +115,17 @@ export class DatabaseHandler extends DatabaseBase {
   #toDocValueMap(
     schemaName: string,
     rawValueMap: RawValueMap | RawValueMap[]
-  ): DocValueMap | DocValueMap[] {}
+  ): DocValueMap | DocValueMap[] {
+    // TODO: Complete this
+    throw new Error('Not implemented');
+  }
   #toRawValueMap(
     schemaName: string,
     docValueMap: DocValueMap | DocValueMap[]
-  ): RawValueMap | RawValueMap[] {}
+  ): RawValueMap | RawValueMap[] {
+    // TODO: Complete this
+    throw new Error('Not implemented');
+  }
 
   #toDocValue(value: RawValue, fieldtype: FieldType): DocValue {
     switch (fieldtype) {
diff --git a/frappe/core/frappe.ts b/frappe/core/frappe.ts
index 8eb51342..a884b35d 100644
--- a/frappe/core/frappe.ts
+++ b/frappe/core/frappe.ts
@@ -64,7 +64,7 @@ export class Frappe {
   }
 
   async initializeAndRegister(customModels = {}, force = false) {
-    this.init(force);
+    await this.init(force);
 
     this.Meta = (await import('frappe/model/meta')).default;
     this.Document = (await import('frappe/model/document')).default;
@@ -74,7 +74,7 @@ export class Frappe {
     this.doc.registerModels(customModels);
   }
 
-  init(force: boolean) {
+  async init(force: boolean) {
     if (this._initialized && !force) return;
 
     this.methods = {};
@@ -83,9 +83,9 @@ export class Frappe {
     // temp params while calling routes
     this.temp = {};
 
-    this.doc.init();
-    this.auth.init();
-    this.db.init();
+    await this.doc.init();
+    await this.auth.init();
+    await this.db.init();
     this._initialized = true;
   }
 
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index dd7387ba..03b62b96 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -171,4 +171,10 @@ export default function registerIpcMainActionListeners(main: Main) {
       return response;
     }
   );
+
+  ipcMain.handle(IPC_ACTIONS.DB_SCHEMA, async (_) => {
+    const response: DatabaseResponse = { error: '', data: undefined };
+    response.data = await databaseManager.getSchemaMap();
+    return response;
+  });
 }
diff --git a/src/demux/db.ts b/src/demux/db.ts
index 99119110..1fce6cf3 100644
--- a/src/demux/db.ts
+++ b/src/demux/db.ts
@@ -1,4 +1,5 @@
 import { ipcRenderer } from 'electron';
+import { SchemaMap } from 'schemas/types';
 import { DatabaseMethod } from 'utils/db/types';
 import { IPC_ACTIONS } from 'utils/messages';
 import { DatabaseResponse } from '../../utils/ipc/types';
@@ -9,6 +10,22 @@ export class DatabaseDemux {
     this.#isElectron = isElectron;
   }
 
+  async getSchemaMap(): Promise<SchemaMap> {
+    let response: DatabaseResponse;
+    if (this.#isElectron) {
+      response = await ipcRenderer.invoke(IPC_ACTIONS.DB_SCHEMA);
+    } else {
+      // TODO: API Call
+      response = { error: '', data: undefined };
+    }
+
+    if (response.error) {
+      throw new Error(response.error);
+    }
+
+    return response.data as SchemaMap;
+  }
+
   async createNewDatabase(dbPath: string, countryCode?: string): Promise<void> {
     let response: DatabaseResponse;
     if (this.#isElectron) {
diff --git a/utils/messages.ts b/utils/messages.ts
index b3745872..d0fbdb55 100644
--- a/utils/messages.ts
+++ b/utils/messages.ts
@@ -32,6 +32,7 @@ export enum IPC_ACTIONS {
   DB_CREATE = 'db-create',
   DB_CONNECT = 'db-connect',
   DB_CALL = 'db-call',
+  DB_SCHEMA = 'db-schema',
 }
 
 // ipcMain.send(...)

From cdb039d3088fd3b5d60fa60daaeb4d7cf79d15ce Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 1 Apr 2022 15:05:51 +0530
Subject: [PATCH 029/163] incr: delete some stuff add typed doc.ts

---
 .prettierignore                         |   1 +
 backend/database/tests/testCore.spec.ts |   3 +-
 frappe/backends/database.js             | 831 ------------------------
 frappe/backends/helpers.ts              |  24 -
 frappe/backends/sqlite.js               | 115 ----
 frappe/core/authHandler.ts              |   2 +-
 frappe/core/dbHandler.ts                |   2 +-
 frappe/core/docHandler.ts               |  15 +-
 frappe/core/types.ts                    |   6 +-
 frappe/index.js                         | 321 ---------
 frappe/{core/frappe.ts => index.ts}     |  24 +-
 frappe/model/doc.ts                     | 691 ++++++++++++++++++++
 frappe/model/helpers.ts                 | 103 +++
 frappe/model/index.js                   | 114 ----
 frappe/model/meta.js                    | 334 ----------
 frappe/model/{naming.js => naming.ts}   |   4 +-
 frappe/model/runPatches.js              |  26 -
 frappe/model/types.ts                   |  31 +
 frappe/model/validationFunction.ts      |  39 ++
 frappe/utils/observable.ts              |   8 +-
 models/doctype/Payment/PaymentServer.js |   3 +-
 schemas/app/PrintSettings.json          |   3 +-
 schemas/helpers.ts                      |  19 -
 schemas/index.ts                        |   2 +-
 schemas/tests/testSchemaBuilder.spec.ts |   2 +-
 schemas/types.ts                        |   6 +-
 src/pages/GetStarted.vue                |  38 +-
 src/pages/SetupWizard/setupCompany.js   |  23 +-
 utils/index.ts                          |  24 +
 29 files changed, 960 insertions(+), 1854 deletions(-)
 create mode 100644 .prettierignore
 delete mode 100644 frappe/backends/database.js
 delete mode 100644 frappe/backends/helpers.ts
 delete mode 100644 frappe/backends/sqlite.js
 delete mode 100644 frappe/index.js
 rename frappe/{core/frappe.ts => index.ts} (82%)
 create mode 100644 frappe/model/doc.ts
 create mode 100644 frappe/model/helpers.ts
 delete mode 100644 frappe/model/index.js
 delete mode 100644 frappe/model/meta.js
 rename frappe/model/{naming.js => naming.ts} (95%)
 delete mode 100644 frappe/model/runPatches.js
 create mode 100644 frappe/model/types.ts
 create mode 100644 frappe/model/validationFunction.ts
 delete mode 100644 schemas/helpers.ts

diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..d89325b6
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1 @@
+**/types.ts
\ No newline at end of file
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index 2b1ddd80..c91dd2e1 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -1,8 +1,7 @@
 import * as assert from 'assert';
 import 'mocha';
-import { getMapFromList } from 'schemas/helpers';
 import { FieldTypeEnum, RawValue } from 'schemas/types';
-import { getValueMapFromList, sleep } from 'utils';
+import { getMapFromList, getValueMapFromList, sleep } from 'utils';
 import { getDefaultMetaFieldValueMap, sqliteTypeMap } from '../../helpers';
 import DatabaseCore from '../core';
 import { FieldValueMap, SqliteTableInfo } from '../types';
diff --git a/frappe/backends/database.js b/frappe/backends/database.js
deleted file mode 100644
index d0951e00..00000000
--- a/frappe/backends/database.js
+++ /dev/null
@@ -1,831 +0,0 @@
-import frappe from 'frappe';
-import Observable from 'frappe/utils/observable';
-import { knex } from 'knex';
-import CacheManager from '../utils/cacheManager';
-import { getRandomString } from '../utils/index';
-
-export default class Database extends Observable {
-  constructor() {
-    super();
-    this.initTypeMap();
-    this.connectionParams = {};
-    this.cache = new CacheManager();
-  }
-
-  connect() {
-    this.knex = knex(this.connectionParams);
-    this.knex.on('query-error', (error) => {
-      error.type = this.getError(error);
-    });
-    this.executePostDbConnect();
-  }
-
-  close() {
-    //
-  }
-
-  async migrate() {
-    for (let doctype in frappe.models) {
-      // check if controller module
-      let meta = frappe.getMeta(doctype);
-      let baseDoctype = meta.getBaseDocType();
-      if (!meta.isSingle) {
-        if (await this.tableExists(baseDoctype)) {
-          await this.alterTable(baseDoctype);
-        } else {
-          await this.createTable(baseDoctype);
-        }
-      }
-    }
-    await this.commit();
-    await this.initializeSingles();
-  }
-
-  async initializeSingles() {
-    let singleDoctypes = frappe
-      .getModels((model) => model.isSingle)
-      .map((model) => model.name);
-
-    for (let doctype of singleDoctypes) {
-      if (await this.singleExists(doctype)) {
-        const singleValues = await this.getSingleFieldsToInsert(doctype);
-        singleValues.forEach(({ fieldname, value }) => {
-          let singleValue = frappe.getNewDoc({
-            doctype: 'SingleValue',
-            parent: doctype,
-            fieldname,
-            value,
-          });
-          singleValue.insert();
-        });
-        continue;
-      }
-      let meta = frappe.getMeta(doctype);
-      if (meta.fields.every((df) => df.default == null)) {
-        continue;
-      }
-      let defaultValues = meta.fields.reduce((doc, df) => {
-        if (df.default != null) {
-          doc[df.fieldname] = df.default;
-        }
-        return doc;
-      }, {});
-      await this.updateSingle(doctype, defaultValues);
-    }
-  }
-
-  async singleExists(doctype) {
-    let res = await this.knex('SingleValue')
-      .count('parent as count')
-      .where('parent', doctype)
-      .first();
-    return res.count > 0;
-  }
-
-  async getSingleFieldsToInsert(doctype) {
-    const existingFields = (
-      await frappe.db
-        .knex('SingleValue')
-        .where({ parent: doctype })
-        .select('fieldname')
-    ).map(({ fieldname }) => fieldname);
-
-    return frappe
-      .getMeta(doctype)
-      .fields.map(({ fieldname, default: value }) => ({
-        fieldname,
-        value,
-      }))
-      .filter(
-        ({ fieldname, value }) =>
-          !existingFields.includes(fieldname) && value !== undefined
-      );
-  }
-
-  tableExists(table) {
-    return this.knex.schema.hasTable(table);
-  }
-
-  async createTable(doctype, tableName = null) {
-    let fields = this.getValidFields(doctype);
-    return await this.runCreateTableQuery(tableName || doctype, fields);
-  }
-
-  runCreateTableQuery(doctype, fields) {
-    return this.knex.schema.createTable(doctype, (table) => {
-      for (let field of fields) {
-        this.buildColumnForTable(table, field);
-      }
-    });
-  }
-
-  async alterTable(doctype) {
-    // get columns
-    let diff = await this.getColumnDiff(doctype);
-    let newForeignKeys = await this.getNewForeignKeys(doctype);
-
-    return this.knex.schema
-      .table(doctype, (table) => {
-        if (diff.added.length) {
-          for (let field of diff.added) {
-            this.buildColumnForTable(table, field);
-          }
-        }
-
-        if (diff.removed.length) {
-          this.removeColumns(doctype, diff.removed);
-        }
-      })
-      .then(() => {
-        if (newForeignKeys.length) {
-          return this.addForeignKeys(doctype, newForeignKeys);
-        }
-      });
-  }
-
-  buildColumnForTable(table, field) {
-    let columnType = this.getColumnType(field);
-    if (!columnType) {
-      // In case columnType is "Table"
-      // childTable links are handled using the childTable's "parent" field
-      return;
-    }
-
-    let column = table[columnType](field.fieldname);
-
-    // primary key
-    if (field.fieldname === 'name') {
-      column.primary();
-    }
-
-    // default value
-    if (!!field.default && !(field.default instanceof Function)) {
-      column.defaultTo(field.default);
-    }
-
-    // required
-    if (
-      (!!field.required && !(field.required instanceof Function)) ||
-      field.fieldtype === 'Currency'
-    ) {
-      column.notNullable();
-    }
-
-    // link
-    if (field.fieldtype === 'Link' && field.target) {
-      let meta = frappe.getMeta(field.target);
-      table
-        .foreign(field.fieldname)
-        .references('name')
-        .inTable(meta.getBaseDocType())
-        .onUpdate('CASCADE')
-        .onDelete('RESTRICT');
-    }
-  }
-
-  async getColumnDiff(doctype) {
-    const tableColumns = await this.getTableColumns(doctype);
-    const validFields = this.getValidFields(doctype);
-    const diff = { added: [], removed: [] };
-
-    for (let field of validFields) {
-      if (
-        !tableColumns.includes(field.fieldname) &&
-        this.getColumnType(field)
-      ) {
-        diff.added.push(field);
-      }
-    }
-
-    const validFieldNames = validFields.map((field) => field.fieldname);
-    for (let column of tableColumns) {
-      if (!validFieldNames.includes(column)) {
-        diff.removed.push(column);
-      }
-    }
-
-    return diff;
-  }
-
-  async removeColumns(doctype, removed) {
-    for (let column of removed) {
-      await this.runRemoveColumnQuery(doctype, column);
-    }
-  }
-
-  async getNewForeignKeys(doctype) {
-    let foreignKeys = await this.getForeignKeys(doctype);
-    let newForeignKeys = [];
-    let meta = frappe.getMeta(doctype);
-    for (let field of meta.getValidFields({ withChildren: false })) {
-      if (
-        field.fieldtype === 'Link' &&
-        !foreignKeys.includes(field.fieldname)
-      ) {
-        newForeignKeys.push(field);
-      }
-    }
-    return newForeignKeys;
-  }
-
-  async addForeignKeys(doctype, newForeignKeys) {
-    for (let field of newForeignKeys) {
-      this.addForeignKey(doctype, field);
-    }
-  }
-
-  async getForeignKeys(doctype, field) {
-    return [];
-  }
-
-  async getTableColumns(doctype) {
-    return [];
-  }
-
-  async get(doctype, name = null, fields = '*') {
-    let meta = frappe.getMeta(doctype);
-    let doc;
-    if (meta.isSingle) {
-      doc = await this.getSingle(doctype);
-      doc.name = doctype;
-    } else {
-      if (!name) {
-        throw new frappe.errors.ValueError('name is mandatory');
-      }
-      doc = await this.getOne(doctype, name, fields);
-    }
-    if (!doc) {
-      return;
-    }
-    await this.loadChildren(doc, meta);
-    return doc;
-  }
-
-  async loadChildren(doc, meta) {
-    // load children
-    let tableFields = meta.getTableFields();
-    for (let field of tableFields) {
-      doc[field.fieldname] = await this.getAll({
-        doctype: field.childtype,
-        fields: ['*'],
-        filters: { parent: doc.name },
-        orderBy: 'idx',
-        order: 'asc',
-      });
-    }
-  }
-
-  async getSingle(doctype) {
-    let values = await this.getAll({
-      doctype: 'SingleValue',
-      fields: ['fieldname', 'value'],
-      filters: { parent: doctype },
-      orderBy: 'fieldname',
-      order: 'asc',
-    });
-    let doc = {};
-    for (let row of values) {
-      doc[row.fieldname] = row.value;
-    }
-    return doc;
-  }
-
-  /**
-   * Get list of values from the singles table.
-   * @param  {...string | Object} fieldnames list of fieldnames to get the values of
-   * @returns {Array<Object>} array of {parent, value, fieldname}.
-   * @example
-   * Database.getSingleValues('internalPrecision');
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   * @example
-   * Database.getSingleValues({fieldname:'internalPrecision', parent: 'SystemSettings'});
-   * // returns [{ fieldname: 'internalPrecision', parent: 'SystemSettings', value: '12' }]
-   */
-  async getSingleValues(...fieldnames) {
-    fieldnames = fieldnames.map((fieldname) => {
-      if (typeof fieldname === 'string') {
-        return { fieldname };
-      }
-      return fieldname;
-    });
-
-    let builder = frappe.db.knex('SingleValue');
-    builder = builder.where(fieldnames[0]);
-
-    fieldnames.slice(1).forEach(({ fieldname, parent }) => {
-      if (typeof parent === 'undefined') {
-        builder = builder.orWhere({ fieldname });
-      } else {
-        builder = builder.orWhere({ fieldname, parent });
-      }
-    });
-
-    let values = [];
-    try {
-      values = await builder.select('fieldname', 'value', 'parent');
-    } catch (error) {
-      if (error.message.includes('no such table')) {
-        return [];
-      }
-      throw error;
-    }
-
-    return values.map((value) => {
-      const fields = frappe.getMeta(value.parent).fields;
-      return this.getDocFormattedDoc(fields, values);
-    });
-  }
-
-  async getOne(doctype, name, fields = '*') {
-    let meta = frappe.getMeta(doctype);
-    let baseDoctype = meta.getBaseDocType();
-
-    const doc = await this.knex
-      .select(fields)
-      .from(baseDoctype)
-      .where('name', name)
-      .first();
-
-    if (!doc) {
-      return doc;
-    }
-
-    return this.getDocFormattedDoc(meta.fields, doc);
-  }
-
-  getDocFormattedDoc(fields, doc) {
-    // format for usage, not going into the db
-    const docFields = Object.keys(doc);
-    const filteredFields = fields.filter(({ fieldname }) =>
-      docFields.includes(fieldname)
-    );
-
-    const formattedValues = filteredFields.reduce((d, field) => {
-      const { fieldname } = field;
-      d[fieldname] = this.getDocFormattedValues(field, doc[fieldname]);
-      return d;
-    }, {});
-
-    return Object.assign(doc, formattedValues);
-  }
-
-  getDocFormattedValues(field, value) {
-    // format for usage, not going into the db
-    try {
-      if (field.fieldtype === 'Currency') {
-        return frappe.pesa(value);
-      }
-    } catch (err) {
-      err.message += ` value: '${value}' of type: ${typeof value}, fieldname: '${
-        field.fieldname
-      }', label: '${field.label}'`;
-      throw err;
-    }
-    return value;
-  }
-
-  triggerChange(doctype, name) {
-    this.trigger(`change:${doctype}`, { name }, 500);
-    this.trigger(`change`, { doctype, name }, 500);
-    // also trigger change for basedOn doctype
-    let meta = frappe.getMeta(doctype);
-    if (meta.basedOn) {
-      this.triggerChange(meta.basedOn, name);
-    }
-  }
-
-  async insert(doctype, doc) {
-    let meta = frappe.getMeta(doctype);
-    let baseDoctype = meta.getBaseDocType();
-    doc = this.applyBaseDocTypeFilters(doctype, doc);
-
-    // insert parent
-    if (meta.isSingle) {
-      await this.updateSingle(doctype, doc);
-    } else {
-      await this.insertOne(baseDoctype, doc);
-    }
-
-    // insert children
-    await this.insertChildren(meta, doc, baseDoctype);
-
-    this.triggerChange(doctype, doc.name);
-
-    return doc;
-  }
-
-  async insertChildren(meta, doc, doctype) {
-    let tableFields = meta.getTableFields();
-    for (let field of tableFields) {
-      let idx = 0;
-      for (let child of doc[field.fieldname] || []) {
-        this.prepareChild(doctype, doc.name, child, field, idx);
-        await this.insertOne(field.childtype, child);
-        idx++;
-      }
-    }
-  }
-
-  insertOne(doctype, doc) {
-    let fields = this.getValidFields(doctype);
-
-    if (!doc.name) {
-      doc.name = getRandomString();
-    }
-
-    let formattedDoc = this.getFormattedDoc(fields, doc);
-    return this.knex(doctype).insert(formattedDoc);
-  }
-
-  async update(doctype, doc) {
-    let meta = frappe.getMeta(doctype);
-    let baseDoctype = meta.getBaseDocType();
-    doc = this.applyBaseDocTypeFilters(doctype, doc);
-
-    // update parent
-    if (meta.isSingle) {
-      await this.updateSingle(doctype, doc);
-    } else {
-      await this.updateOne(baseDoctype, doc);
-    }
-
-    // insert or update children
-    await this.updateChildren(meta, doc, baseDoctype);
-
-    this.triggerChange(doctype, doc.name);
-
-    return doc;
-  }
-
-  async updateChildren(meta, doc, doctype) {
-    let tableFields = meta.getTableFields();
-    for (let field of tableFields) {
-      let added = [];
-      for (let child of doc[field.fieldname] || []) {
-        this.prepareChild(doctype, doc.name, child, field, added.length);
-        if (await this.exists(field.childtype, child.name)) {
-          await this.updateOne(field.childtype, child);
-        } else {
-          await this.insertOne(field.childtype, child);
-        }
-        added.push(child.name);
-      }
-      await this.runDeleteOtherChildren(field, doc.name, added);
-    }
-  }
-
-  updateOne(doctype, doc) {
-    let validFields = this.getValidFields(doctype);
-    let fieldsToUpdate = Object.keys(doc).filter((f) => f !== 'name');
-    let fields = validFields.filter((df) =>
-      fieldsToUpdate.includes(df.fieldname)
-    );
-    let formattedDoc = this.getFormattedDoc(fields, doc);
-
-    return this.knex(doctype)
-      .where('name', doc.name)
-      .update(formattedDoc)
-      .then(() => {
-        let cacheKey = `${doctype}:${doc.name}`;
-        if (this.cache.hexists(cacheKey)) {
-          for (let fieldname in formattedDoc) {
-            let value = formattedDoc[fieldname];
-            this.cache.hset(cacheKey, fieldname, value);
-          }
-        }
-      });
-  }
-
-  runDeleteOtherChildren(field, parent, added) {
-    // delete other children
-    return this.knex(field.childtype)
-      .where('parent', parent)
-      .andWhere('name', 'not in', added)
-      .delete();
-  }
-
-  async updateSingle(doctype, doc) {
-    let meta = frappe.getMeta(doctype);
-    await this.deleteSingleValues(doctype);
-    for (let field of meta.getValidFields({ withChildren: false })) {
-      let value = doc[field.fieldname];
-      if (value != null) {
-        let singleValue = frappe.getNewDoc({
-          doctype: 'SingleValue',
-          parent: doctype,
-          fieldname: field.fieldname,
-          value: value,
-        });
-        await singleValue.insert();
-      }
-    }
-  }
-
-  deleteSingleValues(name) {
-    return this.knex('SingleValue').where('parent', name).delete();
-  }
-
-  async rename(doctype, oldName, newName) {
-    let meta = frappe.getMeta(doctype);
-    let baseDoctype = meta.getBaseDocType();
-    await this.knex(baseDoctype)
-      .update({ name: newName })
-      .where('name', oldName)
-      .then(() => {
-        this.clearValueCache(doctype, oldName);
-      });
-    await frappe.db.commit();
-
-    this.triggerChange(doctype, newName);
-  }
-
-  prepareChild(parenttype, parent, child, field, idx) {
-    if (!child.name) {
-      child.name = getRandomString();
-    }
-    child.parent = parent;
-    child.parenttype = parenttype;
-    child.parentfield = field.fieldname;
-    child.idx = idx;
-  }
-
-  getValidFields(doctype) {
-    return frappe.getMeta(doctype).getValidFields({ withChildren: false });
-  }
-
-  getFormattedDoc(fields, doc) {
-    // format for storage, going into the db
-    let formattedDoc = {};
-    fields.map((field) => {
-      let value = doc[field.fieldname];
-      formattedDoc[field.fieldname] = this.getFormattedValue(field, value);
-    });
-    return formattedDoc;
-  }
-
-  getFormattedValue(field, value) {
-    // format for storage, going into the db
-    const type = typeof value;
-    if (field.fieldtype === 'Currency') {
-      let currency = value;
-
-      if (type === 'number' || type === 'string') {
-        currency = frappe.pesa(value);
-      }
-
-      const currencyValue = currency.store;
-      if (typeof currencyValue !== 'string') {
-        throw new Error(
-          `invalid currencyValue '${currencyValue}' of type '${typeof currencyValue}' on converting from '${value}' of type '${type}'`
-        );
-      }
-
-      return currencyValue;
-    }
-
-    if (value instanceof Date) {
-      if (field.fieldtype === 'Date') {
-        // date
-        return value.toISOString().substr(0, 10);
-      } else {
-        // datetime
-        return value.toISOString();
-      }
-    } else if (field.fieldtype === 'Link' && !value) {
-      // empty value must be null to satisfy
-      // foreign key constraint
-      return null;
-    } else {
-      return value;
-    }
-  }
-
-  applyBaseDocTypeFilters(doctype, doc) {
-    let meta = frappe.getMeta(doctype);
-    if (meta.filters) {
-      for (let fieldname in meta.filters) {
-        let value = meta.filters[fieldname];
-        if (typeof value !== 'object') {
-          doc[fieldname] = value;
-        }
-      }
-    }
-    return doc;
-  }
-
-  async deleteMany(doctype, names) {
-    for (const name of names) {
-      await this.delete(doctype, name);
-    }
-  }
-
-  async delete(doctype, name) {
-    let meta = frappe.getMeta(doctype);
-    let baseDoctype = meta.getBaseDocType();
-    await this.deleteOne(baseDoctype, name);
-
-    // delete children
-    let tableFields = frappe.getMeta(doctype).getTableFields();
-    for (let field of tableFields) {
-      await this.deleteChildren(field.childtype, name);
-    }
-
-    this.triggerChange(doctype, name);
-  }
-
-  async deleteOne(doctype, name) {
-    return this.knex(doctype)
-      .where('name', name)
-      .delete()
-      .then(() => {
-        this.clearValueCache(doctype, name);
-      });
-  }
-
-  deleteChildren(parenttype, parent) {
-    return this.knex(parenttype).where('parent', parent).delete();
-  }
-
-  async exists(doctype, name) {
-    return (await this.getValue(doctype, name)) ? true : false;
-  }
-
-  async getValue(doctype, filters, fieldname = 'name') {
-    let meta = frappe.getMeta(doctype);
-    let baseDoctype = meta.getBaseDocType();
-    if (typeof filters === 'string') {
-      filters = { name: filters };
-    }
-    if (meta.filters) {
-      Object.assign(filters, meta.filters);
-    }
-
-    let row = await this.getAll({
-      doctype: baseDoctype,
-      fields: [fieldname],
-      filters: filters,
-      start: 0,
-      limit: 1,
-      orderBy: 'name',
-      order: 'asc',
-    });
-    return row.length ? row[0][fieldname] : null;
-  }
-
-  async setValue(doctype, name, fieldname, value) {
-    return await this.setValues(doctype, name, {
-      [fieldname]: value,
-    });
-  }
-
-  async setValues(doctype, name, fieldValuePair) {
-    let doc = Object.assign({}, fieldValuePair, { name });
-    return this.updateOne(doctype, doc);
-  }
-
-  async getCachedValue(doctype, name, fieldname) {
-    let value = this.cache.hget(`${doctype}:${name}`, fieldname);
-    if (value == null) {
-      value = await this.getValue(doctype, name, fieldname);
-    }
-    return value;
-  }
-
-  async getAll({
-    doctype,
-    fields,
-    filters,
-    start,
-    limit,
-    groupBy,
-    orderBy = 'creation',
-    order = 'desc',
-  } = {}) {
-    let meta = frappe.getMeta(doctype);
-    let baseDoctype = meta.getBaseDocType();
-    if (!fields) {
-      fields = meta.getKeywordFields();
-      fields.push('name');
-    }
-    if (typeof fields === 'string') {
-      fields = [fields];
-    }
-    if (meta.filters) {
-      filters = Object.assign({}, filters, meta.filters);
-    }
-
-    let builder = this.knex.select(fields).from(baseDoctype);
-
-    this.applyFiltersToBuilder(builder, filters);
-
-    if (orderBy) {
-      builder.orderBy(orderBy, order);
-    }
-
-    if (groupBy) {
-      builder.groupBy(groupBy);
-    }
-
-    if (start) {
-      builder.offset(start);
-    }
-
-    if (limit) {
-      builder.limit(limit);
-    }
-
-    const docs = await builder;
-    return docs.map((doc) => this.getDocFormattedDoc(meta.fields, doc));
-  }
-
-  applyFiltersToBuilder(builder, filters) {
-    // {"status": "Open"} => `status = "Open"`
-
-    // {"status": "Open", "name": ["like", "apple%"]}
-    // => `status="Open" and name like "apple%"
-
-    // {"date": [">=", "2017-09-09", "<=", "2017-11-01"]}
-    // => `date >= 2017-09-09 and date <= 2017-11-01`
-
-    let filtersArray = [];
-
-    for (let field in filters) {
-      let value = filters[field];
-      let operator = '=';
-      let comparisonValue = value;
-
-      if (Array.isArray(value)) {
-        operator = value[0];
-        comparisonValue = value[1];
-        operator = operator.toLowerCase();
-
-        if (operator === 'includes') {
-          operator = 'like';
-        }
-
-        if (operator === 'like' && !comparisonValue.includes('%')) {
-          comparisonValue = `%${comparisonValue}%`;
-        }
-      }
-
-      filtersArray.push([field, operator, comparisonValue]);
-
-      if (Array.isArray(value) && value.length > 2) {
-        // multiple conditions
-        let operator = value[2];
-        let comparisonValue = value[3];
-        filtersArray.push([field, operator, comparisonValue]);
-      }
-    }
-
-    filtersArray.map((filter) => {
-      const [field, operator, comparisonValue] = filter;
-      if (operator === '=') {
-        builder.where(field, comparisonValue);
-      } else {
-        builder.where(field, operator, comparisonValue);
-      }
-    });
-  }
-
-  run(query, params) {
-    // run query
-    return this.sql(query, params);
-  }
-
-  sql(query, params) {
-    // run sql
-    return this.knex.raw(query, params);
-  }
-
-  async commit() {
-    try {
-      await this.sql('commit');
-    } catch (e) {
-      if (e.type !== frappe.errors.CannotCommitError) {
-        throw e;
-      }
-    }
-  }
-
-  clearValueCache(doctype, name) {
-    let cacheKey = `${doctype}:${name}`;
-    this.cache.hclear(cacheKey);
-  }
-
-  getColumnType(field) {
-    return this.typeMap[field.fieldtype];
-  }
-
-  getError(err) {
-    return frappe.errors.DatabaseError;
-  }
-
-  initTypeMap() {
-    this.typeMap = {};
-  }
-
-  executePostDbConnect() {
-    frappe.initializeMoneyMaker();
-  }
-}
diff --git a/frappe/backends/helpers.ts b/frappe/backends/helpers.ts
deleted file mode 100644
index 1d2d38a4..00000000
--- a/frappe/backends/helpers.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export const sqliteTypeMap = {
-  AutoComplete: 'text',
-  Currency: 'text',
-  Int: 'integer',
-  Float: 'float',
-  Percent: 'float',
-  Check: 'integer',
-  Code: 'text',
-  Date: 'text',
-  Datetime: 'text',
-  Time: 'text',
-  Text: 'text',
-  Data: 'text',
-  Link: 'text',
-  DynamicLink: 'text',
-  Password: 'text',
-  Select: 'text',
-  File: 'text',
-  Attach: 'text',
-  AttachImage: 'text',
-  Color: 'text',
-};
-
-export const validTypes = Object.keys(sqliteTypeMap);
diff --git a/frappe/backends/sqlite.js b/frappe/backends/sqlite.js
deleted file mode 100644
index f9f8a58a..00000000
--- a/frappe/backends/sqlite.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import frappe from 'frappe';
-import Database from './database';
-import { sqliteTypeMap } from './helpers';
-
-export default class SqliteDatabase extends Database {
-  constructor({ dbPath }) {
-    super();
-    this.dbPath = dbPath;
-    this.connectionParams = {
-      client: 'sqlite3',
-      connection: {
-        filename: this.dbPath,
-      },
-      pool: {
-        afterCreate(conn, done) {
-          conn.run('PRAGMA foreign_keys=ON');
-          done();
-        },
-      },
-      useNullAsDefault: true,
-      asyncStackTraces: process.env.NODE_ENV === 'development',
-    };
-  }
-
-  async addForeignKeys(doctype, newForeignKeys) {
-    await this.sql('PRAGMA foreign_keys=OFF');
-    await this.sql('BEGIN TRANSACTION');
-
-    const tempName = 'TEMP' + doctype;
-
-    // create temp table
-    await this.createTable(doctype, tempName);
-
-    try {
-      // copy from old to new table
-      await this.knex(tempName).insert(this.knex.select().from(doctype));
-    } catch (err) {
-      await this.sql('ROLLBACK');
-      await this.sql('PRAGMA foreign_keys=ON');
-
-      const rows = await this.knex.select().from(doctype);
-      await this.prestigeTheTable(doctype, rows);
-      return;
-    }
-
-    // drop old table
-    await this.knex.schema.dropTable(doctype);
-
-    // rename new table
-    await this.knex.schema.renameTable(tempName, doctype);
-
-    await this.sql('COMMIT');
-    await this.sql('PRAGMA foreign_keys=ON');
-  }
-
-  removeColumns() {
-    // pass
-  }
-
-  async getTableColumns(doctype) {
-    return (await this.sql(`PRAGMA table_info(${doctype})`)).map((d) => d.name);
-  }
-
-  async getForeignKeys(doctype) {
-    return (await this.sql(`PRAGMA foreign_key_list(${doctype})`)).map(
-      (d) => d.from
-    );
-  }
-
-  initTypeMap() {
-    this.typeMap = sqliteTypeMap;
-  }
-
-  getError(err) {
-    let errorType = frappe.errors.DatabaseError;
-    if (err.message.includes('FOREIGN KEY')) {
-      errorType = frappe.errors.LinkValidationError;
-    }
-    if (err.message.includes('SQLITE_ERROR: cannot commit')) {
-      errorType = frappe.errors.CannotCommitError;
-    }
-    if (err.message.includes('SQLITE_CONSTRAINT: UNIQUE constraint failed:')) {
-      errorType = frappe.errors.DuplicateEntryError;
-    }
-    return errorType;
-  }
-
-  async prestigeTheTable(tableName, tableRows) {
-    const max = 200;
-
-    // Alter table hacx for sqlite in case of schema change.
-    const tempName = `__${tableName}`;
-    await this.knex.schema.dropTableIfExists(tempName);
-
-    await this.knex.raw('PRAGMA foreign_keys=OFF');
-    await this.createTable(tableName, tempName);
-
-    if (tableRows.length > 200) {
-      const fi = Math.floor(tableRows.length / max);
-      for (let i = 0; i <= fi; i++) {
-        const rowSlice = tableRows.slice(i * max, i + 1 * max);
-        if (rowSlice.length === 0) {
-          break;
-        }
-        await this.knex.batchInsert(tempName, rowSlice);
-      }
-    } else {
-      await this.knex.batchInsert(tempName, tableRows);
-    }
-
-    await this.knex.schema.dropTable(tableName);
-    await this.knex.schema.renameTable(tempName, tableName);
-    await this.knex.raw('PRAGMA foreign_keys=ON');
-  }
-}
diff --git a/frappe/core/authHandler.ts b/frappe/core/authHandler.ts
index 05786be1..d1f727c0 100644
--- a/frappe/core/authHandler.ts
+++ b/frappe/core/authHandler.ts
@@ -1,4 +1,4 @@
-import { Frappe } from 'frappe/core/frappe';
+import { Frappe } from 'frappe';
 
 interface AuthConfig {
   serverURL: string;
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index 5957b903..3e78b453 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -1,5 +1,5 @@
 import { DatabaseDemux } from '@/demux/db';
-import { Frappe } from 'frappe/core/frappe';
+import { Frappe } from 'frappe';
 import Money from 'pesa/dist/types/src/money';
 import { FieldType, FieldTypeEnum, RawValue, SchemaMap } from 'schemas/types';
 import { DatabaseBase, GetAllOptions } from 'utils/db/types';
diff --git a/frappe/core/docHandler.ts b/frappe/core/docHandler.ts
index ad3b6a66..ecdfdbae 100644
--- a/frappe/core/docHandler.ts
+++ b/frappe/core/docHandler.ts
@@ -1,9 +1,10 @@
 import { Field, Model } from '@/types/model';
-import Doc from 'frappe/model/document';
+import Doc from 'frappe/model/doc';
 import Meta from 'frappe/model/meta';
 import { getDuplicates, getRandomString } from 'frappe/utils';
 import Observable from 'frappe/utils/observable';
-import { Frappe } from './frappe';
+import { Frappe } from '..';
+import { DocValue } from './types';
 
 type DocMap = Record<string, Doc | undefined>;
 type MetaMap = Record<string, Meta | undefined>;
@@ -109,8 +110,8 @@ export class DocHandler {
     }
   }
 
-  getDocFromCache(doctype: string, name: string): Doc | undefined {
-    const doc = (this.docs?.[doctype] as DocMap)?.[name];
+  getDocFromCache(schemaName: string, name: string): Doc | undefined {
+    const doc = (this.docs?.[schemaName] as DocMap)?.[name];
     return doc;
   }
 
@@ -251,4 +252,10 @@ export class DocHandler {
       await doc.insert();
     }
   }
+
+  getCachedValue(
+    schemaName: string,
+    name: string,
+    fieldname: string
+  ): DocValue {}
 }
diff --git a/frappe/core/types.ts b/frappe/core/types.ts
index 4a8beaa6..532c7f50 100644
--- a/frappe/core/types.ts
+++ b/frappe/core/types.ts
@@ -1,9 +1,9 @@
+import Doc from 'frappe/model/doc';
 import Money from 'pesa/dist/types/src/money';
 import { RawValue } from 'schemas/types';
 
-export type DocValue = string | number | boolean | Date | Money;
-
-export type DocValueMap = Record<string, DocValue | DocValueMap[]>;
+export type DocValue = string | number | boolean | Date | Money | null;
+export type DocValueMap = Record<string, DocValue | Doc[] | DocValueMap[]>;
 export type RawValueMap = Record<string, RawValue | RawValueMap[]>;
 
 export type SingleValue<T> = {
diff --git a/frappe/index.js b/frappe/index.js
deleted file mode 100644
index 314034aa..00000000
--- a/frappe/index.js
+++ /dev/null
@@ -1,321 +0,0 @@
-import { getMoneyMaker } from 'pesa';
-import { markRaw } from 'vue';
-import { AuthHandler } from './core/authHandler';
-import { asyncHandler, getDuplicates, getRandomString } from './utils';
-import {
-  DEFAULT_DISPLAY_PRECISION,
-  DEFAULT_INTERNAL_PRECISION,
-} from './utils/consts';
-import * as errors from './utils/errors';
-import { format } from './utils/format';
-import Observable from './utils/observable';
-import { t, T } from './utils/translation';
-
-export class Frappe {
-  t = t;
-  T = T;
-  format = format;
-
-  errors = errors;
-  isElectron = false;
-  isServer = false;
-
-  constructor() {
-    this.auth = new AuthHandler();
-  }
-
-  async initializeAndRegister(customModels = {}, force = false) {
-    this.init(force);
-
-    this.Meta = (await import('frappe/model/meta')).default;
-    this.Document = (await import('frappe/model/document')).default;
-
-    const coreModels = await import('frappe/models');
-    this.registerModels(coreModels.default);
-    this.registerModels(customModels);
-  }
-
-  init(force) {
-    if (this._initialized && !force) return;
-
-    // Initialize Globals
-    this.metaCache = {};
-    this.models = {};
-
-    this.methods = {};
-    this.errorLog = [];
-
-    // temp params while calling routes
-    this.temp = {};
-
-    this.docs = new Observable();
-    this.events = new Observable();
-    this._initialized = true;
-  }
-
-  registerModels(models) {
-    // register models from app/models/index.js
-    for (let doctype in models) {
-      let metaDefinition = models[doctype];
-      if (!metaDefinition.name) {
-        throw new Error(`Name is mandatory for ${doctype}`);
-      }
-      if (metaDefinition.name !== doctype) {
-        throw new Error(
-          `Model name mismatch for ${doctype}: ${metaDefinition.name}`
-        );
-      }
-      let fieldnames = (metaDefinition.fields || [])
-        .map((df) => df.fieldname)
-        .sort();
-      let duplicateFieldnames = getDuplicates(fieldnames);
-      if (duplicateFieldnames.length > 0) {
-        throw new Error(
-          `Duplicate fields in ${doctype}: ${duplicateFieldnames.join(', ')}`
-        );
-      }
-
-      this.models[doctype] = metaDefinition;
-    }
-  }
-
-  registerMethod({ method, handler }) {
-    this.methods[method] = handler;
-    if (this.app) {
-      // add to router if client-server
-      this.app.post(
-        `/api/method/${method}`,
-        asyncHandler(async function (request, response) {
-          let data = await handler(request.body);
-          if (data === undefined) {
-            data = {};
-          }
-          return response.json(data);
-        })
-      );
-    }
-  }
-
-  async initializeMoneyMaker(currency) {
-    currency ??= 'XXX';
-
-    // to be called after db initialization
-    const values =
-      (await frappe.db?.getSingleValues(
-        {
-          fieldname: 'internalPrecision',
-          parent: 'SystemSettings',
-        },
-        {
-          fieldname: 'displayPrecision',
-          parent: 'SystemSettings',
-        }
-      )) ?? [];
-
-    let { internalPrecision: precision, displayPrecision: display } =
-      values.reduce((acc, { fieldname, value }) => {
-        acc[fieldname] = value;
-        return acc;
-      }, {});
-
-    if (typeof precision === 'undefined') {
-      precision = DEFAULT_INTERNAL_PRECISION;
-    }
-
-    if (typeof precision === 'string') {
-      precision = parseInt(precision);
-    }
-
-    if (typeof display === 'undefined') {
-      display = DEFAULT_DISPLAY_PRECISION;
-    }
-
-    if (typeof display === 'string') {
-      display = parseInt(display);
-    }
-
-    this.pesa = getMoneyMaker({
-      currency,
-      precision,
-      display,
-      wrapper: markRaw,
-    });
-  }
-
-  getModels(filterFunction) {
-    let models = [];
-    for (let doctype in this.models) {
-      models.push(this.models[doctype]);
-    }
-    return filterFunction ? models.filter(filterFunction) : models;
-  }
-
-  async call({ method, args }) {
-    if (this.isServer) {
-      if (this.methods[method]) {
-        return await this.methods[method](args);
-      } else {
-        throw new Error(`${method} not found`);
-      }
-    }
-
-    let url = `/api/method/${method}`;
-    let response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(args || {}),
-    });
-    return await response.json();
-  }
-
-  addToCache(doc) {
-    if (!this.docs) return;
-
-    // add to `docs` cache
-    if (doc.doctype && doc.name) {
-      if (!this.docs[doc.doctype]) {
-        this.docs[doc.doctype] = {};
-      }
-      this.docs[doc.doctype][doc.name] = doc;
-
-      // singles available as first level objects too
-      if (doc.doctype === doc.name) {
-        this[doc.name] = doc;
-      }
-
-      // propogate change to `docs`
-      doc.on('change', (params) => {
-        this.docs.trigger('change', params);
-      });
-    }
-  }
-
-  removeFromCache(doctype, name) {
-    try {
-      delete this.docs[doctype][name];
-    } catch (e) {
-      console.warn(`Document ${doctype} ${name} does not exist`);
-    }
-  }
-
-  isDirty(doctype, name) {
-    return (
-      (this.docs &&
-        this.docs[doctype] &&
-        this.docs[doctype][name] &&
-        this.docs[doctype][name]._dirty) ||
-      false
-    );
-  }
-
-  getDocFromCache(doctype, name) {
-    if (this.docs && this.docs[doctype] && this.docs[doctype][name]) {
-      return this.docs[doctype][name];
-    }
-  }
-
-  getMeta(doctype) {
-    if (!this.metaCache[doctype]) {
-      let model = this.models[doctype];
-      if (!model) {
-        throw new Error(`${doctype} is not a registered doctype`);
-      }
-
-      let metaClass = model.metaClass || this.Meta;
-      this.metaCache[doctype] = new metaClass(model);
-    }
-
-    return this.metaCache[doctype];
-  }
-
-  async getDoc(doctype, name, options = { skipDocumentCache: false }) {
-    let doc = options.skipDocumentCache
-      ? null
-      : this.getDocFromCache(doctype, name);
-    if (!doc) {
-      doc = new (this.getDocumentClass(doctype))({
-        doctype: doctype,
-        name: name,
-      });
-      await doc.load();
-      this.addToCache(doc);
-    }
-    return doc;
-  }
-
-  getDocumentClass(doctype) {
-    const meta = this.getMeta(doctype);
-    return meta.documentClass || this.Document;
-  }
-
-  async getSingle(doctype) {
-    return await this.getDoc(doctype, doctype);
-  }
-
-  async getDuplicate(doc) {
-    const newDoc = await this.getEmptyDoc(doc.doctype);
-    for (let field of this.getMeta(doc.doctype).getValidFields()) {
-      if (['name', 'submitted'].includes(field.fieldname)) continue;
-      if (field.fieldtype === 'Table') {
-        newDoc[field.fieldname] = (doc[field.fieldname] || []).map((d) => {
-          let newd = Object.assign({}, d);
-          newd.name = '';
-          return newd;
-        });
-      } else {
-        newDoc[field.fieldname] = doc[field.fieldname];
-      }
-    }
-    return newDoc;
-  }
-
-  getEmptyDoc(doctype, cacheDoc = true) {
-    let doc = this.getNewDoc({ doctype: doctype });
-    doc._notInserted = true;
-    doc.name = getRandomString();
-
-    if (cacheDoc) {
-      this.addToCache(doc);
-    }
-
-    return doc;
-  }
-
-  getNewDoc(data) {
-    let doc = new (this.getDocumentClass(data.doctype))(data);
-    doc.setDefaults();
-    return doc;
-  }
-
-  createMeta(fields) {
-    return new this.Meta({ isCustom: 1, fields });
-  }
-
-  async syncDoc(data) {
-    let doc;
-    if (await this.db.exists(data.doctype, data.name)) {
-      doc = await this.getDoc(data.doctype, data.name);
-      Object.assign(doc, data);
-      await doc.update();
-    } else {
-      doc = this.getNewDoc(data);
-      await doc.insert();
-    }
-  }
-
-  close() {
-    this.db.close();
-    this.auth.logout();
-  }
-
-  store = {
-    isDevelopment: false,
-    appVersion: '',
-  };
-}
-
-export { T, t };
-export default new Frappe();
diff --git a/frappe/core/frappe.ts b/frappe/index.ts
similarity index 82%
rename from frappe/core/frappe.ts
rename to frappe/index.ts
index a884b35d..e998d74a 100644
--- a/frappe/core/frappe.ts
+++ b/frappe/index.ts
@@ -1,19 +1,17 @@
 import { ErrorLog } from '@/errorHandling';
-import { Model } from '@/types/model';
-import Doc from 'frappe/model/document';
-import Meta from 'frappe/model/meta';
+import Doc from 'frappe/model/doc';
 import { getMoneyMaker, MoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
+import { AuthHandler } from './core/authHandler';
+import { DatabaseHandler } from './core/dbHandler';
+import { DocHandler } from './core/docHandler';
 import {
   DEFAULT_DISPLAY_PRECISION,
   DEFAULT_INTERNAL_PRECISION,
-} from '../utils/consts';
-import * as errors from '../utils/errors';
-import { format } from '../utils/format';
-import { t, T } from '../utils/translation';
-import { AuthHandler } from './authHandler';
-import { DatabaseHandler } from './dbHandler';
-import { DocHandler } from './docHandler';
+} from './utils/consts';
+import * as errors from './utils/errors';
+import { format } from './utils/format';
+import { t, T } from './utils/translation';
 
 export class Frappe {
   t = t;
@@ -30,8 +28,7 @@ export class Frappe {
   doc: DocHandler;
   db: DatabaseHandler;
 
-  Meta?: typeof Meta;
-  Document?: typeof Doc;
+  Doc?: typeof Doc;
 
   _initialized: boolean = false;
 
@@ -66,8 +63,7 @@ export class Frappe {
   async initializeAndRegister(customModels = {}, force = false) {
     await this.init(force);
 
-    this.Meta = (await import('frappe/model/meta')).default;
-    this.Document = (await import('frappe/model/document')).default;
+    this.Doc = (await import('frappe/model/doc')).default;
 
     const coreModels = await import('frappe/models');
     this.doc.registerModels(coreModels.default as Record<string, Model>);
diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
new file mode 100644
index 00000000..17327e63
--- /dev/null
+++ b/frappe/model/doc.ts
@@ -0,0 +1,691 @@
+import telemetry from '@/telemetry/telemetry';
+import { Verb } from '@/telemetry/types';
+import { DocValue, DocValueMap } from 'frappe/core/types';
+import {
+  Conflict,
+  MandatoryError,
+  NotFoundError,
+  ValidationError,
+} from 'frappe/utils/errors';
+import Observable from 'frappe/utils/observable';
+import Money from 'pesa/dist/types/src/money';
+import {
+  Field,
+  FieldTypeEnum,
+  OptionField,
+  Schema,
+  TargetField,
+} from 'schemas/types';
+import { getIsNullOrUndef, getMapFromList } from 'utils';
+import frappe from '..';
+import { getRandomString, isPesa } from '../utils/index';
+import {
+  areDocValuesEqual,
+  getMissingMandatoryMessage,
+  getPreDefaultValues,
+  shouldApplyFormula,
+} from './helpers';
+import { setName } from './naming';
+import {
+  DefaultMap,
+  DependsOnMap,
+  FormulaMap,
+  RequiredMap,
+  ValidationMap,
+} from './types';
+import { validateSelect } from './validationFunction';
+
+export default class Doc extends Observable<DocValue | Doc[]> {
+  name?: string;
+  schema: Readonly<Schema>;
+  fieldMap: Record<string, Field>;
+
+  /**
+   * Fields below are used by child docs to maintain
+   * reference w.r.t their parent doc.
+   */
+  idx?: number;
+  parentdoc?: Doc;
+  parentfield?: string;
+
+  _links?: Record<string, Doc>;
+  _dirty: boolean = true;
+  _notInserted: boolean = true;
+
+  flags = {
+    submitAction: false,
+    revertAction: false,
+  };
+
+  constructor(schema: Schema, data: DocValueMap) {
+    super();
+    this.schema = schema;
+    this._setInitialValues(data);
+    this.fieldMap = getMapFromList(schema.fields, 'fieldname');
+  }
+
+  get schemaName(): string {
+    return this.schema.name;
+  }
+
+  get isNew(): boolean {
+    return this._notInserted;
+  }
+
+  get tableFields(): TargetField[] {
+    return this.schema.fields.filter(
+      (f) => f.fieldtype === FieldTypeEnum.Table
+    ) as TargetField[];
+  }
+
+  _setInitialValues(data: DocValueMap) {
+    for (const fieldname in data) {
+      const value = data[fieldname];
+
+      if (Array.isArray(value)) {
+        for (const row of value) {
+          this.push(fieldname, row);
+        }
+      } else {
+        this[fieldname] = value;
+      }
+    }
+
+    // set unset fields as null
+    for (const field of this.schema.fields) {
+      if (this[field.fieldname] === undefined) {
+        this[field.fieldname] = null;
+      }
+    }
+  }
+
+  setDirty(value: boolean) {
+    this._dirty = value;
+    if (this.schema.isChild && this.parentdoc) {
+      this.parentdoc._dirty = value;
+    }
+  }
+
+  // set value and trigger change
+  async set(fieldname: string | DocValueMap, value?: DocValue | Doc[]) {
+    if (typeof fieldname === 'object') {
+      this.setMultiple(fieldname as DocValueMap);
+      return;
+    }
+
+    if (fieldname === 'numberSeries' && !this._notInserted) {
+      return;
+    }
+
+    if (value === undefined) {
+      return;
+    }
+
+    if (
+      this.fieldMap[fieldname] === undefined ||
+      (this[fieldname] !== undefined &&
+        areDocValuesEqual(this[fieldname] as DocValue, value as DocValue))
+    ) {
+      return;
+    }
+
+    this.setDirty(true);
+    if (Array.isArray(value)) {
+      this[fieldname] = value.map((row, i) => {
+        row.idx = i;
+        return row;
+      });
+    } else {
+      const field = this.fieldMap[fieldname];
+      await this.validateField(field, value);
+      this[fieldname] = value;
+    }
+
+    // always run applyChange from the parentdoc
+    if (this.schema.isChild && this.parentdoc) {
+      await this.applyChange(fieldname);
+      await this.parentdoc.applyChange(this.parentfield as string);
+    } else {
+      await this.applyChange(fieldname);
+    }
+  }
+
+  async setMultiple(docValueMap: DocValueMap) {
+    for (const fieldname in docValueMap) {
+      await this.set(fieldname, docValueMap[fieldname] as DocValue | Doc[]);
+    }
+  }
+
+  async applyChange(fieldname: string) {
+    await this.applyFormula(fieldname);
+    await this.trigger('change', {
+      doc: this,
+      changed: fieldname,
+    });
+  }
+
+  setDefaults() {
+    for (const field of this.schema.fields) {
+      if (!getIsNullOrUndef(this[field.fieldname])) {
+        continue;
+      }
+
+      let defaultValue: DocValue | Doc[] = getPreDefaultValues(field.fieldtype);
+      const defaultFunction = this.defaults[field.fieldname];
+
+      if (defaultFunction !== undefined) {
+        defaultValue = defaultFunction();
+      } else if (field.default !== undefined) {
+        defaultValue = field.default;
+      }
+
+      if (field.fieldtype === 'Currency' && !isPesa(defaultValue)) {
+        defaultValue = frappe.pesa!(defaultValue as string | number);
+      }
+
+      this[field.fieldname] = defaultValue;
+    }
+  }
+
+  append(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
+    // push child row and trigger change
+    this.push(fieldname, docValueMap);
+    this._dirty = true;
+    this.applyChange(fieldname);
+  }
+
+  push(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
+    // push child row without triggering change
+    this[fieldname] ??= [];
+    const childDoc = this._initChild(docValueMap, fieldname);
+    (this[fieldname] as Doc[]).push(childDoc);
+  }
+
+  _initChild(docValueMap: Doc | DocValueMap, fieldname: string): Doc {
+    if (docValueMap instanceof Doc) {
+      return docValueMap;
+    }
+
+    const data: Record<string, unknown> = Object.assign({}, docValueMap);
+
+    data.parent = this.name;
+    data.parenttype = this.schemaName;
+    data.parentfield = fieldname;
+    data.parentdoc = this;
+
+    if (!data.idx) {
+      data.idx = ((this[fieldname] as Doc[]) || []).length;
+    }
+
+    if (!data.name) {
+      data.name = getRandomString();
+    }
+
+    const childSchemaName = this.fieldMap[fieldname] as TargetField;
+    const schema = frappe.db.schemaMap[childSchemaName.target];
+    const childDoc = new Doc(schema, data as DocValueMap);
+    childDoc.setDefaults();
+    return childDoc;
+  }
+
+  async validateInsert() {
+    this.validateMandatory();
+    await this.validateFields();
+  }
+
+  validateMandatory() {
+    const checkForMandatory: Doc[] = [this];
+    const tableFields = this.schema.fields.filter(
+      (f) => f.fieldtype === FieldTypeEnum.Table
+    ) as TargetField[];
+
+    for (const field of tableFields) {
+      const childDocs = this.get(field.fieldname) as Doc[];
+      checkForMandatory.push(...childDocs);
+    }
+
+    const missingMandatoryMessage = checkForMandatory
+      .map((doc) => getMissingMandatoryMessage(doc))
+      .filter(Boolean);
+
+    if (missingMandatoryMessage.length > 0) {
+      const fields = missingMandatoryMessage.join('\n');
+      const message = frappe.t`Value missing for ${fields}`;
+      throw new MandatoryError(message);
+    }
+  }
+
+  async validateFields() {
+    const fields = this.schema.fields;
+    for (const field of fields) {
+      if (field.fieldtype === FieldTypeEnum.Table) {
+        continue;
+      }
+
+      const value = this.get(field.fieldname) as DocValue;
+      await this.validateField(field, value);
+    }
+  }
+
+  async validateField(field: Field, value: DocValue) {
+    if (field.fieldtype == 'Select') {
+      validateSelect(field as OptionField, value as string);
+    }
+
+    if (value === null || value === undefined) {
+      return;
+    }
+
+    const validator = this.validations[field.fieldname];
+    if (validator === undefined) {
+      return;
+    }
+
+    await validator(value);
+  }
+
+  getValidDict(): DocValueMap {
+    const data: DocValueMap = {};
+    for (const field of this.schema.fields) {
+      let value = this[field.fieldname] as DocValue | DocValueMap[];
+
+      if (Array.isArray(value)) {
+        value = value.map((doc) => (doc as Doc).getValidDict());
+      }
+
+      if (isPesa(value)) {
+        value = (value as Money).copy();
+      }
+
+      data[field.fieldname] = value;
+    }
+    return data;
+  }
+
+  setBaseMetaValues() {
+    if (this.schema.isSubmittable && typeof this.submitted !== 'boolean') {
+      this.submitted = false;
+      this.cancelled = false;
+    }
+
+    if (!this.createdBy) {
+      this.createdBy = frappe.auth.session.user;
+    }
+
+    if (!this.created) {
+      this.created = new Date();
+    }
+
+    this.updateModified();
+  }
+
+  updateModified() {
+    this.modifiedBy = frappe.auth.session.user;
+    this.modified = new Date();
+  }
+
+  async load() {
+    if (this.name === undefined) {
+      return;
+    }
+
+    const data = await frappe.db.get(this.schemaName, this.name);
+    if (data && data.name) {
+      this.syncValues(data);
+      if (this.schema.isSingle) {
+        this.setDefaults();
+      }
+
+      await this.loadLinks();
+    } else {
+      throw new NotFoundError(`Not Found: ${this.schemaName} ${this.name}`);
+    }
+  }
+
+  async loadLinks() {
+    this._links = {};
+    const inlineLinks = this.schema.fields.filter((f) => f.inline);
+    for (const f of inlineLinks) {
+      await this.loadLink(f.fieldname);
+    }
+  }
+
+  async loadLink(fieldname: string) {
+    this._links ??= {};
+    const field = this.fieldMap[fieldname] as TargetField;
+    if (field === undefined) {
+      return;
+    }
+
+    const value = this.get(fieldname);
+    if (getIsNullOrUndef(value) || field.target === undefined) {
+      return;
+    }
+
+    this._links[fieldname] = await frappe.doc.getDoc(
+      field.target,
+      value as string
+    );
+  }
+
+  getLink(fieldname: string) {
+    return this._links ? this._links[fieldname] : null;
+  }
+
+  syncValues(data: DocValueMap) {
+    this.clearValues();
+    this._setInitialValues(data);
+    this._dirty = false;
+    this.trigger('change', {
+      doc: this,
+    });
+  }
+
+  clearValues() {
+    for (const { fieldname } of this.schema.fields) {
+      this[fieldname] = null;
+    }
+
+    this._dirty = true;
+    this._notInserted = true;
+  }
+
+  setChildIdx() {
+    const childFields = this.schema.fields.filter(
+      (f) => f.fieldtype === FieldTypeEnum.Table
+    ) as TargetField[];
+
+    for (const field of childFields) {
+      const childDocs = (this.get(field.fieldname) as Doc[]) ?? [];
+
+      for (let i = 0; i < childDocs.length; i++) {
+        childDocs[i].idx = i;
+      }
+    }
+  }
+
+  async compareWithCurrentDoc() {
+    if (this.isNew || !this.name) {
+      return;
+    }
+
+    const currentDoc = await frappe.db.get(this.schemaName, this.name);
+
+    // check for conflict
+    if (
+      currentDoc &&
+      (this.modified as Date) !== (currentDoc.modified as Date)
+    ) {
+      throw new Conflict(
+        frappe.t`Document ${this.doctype} ${this.name} has been modified after loading`
+      );
+    }
+
+    if (this.submitted && !this.schema.isSubmittable) {
+      throw new ValidationError(
+        frappe.t`Document type ${this.doctype} is not submittable`
+      );
+    }
+
+    // set submit action flag
+    if (this.submitted && !currentDoc.submitted) {
+      this.flags.submitAction = true;
+    }
+
+    if (currentDoc.submitted && !this.submitted) {
+      this.flags.revertAction = true;
+    }
+  }
+
+  async applyFormula(fieldname?: string) {
+    if (fieldname && this.formulas[fieldname] === undefined) {
+      return false;
+    }
+
+    const doc = this;
+    let changed = false;
+
+    const childDocs = this.tableFields
+      .map((f) => (this.get(f.fieldname) as Doc[]) ?? [])
+      .flat();
+
+    // children
+    for (const row of childDocs) {
+      const formulaFields = Object.keys(this.formulas).map(
+        (fn) => this.fieldMap[fn]
+      );
+
+      changed ||= await this.applyFormulaForFields(
+        formulaFields,
+        row,
+        fieldname
+      );
+    }
+
+    // parent or child row
+    const formulaFields = Object.keys(this.formulas).map(
+      (fn) => this.fieldMap[fn]
+    );
+    changed ||= await this.applyFormulaForFields(formulaFields, doc, fieldname);
+    return changed;
+  }
+
+  async applyFormulaForFields(
+    formulaFields: Field[],
+    doc: Doc,
+    fieldname?: string
+  ) {
+    let changed = false;
+    for (const field of formulaFields) {
+      if (!shouldApplyFormula(field, doc, fieldname)) {
+        continue;
+      }
+
+      const newVal = await this.getValueFromFormula(field, doc);
+      const previousVal = doc.get(field.fieldname);
+      const isSame = areDocValuesEqual(newVal as DocValue, previousVal);
+      if (newVal === undefined || isSame) {
+        continue;
+      }
+
+      doc[field.fieldname] = newVal;
+      changed = true;
+    }
+
+    return changed;
+  }
+
+  async getValueFromFormula(field: Field, doc: Doc) {
+    let value: Doc[] | DocValue;
+
+    const formula = doc.formulas[field.fieldtype];
+    if (formula === undefined) {
+      return;
+    }
+
+    value = await formula();
+
+    if (Array.isArray(value) && field.fieldtype === FieldTypeEnum.Table) {
+      value = value.map((row) => this._initChild(row, field.fieldname));
+    }
+
+    return value;
+  }
+
+  async commit() {
+    // re-run triggers
+    this.setChildIdx();
+    await this.applyFormula();
+    await this.trigger('validate', null);
+  }
+
+  async insert() {
+    await setName(this);
+    this.setBaseMetaValues();
+    await this.commit();
+    await this.validateInsert();
+    await this.trigger('beforeInsert', null);
+
+    const oldName = this.name!;
+    const data = await frappe.db.insert(this.schemaName, this.getValidDict());
+    this.syncValues(data);
+
+    if (oldName !== this.name) {
+      frappe.doc.removeFromCache(this.schemaName, oldName);
+    }
+
+    await this.trigger('afterInsert', null);
+    await this.trigger('afterSave', null);
+
+    telemetry.log(Verb.Created, this.schemaName);
+    return this;
+  }
+
+  async update() {
+    await this.compareWithCurrentDoc();
+    await this.commit();
+    await this.trigger('beforeUpdate');
+
+    // before submit
+    if (this.flags.submitAction) await this.trigger('beforeSubmit');
+    if (this.flags.revertAction) await this.trigger('beforeRevert');
+
+    // update modifiedBy and modified
+    this.updateModified();
+
+    const data = this.getValidDict();
+    await frappe.db.update(this.schemaName, data);
+    this.syncValues(data);
+
+    await this.trigger('afterUpdate');
+    await this.trigger('afterSave');
+
+    // after submit
+    if (this.flags.submitAction) await this.trigger('afterSubmit');
+    if (this.flags.revertAction) await this.trigger('afterRevert');
+
+    return this;
+  }
+
+  async insertOrUpdate() {
+    if (this._notInserted) {
+      return await this.insert();
+    } else {
+      return await this.update();
+    }
+  }
+
+  async delete() {
+    await this.trigger('beforeDelete');
+    await frappe.db.delete(this.schemaName, this.name!);
+    await this.trigger('afterDelete');
+
+    telemetry.log(Verb.Deleted, this.schemaName);
+  }
+
+  async submitOrRevert(isSubmit: boolean) {
+    const wasSubmitted = this.submitted;
+    this.submitted = isSubmit;
+    try {
+      await this.update();
+    } catch (e) {
+      this.submitted = wasSubmitted;
+      throw e;
+    }
+  }
+
+  async submit() {
+    this.cancelled = false;
+    await this.submitOrRevert(true);
+  }
+
+  async revert() {
+    await this.submitOrRevert(false);
+  }
+
+  async rename(newName: string) {
+    await this.trigger('beforeRename');
+    await frappe.db.rename(this.schemaName, this.name!, newName);
+    this.name = newName;
+    await this.trigger('afterRename');
+  }
+
+  async trigger(event: string, params?: unknown) {
+    if (this[event]) {
+      await (this[event] as Function)(params);
+    }
+
+    await super.trigger(event, params);
+  }
+
+  getSum(tablefield: string, childfield: string, convertToFloat = true) {
+    const childDocs = (this.get(tablefield) as Doc[]) ?? [];
+    const sum = childDocs
+      .map((d) => {
+        const value = d.get(childfield) ?? 0;
+        if (!isPesa(value)) {
+          try {
+            return frappe.pesa(value as string | number);
+          } catch (err) {
+            (
+              err as Error
+            ).message += ` value: '${value}' of type: ${typeof value}, fieldname: '${tablefield}', childfield: '${childfield}'`;
+            throw err;
+          }
+        }
+        return value as Money;
+      })
+      .reduce((a, b) => a.add(b), frappe.pesa(0));
+
+    if (convertToFloat) {
+      return sum.float;
+    }
+    return sum;
+  }
+
+  getFrom(schemaName: string, name: string, fieldname: string) {
+    if (name === undefined || fieldname === undefined) {
+      return '';
+    }
+
+    return frappe.doc.getCachedValue(schemaName, name, fieldname);
+  }
+
+  async duplicate() {
+    const updateMap: DocValueMap = {};
+    const docValueMap = this.getValidDict();
+    const fieldnames = this.schema.fields.map((f) => f.fieldname);
+
+    for (const fn of fieldnames) {
+      const value = docValueMap[fn];
+      if (getIsNullOrUndef(value)) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        value.forEach((row) => {
+          delete row.name;
+          delete row.parent;
+        });
+      }
+
+      updateMap[fn] = value;
+    }
+
+    if (this.numberSeries) {
+      delete updateMap.name;
+    } else {
+      updateMap.name = updateMap.name + ' CPY';
+    }
+
+    const doc = frappe.doc.getEmptyDoc(this.schemaName, false);
+    await doc.setMultiple(updateMap);
+    await doc.insert();
+  }
+
+  formulas: FormulaMap = {};
+  defaults: DefaultMap = {};
+  validations: ValidationMap = {};
+  required: RequiredMap = {};
+  dependsOn: DependsOnMap = {};
+}
diff --git a/frappe/model/helpers.ts b/frappe/model/helpers.ts
new file mode 100644
index 00000000..7a2c7088
--- /dev/null
+++ b/frappe/model/helpers.ts
@@ -0,0 +1,103 @@
+import frappe from 'frappe';
+import { DocValue } from 'frappe/core/types';
+import { isPesa } from 'frappe/utils';
+import { isEqual } from 'lodash';
+import Money from 'pesa/dist/types/src/money';
+import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
+import { getIsNullOrUndef } from 'utils';
+import Doc from './doc';
+
+export function areDocValuesEqual(
+  dvOne: DocValue | Doc[],
+  dvTwo: DocValue | Doc[]
+): boolean {
+  if (['string', 'number'].includes(typeof dvOne) || dvOne instanceof Date) {
+    return dvOne === dvTwo;
+  }
+
+  if (isPesa(dvOne)) {
+    try {
+      return (dvOne as Money).eq(dvTwo as string | number);
+    } catch {
+      return false;
+    }
+  }
+
+  return isEqual(dvOne, dvTwo);
+}
+
+export function getPreDefaultValues(fieldtype: FieldType): DocValue | Doc[] {
+  switch (fieldtype) {
+    case FieldTypeEnum.Table:
+      return [] as Doc[];
+    case FieldTypeEnum.Currency:
+      return frappe.pesa!(0.0);
+    case FieldTypeEnum.Int:
+    case FieldTypeEnum.Float:
+      return 0;
+    default:
+      return null;
+  }
+}
+
+export function getMissingMandatoryMessage(doc: Doc) {
+  const mandatoryFields = getMandatory(doc);
+  const message = mandatoryFields
+    .filter((f) => {
+      const value = doc.get(f.fieldname);
+      const isNullOrUndef = getIsNullOrUndef(value);
+
+      if (f.fieldtype === FieldTypeEnum.Table) {
+        return isNullOrUndef || (value as Doc[])?.length === 0;
+      }
+
+      return isNullOrUndef || value === '';
+    })
+    .map((f) => f.label)
+    .join(', ');
+
+  if (message && doc.schema.isChild && doc.parentdoc && doc.parentfield) {
+    const parentfield = doc.parentdoc.fieldMap[doc.parentfield];
+    return `${parentfield.label} Row ${(doc.idx ?? 0) + 1}: ${message}`;
+  }
+
+  return message;
+}
+
+function getMandatory(doc: Doc): Field[] {
+  const mandatoryFields: Field[] = [];
+  for (const field of doc.schema.fields) {
+    if (field.required) {
+      mandatoryFields.push(field);
+    }
+
+    const requiredFunction = doc.required[field.fieldname];
+    if (typeof requiredFunction !== 'function') {
+      continue;
+    }
+
+    if (requiredFunction()) {
+      mandatoryFields.push(field);
+    }
+  }
+
+  return mandatoryFields;
+}
+
+export function shouldApplyFormula(field: Field, doc: Doc, fieldname?: string) {
+  if (!doc.formulas[field.fieldtype]) {
+    return false;
+  }
+
+  if (field.readOnly) {
+    return true;
+  }
+
+  const dependsOn = doc.dependsOn[field.fieldname] ?? [];
+  if (fieldname && dependsOn.includes(fieldname)) {
+    return true;
+  }
+
+  const value = doc.get(field.fieldname);
+  return getIsNullOrUndef(value);
+}
diff --git a/frappe/model/index.js b/frappe/model/index.js
deleted file mode 100644
index 415a5005..00000000
--- a/frappe/model/index.js
+++ /dev/null
@@ -1,114 +0,0 @@
-const cloneDeep = require('lodash/cloneDeep');
-
-module.exports = {
-  extend: (base, target, options = {}) => {
-    base = cloneDeep(base);
-    const fieldsToMerge = (target.fields || []).map(df => df.fieldname);
-    const fieldsToRemove = options.skipFields || [];
-    const overrideProps = options.overrideProps || [];
-    for (let prop of overrideProps) {
-      if (base.hasOwnProperty(prop)) {
-        delete base[prop];
-      }
-    }
-
-    let mergeFields = (baseFields, targetFields) => {
-      let fields = cloneDeep(baseFields);
-      fields = fields
-        .filter(df => !fieldsToRemove.includes(df.fieldname))
-        .map(df => {
-          if (fieldsToMerge.includes(df.fieldname)) {
-            let copy = cloneDeep(df);
-            return Object.assign(
-              copy,
-              targetFields.find(tdf => tdf.fieldname === df.fieldname)
-            );
-          }
-          return df;
-        });
-      let fieldsAdded = fields.map(df => df.fieldname);
-      let fieldsToAdd = targetFields.filter(
-        df => !fieldsAdded.includes(df.fieldname)
-      );
-      return fields.concat(fieldsToAdd);
-    };
-
-    let fields = mergeFields(base.fields, target.fields || []);
-    let out = Object.assign(base, target);
-    out.fields = fields;
-
-    return out;
-  },
-  commonFields: [
-    {
-      fieldname: 'name',
-      fieldtype: 'Data',
-      required: 1
-    }
-  ],
-  submittableFields: [
-    {
-      fieldname: 'submitted',
-      fieldtype: 'Check',
-      required: 1
-    }
-  ],
-  parentFields: [
-    {
-      fieldname: 'owner',
-      fieldtype: 'Data',
-      required: 1
-    },
-    {
-      fieldname: 'modifiedBy',
-      fieldtype: 'Data',
-      required: 1
-    },
-    {
-      fieldname: 'creation',
-      fieldtype: 'Datetime',
-      required: 1
-    },
-    {
-      fieldname: 'modified',
-      fieldtype: 'Datetime',
-      required: 1
-    },
-    {
-      fieldname: 'keywords',
-      fieldtype: 'Text'
-    }
-  ],
-  childFields: [
-    {
-      fieldname: 'idx',
-      fieldtype: 'Int',
-      required: 1
-    },
-    {
-      fieldname: 'parent',
-      fieldtype: 'Data',
-      required: 1
-    },
-    {
-      fieldname: 'parenttype',
-      fieldtype: 'Data',
-      required: 1
-    },
-    {
-      fieldname: 'parentfield',
-      fieldtype: 'Data',
-      required: 1
-    }
-  ],
-  treeFields: [
-    {
-      fieldname: 'lft',
-      fieldtype: 'Int'
-    },
-    {
-      fieldname: 'rgt',
-      fieldtype: 'Int'
-    }
-  ]
-};
diff --git a/frappe/model/meta.js b/frappe/model/meta.js
deleted file mode 100644
index 9dd9153c..00000000
--- a/frappe/model/meta.js
+++ /dev/null
@@ -1,334 +0,0 @@
-import frappe from 'frappe';
-import { validTypes } from 'frappe/backends/helpers';
-import { ValueError } from 'frappe/utils/errors';
-import { indicators as indicatorColor } from '../../src/colors';
-import { t } from '../utils/translation';
-import Document from './document';
-import model from './index';
-
-export default class Meta extends Document {
-  filters;
-  basedOn;
-
-  constructor(data) {
-    if (data.basedOn) {
-      let config = frappe.models[data.basedOn];
-      Object.assign(data, config, {
-        name: data.name,
-        label: data.label,
-        filters: data.filters,
-      });
-    }
-    super(data);
-    this.setDefaultIndicators();
-    if (this.setupMeta) {
-      this.setupMeta();
-    }
-    if (!this.titleField) {
-      this.titleField = 'name';
-    }
-  }
-
-  setValues(data) {
-    Object.assign(this, data);
-    this.processFields();
-  }
-
-  processFields() {
-    // add name field
-    if (!this.fields.find((df) => df.fieldname === 'name') && !this.isSingle) {
-      this.fields = [
-        {
-          label: t`ID`,
-          fieldname: 'name',
-          fieldtype: 'Data',
-          required: 1,
-          readOnly: 1,
-        },
-      ].concat(this.fields);
-    }
-
-    this.fields = this.fields.map((df) => {
-      // name field is always required
-      if (df.fieldname === 'name') {
-        df.required = 1;
-      }
-
-      return df;
-    });
-  }
-
-  hasField(fieldname) {
-    return this.getField(fieldname) ? true : false;
-  }
-
-  getField(fieldname) {
-    if (!this._field_map) {
-      this._field_map = {};
-      for (let field of this.fields) {
-        this._field_map[field.fieldname] = field;
-      }
-    }
-    return this._field_map[fieldname];
-  }
-
-  /**
-   * Get fields filtered by filters
-   * @param {Object} filters
-   *
-   * Usage:
-   *   meta = frappe.getMeta('ToDo')
-   *   dataFields = meta.getFieldsWith({ fieldtype: 'Data' })
-   */
-  getFieldsWith(filters) {
-    return this.fields.filter((df) => {
-      let match = true;
-      for (const key in filters) {
-        const value = filters[key];
-        match = df[key] === value;
-      }
-      return match;
-    });
-  }
-
-  getLabel(fieldname) {
-    let df = this.getField(fieldname);
-    return df.getLabel || df.label;
-  }
-
-  getTableFields() {
-    if (this._tableFields === undefined) {
-      this._tableFields = this.fields.filter(
-        (field) => field.fieldtype === 'Table'
-      );
-    }
-    return this._tableFields;
-  }
-
-  getFormulaFields() {
-    if (this._formulaFields === undefined) {
-      this._formulaFields = this.fields.filter((field) => field.formula);
-    }
-    return this._formulaFields;
-  }
-
-  hasFormula() {
-    if (this._hasFormula === undefined) {
-      this._hasFormula = false;
-      if (this.getFormulaFields().length) {
-        this._hasFormula = true;
-      } else {
-        for (let tablefield of this.getTableFields()) {
-          if (frappe.getMeta(tablefield.childtype).getFormulaFields().length) {
-            this._hasFormula = true;
-            break;
-          }
-        }
-      }
-    }
-    return this._hasFormula;
-  }
-
-  getBaseDocType() {
-    return this.basedOn || this.name;
-  }
-
-  async set(fieldname, value) {
-    this[fieldname] = value;
-    await this.trigger(fieldname);
-  }
-
-  get(fieldname) {
-    return this[fieldname];
-  }
-
-  getValidFields({ withChildren = true } = {}) {
-    if (!this._validFields) {
-      this._validFields = [];
-      this._validFieldsWithChildren = [];
-
-      const _add = (field) => {
-        this._validFields.push(field);
-        this._validFieldsWithChildren.push(field);
-      };
-
-      // fields validation
-      this.fields.forEach((df, i) => {
-        if (!df.fieldname) {
-          throw new ValidationError(
-            `DocType ${this.name}: "fieldname" is required for field at index ${i}`
-          );
-        }
-        if (!df.fieldtype) {
-          throw new ValidationError(
-            `DocType ${this.name}: "fieldtype" is required for field "${df.fieldname}"`
-          );
-        }
-      });
-
-      const doctypeFields = this.fields.map((field) => field.fieldname);
-
-      // standard fields
-      for (let field of model.commonFields) {
-        if (
-          validTypes.includes(field.fieldtype) &&
-          !doctypeFields.includes(field.fieldname)
-        ) {
-          _add(field);
-        }
-      }
-
-      if (this.isSubmittable) {
-        _add({
-          fieldtype: 'Check',
-          fieldname: 'submitted',
-          label: t`Submitted`,
-        });
-      }
-
-      if (this.isChild) {
-        // child fields
-        for (let field of model.childFields) {
-          if (
-            validTypes.includes(field.fieldtype) &&
-            !doctypeFields.includes(field.fieldname)
-          ) {
-            _add(field);
-          }
-        }
-      } else {
-        // parent fields
-        for (let field of model.parentFields) {
-          if (
-            validTypes.includes(field.fieldtype) &&
-            !doctypeFields.includes(field.fieldname)
-          ) {
-            _add(field);
-          }
-        }
-      }
-
-      if (this.isTree) {
-        // tree fields
-        for (let field of model.treeFields) {
-          if (
-            validTypes.includes(field.fieldtype) &&
-            !doctypeFields.includes(field.fieldname)
-          ) {
-            _add(field);
-          }
-        }
-      }
-
-      // doctype fields
-      for (let field of this.fields) {
-        const include = validTypes.includes(field.fieldtype);
-
-        if (include) {
-          _add(field);
-        }
-
-        // include tables if (withChildren = True)
-        if (!include && field.fieldtype === 'Table') {
-          this._validFieldsWithChildren.push(field);
-        }
-      }
-    }
-
-    if (withChildren) {
-      return this._validFieldsWithChildren;
-    } else {
-      return this._validFields;
-    }
-  }
-
-  getKeywordFields() {
-    if (!this._keywordFields) {
-      this._keywordFields = this.keywordFields;
-      if (!(this._keywordFields && this._keywordFields.length && this.fields)) {
-        this._keywordFields = this.fields
-          .filter((field) => field.fieldtype !== 'Table' && field.required)
-          .map((field) => field.fieldname);
-      }
-      if (!(this._keywordFields && this._keywordFields.length)) {
-        this._keywordFields = ['name'];
-      }
-    }
-    return this._keywordFields;
-  }
-
-  getQuickEditFields() {
-    if (this.quickEditFields) {
-      return this.quickEditFields.map((fieldname) => this.getField(fieldname));
-    }
-    return this.getFieldsWith({ required: 1 });
-  }
-
-  validateSelect(field, value) {
-    let options = field.options;
-    if (!options) return;
-    if (!field.required && value == null) {
-      return;
-    }
-
-    let validValues = options;
-
-    if (typeof options === 'string') {
-      // values given as string
-      validValues = options.split('\n');
-    }
-
-    if (typeof options[0] === 'object') {
-      // options as array of {label, value} pairs
-      validValues = options.map((o) => o.value);
-    }
-
-    if (!validValues.includes(value)) {
-      throw new ValueError(
-        // prettier-ignore
-        `DocType ${this.name}: Invalid value "${value}" for "${field.label}". Must be one of ${options.join(', ')}`
-      );
-    }
-    return value;
-  }
-
-  async trigger(event, params = {}) {
-    Object.assign(params, {
-      doc: this,
-      name: event,
-    });
-
-    await super.trigger(event, params);
-  }
-
-  setDefaultIndicators() {
-    if (!this.indicators) {
-      if (this.isSubmittable) {
-        this.indicators = {
-          key: 'submitted',
-          colors: {
-            0: indicatorColor.GRAY,
-            1: indicatorColor.BLUE,
-          },
-        };
-      }
-    }
-  }
-
-  getIndicatorColor(doc) {
-    if (frappe.isDirty(this.name, doc.name)) {
-      return indicatorColor.ORANGE;
-    } else {
-      if (this.indicators) {
-        let value = doc[this.indicators.key];
-        if (value) {
-          return this.indicators.colors[value] || indicatorColor.GRAY;
-        } else {
-          return indicatorColor.GRAY;
-        }
-      } else {
-        return indicatorColor.GRAY;
-      }
-    }
-  }
-}
diff --git a/frappe/model/naming.js b/frappe/model/naming.ts
similarity index 95%
rename from frappe/model/naming.js
rename to frappe/model/naming.ts
index 11646197..45c5d50d 100644
--- a/frappe/model/naming.js
+++ b/frappe/model/naming.ts
@@ -1,8 +1,8 @@
 import frappe from 'frappe';
 import { getRandomString } from 'frappe/utils';
 
-export async function isNameAutoSet(doctype) {
-  const doc = frappe.getEmptyDoc(doctype);
+export async function isNameAutoSet(schemaName: string) {
+  const doc = frappe.doc.getEmptyDoc(schemaName);
   if (doc.meta.naming === 'autoincrement') {
     return true;
   }
diff --git a/frappe/model/runPatches.js b/frappe/model/runPatches.js
deleted file mode 100644
index b0bebb7b..00000000
--- a/frappe/model/runPatches.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import frappe from 'frappe';
-
-export default async function runPatches(patchList) {
-  const patchesAlreadyRun = (
-    await frappe.db.knex('PatchRun').select('name')
-  ).map(({ name }) => name);
-
-  for (let patch of patchList) {
-    if (patchesAlreadyRun.includes(patch.patchName)) {
-      continue;
-    }
-
-    await runPatch(patch);
-  }
-}
-
-async function runPatch({ patchName, patchFunction }) {
-  try {
-    await patchFunction();
-    const patchRun = frappe.getEmptyDoc('PatchRun');
-    patchRun.name = patchName;
-    await patchRun.insert();
-  } catch (error) {
-    console.error(`could not run ${patchName}`, error);
-  }
-}
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
new file mode 100644
index 00000000..ecac74cd
--- /dev/null
+++ b/frappe/model/types.ts
@@ -0,0 +1,31 @@
+import { DocValue } from 'frappe/core/types';
+import Doc from './doc';
+
+/**
+ * The functions below are used for dynamic evaluation
+ * and setting of field types.
+ *
+ * Since they are set directly on the doc, they can
+ * access the doc  by using `this`.
+ *
+ * - `Formula`: Async function used for obtaining a computed value such as amount (rate * qty).
+ * - `Default`: Regular function used to dynamically set the default value, example new Date().
+ * - `Validation`: Async function that throw an error if the value is invalid.
+ * - `Required`: Regular function used to decide if a value is mandatory (there are !notnul in the db).
+ */
+export type Formula = () => Promise<DocValue>;
+export type Default = () => DocValue;
+export type Validation = (value: DocValue) => Promise<void>;
+export type Required = () => boolean;
+
+export type FormulaMap = Record<string, Formula | undefined>;
+export type DefaultMap = Record<string, Default | undefined>;
+export type ValidationMap = Record<string, Validation | undefined>;
+export type RequiredMap = Record<string, Required | undefined>;
+
+export type DependsOnMap = Record<string, string[]>
+
+/**
+ * Should add this for hidden too
+
+ */
diff --git a/frappe/model/validationFunction.ts b/frappe/model/validationFunction.ts
new file mode 100644
index 00000000..91703d32
--- /dev/null
+++ b/frappe/model/validationFunction.ts
@@ -0,0 +1,39 @@
+import { ValidationError, ValueError } from 'frappe/utils/errors';
+import { t } from 'frappe/utils/translation';
+import { OptionField } from 'schemas/types';
+
+export function email(value: string) {
+  const isValid = /(.+)@(.+){2,}\.(.+){2,}/.test(value);
+  if (!isValid) {
+    throw new ValidationError(`Invalid email: ${value}`);
+  }
+}
+
+export function phone(value: string) {
+  const isValid = /[+]{0,1}[\d ]+/.test(value);
+  if (!isValid) {
+    throw new ValidationError(`Invalid phone: ${value}`);
+  }
+}
+
+export function validateSelect(field: OptionField, value: string) {
+  const options = field.options;
+  if (!options) {
+    return;
+  }
+
+  if (!field.required && (value === null || value === undefined)) {
+    return;
+  }
+
+  const validValues = options.map((o) => o.value);
+
+  if (validValues.includes(value)) {
+    return;
+  }
+
+  const labels = options.map((o) => o.label).join(', ');
+  throw new ValueError(
+    t`Invalid value ${value} for ${field.label}. Must be one of ${labels}`
+  );
+}
diff --git a/frappe/utils/observable.ts b/frappe/utils/observable.ts
index 5583c3eb..61c8f998 100644
--- a/frappe/utils/observable.ts
+++ b/frappe/utils/observable.ts
@@ -4,7 +4,7 @@ enum EventType {
 }
 
 export default class Observable<T> {
-  [key: string]: unknown;
+  [key: string]: unknown | T;
   _isHot: Map<string, boolean>;
   _eventQueue: Map<string, unknown[]>;
   _map: Map<string, unknown>;
@@ -25,8 +25,8 @@ export default class Observable<T> {
    * @param key
    * @returns
    */
-  get(key: string): unknown {
-    return this[key];
+  get(key: string): T {
+    return this[key] as T;
   }
 
   /**
@@ -35,7 +35,7 @@ export default class Observable<T> {
    * @param key
    * @param value
    */
-  set(key: string, value: unknown) {
+  set(key: string, value: T) {
     this[key] = value;
     this.trigger('change', {
       doc: this,
diff --git a/models/doctype/Payment/PaymentServer.js b/models/doctype/Payment/PaymentServer.js
index 4f4e6f19..a9713d8f 100644
--- a/models/doctype/Payment/PaymentServer.js
+++ b/models/doctype/Payment/PaymentServer.js
@@ -199,9 +199,10 @@ export default class PaymentServer extends Document {
   async updateReferenceOutstandingAmount() {
     await this.for.forEach(async ({ amount, referenceType, referenceName }) => {
       const refDoc = await frappe.getDoc(referenceType, referenceName);
-      refDoc.update({
+      refDoc.setMultiple({
         outstandingAmount: refDoc.outstandingAmount.add(amount),
       });
+      refDoc.update();
     });
   }
 }
diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json
index 7c2570b3..f8fa835b 100644
--- a/schemas/app/PrintSettings.json
+++ b/schemas/app/PrintSettings.json
@@ -35,7 +35,8 @@
       "label": "Address",
       "fieldtype": "Link",
       "target": "Address",
-      "placeholder": "Click to create"
+      "placeholder": "Click to create",
+      "inline": true
     },
     {
       "fieldname": "template",
diff --git a/schemas/helpers.ts b/schemas/helpers.ts
deleted file mode 100644
index 93fce200..00000000
--- a/schemas/helpers.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export function getMapFromList<T, K extends keyof T>(
-  list: T[],
-  name: K
-): Record<string, T> {
-  const acc: Record<string, T> = {};
-  for (const t of list) {
-    const key = t[name];
-    if (key === undefined) {
-      continue;
-    }
-
-    acc[String(key)] = t;
-  }
-  return acc;
-}
-
-export function getListFromMap<T>(map: Record<string, T>): T[] {
-  return Object.keys(map).map((n) => map[n]);
-}
diff --git a/schemas/index.ts b/schemas/index.ts
index 10d89ac6..158279d0 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-import { getListFromMap, getMapFromList } from './helpers';
+import { getListFromMap, getMapFromList } from 'utils';
 import regionalSchemas from './regional';
 import { appSchemas, coreSchemas, metaSchemas } from './schemas';
 import { Field, Schema, SchemaMap, SchemaStub, SchemaStubMap } from './types';
diff --git a/schemas/tests/testSchemaBuilder.spec.ts b/schemas/tests/testSchemaBuilder.spec.ts
index eeabafb9..98e08a56 100644
--- a/schemas/tests/testSchemaBuilder.spec.ts
+++ b/schemas/tests/testSchemaBuilder.spec.ts
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 import { cloneDeep, isEqual } from 'lodash';
 import { describe } from 'mocha';
-import { getMapFromList } from '../helpers';
+import { getMapFromList } from 'utils';
 import {
   addMetaFields,
   cleanSchemas,
diff --git a/schemas/types.ts b/schemas/types.ts
index d3de2233..5fd297c0 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -59,7 +59,6 @@ export enum FieldTypeEnum {
 export type FieldType = keyof typeof FieldTypeEnum;
 export type RawValue = string | number | boolean | null;
 
-// prettier-ignore
 export interface BaseField {
   fieldname: string;             // Column name in the db
   fieldtype: FieldType;          // UI Descriptive field types that map to column types
@@ -73,6 +72,7 @@ export interface BaseField {
   groupBy?: string;              // UI Facing used in dropdowns fields
   computed?: boolean;            // Indicates whether a value is computed, implies readonly
   meta?: boolean;                // Field is a meta field, i.e. only for the db, not UI
+  inline?: boolean;              // UI Facing config, whether to display doc inline.
 }
 
 export type SelectOption = { value: string; label: string };
@@ -84,19 +84,16 @@ export interface OptionField extends BaseField {
   options: SelectOption[];
 }
 
-// prettier-ignore
 export interface TargetField extends BaseField {
   fieldtype: FieldTypeEnum.Table | FieldTypeEnum.Link;
   target: string;                // Name of the table or group of tables to fetch values
 }
 
-// @formatter:off
 export interface DynamicLinkField extends BaseField {
   fieldtype: FieldTypeEnum.DynamicLink;
   references: string;            // Reference to an option field that links to schema
 }
 
-// @formatter:off
 export interface NumberField extends BaseField {
   fieldtype: FieldTypeEnum.Float | FieldTypeEnum.Int;
   minvalue?: number;             // UI Facing used to restrict lower bound
@@ -112,7 +109,6 @@ export type Field =
 
 export type TreeSettings = { parentField: string };
 
-// @formatter:off
 export interface Schema {
   name: string;                  // Table name
   label: string;                 // Translateable UI facing name
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index 167e2da1..c6152834 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -87,10 +87,10 @@
 import Button from '@/components/Button';
 import Icon from '@/components/Icon';
 import PageHeader from '@/components/PageHeader';
-import { IPC_MESSAGES } from 'utils/messages';
 import { openSettings, routeTo } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'frappe';
+import { IPC_MESSAGES } from 'utils/messages';
 import { h } from 'vue';
 
 export default {
@@ -112,8 +112,7 @@ export default {
               key: 'Invoice',
               label: t`Invoice`,
               icon: 'invoice',
-              description:
-                t`Customize your invoices by adding a logo and address details`,
+              description: t`Customize your invoices by adding a logo and address details`,
               fieldname: 'invoiceSetup',
               action() {
                 openSettings('Invoice');
@@ -123,8 +122,7 @@ export default {
               key: 'General',
               label: t`General`,
               icon: 'general',
-              description:
-                t`Setup your company information, email, country and fiscal year`,
+              description: t`Setup your company information, email, country and fiscal year`,
               fieldname: 'companySetup',
               action() {
                 openSettings('General');
@@ -134,8 +132,7 @@ export default {
               key: 'System',
               label: t`System`,
               icon: 'system',
-              description:
-                t`Setup system defaults like date format and display precision`,
+              description: t`Setup system defaults like date format and display precision`,
               fieldname: 'systemSetup',
               action() {
                 openSettings('System');
@@ -151,8 +148,7 @@ export default {
               key: 'Review Accounts',
               label: t`Review Accounts`,
               icon: 'review-ac',
-              description:
-                t`Review your chart of accounts, add any account or tax heads as needed`,
+              description: t`Review your chart of accounts, add any account or tax heads as needed`,
               action: () => {
                 routeTo('/chart-of-accounts');
               },
@@ -165,8 +161,7 @@ export default {
               label: t`Opening Balances`,
               icon: 'opening-ac',
               fieldname: 'openingBalanceChecked',
-              description:
-                t`Setup your opening balances before performing any accounting entries`,
+              description: t`Setup your opening balances before performing any accounting entries`,
               documentation:
                 'https://frappebooks.com/docs/setting-up#5-setup-opening-balances',
             },
@@ -175,8 +170,7 @@ export default {
               label: t`Add Taxes`,
               icon: 'percentage',
               fieldname: 'taxesAdded',
-              description:
-                t`Setup your tax templates for your sales or purchase transactions`,
+              description: t`Setup your tax templates for your sales or purchase transactions`,
               action: () => routeTo('/list/Tax'),
               documentation:
                 'https://frappebooks.com/docs/setting-up#2-add-taxes',
@@ -191,8 +185,7 @@ export default {
               key: 'Add Sales Items',
               label: t`Add Items`,
               icon: 'item',
-              description:
-                t`Add products or services that you sell to your customers`,
+              description: t`Add products or services that you sell to your customers`,
               action: () => routeTo('/list/Item'),
               fieldname: 'itemCreated',
               documentation:
@@ -212,8 +205,7 @@ export default {
               key: 'Create Invoice',
               label: t`Create Invoice`,
               icon: 'sales-invoice',
-              description:
-                t`Create your first invoice and mail it to your customer`,
+              description: t`Create your first invoice and mail it to your customer`,
               action: () => routeTo('/list/SalesInvoice'),
               fieldname: 'invoiceCreated',
               documentation: 'https://frappebooks.com/docs/invoices',
@@ -228,8 +220,7 @@ export default {
               key: 'Add Purchase Items',
               label: t`Add Items`,
               icon: 'item',
-              description:
-                t`Add products or services that you buy from your suppliers`,
+              description: t`Add products or services that you buy from your suppliers`,
               action: () => routeTo('/list/Item'),
               fieldname: 'itemCreated',
             },
@@ -245,8 +236,7 @@ export default {
               key: 'Create Bill',
               label: t`Create Bill`,
               icon: 'purchase-invoice',
-              description:
-                t`Create your first bill and mail it to your supplier`,
+              description: t`Create your first bill and mail it to your supplier`,
               action: () => routeTo('/list/PurchaseInvoice'),
               fieldname: 'billCreated',
               documentation: 'https://frappebooks.com/docs/bills',
@@ -316,7 +306,8 @@ export default {
       if (onboardingComplete) {
         await this.updateChecks({ onboardingComplete });
         const systemSettings = await frappe.getSingle('SystemSettings');
-        await systemSettings.update({ hideGetStarted: 1 });
+        await systemSettings.set({ hideGetStarted: 1 });
+        await systemSettings.update();
       }
 
       return onboardingComplete;
@@ -380,7 +371,8 @@ export default {
       await this.updateChecks(toUpdate);
     },
     async updateChecks(toUpdate) {
-      await frappe.GetStarted.update(toUpdate);
+      await frappe.GetStarted.setMultiple(toUpdate);
+      await frappe.GetStarted.update();
       frappe.GetStarted = await frappe.getSingle('GetStarted');
     },
     isCompleted(item) {
diff --git a/src/pages/SetupWizard/setupCompany.js b/src/pages/SetupWizard/setupCompany.js
index 04df9f06..a8238f76 100644
--- a/src/pages/SetupWizard/setupCompany.js
+++ b/src/pages/SetupWizard/setupCompany.js
@@ -27,7 +27,7 @@ export default async function setupCompany(setupWizardValues) {
   const locale = countryList[country]['locale'] ?? DEFAULT_LOCALE;
   await callInitializeMoneyMaker(currency);
 
-  await accountingSettings.update({
+  const accountingSettingsUpdateMap = {
     companyName,
     country,
     fullname: name,
@@ -36,25 +36,34 @@ export default async function setupCompany(setupWizardValues) {
     fiscalYearStart,
     fiscalYearEnd,
     currency,
-  });
+  };
+
+  await accountingSettings.setMultiple(accountingSettingsUpdateMap);
+  await accountingSettings.update();
 
   const printSettings = await frappe.getSingle('PrintSettings');
-  printSettings.update({
+  const printSettingsUpdateMap = {
     logo: companyLogo,
     companyName,
     email,
-    displayLogo: companyLogo ? 1 : 0,
-  });
+    displayLogo: companyLogo ? true : false,
+  };
+
+  await printSettings.setMultiple(printSettingsUpdateMap);
+  await printSettings.update();
 
   await setupGlobalCurrencies(countryList);
   await setupChartOfAccounts(bankName, country, chartOfAccounts);
   await setupRegionalChanges(country);
   updateInitializationConfig();
 
-  await accountingSettings.update({ setupComplete: 1 });
+  await accountingSettings.setMultiple({ setupComplete: true });
+  await accountingSettings.update();
   frappe.AccountingSettings = accountingSettings;
 
-  (await frappe.getSingle('SystemSettings')).update({ locale });
+  const systemSettings = await frappe.getSingle('SystemSettings');
+  systemSettings.setMultiple({ locale });
+  systemSettings.update();
 }
 
 async function setupGlobalCurrencies(countries) {
diff --git a/utils/index.ts b/utils/index.ts
index 2bef4b69..6b1b3d62 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -31,3 +31,27 @@ export function getRandomString(): string {
 export async function sleep(durationMilliseconds: number = 1000) {
   return new Promise((r) => setTimeout(() => r(null), durationMilliseconds));
 }
+
+export function getMapFromList<T, K extends keyof T>(
+  list: T[],
+  name: K
+): Record<string, T> {
+  const acc: Record<string, T> = {};
+  for (const t of list) {
+    const key = t[name];
+    if (key === undefined) {
+      continue;
+    }
+
+    acc[String(key)] = t;
+  }
+  return acc;
+}
+
+export function getListFromMap<T>(map: Record<string, T>): T[] {
+  return Object.keys(map).map((n) => map[n]);
+}
+
+export function getIsNullOrUndef(value: unknown): boolean {
+  return value === null || value === undefined;
+}

From e0e74817be73ec0df848e58cc261ee130281324d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 7 Apr 2022 11:50:14 +0530
Subject: [PATCH 030/163] incr: update docHandler to not use meta

---
 backend/database/core.ts                |  49 ++---
 backend/database/tests/testCore.spec.ts |   6 +-
 frappe/core/docHandler.ts               | 241 ++++++++----------------
 frappe/index.ts                         |  30 ++-
 frappe/model/doc.ts                     |  19 +-
 frappe/model/types.ts                   |   4 +-
 schemas/index.ts                        |   8 +-
 schemas/tests/testSchemaBuilder.spec.ts |  24 +--
 schemas/types.ts                        |   2 +-
 9 files changed, 163 insertions(+), 220 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 874fa826..5f6b9fce 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -11,6 +11,7 @@ import {
   Field,
   FieldTypeEnum,
   RawValue,
+  Schema,
   SchemaMap,
   TargetField,
 } from '../../schemas/types';
@@ -92,7 +93,7 @@ export default class DatabaseCore extends DatabaseBase {
 
   async migrate() {
     for (const schemaName in this.schemaMap) {
-      const schema = this.schemaMap[schemaName];
+      const schema = this.schemaMap[schemaName] as Schema;
       if (schema.isSingle) {
         continue;
       }
@@ -109,7 +110,7 @@ export default class DatabaseCore extends DatabaseBase {
   }
 
   async exists(schemaName: string, name?: string): Promise<boolean> {
-    const schema = this.schemaMap[schemaName];
+    const schema = this.schemaMap[schemaName] as Schema;
     if (schema.isSingle) {
       return this.#singleExists(schemaName);
     }
@@ -134,7 +135,7 @@ export default class DatabaseCore extends DatabaseBase {
     fieldValueMap: FieldValueMap
   ): Promise<FieldValueMap> {
     // insert parent
-    if (this.schemaMap[schemaName].isSingle) {
+    if (this.schemaMap[schemaName]!.isSingle) {
       await this.#updateSingleValues(schemaName, fieldValueMap);
     } else {
       await this.#insertOne(schemaName, fieldValueMap);
@@ -150,7 +151,7 @@ export default class DatabaseCore extends DatabaseBase {
     name: string = '',
     fields?: string | string[]
   ): Promise<FieldValueMap> {
-    const schema = this.schemaMap[schemaName];
+    const schema = this.schemaMap[schemaName] as Schema;
     if (!schema.isSingle && !name) {
       throw new ValueError('name is mandatory');
     }
@@ -204,7 +205,7 @@ export default class DatabaseCore extends DatabaseBase {
     schemaName: string,
     options: GetAllOptions = {}
   ): Promise<FieldValueMap[]> {
-    const schema = this.schemaMap[schemaName];
+    const schema = this.schemaMap[schemaName] as Schema;
     const hasCreated = !!schema.fields.find((f) => f.fieldname === 'created');
     const {
       fields = ['name', ...(schema.keywordFields ?? [])],
@@ -279,7 +280,7 @@ export default class DatabaseCore extends DatabaseBase {
 
   async update(schemaName: string, fieldValueMap: FieldValueMap) {
     // update parent
-    if (this.schemaMap[schemaName].isSingle) {
+    if (this.schemaMap[schemaName]!.isSingle) {
       await this.#updateSingleValues(schemaName, fieldValueMap);
     } else {
       await this.#updateOne(schemaName, fieldValueMap);
@@ -290,7 +291,7 @@ export default class DatabaseCore extends DatabaseBase {
   }
 
   async delete(schemaName: string, name: string) {
-    const schema = this.schemaMap[schemaName];
+    const schema = this.schemaMap[schemaName] as Schema;
     if (schema.isSingle) {
       await this.#deleteSingle(schemaName, name);
       return;
@@ -462,7 +463,7 @@ export default class DatabaseCore extends DatabaseBase {
 
   async #getColumnDiff(schemaName: string): Promise<ColumnDiff> {
     const tableColumns = await this.#getTableColumns(schemaName);
-    const validFields = this.schemaMap[schemaName].fields;
+    const validFields = this.schemaMap[schemaName]!.fields;
     const diff: ColumnDiff = { added: [], removed: [] };
 
     for (const field of validFields) {
@@ -485,7 +486,7 @@ export default class DatabaseCore extends DatabaseBase {
   async #getNewForeignKeys(schemaName: string): Promise<Field[]> {
     const foreignKeys = await this.#getForeignKeys(schemaName);
     const newForeignKeys: Field[] = [];
-    const schema = this.schemaMap[schemaName];
+    const schema = this.schemaMap[schemaName] as Schema;
     for (const field of schema.fields) {
       if (
         field.fieldtype === 'Link' &&
@@ -534,7 +535,7 @@ export default class DatabaseCore extends DatabaseBase {
       (field as TargetField).target
     ) {
       const targetSchemaName = (field as TargetField).target as string;
-      const schema = this.schemaMap[targetSchemaName];
+      const schema = this.schemaMap[targetSchemaName] as Schema;
       table
         .foreign(field.fieldname)
         .references('name')
@@ -568,7 +569,7 @@ export default class DatabaseCore extends DatabaseBase {
 
   async #createTable(schemaName: string, tableName?: string) {
     tableName ??= schemaName;
-    const fields = this.schemaMap[schemaName].fields;
+    const fields = this.schemaMap[schemaName]!.fields;
     return await this.#runCreateTableQuery(tableName, fields);
   }
 
@@ -587,15 +588,15 @@ export default class DatabaseCore extends DatabaseBase {
         .select('fieldname')
     ).map(({ fieldname }) => fieldname);
 
-    return this.schemaMap[singleSchemaName].fields
-      .map(({ fieldname, default: value }) => ({
+    return this.schemaMap[singleSchemaName]!.fields.map(
+      ({ fieldname, default: value }) => ({
         fieldname,
         value: value as RawValue | undefined,
-      }))
-      .filter(
-        ({ fieldname, value }) =>
-          !existingFields.includes(fieldname) && value !== undefined
-      );
+      })
+    ).filter(
+      ({ fieldname, value }) =>
+        !existingFields.includes(fieldname) && value !== undefined
+    );
   }
 
   async #deleteOne(schemaName: string, name: string) {
@@ -710,7 +711,7 @@ export default class DatabaseCore extends DatabaseBase {
     }
 
     // Non Table Fields
-    const fields = this.schemaMap[schemaName].fields.filter(
+    const fields = this.schemaMap[schemaName]!.fields.filter(
       (f) => f.fieldtype !== FieldTypeEnum.Table
     );
 
@@ -726,7 +727,7 @@ export default class DatabaseCore extends DatabaseBase {
     singleSchemaName: string,
     fieldValueMap: FieldValueMap
   ) {
-    const fields = this.schemaMap[singleSchemaName].fields;
+    const fields = this.schemaMap[singleSchemaName]!.fields;
 
     for (const field of fields) {
       const value = fieldValueMap[field.fieldname] as RawValue | undefined;
@@ -779,7 +780,7 @@ export default class DatabaseCore extends DatabaseBase {
 
   async #initializeSingles() {
     const singleSchemaNames = Object.keys(this.schemaMap).filter(
-      (n) => this.schemaMap[n].isSingle
+      (n) => this.schemaMap[n]!.isSingle
     );
 
     for (const schemaName of singleSchemaNames) {
@@ -788,7 +789,7 @@ export default class DatabaseCore extends DatabaseBase {
         continue;
       }
 
-      const fields = this.schemaMap[schemaName].fields;
+      const fields = this.schemaMap[schemaName]!.fields;
       if (fields.every((f) => f.default === undefined)) {
         continue;
       }
@@ -815,7 +816,7 @@ export default class DatabaseCore extends DatabaseBase {
   async #updateOne(schemaName: string, fieldValueMap: FieldValueMap) {
     const updateMap = { ...fieldValueMap };
     delete updateMap.name;
-    const schema = this.schemaMap[schemaName];
+    const schema = this.schemaMap[schemaName] as Schema;
     for (const { fieldname, fieldtype } of schema.fields) {
       if (fieldtype !== FieldTypeEnum.Table) {
         continue;
@@ -868,7 +869,7 @@ export default class DatabaseCore extends DatabaseBase {
   }
 
   #getTableFields(schemaName: string): TargetField[] {
-    return this.schemaMap[schemaName].fields.filter(
+    return this.schemaMap[schemaName]!.fields.filter(
       (f) => f.fieldtype === FieldTypeEnum.Table
     ) as TargetField[];
   }
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index c91dd2e1..c4c27bdf 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 import 'mocha';
-import { FieldTypeEnum, RawValue } from 'schemas/types';
+import { FieldTypeEnum, RawValue, Schema } from 'schemas/types';
 import { getMapFromList, getValueMapFromList, sleep } from 'utils';
 import { getDefaultMetaFieldValueMap, sqliteTypeMap } from '../../helpers';
 import DatabaseCore from '../core';
@@ -72,7 +72,7 @@ describe('DatabaseCore: Migrate and Check Db', function () {
   specify('Post Migrate TableInfo', async function () {
     await db.migrate();
     for (const schemaName in schemaMap) {
-      const schema = schemaMap[schemaName];
+      const schema = schemaMap[schemaName] as Schema;
       const fieldMap = getMapFromList(schema.fields, 'fieldname');
       const columns: SqliteTableInfo[] = await db.knex!.raw(
         'pragma table_info(??)',
@@ -176,7 +176,7 @@ describe('DatabaseCore: CRUD', function () {
       'select * from SingleValue'
     );
     const defaultMap = getValueMapFromList(
-      schemaMap.SystemSettings.fields,
+      (schemaMap.SystemSettings as Schema).fields,
       'fieldname',
       'default'
     );
diff --git a/frappe/core/docHandler.ts b/frappe/core/docHandler.ts
index ecdfdbae..299c79d6 100644
--- a/frappe/core/docHandler.ts
+++ b/frappe/core/docHandler.ts
@@ -1,25 +1,15 @@
-import { Field, Model } from '@/types/model';
 import Doc from 'frappe/model/doc';
-import Meta from 'frappe/model/meta';
-import { getDuplicates, getRandomString } from 'frappe/utils';
+import { DocMap, ModelMap } from 'frappe/model/types';
+import { getRandomString } from 'frappe/utils';
 import Observable from 'frappe/utils/observable';
 import { Frappe } from '..';
-import { DocValue } from './types';
-
-type DocMap = Record<string, Doc | undefined>;
-type MetaMap = Record<string, Meta | undefined>;
-interface DocData {
-  doctype: string;
-  name?: string;
-  [key: string]: unknown;
-}
+import { DocValue, DocValueMap } from './types';
 
 export class DocHandler {
   frappe: Frappe;
   singles: DocMap = {};
-  metaCache: MetaMap = {};
-  docs?: Observable<Doc>;
-  models: Record<string, Model | undefined> = {};
+  docs: Observable<DocMap> = new Observable();
+  models: ModelMap = {};
 
   constructor(frappe: Frappe) {
     this.frappe = frappe;
@@ -27,124 +17,80 @@ export class DocHandler {
 
   init() {
     this.models = {};
-    this.metaCache = {};
     this.docs = new Observable();
   }
 
-  registerModels(models: Record<string, Model>) {
-    for (const doctype in models) {
-      const metaDefinition = models[doctype];
-      if (!metaDefinition.name) {
-        throw new Error(`Name is mandatory for ${doctype}`);
-      }
-
-      if (metaDefinition.name !== doctype) {
-        throw new Error(
-          `Model name mismatch for ${doctype}: ${metaDefinition.name}`
-        );
-      }
-
-      const fieldnames = (metaDefinition.fields || [])
-        .map((df) => df.fieldname)
-        .sort();
-
-      const duplicateFieldnames = getDuplicates(fieldnames);
-      if (duplicateFieldnames.length > 0) {
-        throw new Error(
-          `Duplicate fields in ${doctype}: ${duplicateFieldnames.join(', ')}`
-        );
-      }
-
-      this.models[doctype] = metaDefinition;
+  registerModels(models: ModelMap) {
+    for (const schemaName in models) {
+      this.models[schemaName] = models[schemaName];
     }
   }
 
-  getModels(filterFunction: (name: Model) => boolean): Model[] {
-    const models: Model[] = [];
-    for (const doctype in this.models) {
-      models.push(this.models[doctype]!);
-    }
-    return filterFunction ? models.filter(filterFunction) : models;
-  }
-
   /**
    * Cache operations
    */
 
   addToCache(doc: Doc) {
-    if (!this.docs) return;
-
-    // add to `docs` cache
-    const name = doc.name as string | undefined;
-    const doctype = doc.doctype as string | undefined;
-
-    if (!doctype || !name) {
+    if (!this.docs) {
       return;
     }
 
-    if (!this.docs[doctype]) {
-      this.docs[doctype] = {};
+    // add to `docs` cache
+    const name = doc.name;
+    const schemaName = doc.schemaName;
+
+    if (!name) {
+      return;
     }
 
-    (this.docs[doctype] as DocMap)[name] = doc;
+    if (!this.docs[schemaName]) {
+      this.docs[schemaName] = {};
+    }
+
+    (this.docs[schemaName] as DocMap)[name] = doc;
 
     // singles available as first level objects too
-    if (doctype === doc.name) {
+    if (schemaName === doc.name) {
       this.singles[name] = doc;
     }
 
-    // propogate change to `docs`
+    // propagate change to `docs`
     doc.on('change', (params: unknown) => {
       this.docs!.trigger('change', params);
     });
   }
 
-  removeFromCache(doctype: string, name: string) {
-    const docMap = this.docs?.[doctype] as DocMap | undefined;
-    const doc = docMap?.[name];
+  removeFromCache(schemaName: string, name: string) {
+    const docMap = this.docs[schemaName] as DocMap | undefined;
+    delete docMap?.[name];
+  }
 
-    if (doc) {
-      delete docMap[name];
-    } else {
-      console.warn(`Document ${doctype} ${name} does not exist`);
+  getFromCache(schemaName: string, name: string): Doc | undefined {
+    const docMap = this.docs[schemaName] as DocMap | undefined;
+    return docMap?.[name];
+  }
+
+  getCachedValue(
+    schemaName: string,
+    name: string,
+    fieldname: string
+  ): DocValue | Doc[] | undefined {
+    const docMap = this.docs[schemaName] as DocMap;
+    const doc = docMap[name];
+    if (doc === undefined) {
+      return;
     }
+
+    return doc.get(fieldname);
   }
 
-  getDocFromCache(schemaName: string, name: string): Doc | undefined {
+  isDirty(schemaName: string, name: string): boolean {
     const doc = (this.docs?.[schemaName] as DocMap)?.[name];
-    return doc;
-  }
-
-  isDirty(doctype: string, name: string) {
-    const doc = (this.docs?.[doctype] as DocMap)?.[name];
     if (doc === undefined) {
       return false;
     }
 
-    return !!doc._dirty;
-  }
-
-  /**
-   * Meta Operations
-   */
-
-  getMeta(doctype: string): Meta {
-    const meta = this.metaCache[doctype];
-    if (meta) {
-      return meta;
-    }
-
-    const model = this.models?.[doctype];
-    if (!model) {
-      throw new Error(`${doctype} is not a registered doctype`);
-    }
-
-    this.metaCache[doctype] = new this.frappe.Meta!(model);
-    return this.metaCache[doctype]!;
-  }
-
-  createMeta(fields: Field[]) {
-    return new this.frappe.Meta!({ isCustom: 1, fields });
+    return doc.dirty;
   }
 
   /**
@@ -152,73 +98,47 @@ export class DocHandler {
    */
 
   async getDoc(
-    doctype: string,
+    schemaName: string,
     name: string,
     options = { skipDocumentCache: false }
   ) {
-    let doc = null;
+    let doc: Doc | undefined;
     if (!options?.skipDocumentCache) {
-      doc = this.getDocFromCache(doctype, name);
+      doc = this.getFromCache(schemaName, name);
     }
 
     if (doc) {
       return doc;
     }
 
-    const DocClass = this.getDocumentClass(doctype);
-    doc = new DocClass({
-      doctype: doctype,
-      name: name,
-    });
-
+    doc = this.getNewDoc(schemaName, { name });
     await doc.load();
     this.addToCache(doc);
 
     return doc;
   }
 
-  getDocumentClass(doctype: string): typeof Doc {
-    const meta = this.getMeta(doctype);
-    let documentClass = this.frappe.Document!;
-    if (meta && meta.documentClass) {
-      documentClass = meta.documentClass as typeof Doc;
+  getModel(schemaName: string): typeof Doc {
+    const Model = this.models[schemaName];
+    if (Model === undefined) {
+      return Doc;
     }
 
-    return documentClass;
+    return Model;
   }
 
-  async getSingle(doctype: string) {
-    return await this.getDoc(doctype, doctype);
+  async getSingle(schemaName: string) {
+    return await this.getDoc(schemaName, schemaName);
   }
 
-  async getDuplicate(doc: Doc) {
-    const doctype = doc.doctype as string;
-    const newDoc = await this.getEmptyDoc(doctype);
-    const meta = this.getMeta(doctype);
-
-    const fields = meta.getValidFields() as Field[];
-
-    for (const field of fields) {
-      if (['name', 'submitted'].includes(field.fieldname)) {
-        continue;
-      }
-
-      newDoc[field.fieldname] = doc[field.fieldname];
-      if (field.fieldtype === 'Table') {
-        const value = (doc[field.fieldname] as DocData[]) || [];
-        newDoc[field.fieldname] = value.map((d) => {
-          const childData = Object.assign({}, d);
-          childData.name = '';
-          return childData;
-        });
-      }
-    }
+  async getDuplicate(doc: Doc): Promise<Doc> {
+    const newDoc = await doc.duplicate(false);
+    delete newDoc.name;
     return newDoc;
   }
 
-  getEmptyDoc(doctype: string, cacheDoc: boolean = true): Doc {
-    const doc = this.getNewDoc({ doctype });
-    doc._notInserted = true;
+  getEmptyDoc(schemaName: string, cacheDoc: boolean = true): Doc {
+    const doc = this.getNewDoc(schemaName);
     doc.name = getRandomString();
 
     if (cacheDoc) {
@@ -228,34 +148,33 @@ export class DocHandler {
     return doc;
   }
 
-  getNewDoc(data: DocData): Doc {
-    const DocClass = this.getDocumentClass(data.doctype);
-    const doc = new DocClass(data);
+  getNewDoc(schemaName: string, data: DocValueMap = {}): Doc {
+    const Model = this.getModel(schemaName);
+    const schema = this.frappe.schemaMap[schemaName];
+    if (schema === undefined) {
+      throw new Error(`Schema not found for ${schemaName}`);
+    }
+
+    const doc = new Model(schema, data);
     doc.setDefaults();
     return doc;
   }
 
-  async syncDoc(data: DocData) {
-    let doc;
-    const { doctype, name } = data;
-    if (!doctype || !name) {
+  async syncDoc(schemaName: string, data: DocValueMap) {
+    const name = data.name as string | undefined;
+    if (name === undefined) {
       return;
     }
 
-    const docExists = await this.frappe.db.exists(doctype, name);
-    if (docExists) {
-      doc = await this.getDoc(doctype, name);
-      Object.assign(doc, data);
-      await doc.update();
-    } else {
-      doc = this.getNewDoc(data);
-      await doc.insert();
+    const docExists = await this.frappe.db.exists(schemaName, name);
+    if (!docExists) {
+      const doc = this.getNewDoc(schemaName, data);
+      await doc.insert;
+      return;
     }
-  }
 
-  getCachedValue(
-    schemaName: string,
-    name: string,
-    fieldname: string
-  ): DocValue {}
+    const doc = await this.getDoc(schemaName, name);
+    await doc.setMultiple(data);
+    await doc.update();
+  }
 }
diff --git a/frappe/index.ts b/frappe/index.ts
index e998d74a..e490927d 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -1,10 +1,11 @@
 import { ErrorLog } from '@/errorHandling';
-import Doc from 'frappe/model/doc';
 import { getMoneyMaker, MoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
 import { AuthHandler } from './core/authHandler';
 import { DatabaseHandler } from './core/dbHandler';
 import { DocHandler } from './core/docHandler';
+import { ModelMap } from './model/types';
+import coreModels from './models';
 import {
   DEFAULT_DISPLAY_PRECISION,
   DEFAULT_INTERNAL_PRECISION,
@@ -13,6 +14,14 @@ import * as errors from './utils/errors';
 import { format } from './utils/format';
 import { t, T } from './utils/translation';
 
+/**
+ * Terminology
+ * - Schema: object that defines shape of the data in the database
+ * - Model: the controller class that extends the Doc class or the Doc
+ *    class itself.
+ * - Doc: instance of a Model, i.e. what has the data.
+ */
+
 export class Frappe {
   t = t;
   T = T;
@@ -28,8 +37,6 @@ export class Frappe {
   doc: DocHandler;
   db: DatabaseHandler;
 
-  Doc?: typeof Doc;
-
   _initialized: boolean = false;
 
   errorLog?: ErrorLog[];
@@ -38,8 +45,9 @@ export class Frappe {
 
   constructor() {
     this.auth = new AuthHandler(this);
-    this.doc = new DocHandler(this);
     this.db = new DatabaseHandler(this);
+    this.doc = new DocHandler(this);
+
     this.pesa = getMoneyMaker({
       currency: 'XXX',
       precision: DEFAULT_INTERNAL_PRECISION,
@@ -60,13 +68,17 @@ export class Frappe {
     return this.doc.models;
   }
 
-  async initializeAndRegister(customModels = {}, force = false) {
+  get schemaMap() {
+    return this.db.schemaMap;
+  }
+
+  async initializeAndRegister(
+    customModels: ModelMap = {},
+    force: boolean = false
+  ) {
     await this.init(force);
 
-    this.Doc = (await import('frappe/model/doc')).default;
-
-    const coreModels = await import('frappe/models');
-    this.doc.registerModels(coreModels.default as Record<string, Model>);
+    this.doc.registerModels(coreModels as ModelMap);
     this.doc.registerModels(customModels);
   }
 
diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
index 17327e63..ddab7470 100644
--- a/frappe/model/doc.ts
+++ b/frappe/model/doc.ts
@@ -78,6 +78,10 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     ) as TargetField[];
   }
 
+  get dirty() {
+    return this._dirty;
+  }
+
   _setInitialValues(data: DocValueMap) {
     for (const fieldname in data) {
       const value = data[fieldname];
@@ -222,7 +226,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
 
     const childSchemaName = this.fieldMap[fieldname] as TargetField;
-    const schema = frappe.db.schemaMap[childSchemaName.target];
+    const schema = frappe.db.schemaMap[childSchemaName.target] as Schema;
     const childDoc = new Doc(schema, data as DocValueMap);
     childDoc.setDefaults();
     return childDoc;
@@ -417,13 +421,13 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       (this.modified as Date) !== (currentDoc.modified as Date)
     ) {
       throw new Conflict(
-        frappe.t`Document ${this.doctype} ${this.name} has been modified after loading`
+        frappe.t`Document ${this.schemaName} ${this.name} has been modified after loading`
       );
     }
 
     if (this.submitted && !this.schema.isSubmittable) {
       throw new ValidationError(
-        frappe.t`Document type ${this.doctype} is not submittable`
+        frappe.t`Document type ${this.schemaName} is not submittable`
       );
     }
 
@@ -651,7 +655,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return frappe.doc.getCachedValue(schemaName, name, fieldname);
   }
 
-  async duplicate() {
+  async duplicate(shouldInsert: boolean = true): Promise<Doc> {
     const updateMap: DocValueMap = {};
     const docValueMap = this.getValidDict();
     const fieldnames = this.schema.fields.map((f) => f.fieldname);
@@ -680,7 +684,12 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
     const doc = frappe.doc.getEmptyDoc(this.schemaName, false);
     await doc.setMultiple(updateMap);
-    await doc.insert();
+
+    if (shouldInsert) {
+      await doc.insert();
+    }
+
+    return doc;
   }
 
   formulas: FormulaMap = {};
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
index ecac74cd..894905e1 100644
--- a/frappe/model/types.ts
+++ b/frappe/model/types.ts
@@ -27,5 +27,7 @@ export type DependsOnMap = Record<string, string[]>
 
 /**
  * Should add this for hidden too
-
  */
+
+export type ModelMap = Record< string, typeof Doc | undefined>
+export type DocMap = Record<string, Doc | undefined>;
\ No newline at end of file
diff --git a/schemas/index.ts b/schemas/index.ts
index 158279d0..ccd3c31d 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -31,7 +31,7 @@ function deepFreeze(schemaMap: SchemaMap) {
       Object.freeze(schemaMap[schemaName][key]);
     }
 
-    for (const field of schemaMap[schemaName].fields ?? []) {
+    for (const field of schemaMap[schemaName]?.fields ?? []) {
       Object.freeze(field);
     }
   }
@@ -47,7 +47,7 @@ export function addMetaFields(schemaMap: SchemaMap): SchemaMap {
   const submittableTree = getCombined(tree, metaSchemaMap.submittable);
 
   for (const name in schemaMap) {
-    const schema = schemaMap[name];
+    const schema = schemaMap[name] as Schema;
     if (schema.isSingle) {
       continue;
     }
@@ -71,7 +71,7 @@ export function addMetaFields(schemaMap: SchemaMap): SchemaMap {
 
 function addNameField(schemaMap: SchemaMap) {
   for (const name in schemaMap) {
-    const schema = schemaMap[name];
+    const schema = schemaMap[name] as Schema;
     if (schema.isSingle) {
       continue;
     }
@@ -104,7 +104,7 @@ function getAppSchemas(countryCode: string): SchemaMap {
 
 export function cleanSchemas(schemaMap: SchemaMap): SchemaMap {
   for (const name in schemaMap) {
-    const schema = schemaMap[name];
+    const schema = schemaMap[name] as Schema;
     if (schema.isAbstract && !schema.extends) {
       delete schemaMap[name];
       continue;
diff --git a/schemas/tests/testSchemaBuilder.spec.ts b/schemas/tests/testSchemaBuilder.spec.ts
index 98e08a56..bb7dc403 100644
--- a/schemas/tests/testSchemaBuilder.spec.ts
+++ b/schemas/tests/testSchemaBuilder.spec.ts
@@ -86,7 +86,7 @@ describe('Schema Builder', function () {
   );
   describe('Abstract Combined Schemas', function () {
     specify('Meta Properties', function () {
-      assert.strictEqual(abstractCombined.Customer.extends, undefined);
+      assert.strictEqual(abstractCombined.Customer!.extends, undefined);
     });
 
     specify('Abstract Schema Existance', function () {
@@ -94,11 +94,11 @@ describe('Schema Builder', function () {
     });
 
     specify('Field Counts', function () {
-      assert.strictEqual(abstractCombined.Customer.fields?.length, 10);
+      assert.strictEqual(abstractCombined.Customer!.fields?.length, 10);
     });
 
     specify('Quick Edit Field Counts', function () {
-      assert.strictEqual(abstractCombined.Customer.quickEditFields?.length, 7);
+      assert.strictEqual(abstractCombined.Customer!.quickEditFields?.length, 7);
     });
 
     specify('Schema Equality with App Schemas', function () {
@@ -127,7 +127,7 @@ describe('Schema Builder', function () {
       assert.strictEqual(
         everyFieldExists(
           regionalSchemaMap.Party.quickEditFields ?? [],
-          abstractCombined.Customer
+          abstractCombined.Customer!
         ),
         true
       );
@@ -152,14 +152,14 @@ describe('Schema Builder', function () {
   describe('Final Schemas', function () {
     specify('Schema Field Existance', function () {
       assert.strictEqual(
-        everyFieldExists(baseFieldNames, finalSchemas.Customer),
+        everyFieldExists(baseFieldNames, finalSchemas.Customer!),
         true
       );
 
       assert.strictEqual(
         someFieldExists(
           subtract(allFieldNames, baseFieldNames),
-          finalSchemas.Customer
+          finalSchemas.Customer!
         ),
         false
       );
@@ -167,7 +167,7 @@ describe('Schema Builder', function () {
       assert.strictEqual(
         everyFieldExists(
           [...baseFieldNames, ...submittableFieldNames],
-          finalSchemas.JournalEntry
+          finalSchemas.JournalEntry!
         ),
         true
       );
@@ -175,20 +175,20 @@ describe('Schema Builder', function () {
       assert.strictEqual(
         someFieldExists(
           subtract(allFieldNames, baseFieldNames, submittableFieldNames),
-          finalSchemas.JournalEntry
+          finalSchemas.JournalEntry!
         ),
         false
       );
 
       assert.strictEqual(
-        everyFieldExists(childFieldNames, finalSchemas.JournalEntryAccount),
+        everyFieldExists(childFieldNames, finalSchemas.JournalEntryAccount!),
         true
       );
 
       assert.strictEqual(
         someFieldExists(
           subtract(allFieldNames, childFieldNames),
-          finalSchemas.JournalEntryAccount
+          finalSchemas.JournalEntryAccount!
         ),
         false
       );
@@ -196,7 +196,7 @@ describe('Schema Builder', function () {
       assert.strictEqual(
         everyFieldExists(
           [...treeFieldNames, ...baseFieldNames],
-          finalSchemas.Account
+          finalSchemas.Account!
         ),
         true
       );
@@ -204,7 +204,7 @@ describe('Schema Builder', function () {
       assert.strictEqual(
         someFieldExists(
           subtract(allFieldNames, treeFieldNames, baseFieldNames),
-          finalSchemas.Account
+          finalSchemas.Account!
         ),
         false
       );
diff --git a/schemas/types.ts b/schemas/types.ts
index 5fd297c0..072f9dcd 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -128,5 +128,5 @@ export interface Schema {
 export interface SchemaStub extends Partial<Schema> {
   name: string;
 }
-export type SchemaMap = Record<string, Schema>;
+export type SchemaMap = Record<string, Schema | undefined>;
 export type SchemaStubMap = Record<string, SchemaStub>;

From 0efd2b4c339860f2ed71c326ece0208aa9045f3d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 7 Apr 2022 14:57:01 +0530
Subject: [PATCH 031/163] refactor: remove core js schemas - switch to doc and
 json schemas instead

---
 frappe/index.ts                               |  1 -
 frappe/models/NumberSeries.ts                 | 38 ++++++++
 frappe/models/SystemSettings.ts               | 19 ++++
 .../doctype/NumberSeries/NumberSeries.js      | 66 -------------
 .../NumberSeries/NumberSeriesDocument.js      | 37 --------
 frappe/models/doctype/PatchRun/PatchRun.js    | 12 ---
 .../models/doctype/SingleValue/SingleValue.js | 29 ------
 .../doctype/SystemSettings/SystemSettings.js  | 94 -------------------
 frappe/models/index.js                        | 11 ---
 frappe/models/index.ts                        |  7 ++
 src/main.js                                   |  1 -
 11 files changed, 64 insertions(+), 251 deletions(-)
 create mode 100644 frappe/models/NumberSeries.ts
 create mode 100644 frappe/models/SystemSettings.ts
 delete mode 100644 frappe/models/doctype/NumberSeries/NumberSeries.js
 delete mode 100644 frappe/models/doctype/NumberSeries/NumberSeriesDocument.js
 delete mode 100644 frappe/models/doctype/PatchRun/PatchRun.js
 delete mode 100644 frappe/models/doctype/SingleValue/SingleValue.js
 delete mode 100644 frappe/models/doctype/SystemSettings/SystemSettings.js
 delete mode 100644 frappe/models/index.js
 create mode 100644 frappe/models/index.ts

diff --git a/frappe/index.ts b/frappe/index.ts
index e490927d..19d40d4b 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -29,7 +29,6 @@ export class Frappe {
 
   errors = errors;
   isElectron = false;
-  isServer = false;
 
   pesa: MoneyMaker;
 
diff --git a/frappe/models/NumberSeries.ts b/frappe/models/NumberSeries.ts
new file mode 100644
index 00000000..ec13f80d
--- /dev/null
+++ b/frappe/models/NumberSeries.ts
@@ -0,0 +1,38 @@
+import { getPaddedName } from '@/utils';
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+
+export default class NumberSeries extends Doc {
+  validate() {
+    const current = this.get('current') as number | null;
+    if (current) {
+      this.current = this.get('start');
+    }
+  }
+
+  async next(schemaName: string) {
+    this.validate();
+
+    const exists = await this.checkIfCurrentExists(schemaName);
+    if (!exists) {
+      return this.getPaddedName(this.current as number);
+    }
+
+    this.current = (this.current as number) + 1;
+    await this.update();
+    return this.getPaddedName(this.current as number);
+  }
+
+  async checkIfCurrentExists(schemaName: string) {
+    if (!schemaName) {
+      return true;
+    }
+
+    const name = this.getPaddedName(this.current as number);
+    return await frappe.db.exists(schemaName, name);
+  }
+
+  getPaddedName(next: number): string {
+    return getPaddedName(this.name, next, this.padZeros);
+  }
+}
diff --git a/frappe/models/SystemSettings.ts b/frappe/models/SystemSettings.ts
new file mode 100644
index 00000000..dd164bdc
--- /dev/null
+++ b/frappe/models/SystemSettings.ts
@@ -0,0 +1,19 @@
+import { DocValue } from 'frappe/core/types';
+import Doc from 'frappe/model/doc';
+import { ValidationMap } from 'frappe/model/types';
+import { ValidationError } from 'frappe/utils/errors';
+import { t } from 'frappe/utils/translation';
+
+export default class SystemSettings extends Doc {
+  validations: ValidationMap = {
+    async displayPrecision(value: DocValue) {
+      if ((value as number) >= 0 && (value as number) <= 9) {
+        return;
+      }
+
+      throw new ValidationError(
+        t`Display Precision should have a value between 0 and 9.`
+      );
+    },
+  };
+}
diff --git a/frappe/models/doctype/NumberSeries/NumberSeries.js b/frappe/models/doctype/NumberSeries/NumberSeries.js
deleted file mode 100644
index 51b1282d..00000000
--- a/frappe/models/doctype/NumberSeries/NumberSeries.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { t } from 'frappe';
-import NumberSeries from './NumberSeriesDocument.js';
-
-const referenceTypeMap = {
-  SalesInvoice: t`Invoice`,
-  PurchaseInvoice: t`Bill`,
-  Payment: t`Payment`,
-  JournalEntry: t`Journal Entry`,
-  Quotation: t`Quotation`,
-  SalesOrder: t`SalesOrder`,
-  Fulfillment: t`Fulfillment`,
-  PurchaseOrder: t`PurchaseOrder`,
-  PurchaseReceipt: t`PurchaseReceipt`,
-  '-': t`None`,
-};
-
-export default {
-  name: 'NumberSeries',
-  label: t`Number Series`,
-  documentClass: NumberSeries,
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Prefix`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'start',
-      label: t`Start`,
-      fieldtype: 'Int',
-      default: 1001,
-      required: 1,
-      minvalue: 0,
-    },
-    {
-      fieldname: 'padZeros',
-      label: t`Pad Zeros`,
-      fieldtype: 'Int',
-      default: 4,
-      required: 1,
-    },
-    {
-      fieldname: 'referenceType',
-      label: t`Reference Type`,
-      fieldtype: 'Select',
-      options: Object.keys(referenceTypeMap),
-      map: referenceTypeMap,
-      default: '-',
-      required: 1,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'current',
-      label: t`Current`,
-      fieldtype: 'Int',
-      required: 1,
-      readOnly: 1,
-    },
-  ],
-  quickEditFields: ['start', 'padZeros', 'referenceType'],
-};
diff --git a/frappe/models/doctype/NumberSeries/NumberSeriesDocument.js b/frappe/models/doctype/NumberSeries/NumberSeriesDocument.js
deleted file mode 100644
index 09c6f73c..00000000
--- a/frappe/models/doctype/NumberSeries/NumberSeriesDocument.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { getPaddedName } from '@/utils';
-import frappe from 'frappe';
-import Document from 'frappe/model/document';
-
-export default class NumberSeries extends Document {
-  validate() {
-    if (!this.current) {
-      this.current = this.start;
-    }
-  }
-
-  async next(doctype) {
-    this.validate();
-
-    const exists = await this.checkIfCurrentExists(doctype);
-    if (!exists) {
-      return this.getPaddedName(this.current);
-    }
-
-    this.current++;
-    await this.update();
-    return this.getPaddedName(this.current);
-  }
-
-  async checkIfCurrentExists(doctype) {
-    if (!doctype) {
-      return true;
-    }
-
-    const name = this.getPaddedName(this.current);
-    return await frappe.db.exists(doctype, name);
-  }
-
-  getPaddedName(next) {
-    return getPaddedName(this.name, next, this.padZeros);
-  }
-}
diff --git a/frappe/models/doctype/PatchRun/PatchRun.js b/frappe/models/doctype/PatchRun/PatchRun.js
deleted file mode 100644
index 8ec73bce..00000000
--- a/frappe/models/doctype/PatchRun/PatchRun.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'PatchRun',
-  fields: [
-    {
-      fieldname: 'name',
-      fieldtype: 'Data',
-      label: t`Name`,
-    },
-  ],
-};
diff --git a/frappe/models/doctype/SingleValue/SingleValue.js b/frappe/models/doctype/SingleValue/SingleValue.js
deleted file mode 100644
index 721a7b30..00000000
--- a/frappe/models/doctype/SingleValue/SingleValue.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const { t } = require('frappe');
-
-module.exports = {
-  name: 'SingleValue',
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'parent',
-      label: t`Parent`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'fieldname',
-      label: t`Fieldname`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'value',
-      label: t`Value`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-  ],
-};
diff --git a/frappe/models/doctype/SystemSettings/SystemSettings.js b/frappe/models/doctype/SystemSettings/SystemSettings.js
deleted file mode 100644
index 45603b80..00000000
--- a/frappe/models/doctype/SystemSettings/SystemSettings.js
+++ /dev/null
@@ -1,94 +0,0 @@
-const { DateTime } = require('luxon');
-const { t } = require('frappe');
-const {
-  DEFAULT_DISPLAY_PRECISION,
-  DEFAULT_INTERNAL_PRECISION,
-  DEFAULT_LOCALE,
-} = require('../../../utils/consts');
-
-let dateFormatOptions = (() => {
-  let formats = [
-    'dd/MM/yyyy',
-    'MM/dd/yyyy',
-    'dd-MM-yyyy',
-    'MM-dd-yyyy',
-    'yyyy-MM-dd',
-    'd MMM, y',
-    'MMM d, y',
-  ];
-
-  let today = DateTime.local();
-
-  return formats.map((format) => {
-    return {
-      label: today.toFormat(format),
-      value: format,
-    };
-  });
-})();
-
-module.exports = {
-  name: 'SystemSettings',
-  label: t`System Settings`,
-  doctype: 'DocType',
-  isSingle: 1,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'dateFormat',
-      label: t`Date Format`,
-      fieldtype: 'Select',
-      options: dateFormatOptions,
-      default: 'MMM d, y',
-      required: 1,
-      description: t`Sets the app-wide date display format.`,
-    },
-    {
-      fieldname: 'locale',
-      label: t`Locale`,
-      fieldtype: 'Data',
-      default: DEFAULT_LOCALE,
-      description: t`Set the local code. This is used for number formatting.`,
-    },
-    {
-      fieldname: 'displayPrecision',
-      label: t`Display Precision`,
-      fieldtype: 'Int',
-      default: DEFAULT_DISPLAY_PRECISION,
-      required: 1,
-      minValue: 0,
-      maxValue: 9,
-      validate(value, doc) {
-        if (value >= 0 && value <= 9) {
-          return;
-        }
-        throw new frappe.errors.ValidationError(
-          t`Display Precision should have a value between 0 and 9.`
-        );
-      },
-      description: t`Sets how many digits are shown after the decimal point.`,
-    },
-    {
-      fieldname: 'internalPrecision',
-      label: t`Internal Precision`,
-      fieldtype: 'Int',
-      minValue: 0,
-      default: DEFAULT_INTERNAL_PRECISION,
-      description: t`Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.`,
-    },
-    {
-      fieldname: 'hideGetStarted',
-      label: t`Hide Get Started`,
-      fieldtype: 'Check',
-      default: 0,
-      description: t`Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.`,
-    },
-  ],
-  quickEditFields: [
-    'locale',
-    'dateFormat',
-    'displayPrecision',
-    'hideGetStarted',
-  ],
-};
diff --git a/frappe/models/index.js b/frappe/models/index.js
deleted file mode 100644
index b24843d0..00000000
--- a/frappe/models/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import NumberSeries from './doctype/NumberSeries/NumberSeries.js';
-import PatchRun from './doctype/PatchRun/PatchRun.js';
-import SingleValue from './doctype/SingleValue/SingleValue.js';
-import SystemSettings from './doctype/SystemSettings/SystemSettings.js';
-
-export default {
-  NumberSeries,
-  SingleValue,
-  SystemSettings,
-  PatchRun,
-};
diff --git a/frappe/models/index.ts b/frappe/models/index.ts
new file mode 100644
index 00000000..ce29ca97
--- /dev/null
+++ b/frappe/models/index.ts
@@ -0,0 +1,7 @@
+import NumberSeries from './NumberSeries.js';
+import SystemSettings from './SystemSettings';
+
+export default {
+  NumberSeries,
+  SystemSettings,
+};
diff --git a/src/main.js b/src/main.js
index 6e564444..ed9b3688 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,7 +22,6 @@ import { setLanguageMap, stringifyCircular } from './utils';
     window.config = config;
   }
 
-  frappe.isServer = true;
   frappe.isElectron = true;
 
   const models = (await import('../models')).default;

From a66e2bcc45a4cdcce5d4f5c5e9b3f585dc131fbd Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 7 Apr 2022 19:08:17 +0530
Subject: [PATCH 032/163] incr: database demux base - remove a few redundant
 files

---
 backend/database/manager.ts |   4 +-
 frappe/core/dbHandler.ts    |  21 +-
 frappe/core/types.ts        |   8 +
 frappe/index.ts             |  11 +-
 frappe/model/document.js    | 762 ------------------------------------
 src/demux/db.ts             |   5 +-
 src/initialization.js       | 127 ------
 src/migrate.js              |  47 ---
 src/types/model.ts          |  53 ---
 tests/testFrappe.spec.ts    |  12 +
 utils/db/types.ts           |  20 +
 11 files changed, 69 insertions(+), 1001 deletions(-)
 delete mode 100644 frappe/model/document.js
 delete mode 100644 src/initialization.js
 delete mode 100644 src/migrate.js
 delete mode 100644 src/types/model.ts
 create mode 100644 tests/testFrappe.spec.ts

diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 33d7e434..53d52e32 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -1,5 +1,5 @@
 import fs from 'fs/promises';
-import { DatabaseMethod } from 'utils/db/types';
+import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { getSchemas } from '../../schemas';
 import { databaseMethodSet } from '../helpers';
 import patches from '../patches';
@@ -7,7 +7,7 @@ import DatabaseCore from './core';
 import { runPatches } from './runPatch';
 import { Patch } from './types';
 
-export class DatabaseManager {
+export class DatabaseManager extends DatabaseDemuxBase {
   db?: DatabaseCore;
 
   get #isInitialized(): boolean {
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index 3e78b453..70c13d4f 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -2,18 +2,29 @@ import { DatabaseDemux } from '@/demux/db';
 import { Frappe } from 'frappe';
 import Money from 'pesa/dist/types/src/money';
 import { FieldType, FieldTypeEnum, RawValue, SchemaMap } from 'schemas/types';
-import { DatabaseBase, GetAllOptions } from 'utils/db/types';
-import { DocValue, DocValueMap, RawValueMap, SingleValue } from './types';
+import { DatabaseBase, DatabaseDemuxBase, GetAllOptions } from 'utils/db/types';
+import {
+  DatabaseDemuxConstructor,
+  DocValue,
+  DocValueMap,
+  RawValueMap,
+  SingleValue,
+} from './types';
 
 export class DatabaseHandler extends DatabaseBase {
   #frappe: Frappe;
-  #demux: DatabaseDemux;
+  #demux: DatabaseDemuxBase;
   schemaMap: Readonly<SchemaMap> = {};
 
-  constructor(frappe: Frappe) {
+  constructor(frappe: Frappe, Demux?: DatabaseDemuxConstructor) {
     super();
     this.#frappe = frappe;
-    this.#demux = new DatabaseDemux(frappe.isElectron);
+
+    if (Demux !== undefined) {
+      this.#demux = new Demux(frappe.isElectron);
+    } else {
+      this.#demux = new DatabaseDemux(frappe.isElectron);
+    }
   }
 
   async createNewDatabase(dbPath: string, countryCode?: string) {
diff --git a/frappe/core/types.ts b/frappe/core/types.ts
index 532c7f50..4a8afa49 100644
--- a/frappe/core/types.ts
+++ b/frappe/core/types.ts
@@ -1,6 +1,7 @@
 import Doc from 'frappe/model/doc';
 import Money from 'pesa/dist/types/src/money';
 import { RawValue } from 'schemas/types';
+import { DatabaseDemuxBase } from 'utils/db/types';
 
 export type DocValue = string | number | boolean | Date | Money | null;
 export type DocValueMap = Record<string, DocValue | Doc[] | DocValueMap[]>;
@@ -11,3 +12,10 @@ export type SingleValue<T> = {
   parent: string;
   value: T;
 }[];
+
+/**
+ * DatabaseDemuxConstructor: type for a constructor that returns a DatabaseDemuxBase
+ * it's typed this way because `typeof AbstractClass` is invalid as abstract classes
+ * can't be initialized using `new`.
+ */
+export type DatabaseDemuxConstructor = new (isElectron?: boolean)=> DatabaseDemuxBase
\ No newline at end of file
diff --git a/frappe/index.ts b/frappe/index.ts
index 19d40d4b..249116d8 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -4,6 +4,7 @@ import { markRaw } from 'vue';
 import { AuthHandler } from './core/authHandler';
 import { DatabaseHandler } from './core/dbHandler';
 import { DocHandler } from './core/docHandler';
+import { DatabaseDemuxConstructor } from './core/types';
 import { ModelMap } from './model/types';
 import coreModels from './models';
 import {
@@ -42,9 +43,13 @@ export class Frappe {
   methods?: Record<string, Function>;
   temp?: Record<string, unknown>;
 
-  constructor() {
+  constructor(DatabaseDemux?: DatabaseDemuxConstructor) {
+    /**
+     * `DatabaseManager` can be passed as the `DatabaseDemux` for
+     * testing this class without API or IPC calls.
+     */
     this.auth = new AuthHandler(this);
-    this.db = new DatabaseHandler(this);
+    this.db = new DatabaseHandler(this, DatabaseDemux);
     this.doc = new DocHandler(this);
 
     this.pesa = getMoneyMaker({
@@ -81,7 +86,7 @@ export class Frappe {
     this.doc.registerModels(customModels);
   }
 
-  async init(force: boolean) {
+  async init(force?: boolean) {
     if (this._initialized && !force) return;
 
     this.methods = {};
diff --git a/frappe/model/document.js b/frappe/model/document.js
deleted file mode 100644
index fc7303c6..00000000
--- a/frappe/model/document.js
+++ /dev/null
@@ -1,762 +0,0 @@
-import telemetry from '@/telemetry/telemetry';
-import { Verb } from '@/telemetry/types';
-import frappe from 'frappe';
-import Observable from 'frappe/utils/observable';
-import { DEFAULT_INTERNAL_PRECISION } from '../utils/consts';
-import { getRandomString, isPesa } from '../utils/index';
-import { setName } from './naming';
-
-export default class Document extends Observable {
-  constructor(data) {
-    super();
-    this.fetchValuesCache = {};
-    this.flags = {};
-    this.setup();
-    this.setValues(data);
-  }
-
-  setup() {
-    // add listeners
-  }
-
-  setValues(data) {
-    for (let fieldname in data) {
-      let value = data[fieldname];
-      if (fieldname.startsWith('_')) {
-        // private property
-        this[fieldname] = value;
-      } else if (Array.isArray(value)) {
-        for (let row of value) {
-          this.push(fieldname, row);
-        }
-      } else {
-        this[fieldname] = value;
-      }
-    }
-    // set unset fields as null
-    for (let field of this.meta.getValidFields()) {
-      // check for null or undefined
-      if (this[field.fieldname] == null) {
-        this[field.fieldname] = null;
-      }
-    }
-  }
-
-  get meta() {
-    if (this.isCustom) {
-      this._meta = frappe.createMeta(this.fields);
-    }
-    if (!this._meta) {
-      this._meta = frappe.getMeta(this.doctype);
-    }
-    return this._meta;
-  }
-
-  async getSettings() {
-    if (!this._settings) {
-      this._settings = await frappe.getSingle(this.meta.settings);
-    }
-    return this._settings;
-  }
-
-  // set value and trigger change
-  async set(fieldname, value) {
-    if (typeof fieldname === 'object') {
-      const valueDict = fieldname;
-      for (let fieldname in valueDict) {
-        await this.set(fieldname, valueDict[fieldname]);
-      }
-      return;
-    }
-
-    if (fieldname === 'numberSeries' && !this._notInserted) {
-      return;
-    }
-
-    if (this[fieldname] !== value) {
-      this._dirty = true;
-      // if child is dirty, parent is dirty too
-      if (this.meta.isChild && this.parentdoc) {
-        this.parentdoc._dirty = true;
-      }
-
-      if (Array.isArray(value)) {
-        this[fieldname] = [];
-        value.forEach((row, i) => {
-          this.append(fieldname, row);
-          row.idx = i;
-        });
-      } else {
-        await this.validateField(fieldname, value);
-        this[fieldname] = value;
-      }
-
-      // always run applyChange from the parentdoc
-      if (this.meta.isChild && this.parentdoc) {
-        await this.applyChange(fieldname);
-        await this.parentdoc.applyChange(this.parentfield);
-      } else {
-        await this.applyChange(fieldname);
-      }
-    }
-  }
-
-  async applyChange(fieldname) {
-    await this.applyFormula(fieldname);
-    this.roundFloats();
-    await this.trigger('change', {
-      doc: this,
-      changed: fieldname,
-    });
-  }
-
-  setDefaults() {
-    for (let field of this.meta.fields) {
-      if (this[field.fieldname] == null) {
-        let defaultValue = getPreDefaultValues(field.fieldtype);
-
-        if (typeof field.default === 'function') {
-          defaultValue = field.default(this);
-        } else if (field.default !== undefined) {
-          defaultValue = field.default;
-        }
-
-        if (field.fieldtype === 'Currency' && !isPesa(defaultValue)) {
-          defaultValue = frappe.pesa(defaultValue);
-        }
-
-        this[field.fieldname] = defaultValue;
-      }
-    }
-
-    if (this.meta.basedOn && this.meta.filters) {
-      this.setValues(this.meta.filters);
-    }
-  }
-
-  castValues() {
-    for (let field of this.meta.fields) {
-      let value = this[field.fieldname];
-      if (value == null) {
-        continue;
-      }
-      if (['Int', 'Check'].includes(field.fieldtype)) {
-        value = parseInt(value, 10);
-      } else if (field.fieldtype === 'Float') {
-        value = parseFloat(value);
-      } else if (field.fieldtype === 'Currency' && !isPesa(value)) {
-        value = frappe.pesa(value);
-      }
-      this[field.fieldname] = value;
-    }
-  }
-
-  setKeywords() {
-    let keywords = [];
-    for (let fieldname of this.meta.getKeywordFields()) {
-      keywords.push(this[fieldname]);
-    }
-    this.keywords = keywords.join(', ');
-  }
-
-  append(key, document = {}) {
-    // push child row and trigger change
-    this.push(key, document);
-    this._dirty = true;
-    this.applyChange(key);
-  }
-
-  push(key, document = {}) {
-    // push child row without triggering change
-    if (!this[key]) {
-      this[key] = [];
-    }
-    this[key].push(this._initChild(document, key));
-  }
-
-  _initChild(data, key) {
-    if (data instanceof Document) {
-      return data;
-    }
-
-    data.doctype = this.meta.getField(key).childtype;
-    data.parent = this.name;
-    data.parenttype = this.doctype;
-    data.parentfield = key;
-    data.parentdoc = this;
-
-    if (!data.idx) {
-      data.idx = (this[key] || []).length;
-    }
-
-    if (!data.name) {
-      data.name = getRandomString();
-    }
-
-    const childDoc = new Document(data);
-    childDoc.setDefaults();
-    return childDoc;
-  }
-
-  async validateInsert() {
-    this.validateMandatory();
-    await this.validateFields();
-  }
-
-  validateMandatory() {
-    let checkForMandatory = [this];
-    let tableFields = this.meta.fields.filter((df) => df.fieldtype === 'Table');
-    tableFields.map((df) => {
-      let rows = this[df.fieldname];
-      checkForMandatory = [...checkForMandatory, ...rows];
-    });
-
-    let missingMandatory = checkForMandatory
-      .map((doc) => getMissingMandatory(doc))
-      .filter(Boolean);
-
-    if (missingMandatory.length > 0) {
-      let fields = missingMandatory.join('\n');
-      let message = frappe.t`Value missing for ${fields}`;
-      throw new frappe.errors.MandatoryError(message);
-    }
-
-    function getMissingMandatory(doc) {
-      let mandatoryFields = doc.meta.fields.filter((df) => {
-        if (df.required instanceof Function) {
-          return df.required(doc);
-        }
-        return df.required;
-      });
-      let message = mandatoryFields
-        .filter((df) => {
-          let value = doc[df.fieldname];
-          if (df.fieldtype === 'Table') {
-            return value == null || value.length === 0;
-          }
-          return value == null || value === '';
-        })
-        .map((df) => {
-          return `"${df.label}"`;
-        })
-        .join(', ');
-
-      if (message && doc.meta.isChild) {
-        let parentfield = doc.parentdoc.meta.getField(doc.parentfield);
-        message = `${parentfield.label} Row ${doc.idx + 1}: ${message}`;
-      }
-
-      return message;
-    }
-  }
-
-  async validateFields() {
-    let fields = this.meta.fields;
-    for (let field of fields) {
-      await this.validateField(field.fieldname, this.get(field.fieldname));
-    }
-  }
-
-  async validateField(key, value) {
-    let field = this.meta.getField(key);
-    if (!field) {
-      throw new frappe.errors.InvalidFieldError(`Invalid field ${key}`);
-    }
-    if (field.fieldtype == 'Select') {
-      this.meta.validateSelect(field, value);
-    }
-    if (field.validate && value != null) {
-      let validator = null;
-      if (typeof field.validate === 'object') {
-        validator = this.getValidateFunction(field.validate);
-      }
-      if (typeof field.validate === 'function') {
-        validator = field.validate;
-      }
-      if (validator) {
-        await validator(value, this);
-      }
-    }
-  }
-
-  getValidateFunction(validator) {
-    let functions = {
-      email(value) {
-        let isValid = /(.+)@(.+){2,}\.(.+){2,}/.test(value);
-        if (!isValid) {
-          throw new frappe.errors.ValidationError(`Invalid email: ${value}`);
-        }
-      },
-      phone(value) {
-        let isValid = /[+]{0,1}[\d ]+/.test(value);
-        if (!isValid) {
-          throw new frappe.errors.ValidationError(`Invalid phone: ${value}`);
-        }
-      },
-    };
-
-    return functions[validator.type];
-  }
-
-  getValidDict() {
-    let data = {};
-    for (let field of this.meta.getValidFields()) {
-      let value = this[field.fieldname];
-      if (Array.isArray(value)) {
-        value = value.map((doc) =>
-          doc.getValidDict ? doc.getValidDict() : doc
-        );
-      }
-      data[field.fieldname] = value;
-    }
-    return data;
-  }
-
-  setStandardValues() {
-    // set standard values on server-side only
-    if (frappe.isServer) {
-      if (this.isSubmittable && this.submitted == null) {
-        this.submitted = 0;
-      }
-
-      let now = new Date().toISOString();
-      if (!this.owner) {
-        this.owner = frappe.auth.session.user;
-      }
-
-      if (!this.creation) {
-        this.creation = now;
-      }
-
-      this.updateModified();
-    }
-  }
-
-  updateModified() {
-    if (frappe.isServer) {
-      let now = new Date().toISOString();
-      this.modifiedBy = frappe.auth.session.user;
-      this.modified = now;
-    }
-  }
-
-  async load() {
-    let data = await frappe.db.get(this.doctype, this.name);
-    if (data && data.name) {
-      this.syncValues(data);
-      if (this.meta.isSingle) {
-        this.setDefaults();
-        this.castValues();
-      }
-      await this.loadLinks();
-    } else {
-      throw new frappe.errors.NotFoundError(
-        `Not Found: ${this.doctype} ${this.name}`
-      );
-    }
-  }
-
-  async loadLinks() {
-    this._links = {};
-    let inlineLinks = this.meta.fields.filter((df) => df.inline);
-    for (let df of inlineLinks) {
-      await this.loadLink(df.fieldname);
-    }
-  }
-
-  async loadLink(fieldname) {
-    this._links = this._links || {};
-    let df = this.meta.getField(fieldname);
-    if (this[df.fieldname]) {
-      this._links[df.fieldname] = await frappe.getDoc(
-        df.target,
-        this[df.fieldname]
-      );
-    }
-  }
-
-  getLink(fieldname) {
-    return this._links ? this._links[fieldname] : null;
-  }
-
-  syncValues(data) {
-    this.clearValues();
-    this.setValues(data);
-    this._dirty = false;
-    this.trigger('change', {
-      doc: this,
-    });
-  }
-
-  clearValues() {
-    let toClear = ['_dirty', '_notInserted'].concat(
-      this.meta.getValidFields().map((df) => df.fieldname)
-    );
-    for (let key of toClear) {
-      this[key] = null;
-    }
-  }
-
-  setChildIdx() {
-    // renumber children
-    for (let field of this.meta.getValidFields()) {
-      if (field.fieldtype === 'Table') {
-        for (let i = 0; i < (this[field.fieldname] || []).length; i++) {
-          this[field.fieldname][i].idx = i;
-        }
-      }
-    }
-  }
-
-  async compareWithCurrentDoc() {
-    if (frappe.isServer && !this.isNew()) {
-      let currentDoc = await frappe.db.get(this.doctype, this.name);
-
-      // check for conflict
-      if (currentDoc && this.modified != currentDoc.modified) {
-        throw new frappe.errors.Conflict(
-          frappe.t`Document ${this.doctype} ${this.name} has been modified after loading`
-        );
-      }
-
-      if (this.submitted && !this.meta.isSubmittable) {
-        throw new frappe.errors.ValidationError(
-          frappe.t`Document type ${this.doctype} is not submittable`
-        );
-      }
-
-      // set submit action flag
-      this.flags = {};
-      if (this.submitted && !currentDoc.submitted) {
-        this.flags.submitAction = true;
-      }
-
-      if (currentDoc.submitted && !this.submitted) {
-        this.flags.revertAction = true;
-      }
-    }
-  }
-
-  async applyFormula(fieldname) {
-    if (!this.meta.hasFormula()) {
-      return false;
-    }
-
-    let doc = this;
-    let changed = false;
-
-    // children
-    for (let tablefield of this.meta.getTableFields()) {
-      let formulaFields = frappe
-        .getMeta(tablefield.childtype)
-        .getFormulaFields();
-      if (formulaFields.length) {
-        const value = this[tablefield.fieldname] || [];
-        for (let row of value) {
-          for (let field of formulaFields) {
-            if (shouldApplyFormula(field, row)) {
-              let val = await this.getValueFromFormula(field, row);
-              let previousVal = row[field.fieldname];
-              if (val !== undefined && previousVal !== val) {
-                row[field.fieldname] = val;
-                changed = true;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // parent or child row
-    for (let field of this.meta.getFormulaFields()) {
-      if (shouldApplyFormula(field, doc)) {
-        let previousVal = doc[field.fieldname];
-        let val = await this.getValueFromFormula(field, doc);
-        if (val !== undefined && previousVal !== val) {
-          doc[field.fieldname] = val;
-          changed = true;
-        }
-      }
-    }
-
-    return changed;
-
-    function shouldApplyFormula(field, doc) {
-      if (field.readOnly) {
-        return true;
-      }
-      if (
-        fieldname &&
-        field.formulaDependsOn &&
-        field.formulaDependsOn.includes(fieldname)
-      ) {
-        return true;
-      }
-
-      if (!frappe.isServer || frappe.isElectron) {
-        if (doc[field.fieldname] == null || doc[field.fieldname] == '') {
-          return true;
-        }
-      }
-      return false;
-    }
-  }
-
-  async getValueFromFormula(field, doc) {
-    let value;
-
-    if (doc.meta.isChild) {
-      value = await field.formula(doc, doc.parentdoc);
-    } else {
-      value = await field.formula(doc);
-    }
-
-    if (value === undefined) {
-      return;
-    }
-
-    if ('Float' === field.fieldtype) {
-      value = this.round(value, field);
-    }
-
-    if (field.fieldtype === 'Table' && Array.isArray(value)) {
-      value = value.map((row) => {
-        let doc = this._initChild(row, field.fieldname);
-        doc.roundFloats();
-        return doc;
-      });
-    }
-
-    return value;
-  }
-
-  roundFloats() {
-    let fields = this.meta
-      .getValidFields()
-      .filter((df) => ['Float', 'Table'].includes(df.fieldtype));
-
-    for (let df of fields) {
-      let value = this[df.fieldname];
-      if (value == null) {
-        continue;
-      }
-      // child
-      if (Array.isArray(value)) {
-        value.map((row) => row.roundFloats());
-        continue;
-      }
-      // field
-      let roundedValue = this.round(value, df);
-      if (roundedValue && value !== roundedValue) {
-        this[df.fieldname] = roundedValue;
-      }
-    }
-  }
-
-  async commit() {
-    // re-run triggers
-    this.setKeywords();
-    this.setChildIdx();
-    await this.applyFormula();
-    await this.trigger('validate');
-  }
-
-  async insert() {
-    await setName(this);
-    this.setStandardValues();
-    await this.commit();
-    await this.validateInsert();
-    await this.trigger('beforeInsert');
-
-    let oldName = this.name;
-    const data = await frappe.db.insert(this.doctype, this.getValidDict());
-    this.syncValues(data);
-
-    if (oldName !== this.name) {
-      frappe.removeFromCache(this.doctype, oldName);
-    }
-
-    await this.trigger('afterInsert');
-    await this.trigger('afterSave');
-
-    telemetry.log(Verb.Created, this.doctype);
-    return this;
-  }
-
-  async update(...args) {
-    if (args.length) {
-      await this.set(...args);
-    }
-    await this.compareWithCurrentDoc();
-    await this.commit();
-    await this.trigger('beforeUpdate');
-
-    // before submit
-    if (this.flags.submitAction) await this.trigger('beforeSubmit');
-    if (this.flags.revertAction) await this.trigger('beforeRevert');
-
-    // update modifiedBy and modified
-    this.updateModified();
-
-    const data = await frappe.db.update(this.doctype, this.getValidDict());
-    this.syncValues(data);
-
-    await this.trigger('afterUpdate');
-    await this.trigger('afterSave');
-
-    // after submit
-    if (this.flags.submitAction) await this.trigger('afterSubmit');
-    if (this.flags.revertAction) await this.trigger('afterRevert');
-
-    return this;
-  }
-
-  async insertOrUpdate() {
-    if (this._notInserted) {
-      return await this.insert();
-    } else {
-      return await this.update();
-    }
-  }
-
-  async delete() {
-    await this.trigger('beforeDelete');
-    await frappe.db.delete(this.doctype, this.name);
-    await this.trigger('afterDelete');
-
-    telemetry.log(Verb.Deleted, this.doctype);
-  }
-
-  async submitOrRevert(isSubmit) {
-    const wasSubmitted = this.submitted;
-    this.submitted = isSubmit;
-    try {
-      await this.update();
-    } catch (e) {
-      this.submitted = wasSubmitted;
-      throw e;
-    }
-  }
-
-  async submit() {
-    this.cancelled = 0;
-    await this.submitOrRevert(1);
-  }
-
-  async revert() {
-    await this.submitOrRevert(0);
-  }
-
-  async rename(newName) {
-    await this.trigger('beforeRename');
-    await frappe.db.rename(this.doctype, this.name, newName);
-    this.name = newName;
-    await this.trigger('afterRename');
-  }
-
-  // trigger methods on the class if they match
-  // with the trigger name
-  async trigger(event, params) {
-    if (this[event]) {
-      await this[event](params);
-    }
-    await super.trigger(event, params);
-  }
-
-  // helper functions
-  getSum(tablefield, childfield, convertToFloat = true) {
-    const sum = (this[tablefield] || [])
-      .map((d) => {
-        const value = d[childfield] ?? 0;
-        if (!isPesa(value)) {
-          try {
-            return frappe.pesa(value);
-          } catch (err) {
-            err.message += ` value: '${value}' of type: ${typeof value}, fieldname: '${tablefield}', childfield: '${childfield}'`;
-            throw err;
-          }
-        }
-        return value;
-      })
-      .reduce((a, b) => a.add(b), frappe.pesa(0));
-
-    if (convertToFloat) {
-      return sum.float;
-    }
-    return sum;
-  }
-
-  getFrom(doctype, name, fieldname) {
-    if (!name) return '';
-    return frappe.db.getCachedValue(doctype, name, fieldname);
-  }
-
-  round(value, df = null) {
-    if (typeof df === 'string') {
-      df = this.meta.getField(df);
-    }
-    const precision =
-      frappe.SystemSettings.internalPrecision ?? DEFAULT_INTERNAL_PRECISION;
-    return frappe.pesa(value).clip(precision).float;
-  }
-
-  isNew() {
-    return this._notInserted;
-  }
-
-  getFieldMetaMap() {
-    return this.meta.fields.reduce((obj, meta) => {
-      obj[meta.fieldname] = meta;
-      return obj;
-    }, {});
-  }
-
-  async duplicate() {
-    const updateMap = {};
-    const fieldValueMap = this.getValidDict();
-    const keys = this.meta.fields.map((f) => f.fieldname);
-    for (const key of keys) {
-      let value = fieldValueMap[key];
-      if (!value) {
-        continue;
-      }
-
-      if (isPesa(value)) {
-        value = value.copy();
-      }
-
-      if (value instanceof Array) {
-        value.forEach((row) => {
-          delete row.name;
-          delete row.parent;
-        });
-      }
-
-      updateMap[key] = value;
-    }
-
-    if (this.numberSeries) {
-      delete updateMap.name;
-    } else {
-      updateMap.name = updateMap.name + ' CPY';
-    }
-
-    const doc = frappe.getEmptyDoc(this.doctype, false);
-    await doc.set(updateMap);
-    await doc.insert();
-  }
-}
-
-function getPreDefaultValues(fieldtype) {
-  switch (fieldtype) {
-    case 'Table':
-      return [];
-    case 'Currency':
-      return frappe.pesa(0.0);
-    case 'Int':
-    case 'Float':
-      return 0;
-    default:
-      return null;
-  }
-}
diff --git a/src/demux/db.ts b/src/demux/db.ts
index 1fce6cf3..41abe1b8 100644
--- a/src/demux/db.ts
+++ b/src/demux/db.ts
@@ -1,12 +1,13 @@
 import { ipcRenderer } from 'electron';
 import { SchemaMap } from 'schemas/types';
-import { DatabaseMethod } from 'utils/db/types';
+import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { IPC_ACTIONS } from 'utils/messages';
 import { DatabaseResponse } from '../../utils/ipc/types';
 
-export class DatabaseDemux {
+export class DatabaseDemux extends DatabaseDemuxBase {
   #isElectron: boolean = false;
   constructor(isElectron: boolean) {
+    super();
     this.#isElectron = isElectron;
   }
 
diff --git a/src/initialization.js b/src/initialization.js
deleted file mode 100644
index 13d77cb1..00000000
--- a/src/initialization.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import config from '@/config';
-import SQLiteDatabase from 'frappe/backends/sqlite';
-import fs from 'fs';
-import regionalModelUpdates from '../models/regionalModelUpdates';
-import postStart, { setCurrencySymbols } from '../server/postStart';
-import { DB_CONN_FAILURE } from '../utils/messages';
-import runMigrate from './migrate';
-import { getId } from './telemetry/helpers';
-import telemetry from './telemetry/telemetry';
-import { callInitializeMoneyMaker, getSavePath } from './utils';
-
-export async function createNewDatabase() {
-  const { canceled, filePath } = await getSavePath('books', 'db');
-  if (canceled || filePath.length === 0) {
-    return '';
-  }
-
-  if (fs.existsSync(filePath)) {
-    fs.unlinkSync(filePath);
-  }
-
-  return filePath;
-}
-
-async function runRegionalModelUpdates() {
-  if (!(await frappe.db.knex.schema.hasTable('SingleValue'))) {
-    return;
-  }
-
-  const { country, setupComplete } = await frappe.db.get('AccountingSettings');
-  if (!parseInt(setupComplete)) return;
-  await regionalModelUpdates({ country });
-}
-
-export async function connectToLocalDatabase(filePath) {
-  if (!filePath) {
-    return { connectionSuccess: false, reason: DB_CONN_FAILURE.INVALID_FILE };
-  }
-
-  frappe.auth.login('Administrator');
-  try {
-    frappe.db = new SQLiteDatabase({
-      dbPath: filePath,
-    });
-    await frappe.db.connect();
-  } catch (error) {
-    console.error(error);
-    return { connectionSuccess: false, reason: DB_CONN_FAILURE.CANT_CONNECT };
-  }
-
-  // first init no currency, for migratory needs
-  await callInitializeMoneyMaker();
-
-  try {
-    await runRegionalModelUpdates();
-  } catch (error) {
-    console.error('regional model updates failed', error);
-  }
-
-  try {
-    await runMigrate();
-    await postStart();
-  } catch (error) {
-    if (!error.message.includes('SQLITE_CANTOPEN')) {
-      throw error;
-    }
-
-    console.error(error);
-    return { connectionSuccess: false, reason: DB_CONN_FAILURE.CANT_OPEN };
-  }
-
-  // set file info in config
-  const { companyName } = frappe.AccountingSettings;
-  let files = config.get('files') || [];
-  if (
-    !files.find(
-      (file) => file.filePath === filePath && file.companyName === companyName
-    )
-  ) {
-    files = [
-      {
-        companyName,
-        id: getId(),
-        filePath,
-      },
-      ...files.filter((file) => file.filePath !== filePath),
-    ];
-    config.set('files', files);
-  }
-
-  // set last selected file
-  config.set('lastSelectedFilePath', filePath);
-
-  // second init with currency, normal usage
-  await callInitializeMoneyMaker();
-  await telemetry.start();
-
-  if (frappe.store.isDevelopment) {
-    // @ts-ignore
-    window.telemetry = telemetry;
-  }
-
-  return { connectionSuccess: true, reason: '' };
-}
-
-export async function purgeCache(purgeAll = false) {
-  const filterFunction = purgeAll
-    ? () => true
-    : (d) => frappe.docs[d][d] instanceof frappe.Meta;
-
-  Object.keys(frappe.docs)
-    .filter(filterFunction)
-    .forEach((d) => {
-      frappe.removeFromCache(d, d);
-      delete frappe[d];
-    });
-
-  if (purgeAll) {
-    delete frappe.db;
-    const models = (await import('../models')).default;
-    await frappe.initializeAndRegister(models, true);
-  }
-}
-
-export async function postSetup() {
-  await setCurrencySymbols();
-}
diff --git a/src/migrate.js b/src/migrate.js
deleted file mode 100644
index ab745cdb..00000000
--- a/src/migrate.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import frappe from 'frappe';
-import runPatches from 'frappe/model/runPatches';
-import patches from '../patches/patches.json';
-
-export default async function runMigrate() {
-  const canRunPatches = await getCanRunPatches();
-  if (!canRunPatches) {
-    return await frappe.db.migrate();
-  }
-
-  const patchList = await fetchPatchList();
-  await runPatches(patchList.filter(({ beforeMigrate }) => beforeMigrate));
-  await frappe.db.migrate();
-  await runPatches(patchList.filter(({ beforeMigrate }) => !beforeMigrate));
-}
-
-async function fetchPatchList() {
-  return await Promise.all(
-    patches.map(async ({ version, fileName, beforeMigrate }) => {
-      if (typeof beforeMigrate === 'undefined') {
-        beforeMigrate = true;
-      }
-
-      const patchName = `${version}/${fileName}`;
-      // This import is pseudo dynamic
-      // webpack runs static analysis on the static portion of the import
-      // i.e. '../patches/' this may break on windows due to the path
-      // delimiter used.
-      //
-      // Only way to fix this is probably upgrading the build from
-      // webpack to something else.
-      const patchFunction = (await import('../patches/' + patchName)).default;
-      return { patchName, patchFunction, beforeMigrate };
-    })
-  );
-}
-
-async function getCanRunPatches() {
-  return (
-    (
-      await frappe.db
-        .knex('sqlite_master')
-        .where({ type: 'table', name: 'PatchRun' })
-        .select('name')
-    ).length > 0
-  );
-}
diff --git a/src/types/model.ts b/src/types/model.ts
deleted file mode 100644
index 4a50a29a..00000000
--- a/src/types/model.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-export type Map = {
-  [key: string]: unknown;
-};
-
-export enum FieldType {
-  Data = 'Data',
-  Select = 'Select',
-  Link = 'Link',
-  Date = 'Date',
-  Table = 'Table',
-  AutoComplete = 'AutoComplete',
-  Check = 'Check',
-  AttachImage = 'AttachImage',
-  DynamicLink = 'DynamicLink',
-  Int = 'Int',
-  Float = 'Float',
-  Currency = 'Currency',
-  Text = 'Text',
-  Color = 'Color',
-}
-
-export interface Field {
-  fieldname: string;
-  fieldtype: FieldType;
-  label: string;
-  childtype?: string;
-  target?: string;
-  default?: unknown;
-  required?: number;
-  readOnly?: number;
-  hidden?: number | Function;
-  options?: string[];
-  description?: string;
-}
-
-export interface Doc {
-  name: string;
-  set: (fieldname: Map | string, value?: unknown) => Promise<void>;
-  insert: () => Promise<void>;
-  submit: () => Promise<void>;
-}
-
-export interface Model {
-  label?: string;
-  name: string;
-  doctype?: string;
-  fields: Field[];
-  isSingle?: number; // boolean
-  regional?: number; // boolean
-  augmented?: number; // boolean
-  keywordFields?: string[];
-  quickEditFields?: string[];
-}
\ No newline at end of file
diff --git a/tests/testFrappe.spec.ts b/tests/testFrappe.spec.ts
new file mode 100644
index 00000000..9f5d8ebe
--- /dev/null
+++ b/tests/testFrappe.spec.ts
@@ -0,0 +1,12 @@
+import 'mocha';
+import { DatabaseManager } from '../backend/database/manager';
+import { Frappe } from '../frappe';
+
+describe('Frappe', function () {
+  const frappe = new Frappe(DatabaseManager);
+
+  specify('Init', async function () {
+    await frappe.init();
+    await frappe.db.connectToDatabase(':memory:');
+  });
+});
diff --git a/utils/db/types.ts b/utils/db/types.ts
index f25170bb..56403d34 100644
--- a/utils/db/types.ts
+++ b/utils/db/types.ts
@@ -6,6 +6,8 @@
  * match on both ends.
  */
 
+import { SchemaMap } from "schemas/types";
+
 type UnknownMap = Record<string, unknown>;
 export abstract class DatabaseBase {
   // Create
@@ -61,3 +63,21 @@ export interface GetAllOptions {
 }
 
 export type QueryFilter = Record<string, string | string[]>;
+
+
+/**
+ * DatabaseDemuxBase is an abstract class that ensures that the function signatures
+ * match between the DatabaseManager and the DatabaseDemux.
+ * 
+ * This allows testing the frontend code while directly plugging in the DatabaseManager
+ * and bypassing all the API and IPC calls.
+ */
+export abstract class DatabaseDemuxBase {
+  abstract getSchemaMap(): Promise<SchemaMap> | SchemaMap
+
+  abstract createNewDatabase(dbPath: string, countryCode?: string): Promise<void> 
+
+  abstract connectToDatabase(dbPath: string, countryCode?: string): Promise<void> 
+
+  abstract call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown> 
+}

From 9e71466b829cf87bda345559539ea7259c31d68d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 8 Apr 2022 11:00:52 +0530
Subject: [PATCH 033/163] refactor: use one schema for Customer and Supplier

---
 schemas/app/Party.json               | 23 +++++++++-
 schemas/app/Supplier.json            |  5 ---
 schemas/schemas.ts                   |  7 +--
 schemas/{app => tests}/Customer.json |  0
 schemas/tests/Party.json             | 65 ++++++++++++++++++++++++++++
 schemas/tests/helpers.ts             |  4 +-
 6 files changed, 90 insertions(+), 14 deletions(-)
 delete mode 100644 schemas/app/Supplier.json
 rename schemas/{app => tests}/Customer.json (100%)
 create mode 100644 schemas/tests/Party.json

diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index ae18d0fc..f197bade 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -1,7 +1,6 @@
 {
   "name": "Party",
   "label": "Party",
-  "isAbstract": true,
   "fields": [
     {
       "fieldname": "name",
@@ -15,6 +14,27 @@
       "label": "Image",
       "fieldtype": "AttachImage"
     },
+    {
+      "fieldname": "role",
+      "label": "Role",
+      "fieldtype": "Select",
+      "default": "Both",
+      "options": [
+        {
+          "value": "Both",
+          "label": "Both"
+        },
+        {
+          "value": "Supplier",
+          "label": "Supplier"
+        },
+        {
+          "value": "Customer",
+          "label": "Customer"
+        }
+      ],
+      "required": true
+    },
     {
       "fieldname": "defaultAccount",
       "label": "Default Account",
@@ -56,6 +76,7 @@
   ],
   "quickEditFields": [
     "email",
+    "role",
     "phone",
     "address",
     "defaultAccount",
diff --git a/schemas/app/Supplier.json b/schemas/app/Supplier.json
deleted file mode 100644
index 7db93805..00000000
--- a/schemas/app/Supplier.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "Supplier",
-  "label": "Supplier",
-  "extends": "Party"
-}
\ No newline at end of file
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index 1eeae100..527417c6 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -5,13 +5,12 @@ import Address from './app/Address.json';
 import Color from './app/Color.json';
 import CompanySettings from './app/CompanySettings.json';
 import Currency from './app/Currency.json';
-import Customer from './app/Customer.json';
 import GetStarted from './app/GetStarted.json';
 import Item from './app/Item.json';
 import JournalEntry from './app/JournalEntry.json';
 import JournalEntryAccount from './app/JournalEntryAccount.json';
 import NumberSeries from './app/NumberSeries.json';
-import Party from './app/Party.json';
+import Party from './tests/Party.json';
 import Payment from './app/Payment.json';
 import PaymentFor from './app/PaymentFor.json';
 import PrintSettings from './app/PrintSettings.json';
@@ -21,7 +20,6 @@ import SalesInvoice from './app/SalesInvoice.json';
 import SalesInvoiceItem from './app/SalesInvoiceItem.json';
 import SalesInvoiceSettings from './app/SalesInvoiceSettings.json';
 import SetupWizard from './app/SetupWizard.json';
-import Supplier from './app/Supplier.json';
 import Tax from './app/Tax.json';
 import TaxDetail from './app/TaxDetail.json';
 import TaxSummary from './app/TaxSummary.json';
@@ -63,9 +61,6 @@ export const appSchemas: Schema[] | SchemaStub[] = [
   AccountingLedgerEntry as Schema,
 
   Party as Schema,
-  Supplier as SchemaStub,
-  Customer as SchemaStub,
-
   Address as Schema,
   Item as Schema,
 
diff --git a/schemas/app/Customer.json b/schemas/tests/Customer.json
similarity index 100%
rename from schemas/app/Customer.json
rename to schemas/tests/Customer.json
diff --git a/schemas/tests/Party.json b/schemas/tests/Party.json
new file mode 100644
index 00000000..ae18d0fc
--- /dev/null
+++ b/schemas/tests/Party.json
@@ -0,0 +1,65 @@
+{
+  "name": "Party",
+  "label": "Party",
+  "isAbstract": true,
+  "fields": [
+    {
+      "fieldname": "name",
+      "label": "Name",
+      "fieldtype": "Data",
+      "required": true,
+      "placeholder": "Full Name"
+    },
+    {
+      "fieldname": "image",
+      "label": "Image",
+      "fieldtype": "AttachImage"
+    },
+    {
+      "fieldname": "defaultAccount",
+      "label": "Default Account",
+      "fieldtype": "Link",
+      "target": "Account"
+    },
+    {
+      "fieldname": "outstandingAmount",
+      "label": "Outstanding Amount",
+      "fieldtype": "Currency"
+    },
+    {
+      "fieldname": "currency",
+      "label": "Currency",
+      "fieldtype": "Link",
+      "target": "Currency",
+      "placeholder": "INR"
+    },
+    {
+      "fieldname": "email",
+      "label": "Email",
+      "fieldtype": "Data",
+      "placeholder": "john@doe.com"
+    },
+    {
+      "fieldname": "phone",
+      "label": "Phone",
+      "fieldtype": "Data",
+      "placeholder": "Phone"
+    },
+    {
+      "fieldname": "address",
+      "label": "Address",
+      "fieldtype": "Link",
+      "target": "Address",
+      "placeholder": "Click to create",
+      "inline": true
+    }
+  ],
+  "quickEditFields": [
+    "email",
+    "phone",
+    "address",
+    "defaultAccount",
+    "currency"
+  ],
+  "keywordFields": ["name"]
+}
diff --git a/schemas/tests/helpers.ts b/schemas/tests/helpers.ts
index 0d9cd837..ab665d2e 100644
--- a/schemas/tests/helpers.ts
+++ b/schemas/tests/helpers.ts
@@ -1,11 +1,11 @@
 import { cloneDeep } from 'lodash';
 import Account from '../app/Account.json';
-import Customer from '../app/Customer.json';
 import JournalEntry from '../app/JournalEntry.json';
 import JournalEntryAccount from '../app/JournalEntryAccount.json';
-import Party from '../app/Party.json';
 import PartyRegional from '../regional/in/Party.json';
 import { Schema, SchemaStub, SchemaStubMap } from '../types';
+import Customer from './Customer.json';
+import Party from './Party.json';
 
 interface AppSchemaMap extends SchemaStubMap {
   Account: SchemaStub;

From 0201844fd05b6060f32355fcc7d9a118acde48de Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 8 Apr 2022 11:40:04 +0530
Subject: [PATCH 034/163] refactor: properly type naming - remove redundant
 files - change getDoc and getNewDoc

---
 accounting/importCOA.js                       |   3 +-
 accounting/ledgerPosting.js                   |  13 ++-
 frappe/core/dbHandler.ts                      |   2 +-
 frappe/model/naming.ts                        |  98 ++++++++---------
 models/doctype/Payment/PaymentServer.js       |   8 +-
 .../SalesInvoice/SalesInvoicePrint.vue        |   6 +-
 .../Transaction/TransactionDocument.js        |   3 +-
 .../doctype/Transaction/TransactionServer.js  |   7 +-
 patches/0.0.3/makePaymentRefIdNullable.js     |  28 -----
 patches/0.0.4/convertCurrencyToStrings.js     |  43 --------
 patches/0.3.2/fixJournalEntryIds.js           | 104 ------------------
 patches/0.3.2/moveNumberSeriesFromSettings.js |  20 ----
 patches/patches.json                          |  22 ----
 reports/GoodsAndServiceTax/BaseGSTR.js        |   9 +-
 schemas/app/AccountingLedgerEntry.json        |   1 +
 schemas/types.ts                              |   2 +
 src/components/InvoiceCustomizer.vue          |   2 +-
 src/components/ReconciliationValidation.vue   |   2 +-
 src/dataImport.ts                             |  27 ++---
 src/pages/InvoiceForm.vue                     |  12 +-
 src/pages/JournalEntryForm.vue                |   2 +-
 src/pages/PrintView/PrintView.vue             |   4 +-
 src/pages/QuickEditForm.vue                   |   2 +-
 src/pages/Settings/TabGeneral.vue             |   4 +-
 src/pages/SetupWizard/SetupWizard.vue         |  34 +++---
 src/pages/SetupWizard/setupCompany.js         |   2 +-
 src/telemetry/helpers.ts                      |  22 +---
 src/utils.js                                  |   2 +-
 tests/testFrappe.spec.ts                      |   4 +-
 29 files changed, 130 insertions(+), 358 deletions(-)
 delete mode 100644 patches/0.0.3/makePaymentRefIdNullable.js
 delete mode 100644 patches/0.0.4/convertCurrencyToStrings.js
 delete mode 100644 patches/0.3.2/fixJournalEntryIds.js
 delete mode 100644 patches/0.3.2/moveNumberSeriesFromSettings.js
 delete mode 100644 patches/patches.json

diff --git a/accounting/importCOA.js b/accounting/importCOA.js
index e9c4bd33..d55fac7c 100644
--- a/accounting/importCOA.js
+++ b/accounting/importCOA.js
@@ -25,8 +25,7 @@ async function importAccounts(children, parentAccount, rootType, rootAccount) {
     const { accountType, accountNumber } = child;
     const accountName = getAccountName(rootName, accountNumber);
     const isGroup = identifyIsGroup(child);
-    const doc = frappe.getNewDoc({
-      doctype: 'Account',
+    const doc = frappe.doc.getNewDoc('Account', {
       name: accountName,
       parentAccount,
       isGroup,
diff --git a/accounting/ledgerPosting.js b/accounting/ledgerPosting.js
index 58a17817..aa83689d 100644
--- a/accounting/ledgerPosting.js
+++ b/accounting/ledgerPosting.js
@@ -27,7 +27,7 @@ export default class LedgerPosting {
 
   async setAccountBalanceChange(accountName, type, amount) {
     const debitAccounts = ['Asset', 'Expense'];
-    const { rootType } = await frappe.getDoc('Account', accountName);
+    const { rootType } = await frappe.doc.getDoc('Account', accountName);
     if (debitAccounts.indexOf(rootType) === -1) {
       const change = type == 'credit' ? amount : amount.neg();
       this.accountEntries.push({
@@ -82,7 +82,10 @@ export default class LedgerPosting {
     });
 
     for (let entry of data) {
-      let entryDoc = await frappe.getDoc('AccountingLedgerEntry', entry.name);
+      let entryDoc = await frappe.doc.getDoc(
+        'AccountingLedgerEntry',
+        entry.name
+      );
       entryDoc.reverted = 1;
       await entryDoc.update();
     }
@@ -145,14 +148,12 @@ export default class LedgerPosting {
 
   async insertEntries() {
     for (let entry of this.entries) {
-      let entryDoc = frappe.getNewDoc({
-        doctype: 'AccountingLedgerEntry',
-      });
+      let entryDoc = frappe.doc.getNewDoc('AccountingLedgerEntry');
       Object.assign(entryDoc, entry);
       await entryDoc.insert();
     }
     for (let entry of this.accountEntries) {
-      let entryDoc = await frappe.getDoc('Account', entry.name);
+      let entryDoc = await frappe.doc.getDoc('Account', entry.name);
       entryDoc.balance = entryDoc.balance.add(entry.balanceChange);
       await entryDoc.update();
     }
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index 70c13d4f..cfd115af 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -72,7 +72,7 @@ export class DatabaseHandler extends DatabaseBase {
 
   async getAll(
     schemaName: string,
-    options: GetAllOptions
+    options: GetAllOptions = {}
   ): Promise<DocValueMap[]> {
     const rawValueMap = (await this.#demux.call(
       'getAll',
diff --git a/frappe/model/naming.ts b/frappe/model/naming.ts
index 45c5d50d..5a7b0ee6 100644
--- a/frappe/model/naming.ts
+++ b/frappe/model/naming.ts
@@ -1,17 +1,24 @@
 import frappe from 'frappe';
+import NumberSeries from 'frappe/models/NumberSeries';
 import { getRandomString } from 'frappe/utils';
+import { BaseError } from 'frappe/utils/errors';
+import { Field, Schema } from 'schemas/types';
+import Doc from './doc';
 
-export async function isNameAutoSet(schemaName: string) {
-  const doc = frappe.doc.getEmptyDoc(schemaName);
-  if (doc.meta.naming === 'autoincrement') {
+export function getNumberSeries(schema: Schema): Field | undefined {
+  const numberSeries = schema.fields.find(
+    (f) => f.fieldname === 'numberSeries'
+  );
+  return numberSeries;
+}
+
+export function isNameAutoSet(schemaName: string): boolean {
+  const schema = frappe.schemaMap[schemaName]!;
+  if (schema.naming === 'autoincrement') {
     return true;
   }
 
-  if (!doc.meta.settings) {
-    return false;
-  }
-
-  const { numberSeries } = await doc.getSettings();
+  const numberSeries = getNumberSeries(schema);
   if (numberSeries) {
     return true;
   }
@@ -19,30 +26,18 @@ export async function isNameAutoSet(schemaName: string) {
   return false;
 }
 
-export async function setName(doc) {
-  if (frappe.isServer) {
-    // if is server, always name again if autoincrement or other
-    if (doc.meta.naming === 'autoincrement') {
-      doc.name = await getNextId(doc.doctype);
-      return;
-    }
+export async function setName(doc: Doc) {
+  // if is server, always name again if autoincrement or other
+  if (doc.schema.naming === 'autoincrement') {
+    doc.name = await getNextId(doc.schemaName);
+    return;
+  }
 
-    // Current, per doc number series
-    if (doc.numberSeries) {
-      doc.name = await getSeriesNext(doc.numberSeries, doc.doctype);
-      return;
-    }
-
-    // Legacy, using doc settings for number series
-    if (doc.meta.settings) {
-      const numberSeries = (await doc.getSettings()).numberSeries;
-      if (!numberSeries) {
-        return;
-      }
-
-      doc.name = await getSeriesNext(numberSeries, doc.doctype);
-      return;
-    }
+  // Current, per doc number series
+  const numberSeries = doc.numberSeries as string | undefined;
+  if (numberSeries !== undefined) {
+    doc.name = await getSeriesNext(numberSeries, doc.schemaName);
+    return;
   }
 
   if (doc.name) {
@@ -50,8 +45,8 @@ export async function setName(doc) {
   }
 
   // name === doctype for Single
-  if (doc.meta.isSingle) {
-    doc.name = doc.meta.name;
+  if (doc.schema.isSingle) {
+    doc.name = doc.schema.name;
     return;
   }
 
@@ -62,54 +57,57 @@ export async function setName(doc) {
   }
 }
 
-export async function getNextId(doctype) {
+export async function getNextId(schemaName: string) {
   // get the last inserted row
-  let lastInserted = await getLastInserted(doctype);
+  const lastInserted = await getLastInserted(schemaName);
   let name = 1;
   if (lastInserted) {
-    let lastNumber = parseInt(lastInserted.name);
+    let lastNumber = parseInt(lastInserted.name as string);
     if (isNaN(lastNumber)) lastNumber = 0;
     name = lastNumber + 1;
   }
   return (name + '').padStart(9, '0');
 }
 
-export async function getLastInserted(doctype) {
-  const lastInserted = await frappe.db.getAll({
-    doctype: doctype,
+export async function getLastInserted(schemaName: string) {
+  const lastInserted = await frappe.db.getAll(schemaName, {
     fields: ['name'],
     limit: 1,
-    order_by: 'creation',
+    orderBy: 'creation',
     order: 'desc',
   });
   return lastInserted && lastInserted.length ? lastInserted[0] : null;
 }
 
-export async function getSeriesNext(prefix, doctype) {
-  let series;
+export async function getSeriesNext(prefix: string, schemaName: string) {
+  let series: NumberSeries;
 
   try {
-    series = await frappe.getDoc('NumberSeries', prefix);
+    series = (await frappe.doc.getDoc('NumberSeries', prefix)) as NumberSeries;
   } catch (e) {
-    if (!e.statusCode || e.statusCode !== 404) {
+    const { statusCode } = e as BaseError;
+    if (!statusCode || statusCode !== 404) {
       throw e;
     }
 
-    await createNumberSeries(prefix, doctype);
-    series = await frappe.getDoc('NumberSeries', prefix);
+    await createNumberSeries(prefix, schemaName);
+    series = (await frappe.doc.getDoc('NumberSeries', prefix)) as NumberSeries;
   }
 
-  return await series.next(doctype);
+  return await series.next(schemaName);
 }
 
-export async function createNumberSeries(prefix, referenceType, start = 1001) {
+export async function createNumberSeries(
+  prefix: string,
+  referenceType: string,
+  start = 1001
+) {
   const exists = await frappe.db.exists('NumberSeries', prefix);
   if (exists) {
     return;
   }
 
-  const series = frappe.getNewDoc({
-    doctype: 'NumberSeries',
+  const series = frappe.doc.getNewDoc('NumberSeries', {
     name: prefix,
     start,
     referenceType,
diff --git a/models/doctype/Payment/PaymentServer.js b/models/doctype/Payment/PaymentServer.js
index a9713d8f..b5845477 100644
--- a/models/doctype/Payment/PaymentServer.js
+++ b/models/doctype/Payment/PaymentServer.js
@@ -28,7 +28,7 @@ export default class PaymentServer extends Document {
     }
 
     const doctype = referenceType;
-    const doc = await frappe.getDoc(doctype, referenceName);
+    const doc = await frappe.doc.getDoc(doctype, referenceName);
 
     let party;
     let paymentType;
@@ -147,7 +147,7 @@ export default class PaymentServer extends Document {
       if (!['SalesInvoice', 'PurchaseInvoice'].includes(row.referenceType)) {
         continue;
       }
-      let referenceDoc = await frappe.getDoc(
+      let referenceDoc = await frappe.doc.getDoc(
         row.referenceType,
         row.referenceName
       );
@@ -175,7 +175,7 @@ export default class PaymentServer extends Document {
         let newOutstanding = outstandingAmount.sub(this.amount);
         await referenceDoc.set('outstandingAmount', newOutstanding);
         await referenceDoc.update();
-        let party = await frappe.getDoc('Party', this.party);
+        let party = await frappe.doc.getDoc('Party', this.party);
         await party.updateOutstandingAmount();
       }
     }
@@ -198,7 +198,7 @@ export default class PaymentServer extends Document {
 
   async updateReferenceOutstandingAmount() {
     await this.for.forEach(async ({ amount, referenceType, referenceName }) => {
-      const refDoc = await frappe.getDoc(referenceType, referenceName);
+      const refDoc = await frappe.doc.getDoc(referenceType, referenceName);
       refDoc.setMultiple({
         outstandingAmount: refDoc.outstandingAmount.add(amount),
       });
diff --git a/models/doctype/SalesInvoice/SalesInvoicePrint.vue b/models/doctype/SalesInvoice/SalesInvoicePrint.vue
index 75e6ef67..d6d35f6c 100644
--- a/models/doctype/SalesInvoice/SalesInvoicePrint.vue
+++ b/models/doctype/SalesInvoice/SalesInvoicePrint.vue
@@ -84,15 +84,15 @@ export default {
       await this.getFont();
     },
     async getTemplate() {
-      let invoiceSettings = await frappe.getDoc('SalesInvoiceSettings');
+      let invoiceSettings = await frappe.doc.getDoc('SalesInvoiceSettings');
       this.template = invoiceTemplates[invoiceSettings.template];
     },
     async getColor() {
-      let invoiceSettings = await frappe.getDoc('SalesInvoiceSettings');
+      let invoiceSettings = await frappe.doc.getDoc('SalesInvoiceSettings');
       this.themeColor = invoiceSettings.themeColor;
     },
     async getFont() {
-      let invoiceSettings = await frappe.getDoc('SalesInvoiceSettings');
+      let invoiceSettings = await frappe.doc.getDoc('SalesInvoiceSettings');
       this.font = invoiceSettings.font;
     },
     async toggleCustomizer() {
diff --git a/models/doctype/Transaction/TransactionDocument.js b/models/doctype/Transaction/TransactionDocument.js
index 49faf74b..6ca2dc4a 100644
--- a/models/doctype/Transaction/TransactionDocument.js
+++ b/models/doctype/Transaction/TransactionDocument.js
@@ -49,7 +49,8 @@ export default class TransactionDocument extends Document {
 
   async getTax(tax) {
     if (!this._taxes) this._taxes = {};
-    if (!this._taxes[tax]) this._taxes[tax] = await frappe.getDoc('Tax', tax);
+    if (!this._taxes[tax])
+      this._taxes[tax] = await frappe.doc.getDoc('Tax', tax);
     return this._taxes[tax];
   }
 
diff --git a/models/doctype/Transaction/TransactionServer.js b/models/doctype/Transaction/TransactionServer.js
index c2ddb296..fe995bcc 100644
--- a/models/doctype/Transaction/TransactionServer.js
+++ b/models/doctype/Transaction/TransactionServer.js
@@ -35,7 +35,10 @@ export default {
       outstandingAmount: this.baseGrandTotal,
     });
 
-    let party = await frappe.getDoc('Party', this.customer || this.supplier);
+    let party = await frappe.doc.getDoc(
+      'Party',
+      this.customer || this.supplier
+    );
     await party.updateOutstandingAmount();
   },
 
@@ -43,7 +46,7 @@ export default {
     let paymentRefList = await this.getPayments();
     for (let paymentFor of paymentRefList) {
       const paymentReference = paymentFor.parent;
-      const payment = await frappe.getDoc('Payment', paymentReference);
+      const payment = await frappe.doc.getDoc('Payment', paymentReference);
       const paymentEntries = await payment.getPosting();
       await paymentEntries.postReverse();
       // To set the payment status as unsubmitted.
diff --git a/patches/0.0.3/makePaymentRefIdNullable.js b/patches/0.0.3/makePaymentRefIdNullable.js
deleted file mode 100644
index 7d9685e6..00000000
--- a/patches/0.0.3/makePaymentRefIdNullable.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import frappe from 'frappe';
-
-export default async function execute() {
-  // Since sqlite has no ALTER TABLE to change column meta
-  // the table has to be _Prestiged_.
-  const tableInfo = await frappe.db.sql('pragma table_info("Payment")');
-  const referenceId = tableInfo.find(({ name }) => name === 'referenceId');
-  if (!referenceId || !referenceId.notnull) {
-    return;
-  }
-
-  await frappe.db.createTable('Payment', '__Payment');
-  await frappe.db.sql('insert into __Payment select * from Payment');
-
-  const mainCount = await frappe.db.knex
-    .table('Payment')
-    .count('name as count');
-  const replCount = await frappe.db.knex
-    .table('__Payment')
-    .count('name as count');
-
-  if (mainCount[0].count === replCount[0].count) {
-    await frappe.db.knex.schema.dropTable('Payment');
-    await frappe.db.knex.schema.renameTable('__Payment', 'Payment');
-  } else {
-    await frappe.db.knex.schema.dropTable('__Payment');
-  }
-}
diff --git a/patches/0.0.4/convertCurrencyToStrings.js b/patches/0.0.4/convertCurrencyToStrings.js
deleted file mode 100644
index dbcdb96c..00000000
--- a/patches/0.0.4/convertCurrencyToStrings.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import frappe from 'frappe';
-
-function getTablesToConvert() {
-  // Do not change loops to map, doesn't work for some reason.
-  const toConvert = [];
-  for (let key in frappe.models) {
-    const model = frappe.models[key];
-
-    const fieldsToConvert = [];
-    for (let i in model.fields) {
-      const field = model.fields[i];
-
-      if (field.fieldtype === 'Currency') {
-        fieldsToConvert.push(field.fieldname);
-      }
-    }
-
-    if (fieldsToConvert.length > 0 && !model.isSingle && !model.basedOn) {
-      toConvert.push({ name: key, fields: fieldsToConvert });
-    }
-  }
-
-  return toConvert;
-}
-
-export default async function execute() {
-  const toConvert = getTablesToConvert();
-  for (let { name, fields } of toConvert) {
-    const rows = await frappe.db.knex(name);
-    const convertedRows = rows.map((row) => {
-      for (let field of fields) {
-        row[field] = frappe.pesa(row[field] ?? 0).store;
-      }
-
-      if ('numberFormat' in row) {
-        delete row.numberFormat;
-      }
-
-      return row;
-    });
-    await frappe.db.prestigeTheTable(name, convertedRows);
-  }
-}
diff --git a/patches/0.3.2/fixJournalEntryIds.js b/patches/0.3.2/fixJournalEntryIds.js
deleted file mode 100644
index 30d16e99..00000000
--- a/patches/0.3.2/fixJournalEntryIds.js
+++ /dev/null
@@ -1,104 +0,0 @@
-import { getPaddedName } from '@/utils';
-import frappe from 'frappe';
-import { journalEntryTypeMap } from '../../models/doctype/JournalEntry/JournalEntry';
-
-export async function getCorrectedJournalEntries() {
-  const jes = await frappe.db.knex('JournalEntry');
-  const names = new Set();
-  const duplicates = [];
-
-  for (const je of jes) {
-    if (je.name in journalEntryTypeMap) {
-      const entryType = je.name;
-      je.name = je.entryType;
-      je.entryType = entryType;
-    }
-
-    if (names.has(je.name)) {
-      duplicates.push(je);
-    } else {
-      names.add(je.name);
-    }
-  }
-
-  if (duplicates.length === 0) {
-    return { jes, currentMap: {}, nsMap: {} };
-  }
-
-  const nameMap = getNameMap(names);
-  const nsMap = await getNumberSeriesMap(nameMap);
-  const currentMap = {};
-
-  const editedMap = {};
-
-  for (const je of duplicates) {
-    const { prefix } = getNumPrefix(je.name);
-    if (prefix.length === 0) {
-      je.name = `${je.name}-${Math.random().toString(36).slice(2, 7)}`;
-      continue;
-    }
-
-    const newNum = nameMap[prefix].at(-1) + 1;
-    nameMap[prefix].push(newNum);
-    currentMap[prefix] = newNum;
-
-    const newName = getPaddedName(prefix, newNum, nsMap[prefix].padZeros);
-    editedMap[je.name] = newName;
-    je.name = newName;
-  }
-
-  return { jes, currentMap, nsMap };
-}
-
-async function updateCurrent(currentMap, nsMap) {
-  for (const name in currentMap) {
-    nsMap[name].update({ current: currentMap[name] });
-  }
-}
-
-async function getNumberSeriesMap(nameMap) {
-  const nsMap = {};
-  for (const name in nameMap) {
-    nsMap[name] = await frappe.getDoc('NumberSeries', name);
-  }
-  return nsMap;
-}
-
-function getNumPrefix(name) {
-  const mo = name.match(/(\D+)(\d+)$/);
-  const np = { num: '', prefix: '' };
-  if (!mo) {
-    return np;
-  }
-
-  np.prefix = mo[1] ?? '';
-  np.num = mo[2] ?? '';
-  return np;
-}
-
-function getNameMap(names) {
-  const nameMap = {};
-  for (const name of names) {
-    const { num, prefix } = getNumPrefix(name);
-    if (prefix.length === 0) {
-      continue;
-    }
-
-    nameMap[prefix] ??= [];
-    nameMap[prefix].push(parseInt(num));
-  }
-
-  for (const name in nameMap) {
-    nameMap[name].sort();
-  }
-
-  return nameMap;
-}
-
-export default async function execute() {
-  const { jes, currentMap, nsMap } = await getCorrectedJournalEntries();
-  await frappe.db.prestigeTheTable('JournalEntry', jes);
-  if (Object.keys(currentMap).length) {
-    updateCurrent(currentMap, nsMap);
-  }
-}
diff --git a/patches/0.3.2/moveNumberSeriesFromSettings.js b/patches/0.3.2/moveNumberSeriesFromSettings.js
deleted file mode 100644
index def267df..00000000
--- a/patches/0.3.2/moveNumberSeriesFromSettings.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { invertMap } from '@/utils';
-import frappe from 'frappe';
-import { DEFAULT_NUMBER_SERIES } from 'frappe/utils/consts';
-
-async function setReferencesOnNumberSeries() {
-  const map = invertMap(DEFAULT_NUMBER_SERIES);
-  const rows = await frappe.db.knex('NumberSeries');
-  for (const row of rows) {
-    if (row.referenceType === map[row.name]) {
-      return;
-    }
-
-    row.referenceType = map[row.name];
-  }
-  await frappe.db.prestigeTheTable('NumberSeries', rows);
-}
-
-export default async function execute() {
-  await setReferencesOnNumberSeries();
-}
diff --git a/patches/patches.json b/patches/patches.json
deleted file mode 100644
index 2382aaba..00000000
--- a/patches/patches.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "version": "0.0.3",
-    "fileName": "makePaymentRefIdNullable",
-    "beforeMigrate": true
-  },
-  {
-    "version": "0.0.4",
-    "fileName": "convertCurrencyToStrings",
-    "beforeMigrate": true
-  },
-  {
-    "version": "0.3.2",
-    "fileName": "moveNumberSeriesFromSettings",
-    "beforeMigrate": false
-  },
-  {
-    "version": "0.3.2",
-    "fileName": "fixJournalEntryIds",
-    "beforeMigrate": true
-  }
-]
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.js b/reports/GoodsAndServiceTax/BaseGSTR.js
index 20cdfb5a..ce039da7 100644
--- a/reports/GoodsAndServiceTax/BaseGSTR.js
+++ b/reports/GoodsAndServiceTax/BaseGSTR.js
@@ -39,18 +39,21 @@ class BaseGSTR {
   }
 
   async getRow(ledgerEntry) {
-    ledgerEntry = await frappe.getDoc(ledgerEntry.doctype, ledgerEntry.name);
+    ledgerEntry = await frappe.doc.getDoc(
+      ledgerEntry.doctype,
+      ledgerEntry.name
+    );
 
     const row = {};
     const { gstin } = frappe.AccountingSettings;
 
-    let party = await frappe.getDoc(
+    let party = await frappe.doc.getDoc(
       'Party',
       ledgerEntry.customer || ledgerEntry.supplier
     );
 
     if (party.address) {
-      let addressDetails = await frappe.getDoc('Address', party.address);
+      let addressDetails = await frappe.doc.getDoc('Address', party.address);
       row.place = addressDetails.pos || '';
     }
 
diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index ac540180..0dcd5773 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -3,6 +3,7 @@
   "label": "Ledger Entry",
   "isSingle": false,
   "isChild": false,
+  "naming": "autoincrement",
   "fields": [
     {
       "fieldname": "date",
diff --git a/schemas/types.ts b/schemas/types.ts
index 072f9dcd..ec90994b 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -108,6 +108,7 @@ export type Field =
   | NumberField;
 
 export type TreeSettings = { parentField: string };
+export type Naming = 'autoincrement' | 'random' | 'numberSeries'
 
 export interface Schema {
   name: string;                  // Table name
@@ -123,6 +124,7 @@ export interface Schema {
   keywordFields?: string[];      // Used to get fields that are to be used for search.
   quickEditFields?: string[];    // Used to get fields for the quickEditForm
   treeSettings?: TreeSettings;   // Used to determine root nodes
+  naming?: Naming;               // Used for assigning name, default is 'random' else 'numberSeries' if present
 }
 
 export interface SchemaStub extends Partial<Schema> {
diff --git a/src/components/InvoiceCustomizer.vue b/src/components/InvoiceCustomizer.vue
index ab2457f9..68ddba27 100644
--- a/src/components/InvoiceCustomizer.vue
+++ b/src/components/InvoiceCustomizer.vue
@@ -50,7 +50,7 @@ export default {
     };
   },
   async created() {
-    this.doc = await frappe.getDoc('SalesInvoiceSettings');
+    this.doc = await frappe.doc.getDoc('SalesInvoiceSettings');
     this.color.hex = this.doc.themeColor;
     const meta = frappe.getMeta('SalesInvoiceSettings');
     this.fields = meta.fields.filter(
diff --git a/src/components/ReconciliationValidation.vue b/src/components/ReconciliationValidation.vue
index dc1d3f22..a07c31e1 100644
--- a/src/components/ReconciliationValidation.vue
+++ b/src/components/ReconciliationValidation.vue
@@ -66,7 +66,7 @@ export default {
           this.selectedEntries.push(this.entries[i]);
       }
       for (let entry of this.selectedEntries) {
-        const payment = await frappe.getDoc('Payment', entry['Payment Entry']);
+        const payment = await frappe.doc.getDoc('Payment', entry['Payment Entry']);
         const clearanceDate =
           luxon.DateTime.fromFormat(
             entry['Clearance Date'],
diff --git a/src/dataImport.ts b/src/dataImport.ts
index 9c869e4d..2c6e72dc 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -1,6 +1,8 @@
-import { Doc, Field, FieldType, Map } from '@/types/model';
 import frappe from 'frappe';
+import { DocValueMap } from 'frappe/core/types';
+import Doc from 'frappe/model/doc';
 import { isNameAutoSet } from 'frappe/model/naming';
+import { FieldType, FieldTypeEnum } from 'schemas/types';
 import { parseCSV } from './csvParser';
 import telemetry from './telemetry/telemetry';
 import { Noun, Verb } from './telemetry/types';
@@ -25,9 +27,8 @@ type Exclusion = {
   [key: string]: string[];
 };
 
-type ObjectMap = {
-  [key: string]: Map;
-};
+type Map = Record<string, unknown>;
+type ObjectMap = Record<string, Map>;
 
 type LabelTemplateFieldMap = {
   [key: string]: TemplateField;
@@ -51,16 +52,16 @@ interface TemplateField {
 
 function formatValue(value: string, fieldtype: FieldType): unknown {
   switch (fieldtype) {
-    case FieldType.Date:
+    case FieldTypeEnum.Date:
       if (value === '') {
         return '';
       }
       return new Date(value);
-    case FieldType.Currency:
+    case FieldTypeEnum.Currency:
       // @ts-ignore
       return frappe.pesa(value || 0);
-    case FieldType.Int:
-    case FieldType.Float: {
+    case FieldTypeEnum.Int:
+    case FieldTypeEnum.Float: {
       const n = parseFloat(value);
       if (!Number.isNaN(n)) {
         return n;
@@ -115,7 +116,7 @@ function getFilteredDocFields(
         return;
       }
 
-      if (fieldtype === FieldType.Table && childtype) {
+      if (fieldtype === FieldTypeEnum.Table && childtype) {
         tableTypes.push([childtype, fieldname]);
         return;
       }
@@ -363,7 +364,7 @@ export class Importer {
 
   async importData(setLoadingStatus: LoadingStatusCallback): Promise<Status> {
     const status: Status = { success: false, names: [], message: '' };
-    const shouldDeleteName = await isNameAutoSet(this.doctype);
+    const shouldDeleteName = isNameAutoSet(this.doctype);
     const docObjs = this.getDocs();
 
     let entriesMade = 0;
@@ -382,7 +383,7 @@ export class Importer {
         delete docObj[key];
       }
 
-      const doc: Doc = frappe.getEmptyDoc(this.doctype, false);
+      const doc: Doc = frappe.doc.getEmptyDoc(this.doctype, false);
       try {
         await this.makeEntry(doc, docObj);
         entriesMade += 1;
@@ -398,7 +399,7 @@ export class Importer {
         return this.handleError(doc, err as Error, status);
       }
 
-      status.names.push(doc.name);
+      status.names.push(doc.name!);
     }
 
     setLoadingStatus(false, entriesMade, docObjs.length);
@@ -417,7 +418,7 @@ export class Importer {
   }
 
   async makeEntry(doc: Doc, docObj: Map) {
-    await doc.set(docObj);
+    await doc.setMultiple(docObj as DocValueMap);
     await doc.insert();
     if (this.shouldSubmit) {
       await doc.submit();
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index feb5f8ee..1dc936a1 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -205,11 +205,11 @@ import DropdownWithActions from '@/components/DropdownWithActions';
 import PageHeader from '@/components/PageHeader';
 import StatusBadge from '@/components/StatusBadge';
 import {
-  getActionsForDocument,
-  getInvoiceStatus,
-  openSettings,
-  routeTo,
-  showMessageDialog,
+getActionsForDocument,
+getInvoiceStatus,
+openSettings,
+routeTo,
+showMessageDialog
 } from '@/utils';
 import frappe from 'frappe';
 import { handleErrorWithDialog } from '../errorHandling';
@@ -263,7 +263,7 @@ export default {
   },
   async mounted() {
     try {
-      this.doc = await frappe.getDoc(this.doctype, this.name);
+      this.doc = await frappe.doc.getDoc(this.doctype, this.name);
       window.d = this.doc;
     } catch (error) {
       if (error instanceof frappe.errors.NotFoundError) {
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 45411052..13e37dd9 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -192,7 +192,7 @@ export default {
   },
   async mounted() {
     try {
-      this.doc = await frappe.getDoc(this.doctype, this.name);
+      this.doc = await frappe.doc.getDoc(this.doctype, this.name);
       window.je = this.doc;
     } catch (error) {
       if (error instanceof frappe.errors.NotFoundError) {
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index c3bf8093..dd137507 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -56,12 +56,12 @@ import Button from '@/components/Button';
 import PageHeader from '@/components/PageHeader';
 import SearchBar from '@/components/SearchBar';
 import TwoColumnForm from '@/components/TwoColumnForm';
-import { IPC_ACTIONS } from 'utils/messages';
 import telemetry from '@/telemetry/telemetry';
 import { Verb } from '@/telemetry/types';
 import { makePDF } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
+import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
   name: 'PrintView',
@@ -81,7 +81,7 @@ export default {
     };
   },
   async mounted() {
-    this.doc = await frappe.getDoc(this.doctype, this.name);
+    this.doc = await frappe.doc.getDoc(this.doctype, this.name);
     this.printSettings = await frappe.getSingle('PrintSettings');
   },
   computed: {
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 44829d52..c3e14a76 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -186,7 +186,7 @@ export default {
     },
     async fetchDoc() {
       try {
-        this.doc = await frappe.getDoc(this.doctype, this.name);
+        this.doc = await frappe.doc.getDoc(this.doctype, this.name);
 
         this.doc.once('afterRename', () => {
           openQuickEdit({
diff --git a/src/pages/Settings/TabGeneral.vue b/src/pages/Settings/TabGeneral.vue
index cc980d7c..3988ea7d 100644
--- a/src/pages/Settings/TabGeneral.vue
+++ b/src/pages/Settings/TabGeneral.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-import frappe from 'frappe';
 import TwoColumnForm from '@/components/TwoColumnForm';
+import frappe from 'frappe';
 
 export default {
   name: 'TabGeneral',
@@ -27,7 +27,7 @@ export default {
     };
   },
   async mounted() {
-    this.doc = await frappe.getDoc('AccountingSettings', 'AccountingSettings', {
+    this.doc = await frappe.doc.getDoc('AccountingSettings', 'AccountingSettings', {
       skipDocumentCache: true,
     });
   },
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 96e8214b..cae87ca8 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -1,20 +1,14 @@
-import FormControl from '@/components/Controls/FormControl';
-import LanguageSelector from '@/components/Controls/LanguageSelector.vue';
-import Popover from '@/components/Popover';
-import TwoColumnForm from '@/components/TwoColumnForm';
-import config from '@/config';
-import { connectToLocalDatabase, purgeCache } from '@/initialization';
-import { IPC_MESSAGES } from '@/messages';
-import { setLanguageMap, showMessageDialog } from '@/utils';
-import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
-import fs from 'fs';
-import path from 'path';
-import {
-getErrorMessage, handleErrorWithDialog, showErrorDialog
-} from '../../errorHandling';
-import setupCompany from './setupCompany';
-import Slide from './Slide.vue';
+import FormControl from '@/components/Controls/FormControl'; import
+LanguageSelector from '@/components/Controls/LanguageSelector.vue'; import
+Popover from '@/components/Popover'; import TwoColumnForm from
+'@/components/TwoColumnForm'; import config from '@/config'; import {
+connectToLocalDatabase, purgeCache } from '@/initialization'; import {
+IPC_MESSAGES } from '@/messages'; import { setLanguageMap, showMessageDialog }
+from '@/utils'; import { ipcRenderer } from 'electron'; import frappe from
+'frappe'; import fs from 'fs'; import path from 'path'; import {
+getErrorMessage, handleErrorWithDialog, showErrorDialog } from
+'../../errorHandling'; import setupCompany from './setupCompany'; import Slide
+from './Slide.vue';
 <template>
   <div>
     <Slide
@@ -119,7 +113,9 @@ import frappe from 'frappe';
 import fs from 'fs';
 import path from 'path';
 import {
-getErrorMessage, handleErrorWithDialog, showErrorDialog
+  getErrorMessage,
+  handleErrorWithDialog,
+  showErrorDialog,
 } from '../../errorHandling';
 import setupCompany from './setupCompany';
 import Slide from './Slide.vue';
@@ -154,7 +150,7 @@ export default {
       this.index = 1;
     }
 
-    this.doc = await frappe.getNewDoc({ doctype: 'SetupWizard' });
+    this.doc = await frappe.doc.getNewDoc('SetupWizard');
     this.doc.on('change', () => {
       this.valuesFilled = this.allValuesFilled();
     });
diff --git a/src/pages/SetupWizard/setupCompany.js b/src/pages/SetupWizard/setupCompany.js
index a8238f76..75d235e6 100644
--- a/src/pages/SetupWizard/setupCompany.js
+++ b/src/pages/SetupWizard/setupCompany.js
@@ -163,7 +163,7 @@ async function checkAndCreateDoc(docObject) {
     return;
   }
 
-  const doc = await frappe.getNewDoc(docObject);
+  const doc = await frappe.doc.getNewDoc(docObject.doctype, docObject);
   return doc.insert();
 }
 
diff --git a/src/telemetry/helpers.ts b/src/telemetry/helpers.ts
index 0f16487f..5f80c425 100644
--- a/src/telemetry/helpers.ts
+++ b/src/telemetry/helpers.ts
@@ -1,7 +1,7 @@
 import config, { ConfigFile, ConfigKeys, TelemetrySetting } from '@/config';
-import { IPC_ACTIONS } from 'utils/messages';
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'frappe';
+import { IPC_ACTIONS } from 'utils/messages';
 import { DoctypeName } from '../../models/types';
 import { Count, UniqueId } from './types';
 
@@ -34,6 +34,7 @@ export async function getCounts(): Promise<Count> {
     DoctypeName.PurchaseInvoiceItem,
     DoctypeName.JournalEntry,
     DoctypeName.JournalEntryAccount,
+    DoctypeName.Party,
     DoctypeName.Account,
     DoctypeName.Tax,
   ];
@@ -46,27 +47,10 @@ export async function getCounts(): Promise<Count> {
 
   type CountResponse = { 'count(*)': number }[];
   for (const name of interestingDocs) {
-    // @ts-ignore
-    const queryResponse: CountResponse = await frappe.db.knex(name).count();
-    const count: number = queryResponse[0]['count(*)'];
+    const count: number = (await frappe.db.getAll(name)).length;
     countMap[name] = count;
   }
 
-  // @ts-ignore
-  const supplierCount: CountResponse = await frappe.db
-    .knex('Party')
-    .count()
-    .where({ supplier: 1 });
-
-  // @ts-ignore
-  const customerCount: CountResponse = await frappe.db
-    .knex('Party')
-    .count()
-    .where({ customer: 1 });
-
-  countMap[DoctypeName.Customer] = customerCount[0]['count(*)'];
-  countMap[DoctypeName.Supplier] = supplierCount[0]['count(*)'];
-
   return countMap;
 }
 
diff --git a/src/utils.js b/src/utils.js
index e23947f4..28c3648f 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -90,7 +90,7 @@ export async function cancelDocWithPrompt(doc) {
         {
           label: t`Yes`,
           async action() {
-            const entryDoc = await frappe.getDoc(doc.doctype, doc.name);
+            const entryDoc = await frappe.doc.getDoc(doc.doctype, doc.name);
             entryDoc.cancelled = 1;
             await entryDoc.update();
             entryDoc
diff --git a/tests/testFrappe.spec.ts b/tests/testFrappe.spec.ts
index 9f5d8ebe..5c5b92c6 100644
--- a/tests/testFrappe.spec.ts
+++ b/tests/testFrappe.spec.ts
@@ -6,7 +6,7 @@ describe('Frappe', function () {
   const frappe = new Frappe(DatabaseManager);
 
   specify('Init', async function () {
-    await frappe.init();
-    await frappe.db.connectToDatabase(':memory:');
+    // await frappe.init();
+    // await frappe.db.connectToDatabase(':memory:');
   });
 });

From d69dec1ca760a9f69a55b7873a6fde6072658fc9 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 8 Apr 2022 12:29:42 +0530
Subject: [PATCH 035/163] incr: type translation

---
 frappe/models/index.ts                        |  2 +-
 frappe/utils/{consts.js => consts.ts}         |  0
 frappe/utils/index.js                         | 78 -------------------
 frappe/utils/index.ts                         | 52 +++++++++++++
 .../utils/{translation.js => translation.ts}  | 32 +++++---
 package.json                                  |  1 +
 src/getLanguageMap.ts                         | 10 +--
 utils/types.ts                                |  2 +
 yarn.lock                                     | 12 +--
 9 files changed, 86 insertions(+), 103 deletions(-)
 rename frappe/utils/{consts.js => consts.ts} (100%)
 delete mode 100644 frappe/utils/index.js
 create mode 100644 frappe/utils/index.ts
 rename frappe/utils/{translation.js => translation.ts} (61%)
 create mode 100644 utils/types.ts

diff --git a/frappe/models/index.ts b/frappe/models/index.ts
index ce29ca97..c9c01faf 100644
--- a/frappe/models/index.ts
+++ b/frappe/models/index.ts
@@ -1,4 +1,4 @@
-import NumberSeries from './NumberSeries.js';
+import NumberSeries from './NumberSeries';
 import SystemSettings from './SystemSettings';
 
 export default {
diff --git a/frappe/utils/consts.js b/frappe/utils/consts.ts
similarity index 100%
rename from frappe/utils/consts.js
rename to frappe/utils/consts.ts
diff --git a/frappe/utils/index.js b/frappe/utils/index.js
deleted file mode 100644
index 23ed1831..00000000
--- a/frappe/utils/index.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { pesa } from 'pesa';
-
-export function slug(str) {
-  return str
-    .replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) {
-      return index == 0 ? letter.toLowerCase() : letter.toUpperCase();
-    })
-    .replace(/\s+/g, '');
-}
-
-export function getRandomString() {
-  return Math.random().toString(36).substr(3);
-}
-
-export async function sleep(seconds) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, seconds * 1000);
-  });
-}
-
-export function getQueryString(params) {
-  if (!params) return '';
-  let parts = [];
-  for (let key in params) {
-    if (key != null && params[key] != null) {
-      parts.push(
-        encodeURIComponent(key) + '=' + encodeURIComponent(params[key])
-      );
-    }
-  }
-  return parts.join('&');
-}
-
-export function asyncHandler(fn) {
-  return (req, res, next) =>
-    Promise.resolve(fn(req, res, next)).catch((err) => {
-      console.log(err);
-      // handle error
-      res.status(err.statusCode || 500).send({ error: err.message });
-    });
-}
-
-/**
- * Returns array from 0 to n - 1
- * @param {Number} n
- */
-export function range(n) {
-  return Array(n)
-    .fill()
-    .map((_, i) => i);
-}
-
-export function unique(list, key = (it) => it) {
-  var seen = {};
-  return list.filter((item) => {
-    var k = key(item);
-    return seen.hasOwnProperty(k) ? false : (seen[k] = true);
-  });
-}
-
-export function getDuplicates(array) {
-  let duplicates = [];
-  for (let i in array) {
-    let previous = array[i - 1];
-    let current = array[i];
-
-    if (current === previous) {
-      if (!duplicates.includes(current)) {
-        duplicates.push(current);
-      }
-    }
-  }
-  return duplicates;
-}
-
-export function isPesa(value) {
-  return value instanceof pesa().constructor;
-}
diff --git a/frappe/utils/index.ts b/frappe/utils/index.ts
new file mode 100644
index 00000000..0af1b050
--- /dev/null
+++ b/frappe/utils/index.ts
@@ -0,0 +1,52 @@
+import { pesa } from 'pesa';
+
+export function slug(str: string) {
+  return str
+    .replace(/(?:^\w|[A-Z]|\b\w)/g, function (letter, index) {
+      return index == 0 ? letter.toLowerCase() : letter.toUpperCase();
+    })
+    .replace(/\s+/g, '');
+}
+
+export function getRandomString() {
+  return Math.random().toString(36).substr(3);
+}
+
+export async function sleep(seconds: number) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, seconds * 1000);
+  });
+}
+
+export function range(n: number) {
+  return Array(n)
+    .fill(null)
+    .map((_, i) => i);
+}
+
+export function unique(list: unknown[], key = (it: unknown) => String(it)) {
+  const seen: Record<string, boolean> = {};
+  return list.filter((item) => {
+    const k = key(item);
+    return seen.hasOwnProperty(k) ? false : (seen[k] = true);
+  });
+}
+
+export function getDuplicates(array: unknown[]) {
+  const duplicates: unknown[] = [];
+  for (const i in array) {
+    const previous = array[parseInt(i) - 1];
+    const current = array[i];
+
+    if (current === previous) {
+      if (!duplicates.includes(current)) {
+        duplicates.push(current);
+      }
+    }
+  }
+  return duplicates;
+}
+
+export function isPesa(value: unknown): boolean {
+  return value instanceof pesa().constructor;
+}
diff --git a/frappe/utils/translation.js b/frappe/utils/translation.ts
similarity index 61%
rename from frappe/utils/translation.js
rename to frappe/utils/translation.ts
index 5a0847d4..bca98963 100644
--- a/frappe/utils/translation.js
+++ b/frappe/utils/translation.ts
@@ -1,3 +1,4 @@
+import { LanguageMap } from 'utils/types';
 import {
   getIndexFormat,
   getIndexList,
@@ -7,7 +8,13 @@ import {
 import { ValueError } from './errors';
 
 class TranslationString {
-  constructor(...args) {
+  args: TemplateStringsArray;
+  argList?: string[];
+  strList?: string[];
+  context?: string;
+  languageMap?: LanguageMap;
+
+  constructor(...args: TemplateStringsArray) {
     this.args = args;
   }
 
@@ -15,12 +22,12 @@ class TranslationString {
     return this.toString();
   }
 
-  ctx(context) {
+  ctx(context?: string) {
     this.context = context;
     return this;
   }
 
-  #formatArg(arg) {
+  #formatArg(arg: string) {
     return arg ?? '';
   }
 
@@ -29,16 +36,16 @@ class TranslationString {
     indexFormat = getWhitespaceSanitized(indexFormat);
 
     const translatedIndexFormat =
-      this.languageMap[indexFormat]?.translation ?? indexFormat;
+      this.languageMap![indexFormat]?.translation ?? indexFormat;
 
     this.argList = getIndexList(translatedIndexFormat).map(
-      (i) => this.argList[i]
+      (i) => this.argList![i]
     );
     this.strList = getSnippets(translatedIndexFormat);
   }
 
   #stitch() {
-    if (!(this.args[0] instanceof Array)) {
+    if (!((this.args[0] as any) instanceof Array)) {
       throw new ValueError(
         `invalid args passed to TranslationString ${
           this.args
@@ -46,15 +53,14 @@ class TranslationString {
       );
     }
 
-    this.strList = this.args[0];
+    this.strList = this.args[0] as any as string[];
     this.argList = this.args.slice(1);
 
     if (this.languageMap) {
       this.#translate();
     }
 
-    return this.strList
-      .map((s, i) => s + this.#formatArg(this.argList[i]))
+    return this.strList!.map((s, i) => s + this.#formatArg(this.argList![i]))
       .join('')
       .replace(/\s+/g, ' ')
       .trim();
@@ -73,14 +79,16 @@ class TranslationString {
   }
 }
 
-export function T(...args) {
+export function T(...args: TemplateStringsArray): TranslationString {
+  // @ts-ignore
   return new TranslationString(...args);
 }
 
-export function t(...args) {
+export function t(...args: TemplateStringsArray): string {
+  // @ts-ignore
   return new TranslationString(...args).s;
 }
 
-export function setLanguageMapOnTranslationString(languageMap) {
+export function setLanguageMapOnTranslationString(languageMap: LanguageMap) {
   TranslationString.prototype.languageMap = languageMap;
 }
diff --git a/package.json b/package.json
index 25e5b7e7..dae51cd5 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "@types/assert": "^1.5.6",
     "@types/electron-devtools-installer": "^2.2.0",
     "@types/lodash": "^4.14.179",
+    "@types/luxon": "^2.3.1",
     "@types/mocha": "^9.1.0",
     "@types/node": "^17.0.23",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
diff --git a/src/getLanguageMap.ts b/src/getLanguageMap.ts
index c9a5e2cb..d0a846ad 100644
--- a/src/getLanguageMap.ts
+++ b/src/getLanguageMap.ts
@@ -11,16 +11,14 @@ const fs = require('fs/promises');
 const path = require('path');
 const fetch = require('node-fetch').default;
 const { splitCsvLine } = require('../scripts/helpers');
+import { LanguageMap } from '../utils/types';
 
 const VALENTINES_DAY = 1644796800000;
 
-type Translation = { translation: string; context?: string };
-type TranslationMap = Record<string, Translation>;
-
 export async function getLanguageMap(
   code: string,
   isDevelopment: boolean = false
-): Promise<TranslationMap> {
+): Promise<LanguageMap> {
   const contents = await getContents(code, isDevelopment);
   return getMapFromContents(contents);
 }
@@ -46,7 +44,7 @@ async function getContents(code: string, isDevelopment: boolean) {
   return contents;
 }
 
-function getMapFromContents(contents: string): TranslationMap {
+function getMapFromContents(contents: string): LanguageMap {
   const lines: string[] = contents.split('\n').slice(1);
   return lines
     .map((l) => splitCsvLine(l) as string[])
@@ -62,7 +60,7 @@ function getMapFromContents(contents: string): TranslationMap {
       }
 
       return acc;
-    }, {} as TranslationMap);
+    }, {} as LanguageMap);
 }
 
 async function getContentsIfExists(code: string): Promise<string> {
diff --git a/utils/types.ts b/utils/types.ts
new file mode 100644
index 00000000..254518a6
--- /dev/null
+++ b/utils/types.ts
@@ -0,0 +1,2 @@
+export type Translation = { translation: string; context?: string };
+export type LanguageMap = Record<string, Translation>;
diff --git a/yarn.lock b/yarn.lock
index f591ad28..9b85286f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1348,6 +1348,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.179.tgz#490ec3288088c91295780237d2497a3aa9dfb5c5"
   integrity sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==
 
+"@types/luxon@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@types/luxon/-/luxon-2.3.1.tgz#e34763178b46232e4c5f079f1706e18692415519"
+  integrity sha512-nAPUltOT28fal2eDZz8yyzNhBjHw1NEymFBP7Q9iCShqpflWPybxHbD7pw/46jQmT+HXOy1QN5hNTms8MOTlOQ==
+
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -7887,12 +7892,7 @@ minimatch@4.2.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
-minimist@^1.2.6:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

From 1329c164c7d33b19d9003defa28d88d08e935537 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 11 Apr 2022 11:34:18 +0530
Subject: [PATCH 036/163] refactor:  convert Customer, Supplier links to Party

---
 schemas/app/AccountingLedgerEntry.json | 12 +++---------
 schemas/app/Payment.json               | 12 +++---------
 schemas/app/PurchaseInvoice.json       |  8 ++++----
 schemas/app/SalesInvoice.json          |  8 ++++----
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index 0dcd5773..b834ad3b 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -18,16 +18,10 @@
       "required": true
     },
     {
-      "fieldname": "customer",
-      "label": "Customer",
+      "fieldname": "party",
+      "label": "Party",
       "fieldtype": "Link",
-      "target": "Customer"
-    },
-    {
-      "fieldname": "supplier",
-      "label": "Supplier",
-      "fieldtype": "Link",
-      "target": "Supplier"
+      "target": "Party"
     },
     {
       "fieldname": "debit",
diff --git a/schemas/app/Payment.json b/schemas/app/Payment.json
index 7aa1463e..f488786d 100644
--- a/schemas/app/Payment.json
+++ b/schemas/app/Payment.json
@@ -13,16 +13,10 @@
       "readOnly": true
     },
     {
-      "fieldname": "customer",
-      "label": "Customer",
+      "fieldname": "party",
+      "label": "Party",
       "fieldtype": "Link",
-      "target": "Customer"
-    },
-    {
-      "fieldname": "supplier",
-      "label": "Supplier",
-      "fieldtype": "Link",
-      "target": "Supplier"
+      "target": "Party"
     },
     {
       "fieldname": "date",
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 73415488..1c2e4138 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -19,10 +19,10 @@
       "fieldtype": "Date"
     },
     {
-      "fieldname": "supplier",
-      "label": "Supplier",
+      "fieldname": "party",
+      "label": "Party",
       "fieldtype": "Link",
-      "target": "Supplier",
+      "target": "Party",
       "required": true
     },
     {
@@ -106,5 +106,5 @@
       "default": "PINV-"
     }
   ],
-  "keywordFields": ["name", "supplier", "numberSeries"]
+  "keywordFields": ["name", "party", "numberSeries"]
 }
\ No newline at end of file
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 11b93d6a..521a8e68 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -4,7 +4,7 @@
   "isSingle": false,
   "isChild": false,
   "isSubmittable": true,
-  "keywordFields": ["name", "customer"],
+  "keywordFields": ["name", "party"],
   "fields": [
     {
       "label": "Invoice No",
@@ -19,10 +19,10 @@
       "fieldtype": "Date"
     },
     {
-      "fieldname": "customer",
-      "label": "Customer",
+      "fieldname": "party",
+      "label": "Party",
       "fieldtype": "Link",
-      "target": "Customer",
+      "target": "Party",
       "required": true
     },
     {

From c1482b0d2f182dfc88911c0a827f1b88471292bf Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 11 Apr 2022 11:34:55 +0530
Subject: [PATCH 037/163] incr: convert knex calls to dbHandler calls - add
 callBespoke

---
 accounting/gst.js                      | 14 +++---
 backend/database/bespoke.ts            | 67 +++++++++++++++++++++++++
 backend/database/manager.ts            | 17 ++++++-
 backend/database/types.ts              |  3 ++
 frappe/core/dbHandler.ts               | 68 ++++++++++++++++++++++++--
 main/registerIpcMainActionListeners.ts | 14 ++++++
 models/doctype/Item/Item.js            |  8 +--
 models/doctype/Party/PartyServer.js    | 12 ++---
 models/doctype/Tax/RegionalEntries.js  |  3 +-
 reports/Cashflow/Cashflow.js           | 26 ++--------
 src/demux/db.ts                        | 16 ++++++
 src/pages/Dashboard/Expenses.vue       | 25 ++--------
 src/pages/Dashboard/UnpaidInvoices.vue | 16 ++----
 src/pages/GetStarted.vue               | 30 ++++--------
 src/pages/SetupWizard/setupCompany.js  | 14 ++++--
 src/utils.js                           | 22 ++++++---
 utils/db/types.ts                      |  2 +
 utils/messages.ts                      |  1 +
 18 files changed, 252 insertions(+), 106 deletions(-)
 create mode 100644 backend/database/bespoke.ts

diff --git a/accounting/gst.js b/accounting/gst.js
index 718d71c6..2bb19bbf 100644
--- a/accounting/gst.js
+++ b/accounting/gst.js
@@ -145,9 +145,10 @@ async function generateB2bData(rows) {
       itms: [],
     };
 
-    let items = await frappe.db
-      .knex('SalesInvoiceItem')
-      .where('parent', invRecord.inum);
+    const items = await frappe.db.getAllRaw('SalesInvoiceItem', {
+      fields: ['*'],
+      filters: { parent: invRecord.inum },
+    });
 
     items.forEach((item) => {
       const itemRecord = {
@@ -205,9 +206,10 @@ async function generateB2clData(invoices) {
       itms: [],
     };
 
-    let items = await frappe.db
-      .knex('SalesInvoiceItem')
-      .where('parent', invRecord.inum);
+    const items = await frappe.db.getAllRaw('SalesInvoiceItem', {
+      fields: ['*'],
+      filters: { parent: invRecord.inum },
+    });
 
     items.forEach((item) => {
       const itemRecord = {
diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts
new file mode 100644
index 00000000..f6b18181
--- /dev/null
+++ b/backend/database/bespoke.ts
@@ -0,0 +1,67 @@
+import DatabaseCore from './core';
+import { BespokeFunction } from './types';
+
+export class BespokeQueries {
+  [key: string]: BespokeFunction;
+
+  static async getTopExpenses(
+    db: DatabaseCore,
+    fromDate: string,
+    toDate: string
+  ) {
+    const expenseAccounts = db
+      .knex!.select('name')
+      .from('Account')
+      .where('rootType', 'Expense');
+
+    const topExpenses = await db
+      .knex!.select({
+        total: db.knex!.raw('sum(cast(?? as real)) - sum(cast(?? as real))', [
+          'debit',
+          'credit',
+        ]),
+      })
+      .select('account')
+      .from('AccountingLedgerEntry')
+      .where('account', 'in', expenseAccounts)
+      .whereBetween('date', [fromDate, toDate])
+      .groupBy('account')
+      .orderBy('total', 'desc')
+      .limit(5);
+    return topExpenses;
+  }
+
+  static async getTotalOutstanding(
+    db: DatabaseCore,
+    schemaName: string,
+    fromDate: string,
+    toDate: string
+  ) {
+    return await db.knex!(schemaName)
+      .sum({ total: 'baseGrandTotal' })
+      .sum({ outstanding: 'outstandingAmount' })
+      .where('submitted', true)
+      .whereBetween('date', [fromDate, toDate])
+      .first();
+  }
+
+  static async getCashflow(db: DatabaseCore, fromDate: string, toDate: string) {
+    const cashAndBankAccounts = db.knex!('Account')
+      .select('name')
+      .where('accountType', 'in', ['Cash', 'Bank'])
+      .andWhere('isGroup', false);
+    const dateAsMonthYear = db.knex!.raw('strftime("%m-%Y", ??)', 'date');
+    return await db.knex!('AccountingLedgerEntry')
+      .where('reverted', false)
+      .sum({
+        inflow: 'debit',
+        outflow: 'credit',
+      })
+      .select({
+        'month-year': dateAsMonthYear,
+      })
+      .where('account', 'in', cashAndBankAccounts)
+      .whereBetween('date', [fromDate, toDate])
+      .groupBy(dateAsMonthYear);
+  }
+}
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 53d52e32..edf9d5c3 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -3,9 +3,10 @@ import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { getSchemas } from '../../schemas';
 import { databaseMethodSet } from '../helpers';
 import patches from '../patches';
+import { BespokeQueries } from './bespoke';
 import DatabaseCore from './core';
 import { runPatches } from './runPatch';
-import { Patch } from './types';
+import { BespokeFunction, Patch } from './types';
 
 export class DatabaseManager extends DatabaseDemuxBase {
   db?: DatabaseCore;
@@ -52,6 +53,20 @@ export class DatabaseManager extends DatabaseDemuxBase {
     return response;
   }
 
+  async callBespoke(method: string, ...args: unknown[]): Promise<unknown> {
+    if (!this.#isInitialized) {
+      return;
+    }
+
+    if (!BespokeQueries.hasOwnProperty(method)) {
+      return;
+    }
+
+    // @ts-ignore
+    const queryFunction: BespokeFunction = BespokeQueries[method];
+    return await queryFunction(this.db!, ...args);
+  }
+
   async #migrate(): Promise<void> {
     if (!this.#isInitialized) {
       return;
diff --git a/backend/database/types.ts b/backend/database/types.ts
index ff521c53..6dcf0ab8 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -1,4 +1,5 @@
 import { Field, RawValue } from '../../schemas/types';
+import DatabaseCore from './core';
 import { DatabaseManager } from './manager';
 
 export interface GetQueryBuilderOptions {
@@ -43,3 +44,5 @@ export interface SqliteTableInfo {
   notnull: number; // 0 | 1
   dflt_value: string | null;
 }
+
+export type BespokeFunction = (db:DatabaseCore, ...args: unknown[]) => Promise<unknown>
\ No newline at end of file
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index cfd115af..c8c45f6d 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -11,6 +11,10 @@ import {
   SingleValue,
 } from './types';
 
+type TopExpenses = { account: string; total: number }[];
+type TotalOutstanding = { total: number; outstanding: number };
+type Cashflow = { inflow: number; outflow: number; 'month-year': string }[];
+
 export class DatabaseHandler extends DatabaseBase {
   #frappe: Frappe;
   #demux: DatabaseDemuxBase;
@@ -74,13 +78,34 @@ export class DatabaseHandler extends DatabaseBase {
     schemaName: string,
     options: GetAllOptions = {}
   ): Promise<DocValueMap[]> {
-    const rawValueMap = (await this.#demux.call(
+    const rawValueMap = await this.#getAll(schemaName, options);
+    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap[];
+  }
+
+  async getAllRaw(
+    schemaName: string,
+    options: GetAllOptions = {}
+  ): Promise<DocValueMap[]> {
+    return await this.#getAll(schemaName, options);
+  }
+
+  async count(
+    schemaName: string,
+    options: GetAllOptions = {}
+  ): Promise<number> {
+    const rawValueMap = await this.#getAll(schemaName, options);
+    return rawValueMap.length;
+  }
+
+  async #getAll(
+    schemaName: string,
+    options: GetAllOptions = {}
+  ): Promise<RawValueMap[]> {
+    return (await this.#demux.call(
       'getAll',
       schemaName,
       options
     )) as RawValueMap[];
-
-    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap[];
   }
 
   async getSingleValues(
@@ -123,6 +148,43 @@ export class DatabaseHandler extends DatabaseBase {
     return (await this.#demux.call('exists', schemaName, name)) as boolean;
   }
 
+  /**
+   * Bespoke function
+   *
+   * These are functions to run custom queries that are too complex for
+   * DatabaseCore and require use of knex or raw queries.
+   *
+   * The query logic for these is in backend/database/bespoke.ts
+   */
+  async getTopExpenses(fromDate: string, toDate: string): Promise<TopExpenses> {
+    return (await this.#demux.callBespoke(
+      'getTopExpenses',
+      fromDate,
+      toDate
+    )) as TopExpenses;
+  }
+
+  async getTotalOutstanding(
+    schemaName: string,
+    fromDate: string,
+    toDate: string
+  ): Promise<TotalOutstanding> {
+    return (await this.#demux.callBespoke(
+      'getTotalOutstanding',
+      schemaName,
+      fromDate,
+      toDate
+    )) as TotalOutstanding;
+  }
+
+  async getCashflow(fromDate: string, toDate: string): Promise<Cashflow> {
+    return (await this.#demux.callBespoke(
+      'getCashflow',
+      fromDate,
+      toDate
+    )) as Cashflow;
+  }
+
   #toDocValueMap(
     schemaName: string,
     rawValueMap: RawValueMap | RawValueMap[]
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 03b62b96..0ff30367 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -172,6 +172,20 @@ export default function registerIpcMainActionListeners(main: Main) {
     }
   );
 
+  ipcMain.handle(
+    IPC_ACTIONS.DB_BESPOKE,
+    async (_, method: string, ...args: unknown[]) => {
+      const response: DatabaseResponse = { error: '', data: undefined };
+      try {
+        response.data = await databaseManager.callBespoke(method, ...args);
+      } catch (error) {
+        response.error = error.toString();
+      }
+
+      return response;
+    }
+  );
+
   ipcMain.handle(IPC_ACTIONS.DB_SCHEMA, async (_) => {
     const response: DatabaseResponse = { error: '', data: undefined };
     response.data = await databaseManager.getSchemaMap();
diff --git a/models/doctype/Item/Item.js b/models/doctype/Item/Item.js
index 0ef9fdf6..7833e2cf 100644
--- a/models/doctype/Item/Item.js
+++ b/models/doctype/Item/Item.js
@@ -97,9 +97,11 @@ export default {
       },
       formulaDependsOn: ['itemType'],
       async formula() {
-        const cogs = await frappe.db
-          .knex('Account')
-          .where({ accountType: 'Cost of Goods Sold' });
+        const cogs = await frappe.db.getAllRaw('Account', {
+          filters: {
+            accountType: 'Cost of Goods Sold',
+          },
+        });
         if (cogs.length === 0) {
           return '';
         } else {
diff --git a/models/doctype/Party/PartyServer.js b/models/doctype/Party/PartyServer.js
index 56868140..02b54a24 100644
--- a/models/doctype/Party/PartyServer.js
+++ b/models/doctype/Party/PartyServer.js
@@ -19,13 +19,13 @@ export default class PartyServer extends Document {
   async updateOutstandingAmount() {
     let isCustomer = this.customer;
     let doctype = isCustomer ? 'SalesInvoice' : 'PurchaseInvoice';
-    let partyField = isCustomer ? 'customer' : 'supplier';
 
-    const outstandingAmounts = await frappe.db.knex
-      .select('outstandingAmount')
-      .from(doctype)
-      .where('submitted', 1)
-      .andWhere(partyField, this.name);
+    const outstandingAmounts = (
+      await frappe.db.getAllRaw(doctype, {
+        fields: ['outstandingAmount', 'party'],
+        filters: { submitted: true },
+      })
+    ).filter(({ party }) => party === this.name);
 
     const totalOutstanding = outstandingAmounts
       .map(({ outstandingAmount }) => frappe.pesa(outstandingAmount))
diff --git a/models/doctype/Tax/RegionalEntries.js b/models/doctype/Tax/RegionalEntries.js
index 9e0be5cf..7b33cb8d 100644
--- a/models/doctype/Tax/RegionalEntries.js
+++ b/models/doctype/Tax/RegionalEntries.js
@@ -15,8 +15,7 @@ export default async function generateTaxes(country) {
         const name = `${type}-${percent}`;
 
         // Not cross checking cause hardcoded values.
-        await frappe.db.knex('Tax').where({ name }).del();
-        await frappe.db.knex('TaxDetail').where({ parent: name }).del();
+        await frappe.db.delete('Tax', name);
 
         const details = getTaxDetails(type, percent);
         await newTax.set({ name, details });
diff --git a/reports/Cashflow/Cashflow.js b/reports/Cashflow/Cashflow.js
index 10b3f294..3c0bd08f 100644
--- a/reports/Cashflow/Cashflow.js
+++ b/reports/Cashflow/Cashflow.js
@@ -1,29 +1,13 @@
 import frappe from 'frappe';
 import { DateTime } from 'luxon';
-import { getPeriodList, getFiscalYear } from '../FinancialStatements/FinancialStatements';
+import {
+  getFiscalYear,
+  getPeriodList,
+} from '../FinancialStatements/FinancialStatements';
 
 class Cashflow {
   async run({ fromDate, toDate, periodicity }) {
-    let cashAndBankAccounts = frappe.db
-      .knex('Account')
-      .select('name')
-      .where('accountType', 'in', ['Cash', 'Bank'])
-      .andWhere('isGroup', 0);
-    let dateAsMonthYear = frappe.db.knex.raw('strftime("%m-%Y", ??)', 'date');
-    let res = await frappe.db
-      .knex('AccountingLedgerEntry')
-      .where('reverted', 0)
-      .sum({
-        inflow: 'debit',
-        outflow: 'credit',
-      })
-      .select({
-        'month-year': dateAsMonthYear,
-      })
-      .where('account', 'in', cashAndBankAccounts)
-      .whereBetween('date', [fromDate, toDate])
-      .groupBy(dateAsMonthYear);
-
+    const res = await frappe.db.getCashflow(fromDate, toDate);
     let fiscalYear = await getFiscalYear();
     let periodList = getPeriodList(fromDate, toDate, periodicity, fiscalYear);
 
diff --git a/src/demux/db.ts b/src/demux/db.ts
index 41abe1b8..9cdc8885 100644
--- a/src/demux/db.ts
+++ b/src/demux/db.ts
@@ -78,4 +78,20 @@ export class DatabaseDemux extends DatabaseDemuxBase {
 
     return response.data;
   }
+
+  async callBespoke(method: string, ...args: unknown[]): Promise<unknown> {
+    let response: DatabaseResponse;
+    if (this.#isElectron) {
+      response = await ipcRenderer.invoke(IPC_ACTIONS.DB_BESPOKE, method, ...args);
+    } else {
+      // TODO: API Call
+      response = { error: '', data: undefined };
+    }
+
+    if (response.error) {
+      throw new Error(response.error);
+    }
+
+    return response.data;
+  }
 }
diff --git a/src/pages/Dashboard/Expenses.vue b/src/pages/Dashboard/Expenses.vue
index 3678051b..a71533ab 100644
--- a/src/pages/Dashboard/Expenses.vue
+++ b/src/pages/Dashboard/Expenses.vue
@@ -21,7 +21,9 @@
             <div class="w-3 h-3 rounded-sm" :class="d.class"></div>
             <div class="ml-3">{{ d.account }}</div>
           </div>
-          <p class="whitespace-nowrap">{{ frappe.format(d.total, 'Currency') }}</p>
+          <p class="whitespace-nowrap">
+            {{ frappe.format(d.total, 'Currency') }}
+          </p>
         </div>
       </div>
       <DonutChart
@@ -93,26 +95,7 @@ export default {
   methods: {
     async setData() {
       const { fromDate, toDate } = await getDatesAndPeriodicity(this.period);
-      const expenseAccounts = frappe.db.knex
-        .select('name')
-        .from('Account')
-        .where('rootType', 'Expense');
-
-      let topExpenses = await frappe.db.knex
-        .select({
-          total: frappe.db.knex.raw(
-            'sum(cast(?? as real)) - sum(cast(?? as real))',
-            ['debit', 'credit']
-          ),
-        })
-        .select('account')
-        .from('AccountingLedgerEntry')
-        .where('account', 'in', expenseAccounts)
-        .whereBetween('date', [fromDate, toDate])
-        .groupBy('account')
-        .orderBy('total', 'desc')
-        .limit(5);
-
+      let topExpenses = await frappe.db.getTopExpenses(fromDate, toDate);
       const shades = [
         { class: 'bg-gray-800', hex: theme.backgroundColor.gray['800'] },
         { class: 'bg-gray-600', hex: theme.backgroundColor.gray['600'] },
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index 85de82c8..e2475de7 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -1,7 +1,3 @@
-import Button from '@/components/Button'; import { routeTo } from '@/utils';
-import frappe from 'frappe'; import { getDatesAndPeriodicity } from
-'./getDatesAndPeriodicity'; import PeriodSelector from './PeriodSelector';
-import SectionHeader from './SectionHeader';
 <template>
   <div class="flex justify-between gap-10">
     <div
@@ -128,13 +124,11 @@ export default {
           this.$data[d.periodKey]
         );
 
-        let result = await frappe.db
-          .knex(d.doctype)
-          .sum({ total: 'baseGrandTotal' })
-          .sum({ outstanding: 'outstandingAmount' })
-          .where('submitted', 1)
-          .whereBetween('date', [fromDate, toDate])
-          .first();
+        let result = await frappe.db.getTotalOutstanding(
+          d.doctype,
+          fromDate,
+          toDate
+        );
 
         let { total, outstanding } = result;
         d.total = total ?? 0;
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index c6152834..d0dff313 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -319,51 +319,39 @@ export default {
       }
 
       if (!frappe.GetStarted.itemCreated) {
-        let { count } = (
-          await frappe.db.knex('Item').count('name as count')
-        )[0];
+        const count = await frappe.db.count('Item');
         if (count > 0) {
           toUpdate.itemCreated = 1;
         }
       }
 
       if (!frappe.GetStarted.invoiceCreated) {
-        let { count } = (
-          await frappe.db.knex('SalesInvoice').count('name as count')
-        )[0];
+        const count = await frappe.db.count('SalesInvoice');
         if (count > 0) {
           toUpdate.invoiceCreated = 1;
         }
       }
 
       if (!frappe.GetStarted.customerCreated) {
-        let { count } = (
-          await frappe.db
-            .knex('Party')
-            .where('customer', 1)
-            .count('name as count')
-        )[0];
+        const count = frappe.db.count('Party', {
+          filters: { role: 'Customer' },
+        });
         if (count > 0) {
           toUpdate.customerCreated = 1;
         }
       }
 
       if (!frappe.GetStarted.billCreated) {
-        let { count } = (
-          await frappe.db.knex('PurchaseInvoice').count('name as count')
-        )[0];
+        const count = await frappe.db.count('SalesInvoice');
         if (count > 0) {
           toUpdate.billCreated = 1;
         }
       }
 
       if (!frappe.GetStarted.supplierCreated) {
-        let { count } = (
-          await frappe.db
-            .knex('Party')
-            .where('supplier', 1)
-            .count('name as count')
-        )[0];
+        const count = frappe.db.count('Party', {
+          filters: { role: 'Supplier' },
+        });
         if (count > 0) {
           toUpdate.supplierCreated = 1;
         }
diff --git a/src/pages/SetupWizard/setupCompany.js b/src/pages/SetupWizard/setupCompany.js
index 75d235e6..136615b2 100644
--- a/src/pages/SetupWizard/setupCompany.js
+++ b/src/pages/SetupWizard/setupCompany.js
@@ -136,7 +136,10 @@ export async function checkIfExactRecordAbsent(docObject) {
   const { doctype, name } = docObject;
   const newDocObject = Object.assign({}, docObject);
   delete newDocObject.doctype;
-  const rows = await frappe.db.knex(doctype).where({ name });
+  const rows = await frappe.db.getAllRaw(doctype, {
+    fields: ['*'],
+    filters: { name },
+  });
 
   if (rows.length === 0) {
     return true;
@@ -150,7 +153,7 @@ export async function checkIfExactRecordAbsent(docObject) {
   });
 
   if (!matchList.every(Boolean)) {
-    await frappe.db.knex(doctype).where({ name }).del();
+    await frappe.db.delete(doctype, name);
     return true;
   }
 
@@ -168,9 +171,10 @@ async function checkAndCreateDoc(docObject) {
 }
 
 async function getBankAccountParentName(country) {
-  const parentBankAccount = await frappe.db
-    .knex('Account')
-    .where({ isGroup: true, accountType: 'Bank' });
+  const parentBankAccount = await frappe.db.getAllRaw('Account', {
+    fields: ['*'],
+    filters: { isGroup: true, accountType: 'Bank' },
+  });
 
   if (parentBankAccount.length === 0) {
     // This should not happen if the fixtures are correct.
diff --git a/src/utils.js b/src/utils.js
index 28c3648f..3f8377c8 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -65,12 +65,22 @@ export function deleteDocWithPrompt(doc) {
 export async function cancelDocWithPrompt(doc) {
   let description = t`This action is permanent`;
   if (['SalesInvoice', 'PurchaseInvoice'].includes(doc.doctype)) {
-    const query = await frappe.db
-      .knex('PaymentFor')
-      .join('Payment', 'PaymentFor.parent', 'Payment.name')
-      .select('parent')
-      .where('cancelled', 0)
-      .where('referenceName', doc.name);
+    const payments = (
+      await frappe.db.getAll('Payment', {
+        fields: ['name'],
+        filters: { cancelled: false },
+      })
+    ).map(({ name }) => name);
+
+    const query = (
+      await frappe.db.getAll('PaymentFor', {
+        fields: ['parent'],
+        filters: {
+          referenceName: doc.name,
+        },
+      })
+    ).filter(({ parent }) => payments.includes(parent));
+
     const paymentList = [...new Set(query.map(({ parent }) => parent))];
 
     if (paymentList.length === 1) {
diff --git a/utils/db/types.ts b/utils/db/types.ts
index 56403d34..4937aade 100644
--- a/utils/db/types.ts
+++ b/utils/db/types.ts
@@ -80,4 +80,6 @@ export abstract class DatabaseDemuxBase {
   abstract connectToDatabase(dbPath: string, countryCode?: string): Promise<void> 
 
   abstract call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown> 
+  
+  abstract callBespoke(method: string, ...args: unknown[]): Promise<unknown>
 }
diff --git a/utils/messages.ts b/utils/messages.ts
index d0fbdb55..8ce2e316 100644
--- a/utils/messages.ts
+++ b/utils/messages.ts
@@ -32,6 +32,7 @@ export enum IPC_ACTIONS {
   DB_CREATE = 'db-create',
   DB_CONNECT = 'db-connect',
   DB_CALL = 'db-call',
+  DB_BESPOKE = 'db-bespoke',
   DB_SCHEMA = 'db-schema',
 }
 

From de7131ba1f61799e77fffdc1dee010e706a5ecbf Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 11 Apr 2022 12:30:21 +0530
Subject: [PATCH 038/163] fix: translation.ts typing

---
 frappe/utils/translation.ts | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/frappe/utils/translation.ts b/frappe/utils/translation.ts
index bca98963..ccf5de0e 100644
--- a/frappe/utils/translation.ts
+++ b/frappe/utils/translation.ts
@@ -7,14 +7,17 @@ import {
 } from '../../scripts/helpers';
 import { ValueError } from './errors';
 
+type TranslationArgs = boolean | number | string;
+type TranslationLiteral = TemplateStringsArray | TranslationArgs;
+
 class TranslationString {
-  args: TemplateStringsArray;
-  argList?: string[];
+  args: TranslationLiteral[];
+  argList?: TranslationArgs[];
   strList?: string[];
   context?: string;
   languageMap?: LanguageMap;
 
-  constructor(...args: TemplateStringsArray) {
+  constructor(...args: TranslationLiteral[]) {
     this.args = args;
   }
 
@@ -27,7 +30,7 @@ class TranslationString {
     return this;
   }
 
-  #formatArg(arg: string) {
+  #formatArg(arg: string | number | boolean) {
     return arg ?? '';
   }
 
@@ -54,7 +57,7 @@ class TranslationString {
     }
 
     this.strList = this.args[0] as any as string[];
-    this.argList = this.args.slice(1);
+    this.argList = this.args.slice(1) as TranslationArgs[];
 
     if (this.languageMap) {
       this.#translate();
@@ -79,13 +82,11 @@ class TranslationString {
   }
 }
 
-export function T(...args: TemplateStringsArray): TranslationString {
-  // @ts-ignore
+export function T(...args: string[]): TranslationString {
   return new TranslationString(...args);
 }
 
-export function t(...args: TemplateStringsArray): string {
-  // @ts-ignore
+export function t(...args: TranslationLiteral[]): string {
   return new TranslationString(...args).s;
 }
 

From 309c5c747462769ad29d44590da544b2c21b62b1 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 11 Apr 2022 12:45:35 +0530
Subject: [PATCH 039/163] refactor: remove util calls from frappe - shift demux
 - fix import - add init test

---
 frappe/core/dbHandler.ts      |  3 ++-
 {src => frappe}/demux/db.ts   |  8 ++++++--
 frappe/index.ts               |  2 +-
 frappe/models/NumberSeries.ts |  7 +++++--
 frappe/utils/types.ts         |  6 ++++++
 schemas/schemas.ts            |  2 +-
 src/errorHandling.ts          | 23 +++++++++--------------
 src/utils.js                  |  4 ----
 tests/testFrappe.spec.ts      | 23 +++++++++++++++++++++--
 9 files changed, 51 insertions(+), 27 deletions(-)
 rename {src => frappe}/demux/db.ts (93%)
 create mode 100644 frappe/utils/types.ts

diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index c8c45f6d..747463be 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -1,5 +1,5 @@
-import { DatabaseDemux } from '@/demux/db';
 import { Frappe } from 'frappe';
+import { DatabaseDemux } from 'frappe/demux/db';
 import Money from 'pesa/dist/types/src/money';
 import { FieldType, FieldTypeEnum, RawValue, SchemaMap } from 'schemas/types';
 import { DatabaseBase, DatabaseDemuxBase, GetAllOptions } from 'utils/db/types';
@@ -11,6 +11,7 @@ import {
   SingleValue,
 } from './types';
 
+// Return types of Bespoke Queries
 type TopExpenses = { account: string; total: number }[];
 type TotalOutstanding = { total: number; outstanding: number };
 type Cashflow = { inflow: number; outflow: number; 'month-year': string }[];
diff --git a/src/demux/db.ts b/frappe/demux/db.ts
similarity index 93%
rename from src/demux/db.ts
rename to frappe/demux/db.ts
index 9cdc8885..76b5b8ad 100644
--- a/src/demux/db.ts
+++ b/frappe/demux/db.ts
@@ -1,8 +1,8 @@
 import { ipcRenderer } from 'electron';
 import { SchemaMap } from 'schemas/types';
 import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
+import { DatabaseResponse } from 'utils/ipc/types';
 import { IPC_ACTIONS } from 'utils/messages';
-import { DatabaseResponse } from '../../utils/ipc/types';
 
 export class DatabaseDemux extends DatabaseDemuxBase {
   #isElectron: boolean = false;
@@ -82,7 +82,11 @@ export class DatabaseDemux extends DatabaseDemuxBase {
   async callBespoke(method: string, ...args: unknown[]): Promise<unknown> {
     let response: DatabaseResponse;
     if (this.#isElectron) {
-      response = await ipcRenderer.invoke(IPC_ACTIONS.DB_BESPOKE, method, ...args);
+      response = await ipcRenderer.invoke(
+        IPC_ACTIONS.DB_BESPOKE,
+        method,
+        ...args
+      );
     } else {
       // TODO: API Call
       response = { error: '', data: undefined };
diff --git a/frappe/index.ts b/frappe/index.ts
index 249116d8..77181b36 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -1,4 +1,3 @@
-import { ErrorLog } from '@/errorHandling';
 import { getMoneyMaker, MoneyMaker } from 'pesa';
 import { markRaw } from 'vue';
 import { AuthHandler } from './core/authHandler';
@@ -14,6 +13,7 @@ import {
 import * as errors from './utils/errors';
 import { format } from './utils/format';
 import { t, T } from './utils/translation';
+import { ErrorLog } from './utils/types';
 
 /**
  * Terminology
diff --git a/frappe/models/NumberSeries.ts b/frappe/models/NumberSeries.ts
index ec13f80d..96fbcc50 100644
--- a/frappe/models/NumberSeries.ts
+++ b/frappe/models/NumberSeries.ts
@@ -1,7 +1,10 @@
-import { getPaddedName } from '@/utils';
 import frappe from 'frappe';
 import Doc from 'frappe/model/doc';
 
+function getPaddedName(prefix: string, next: number, padZeros: number): string {
+  return prefix + next.toString().padStart(padZeros ?? 4, '0');
+}
+
 export default class NumberSeries extends Doc {
   validate() {
     const current = this.get('current') as number | null;
@@ -33,6 +36,6 @@ export default class NumberSeries extends Doc {
   }
 
   getPaddedName(next: number): string {
-    return getPaddedName(this.name, next, this.padZeros);
+    return getPaddedName(this.name as string, next, this.padZeros as number);
   }
 }
diff --git a/frappe/utils/types.ts b/frappe/utils/types.ts
new file mode 100644
index 00000000..16c1e9c9
--- /dev/null
+++ b/frappe/utils/types.ts
@@ -0,0 +1,6 @@
+export interface ErrorLog {
+  name: string;
+  message: string;
+  stack?: string;
+  more?: Record<string, unknown>;
+}
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index 527417c6..a6eb8b65 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -10,7 +10,7 @@ import Item from './app/Item.json';
 import JournalEntry from './app/JournalEntry.json';
 import JournalEntryAccount from './app/JournalEntryAccount.json';
 import NumberSeries from './app/NumberSeries.json';
-import Party from './tests/Party.json';
+import Party from './app/Party.json';
 import Payment from './app/Payment.json';
 import PaymentFor from './app/PaymentFor.json';
 import PrintSettings from './app/PrintSettings.json';
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 8bf1075e..476ee615 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -1,24 +1,18 @@
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'frappe';
-import Document from 'frappe/model/document';
+import Doc from 'frappe/model/doc';
 import {
   DuplicateEntryError,
   LinkValidationError,
   MandatoryError,
   ValidationError,
 } from 'frappe/utils/errors';
+import { ErrorLog } from 'frappe/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import config, { ConfigKeys, TelemetrySetting } from './config';
 import telemetry from './telemetry/telemetry';
 import { showMessageDialog, showToast } from './utils';
 
-export interface ErrorLog {
-  name: string;
-  message: string;
-  stack?: string;
-  more?: Record<string, unknown>;
-}
-
 function getCanLog(): boolean {
   const telemetrySetting = config.get(ConfigKeys.Telemetry);
   return telemetrySetting !== TelemetrySetting.dontLogAnything;
@@ -110,22 +104,23 @@ export function handleError(
   }
 }
 
-export function getErrorMessage(e: Error, doc?: Document): string {
+export function getErrorMessage(e: Error, doc?: Doc): string {
   let errorMessage = e.message || t`An error occurred.`;
 
-  const { doctype, name }: { doctype?: unknown; name?: unknown } = doc ?? {};
-  const canElaborate = !!(doctype && name);
+  const { schemaName, name }: { schemaName?: string; name?: string } =
+    doc ?? {};
+  const canElaborate = !!(schemaName && name);
 
   if (e instanceof LinkValidationError && canElaborate) {
-    errorMessage = t`${doctype} ${name} is linked with existing records.`;
+    errorMessage = t`${schemaName} ${name} is linked with existing records.`;
   } else if (e instanceof DuplicateEntryError && canElaborate) {
-    errorMessage = t`${doctype} ${name} already exists.`;
+    errorMessage = t`${schemaName} ${name} already exists.`;
   }
 
   return errorMessage;
 }
 
-export function handleErrorWithDialog(error: Error, doc?: Document) {
+export function handleErrorWithDialog(error: Error, doc?: Doc) {
   const errorMessage = getErrorMessage(error, doc);
   handleError(false, error, { errorMessage, doc });
 
diff --git a/src/utils.js b/src/utils.js
index 3f8377c8..145fb17f 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -614,7 +614,3 @@ export function invertMap(map) {
 
   return inverted;
 }
-
-export function getPaddedName(prefix, next, padZeros) {
-  return prefix + next.toString().padStart(padZeros ?? 4, '0');
-}
diff --git a/tests/testFrappe.spec.ts b/tests/testFrappe.spec.ts
index 5c5b92c6..22160ef6 100644
--- a/tests/testFrappe.spec.ts
+++ b/tests/testFrappe.spec.ts
@@ -1,3 +1,4 @@
+import * as assert from 'assert';
 import 'mocha';
 import { DatabaseManager } from '../backend/database/manager';
 import { Frappe } from '../frappe';
@@ -6,7 +7,25 @@ describe('Frappe', function () {
   const frappe = new Frappe(DatabaseManager);
 
   specify('Init', async function () {
-    // await frappe.init();
-    // await frappe.db.connectToDatabase(':memory:');
+    assert.strictEqual(
+      Object.keys(frappe.schemaMap).length,
+      0,
+      'zero schemas one'
+    );
+    await frappe.init();
+    assert.strictEqual(
+      Object.keys(frappe.schemaMap).length,
+      0,
+      'zero schemas two'
+    );
+
+    await frappe.db.createNewDatabase(':memory:');
+    await frappe.initializeAndRegister({}, true);
+    assert.strictEqual(
+      Object.keys(frappe.schemaMap).length > 0,
+      true,
+      'non zero schemas'
+    );
+    await frappe.db.close();
   });
 });

From cb54100db49cc1b86285725bc186b55052115a8e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 11 Apr 2022 15:11:49 +0530
Subject: [PATCH 040/163] incr: convert simple models to .ts Doc subclass

---
 frappe/model/doc.ts                           |   9 ++
 frappe/model/types.ts                         |  37 ++++-
 models/baseModels/Account/Account.ts          |  50 ++++++
 .../AccountingLedgerEntry.ts                  |   8 +
 .../AccountingSettings/AccountingSettings.ts  |  20 +++
 .../Address/Address.js                        |   0
 .../Address/RegionalChanges.js                |   0
 models/{doctype => baseModels}/Item/Item.js   |   0
 .../{doctype => baseModels}/Item/ItemList.js  |   0
 .../Item/RegionalChanges.js                   |   0
 .../JournalEntry/JournalEntry.js              |   0
 .../JournalEntry/JournalEntryList.js          |   0
 .../JournalEntry/JournalEntryServer.js        |   0
 .../JournalEntryAccount.ts                    |  35 ++++
 .../{doctype => baseModels}/Party/Customer.js |   0
 .../Party/CustomerList.js                     |   0
 models/{doctype => baseModels}/Party/Party.js |   0
 .../Party/PartyList.js                        |   0
 .../Party/PartyServer.js                      |   0
 .../Party/PartyWidget.vue                     |   0
 .../Party/RegionalChanges.js                  |   0
 .../{doctype => baseModels}/Party/Supplier.js |   0
 .../Party/SupplierList.js                     |   0
 .../Payment/Payment.js                        |   0
 .../Payment/PaymentList.js                    |   0
 .../Payment/PaymentServer.js                  |   0
 models/baseModels/PaymentFor/PaymentFor.ts    |  28 ++++
 .../PurchaseInvoice/PurchaseInvoice.js        |   0
 .../PurchaseInvoiceDocument.js                |   0
 .../PurchaseInvoice/PurchaseInvoiceList.js    |   0
 .../PurchaseInvoice/PurchaseInvoiceServer.js  |   0
 .../PurchaseInvoiceItem.js                    |   0
 .../PurchaseInvoiceItem/RegionalChanges.js    |   0
 .../SalesInvoice/InvoiceTemplate.vue          |   0
 .../SalesInvoice/SalesInvoice.js              |   0
 .../SalesInvoice/SalesInvoiceDocument.js      |   0
 .../SalesInvoice/SalesInvoiceList.js          |   0
 .../SalesInvoice/SalesInvoicePrint.vue        |   0
 .../SalesInvoice/SalesInvoiceServer.js        |   0
 .../SalesInvoice/Templates/Base.vue           |   0
 .../SalesInvoice/Templates/Basic.vue          |   0
 .../SalesInvoice/Templates/Business.vue       |   0
 .../SalesInvoice/Templates/Minimal.vue        |   0
 .../SalesInvoiceItem/RegionalChanges.js       |   0
 .../SalesInvoiceItem/SalesInvoiceItem.js      |   0
 models/baseModels/SetupWizard/SetupWizard.ts  |  95 +++++++++++
 .../Tax/RegionalEntries.js                    |   0
 models/{doctype => baseModels}/Tax/Tax.js     |   0
 models/{doctype => baseModels}/Tax/TaxList.js |   0
 .../{doctype => baseModels}/Tax/TaxServer.js  |   0
 models/baseModels/TaxSummary/TaxSummary.ts    |  13 ++
 .../Transaction/Transaction.js                |   0
 .../Transaction/TransactionDocument.js        |   0
 .../Transaction/TransactionServer.js          |   0
 models/doctype/Account/Account.js             |  95 -----------
 models/doctype/Account/AccountDocument.js     |  11 --
 models/doctype/Account/AccountList.js         |   7 -
 .../AccountingLedgerEntry.js                  |  85 ----------
 .../AccountingLedgerEntryList.js              |   7 -
 .../AccountingSettings/AccountingSettings.js  | 129 ---------------
 models/doctype/Color/Color.js                 |  18 ---
 .../CompanySettings/CompanySettings.js        |  27 ----
 models/doctype/Contact/Contact.js             |  78 ---------
 models/doctype/Currency/Currency.js           |  38 -----
 models/doctype/GetStarted/GetStarted.js       |  67 --------
 .../JournalEntryAccount.js                    |  45 ------
 .../JournalEntrySettings.js                   |  10 --
 models/doctype/PaymentFor/PaymentFor.js       |  54 -------
 .../PaymentSettings/PaymentSettings.js        |  10 --
 models/doctype/PrintSettings/PrintSettings.js | 105 ------------
 .../PurchaseInvoiceSettings.js                |  10 --
 .../SalesInvoiceSettings.js                   |  37 -----
 models/doctype/SetupWizard/SetupWizard.js     | 150 ------------------
 models/doctype/TaxDetail/TaxDetail.js         |  26 ---
 models/doctype/TaxSummary/TaxSummary.js       |  34 ----
 utils/db/types.ts                             |  28 ++--
 76 files changed, 309 insertions(+), 1057 deletions(-)
 create mode 100644 models/baseModels/Account/Account.ts
 create mode 100644 models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
 create mode 100644 models/baseModels/AccountingSettings/AccountingSettings.ts
 rename models/{doctype => baseModels}/Address/Address.js (100%)
 rename models/{doctype => baseModels}/Address/RegionalChanges.js (100%)
 rename models/{doctype => baseModels}/Item/Item.js (100%)
 rename models/{doctype => baseModels}/Item/ItemList.js (100%)
 rename models/{doctype => baseModels}/Item/RegionalChanges.js (100%)
 rename models/{doctype => baseModels}/JournalEntry/JournalEntry.js (100%)
 rename models/{doctype => baseModels}/JournalEntry/JournalEntryList.js (100%)
 rename models/{doctype => baseModels}/JournalEntry/JournalEntryServer.js (100%)
 create mode 100644 models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
 rename models/{doctype => baseModels}/Party/Customer.js (100%)
 rename models/{doctype => baseModels}/Party/CustomerList.js (100%)
 rename models/{doctype => baseModels}/Party/Party.js (100%)
 rename models/{doctype => baseModels}/Party/PartyList.js (100%)
 rename models/{doctype => baseModels}/Party/PartyServer.js (100%)
 rename models/{doctype => baseModels}/Party/PartyWidget.vue (100%)
 rename models/{doctype => baseModels}/Party/RegionalChanges.js (100%)
 rename models/{doctype => baseModels}/Party/Supplier.js (100%)
 rename models/{doctype => baseModels}/Party/SupplierList.js (100%)
 rename models/{doctype => baseModels}/Payment/Payment.js (100%)
 rename models/{doctype => baseModels}/Payment/PaymentList.js (100%)
 rename models/{doctype => baseModels}/Payment/PaymentServer.js (100%)
 create mode 100644 models/baseModels/PaymentFor/PaymentFor.ts
 rename models/{doctype => baseModels}/PurchaseInvoice/PurchaseInvoice.js (100%)
 rename models/{doctype => baseModels}/PurchaseInvoice/PurchaseInvoiceDocument.js (100%)
 rename models/{doctype => baseModels}/PurchaseInvoice/PurchaseInvoiceList.js (100%)
 rename models/{doctype => baseModels}/PurchaseInvoice/PurchaseInvoiceServer.js (100%)
 rename models/{doctype => baseModels}/PurchaseInvoiceItem/PurchaseInvoiceItem.js (100%)
 rename models/{doctype => baseModels}/PurchaseInvoiceItem/RegionalChanges.js (100%)
 rename models/{doctype => baseModels}/SalesInvoice/InvoiceTemplate.vue (100%)
 rename models/{doctype => baseModels}/SalesInvoice/SalesInvoice.js (100%)
 rename models/{doctype => baseModels}/SalesInvoice/SalesInvoiceDocument.js (100%)
 rename models/{doctype => baseModels}/SalesInvoice/SalesInvoiceList.js (100%)
 rename models/{doctype => baseModels}/SalesInvoice/SalesInvoicePrint.vue (100%)
 rename models/{doctype => baseModels}/SalesInvoice/SalesInvoiceServer.js (100%)
 rename models/{doctype => baseModels}/SalesInvoice/Templates/Base.vue (100%)
 rename models/{doctype => baseModels}/SalesInvoice/Templates/Basic.vue (100%)
 rename models/{doctype => baseModels}/SalesInvoice/Templates/Business.vue (100%)
 rename models/{doctype => baseModels}/SalesInvoice/Templates/Minimal.vue (100%)
 rename models/{doctype => baseModels}/SalesInvoiceItem/RegionalChanges.js (100%)
 rename models/{doctype => baseModels}/SalesInvoiceItem/SalesInvoiceItem.js (100%)
 create mode 100644 models/baseModels/SetupWizard/SetupWizard.ts
 rename models/{doctype => baseModels}/Tax/RegionalEntries.js (100%)
 rename models/{doctype => baseModels}/Tax/Tax.js (100%)
 rename models/{doctype => baseModels}/Tax/TaxList.js (100%)
 rename models/{doctype => baseModels}/Tax/TaxServer.js (100%)
 create mode 100644 models/baseModels/TaxSummary/TaxSummary.ts
 rename models/{doctype => baseModels}/Transaction/Transaction.js (100%)
 rename models/{doctype => baseModels}/Transaction/TransactionDocument.js (100%)
 rename models/{doctype => baseModels}/Transaction/TransactionServer.js (100%)
 delete mode 100644 models/doctype/Account/Account.js
 delete mode 100644 models/doctype/Account/AccountDocument.js
 delete mode 100644 models/doctype/Account/AccountList.js
 delete mode 100644 models/doctype/AccountingLedgerEntry/AccountingLedgerEntry.js
 delete mode 100644 models/doctype/AccountingLedgerEntry/AccountingLedgerEntryList.js
 delete mode 100644 models/doctype/AccountingSettings/AccountingSettings.js
 delete mode 100644 models/doctype/Color/Color.js
 delete mode 100644 models/doctype/CompanySettings/CompanySettings.js
 delete mode 100644 models/doctype/Contact/Contact.js
 delete mode 100644 models/doctype/Currency/Currency.js
 delete mode 100644 models/doctype/GetStarted/GetStarted.js
 delete mode 100644 models/doctype/JournalEntryAccount/JournalEntryAccount.js
 delete mode 100644 models/doctype/JournalEntrySettings/JournalEntrySettings.js
 delete mode 100644 models/doctype/PaymentFor/PaymentFor.js
 delete mode 100644 models/doctype/PaymentSettings/PaymentSettings.js
 delete mode 100644 models/doctype/PrintSettings/PrintSettings.js
 delete mode 100644 models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js
 delete mode 100644 models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js
 delete mode 100644 models/doctype/SetupWizard/SetupWizard.js
 delete mode 100644 models/doctype/TaxDetail/TaxDetail.js
 delete mode 100644 models/doctype/TaxSummary/TaxSummary.js

diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
index ddab7470..1ffd3e63 100644
--- a/frappe/model/doc.ts
+++ b/frappe/model/doc.ts
@@ -29,8 +29,12 @@ import { setName } from './naming';
 import {
   DefaultMap,
   DependsOnMap,
+  FiltersMap,
   FormulaMap,
+  ListsMap,
+  ListViewSettings,
   RequiredMap,
+  TreeViewSettings,
   ValidationMap,
 } from './types';
 import { validateSelect } from './validationFunction';
@@ -697,4 +701,9 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   validations: ValidationMap = {};
   required: RequiredMap = {};
   dependsOn: DependsOnMap = {};
+
+  static lists: ListsMap = {};
+  static filters: FiltersMap = {};
+  static listSettings: ListViewSettings = {};
+  static treeSettings?: TreeViewSettings;
 }
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
index 894905e1..b86c06db 100644
--- a/frappe/model/types.ts
+++ b/frappe/model/types.ts
@@ -1,4 +1,6 @@
 import { DocValue } from 'frappe/core/types';
+import { FieldType } from 'schemas/types';
+import { QueryFilter } from 'utils/db/types';
 import Doc from './doc';
 
 /**
@@ -13,7 +15,7 @@ import Doc from './doc';
  * - `Validation`: Async function that throw an error if the value is invalid.
  * - `Required`: Regular function used to decide if a value is mandatory (there are !notnul in the db).
  */
-export type Formula = () => Promise<DocValue>;
+export type Formula = () => Promise<DocValue | undefined>;
 export type Default = () => DocValue;
 export type Validation = (value: DocValue) => Promise<void>;
 export type Required = () => boolean;
@@ -23,11 +25,38 @@ export type DefaultMap = Record<string, Default | undefined>;
 export type ValidationMap = Record<string, Validation | undefined>;
 export type RequiredMap = Record<string, Required | undefined>;
 
-export type DependsOnMap = Record<string, string[]>
+export type DependsOnMap = Record<string, string[]>;
 
 /**
  * Should add this for hidden too
  */
 
-export type ModelMap = Record< string, typeof Doc | undefined>
-export type DocMap = Record<string, Doc | undefined>;
\ No newline at end of file
+export type ModelMap = Record<string, typeof Doc | undefined>;
+export type DocMap = Record<string, Doc | undefined>;
+
+// Static Config properties
+
+export type FilterFunction = (doc: Doc) => QueryFilter;
+export type FiltersMap = Record<string, FilterFunction>;
+
+export type ListFunction = () => string[];
+export type ListsMap = Record<string, ListFunction>;
+
+export interface ColumnConfig {
+  label: string;
+  fieldtype: FieldType;
+  size?: string;
+  render?: (doc: Doc) => { template: string };
+  getValue?: (doc: Doc) => string;
+}
+
+export type ListViewColumn = string | ColumnConfig;
+export interface ListViewSettings {
+  formRoute?: (name: string) => string;
+  columns?: ListViewColumn[];
+}
+
+export interface TreeViewSettings {
+  parentField: string;
+  getRootLabel: () => Promise<string>;
+}
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
new file mode 100644
index 00000000..e296306e
--- /dev/null
+++ b/models/baseModels/Account/Account.ts
@@ -0,0 +1,50 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import {
+  FiltersMap,
+  ListViewSettings,
+  TreeViewSettings,
+} from 'frappe/model/types';
+import { QueryFilter } from 'utils/db/types';
+
+export default class Account extends Doc {
+  async beforeInsert() {
+    if (this.accountType || !this.parentAccount) {
+      return;
+    }
+
+    const account = await frappe.db.get(
+      'Account',
+      this.parentAccount as string
+    );
+    this.accountType = account.accountType as string;
+  }
+
+  static listSettings: ListViewSettings = {
+    columns: ['name', 'parentAccount', 'rootType'],
+  };
+
+  static treeSettings: TreeViewSettings = {
+    parentField: 'parentAccount',
+    async getRootLabel(): Promise<string> {
+      const accountingSettings = await frappe.doc.getSingle(
+        'AccountingSettings'
+      );
+      return accountingSettings.companyName as string;
+    },
+  };
+
+  static filters: FiltersMap = {
+    parentAccount: (doc: Doc) => {
+      const filter: QueryFilter = {
+        isGroup: true,
+      };
+
+      if (doc.rootType) {
+        filter.rootType = doc.rootType as string;
+      }
+
+      return filter;
+    },
+  };
+}
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
new file mode 100644
index 00000000..b14e36e0
--- /dev/null
+++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
@@ -0,0 +1,8 @@
+import Doc from 'frappe/model/doc';
+import { ListViewSettings } from 'frappe/model/types';
+
+export class AccountingLedgerEntry extends Doc {
+  static listSettings: ListViewSettings = {
+    columns: ['account', 'party', 'debit', 'credit', 'balance'],
+  };
+}
diff --git a/models/baseModels/AccountingSettings/AccountingSettings.ts b/models/baseModels/AccountingSettings/AccountingSettings.ts
new file mode 100644
index 00000000..f6128e45
--- /dev/null
+++ b/models/baseModels/AccountingSettings/AccountingSettings.ts
@@ -0,0 +1,20 @@
+import Doc from 'frappe/model/doc';
+import { FiltersMap, ListsMap } from 'frappe/model/types';
+import countryInfo from '../../../fixtures/countryInfo.json';
+
+export class AccountingSettings extends Doc {
+  static filters: FiltersMap = {
+    writeOffAccount: () => ({
+      isGroup: false,
+      rootType: 'Expense',
+    }),
+    roundOffAccount: () => ({
+      isGroup: false,
+      rootType: 'Expense',
+    }),
+  };
+
+  static lists: ListsMap = {
+    country: () => Object.keys(countryInfo),
+  };
+}
diff --git a/models/doctype/Address/Address.js b/models/baseModels/Address/Address.js
similarity index 100%
rename from models/doctype/Address/Address.js
rename to models/baseModels/Address/Address.js
diff --git a/models/doctype/Address/RegionalChanges.js b/models/baseModels/Address/RegionalChanges.js
similarity index 100%
rename from models/doctype/Address/RegionalChanges.js
rename to models/baseModels/Address/RegionalChanges.js
diff --git a/models/doctype/Item/Item.js b/models/baseModels/Item/Item.js
similarity index 100%
rename from models/doctype/Item/Item.js
rename to models/baseModels/Item/Item.js
diff --git a/models/doctype/Item/ItemList.js b/models/baseModels/Item/ItemList.js
similarity index 100%
rename from models/doctype/Item/ItemList.js
rename to models/baseModels/Item/ItemList.js
diff --git a/models/doctype/Item/RegionalChanges.js b/models/baseModels/Item/RegionalChanges.js
similarity index 100%
rename from models/doctype/Item/RegionalChanges.js
rename to models/baseModels/Item/RegionalChanges.js
diff --git a/models/doctype/JournalEntry/JournalEntry.js b/models/baseModels/JournalEntry/JournalEntry.js
similarity index 100%
rename from models/doctype/JournalEntry/JournalEntry.js
rename to models/baseModels/JournalEntry/JournalEntry.js
diff --git a/models/doctype/JournalEntry/JournalEntryList.js b/models/baseModels/JournalEntry/JournalEntryList.js
similarity index 100%
rename from models/doctype/JournalEntry/JournalEntryList.js
rename to models/baseModels/JournalEntry/JournalEntryList.js
diff --git a/models/doctype/JournalEntry/JournalEntryServer.js b/models/baseModels/JournalEntry/JournalEntryServer.js
similarity index 100%
rename from models/doctype/JournalEntry/JournalEntryServer.js
rename to models/baseModels/JournalEntry/JournalEntryServer.js
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
new file mode 100644
index 00000000..99a5fe76
--- /dev/null
+++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
@@ -0,0 +1,35 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import { FiltersMap, FormulaMap } from 'frappe/model/types';
+import Money from 'pesa/dist/types/src/money';
+
+export class JournalEntryAccount extends Doc {
+  getAutoDebitCredit(type: 'debit' | 'credit') {
+    const otherType = type === 'debit' ? 'credit' : 'debit';
+
+    const otherTypeValue = this.get(otherType) as Money;
+    if (!otherTypeValue.isZero()) {
+      return frappe.pesa(0);
+    }
+
+    const totalType = this.parentdoc!.getSum('accounts', type, false) as Money;
+    const totalOtherType = this.parentdoc!.getSum(
+      'accounts',
+      otherType,
+      false
+    ) as Money;
+
+    if (totalType.lt(totalOtherType)) {
+      return totalOtherType.sub(totalType);
+    }
+  }
+
+  formulas: FormulaMap = {
+    debit: async () => this.getAutoDebitCredit('debit'),
+    credit: async () => this.getAutoDebitCredit('credit'),
+  };
+
+  static filters: FiltersMap = {
+    account: () => ({ isGroup: false }),
+  };
+}
diff --git a/models/doctype/Party/Customer.js b/models/baseModels/Party/Customer.js
similarity index 100%
rename from models/doctype/Party/Customer.js
rename to models/baseModels/Party/Customer.js
diff --git a/models/doctype/Party/CustomerList.js b/models/baseModels/Party/CustomerList.js
similarity index 100%
rename from models/doctype/Party/CustomerList.js
rename to models/baseModels/Party/CustomerList.js
diff --git a/models/doctype/Party/Party.js b/models/baseModels/Party/Party.js
similarity index 100%
rename from models/doctype/Party/Party.js
rename to models/baseModels/Party/Party.js
diff --git a/models/doctype/Party/PartyList.js b/models/baseModels/Party/PartyList.js
similarity index 100%
rename from models/doctype/Party/PartyList.js
rename to models/baseModels/Party/PartyList.js
diff --git a/models/doctype/Party/PartyServer.js b/models/baseModels/Party/PartyServer.js
similarity index 100%
rename from models/doctype/Party/PartyServer.js
rename to models/baseModels/Party/PartyServer.js
diff --git a/models/doctype/Party/PartyWidget.vue b/models/baseModels/Party/PartyWidget.vue
similarity index 100%
rename from models/doctype/Party/PartyWidget.vue
rename to models/baseModels/Party/PartyWidget.vue
diff --git a/models/doctype/Party/RegionalChanges.js b/models/baseModels/Party/RegionalChanges.js
similarity index 100%
rename from models/doctype/Party/RegionalChanges.js
rename to models/baseModels/Party/RegionalChanges.js
diff --git a/models/doctype/Party/Supplier.js b/models/baseModels/Party/Supplier.js
similarity index 100%
rename from models/doctype/Party/Supplier.js
rename to models/baseModels/Party/Supplier.js
diff --git a/models/doctype/Party/SupplierList.js b/models/baseModels/Party/SupplierList.js
similarity index 100%
rename from models/doctype/Party/SupplierList.js
rename to models/baseModels/Party/SupplierList.js
diff --git a/models/doctype/Payment/Payment.js b/models/baseModels/Payment/Payment.js
similarity index 100%
rename from models/doctype/Payment/Payment.js
rename to models/baseModels/Payment/Payment.js
diff --git a/models/doctype/Payment/PaymentList.js b/models/baseModels/Payment/PaymentList.js
similarity index 100%
rename from models/doctype/Payment/PaymentList.js
rename to models/baseModels/Payment/PaymentList.js
diff --git a/models/doctype/Payment/PaymentServer.js b/models/baseModels/Payment/PaymentServer.js
similarity index 100%
rename from models/doctype/Payment/PaymentServer.js
rename to models/baseModels/Payment/PaymentServer.js
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
new file mode 100644
index 00000000..608389fe
--- /dev/null
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -0,0 +1,28 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import { FiltersMap, FormulaMap } from 'frappe/model/types';
+import Money from 'pesa/dist/types/src/money';
+
+export class PaymentFor extends Doc {
+  formulas: FormulaMap = {
+    amount: async () => {
+      const outstandingAmount = this.parentdoc!.getFrom(
+        this.referenceType as string,
+        this.referenceName as string,
+        'outstandingAmount'
+      ) as Money;
+
+      if (outstandingAmount) {
+        return outstandingAmount;
+      }
+
+      return frappe.pesa(0);
+    },
+  };
+
+  static filters: FiltersMap = {
+    referenceName: () => ({
+      outstandingAmount: ['>', 0],
+    }),
+  };
+}
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoice.js b/models/baseModels/PurchaseInvoice/PurchaseInvoice.js
similarity index 100%
rename from models/doctype/PurchaseInvoice/PurchaseInvoice.js
rename to models/baseModels/PurchaseInvoice/PurchaseInvoice.js
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoiceDocument.js b/models/baseModels/PurchaseInvoice/PurchaseInvoiceDocument.js
similarity index 100%
rename from models/doctype/PurchaseInvoice/PurchaseInvoiceDocument.js
rename to models/baseModels/PurchaseInvoice/PurchaseInvoiceDocument.js
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoiceList.js b/models/baseModels/PurchaseInvoice/PurchaseInvoiceList.js
similarity index 100%
rename from models/doctype/PurchaseInvoice/PurchaseInvoiceList.js
rename to models/baseModels/PurchaseInvoice/PurchaseInvoiceList.js
diff --git a/models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js b/models/baseModels/PurchaseInvoice/PurchaseInvoiceServer.js
similarity index 100%
rename from models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js
rename to models/baseModels/PurchaseInvoice/PurchaseInvoiceServer.js
diff --git a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js b/models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.js
similarity index 100%
rename from models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js
rename to models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.js
diff --git a/models/doctype/PurchaseInvoiceItem/RegionalChanges.js b/models/baseModels/PurchaseInvoiceItem/RegionalChanges.js
similarity index 100%
rename from models/doctype/PurchaseInvoiceItem/RegionalChanges.js
rename to models/baseModels/PurchaseInvoiceItem/RegionalChanges.js
diff --git a/models/doctype/SalesInvoice/InvoiceTemplate.vue b/models/baseModels/SalesInvoice/InvoiceTemplate.vue
similarity index 100%
rename from models/doctype/SalesInvoice/InvoiceTemplate.vue
rename to models/baseModels/SalesInvoice/InvoiceTemplate.vue
diff --git a/models/doctype/SalesInvoice/SalesInvoice.js b/models/baseModels/SalesInvoice/SalesInvoice.js
similarity index 100%
rename from models/doctype/SalesInvoice/SalesInvoice.js
rename to models/baseModels/SalesInvoice/SalesInvoice.js
diff --git a/models/doctype/SalesInvoice/SalesInvoiceDocument.js b/models/baseModels/SalesInvoice/SalesInvoiceDocument.js
similarity index 100%
rename from models/doctype/SalesInvoice/SalesInvoiceDocument.js
rename to models/baseModels/SalesInvoice/SalesInvoiceDocument.js
diff --git a/models/doctype/SalesInvoice/SalesInvoiceList.js b/models/baseModels/SalesInvoice/SalesInvoiceList.js
similarity index 100%
rename from models/doctype/SalesInvoice/SalesInvoiceList.js
rename to models/baseModels/SalesInvoice/SalesInvoiceList.js
diff --git a/models/doctype/SalesInvoice/SalesInvoicePrint.vue b/models/baseModels/SalesInvoice/SalesInvoicePrint.vue
similarity index 100%
rename from models/doctype/SalesInvoice/SalesInvoicePrint.vue
rename to models/baseModels/SalesInvoice/SalesInvoicePrint.vue
diff --git a/models/doctype/SalesInvoice/SalesInvoiceServer.js b/models/baseModels/SalesInvoice/SalesInvoiceServer.js
similarity index 100%
rename from models/doctype/SalesInvoice/SalesInvoiceServer.js
rename to models/baseModels/SalesInvoice/SalesInvoiceServer.js
diff --git a/models/doctype/SalesInvoice/Templates/Base.vue b/models/baseModels/SalesInvoice/Templates/Base.vue
similarity index 100%
rename from models/doctype/SalesInvoice/Templates/Base.vue
rename to models/baseModels/SalesInvoice/Templates/Base.vue
diff --git a/models/doctype/SalesInvoice/Templates/Basic.vue b/models/baseModels/SalesInvoice/Templates/Basic.vue
similarity index 100%
rename from models/doctype/SalesInvoice/Templates/Basic.vue
rename to models/baseModels/SalesInvoice/Templates/Basic.vue
diff --git a/models/doctype/SalesInvoice/Templates/Business.vue b/models/baseModels/SalesInvoice/Templates/Business.vue
similarity index 100%
rename from models/doctype/SalesInvoice/Templates/Business.vue
rename to models/baseModels/SalesInvoice/Templates/Business.vue
diff --git a/models/doctype/SalesInvoice/Templates/Minimal.vue b/models/baseModels/SalesInvoice/Templates/Minimal.vue
similarity index 100%
rename from models/doctype/SalesInvoice/Templates/Minimal.vue
rename to models/baseModels/SalesInvoice/Templates/Minimal.vue
diff --git a/models/doctype/SalesInvoiceItem/RegionalChanges.js b/models/baseModels/SalesInvoiceItem/RegionalChanges.js
similarity index 100%
rename from models/doctype/SalesInvoiceItem/RegionalChanges.js
rename to models/baseModels/SalesInvoiceItem/RegionalChanges.js
diff --git a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js b/models/baseModels/SalesInvoiceItem/SalesInvoiceItem.js
similarity index 100%
rename from models/doctype/SalesInvoiceItem/SalesInvoiceItem.js
rename to models/baseModels/SalesInvoiceItem/SalesInvoiceItem.js
diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts
new file mode 100644
index 00000000..3728b2f3
--- /dev/null
+++ b/models/baseModels/SetupWizard/SetupWizard.ts
@@ -0,0 +1,95 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import { FormulaMap, ListsMap } from 'frappe/model/types';
+import { DateTime } from 'luxon';
+import countryInfo from '../../../fixtures/countryInfo.json';
+
+export function getCOAList() {
+  return [
+    { name: frappe.t`Standard Chart of Accounts`, countryCode: '' },
+
+    { countryCode: 'ae', name: 'U.A.E - Chart of Accounts' },
+    {
+      countryCode: 'ca',
+      name: 'Canada - Plan comptable pour les provinces francophones',
+    },
+    { countryCode: 'gt', name: 'Guatemala - Cuentas' },
+    { countryCode: 'hu', name: 'Hungary - Chart of Accounts' },
+    { countryCode: 'id', name: 'Indonesia - Chart of Accounts' },
+    { countryCode: 'in', name: 'India - Chart of Accounts' },
+    { countryCode: 'mx', name: 'Mexico - Plan de Cuentas' },
+    { countryCode: 'ni', name: 'Nicaragua - Catalogo de Cuentas' },
+    { countryCode: 'nl', name: 'Netherlands - Grootboekschema' },
+    { countryCode: 'sg', name: 'Singapore - Chart of Accounts' },
+  ];
+}
+
+export class SetupWizard extends Doc {
+  formulas: FormulaMap = {
+    fiscalYearStart: async () => {
+      if (!this.country) return;
+
+      const today = DateTime.local();
+
+      // @ts-ignore
+      const fyStart = countryInfo[this.country].fiscal_year_start as
+        | string
+        | undefined;
+
+      if (fyStart) {
+        return DateTime.fromFormat(fyStart, 'MM-dd')
+          .plus({ year: [1, 2, 3].includes(today.month) ? -1 : 0 })
+          .toISODate();
+      }
+    },
+    fiscalYearEnd: async () => {
+      if (!this.country) {
+        return;
+      }
+
+      const today = DateTime.local();
+
+      // @ts-ignore
+      const fyEnd = countryInfo[this.country].fiscal_year_end as
+        | string
+        | undefined;
+      if (fyEnd) {
+        return DateTime.fromFormat(fyEnd, 'MM-dd')
+          .plus({ year: [1, 2, 3].includes(today.month) ? 0 : 1 })
+          .toISODate();
+      }
+    },
+    currency: async () => {
+      if (!this.country) {
+        return;
+      }
+      // @ts-ignore
+      return countryInfo[this.country].currency;
+    },
+    chartOfAccounts: async () => {
+      const country = this.get('country') as string | undefined;
+      if (country === undefined) {
+        return;
+      }
+
+      // @ts-ignore
+      const code = (countryInfo[country] as undefined | { code: string })?.code;
+      if (code === undefined) {
+        return;
+      }
+
+      const coaList = getCOAList();
+      const coa = coaList.find(({ countryCode }) => countryCode === code);
+
+      if (coa === undefined) {
+        return coaList[0].name;
+      }
+      return coa.name;
+    },
+  };
+
+  static lists: ListsMap = {
+    country: () => Object.keys(countryInfo),
+    chartOfAccounts: () => getCOAList().map(({ name }) => name),
+  };
+}
diff --git a/models/doctype/Tax/RegionalEntries.js b/models/baseModels/Tax/RegionalEntries.js
similarity index 100%
rename from models/doctype/Tax/RegionalEntries.js
rename to models/baseModels/Tax/RegionalEntries.js
diff --git a/models/doctype/Tax/Tax.js b/models/baseModels/Tax/Tax.js
similarity index 100%
rename from models/doctype/Tax/Tax.js
rename to models/baseModels/Tax/Tax.js
diff --git a/models/doctype/Tax/TaxList.js b/models/baseModels/Tax/TaxList.js
similarity index 100%
rename from models/doctype/Tax/TaxList.js
rename to models/baseModels/Tax/TaxList.js
diff --git a/models/doctype/Tax/TaxServer.js b/models/baseModels/Tax/TaxServer.js
similarity index 100%
rename from models/doctype/Tax/TaxServer.js
rename to models/baseModels/Tax/TaxServer.js
diff --git a/models/baseModels/TaxSummary/TaxSummary.ts b/models/baseModels/TaxSummary/TaxSummary.ts
new file mode 100644
index 00000000..3f5c4b0f
--- /dev/null
+++ b/models/baseModels/TaxSummary/TaxSummary.ts
@@ -0,0 +1,13 @@
+import Doc from 'frappe/model/doc';
+import { FormulaMap } from 'frappe/model/types';
+import Money from 'pesa/dist/types/src/money';
+
+export class TaxSummary extends Doc {
+  formulas: FormulaMap = {
+    baseAmount: async () => {
+      const amount = this.amount as Money;
+      const exchangeRate = (this.parentdoc?.exchangeRate ?? 1) as number;
+      return amount.mul(exchangeRate);
+    },
+  };
+}
diff --git a/models/doctype/Transaction/Transaction.js b/models/baseModels/Transaction/Transaction.js
similarity index 100%
rename from models/doctype/Transaction/Transaction.js
rename to models/baseModels/Transaction/Transaction.js
diff --git a/models/doctype/Transaction/TransactionDocument.js b/models/baseModels/Transaction/TransactionDocument.js
similarity index 100%
rename from models/doctype/Transaction/TransactionDocument.js
rename to models/baseModels/Transaction/TransactionDocument.js
diff --git a/models/doctype/Transaction/TransactionServer.js b/models/baseModels/Transaction/TransactionServer.js
similarity index 100%
rename from models/doctype/Transaction/TransactionServer.js
rename to models/baseModels/Transaction/TransactionServer.js
diff --git a/models/doctype/Account/Account.js b/models/doctype/Account/Account.js
deleted file mode 100644
index bee98c57..00000000
--- a/models/doctype/Account/Account.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import frappe, { t } from 'frappe';
-import Account from './AccountDocument';
-
-export default {
-  name: 'Account',
-  label: t`Account`,
-  doctype: 'DocType',
-  documentClass: Account,
-  isSingle: 0,
-  isTree: 1,
-  keywordFields: ['name', 'rootType', 'accountType'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Account Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'rootType',
-      label: t`Root Type`,
-      fieldtype: 'Select',
-      placeholder: t`Root Type`,
-      options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'],
-      required: 1,
-    },
-    {
-      fieldname: 'parentAccount',
-      label: t`Parent Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      getFilters: (query, doc) => {
-        const filter = {
-          isGroup: 1,
-        };
-        doc.rootType ? (filter.rootType = doc.rootType) : '';
-        return filter;
-      },
-    },
-    {
-      fieldname: 'accountType',
-      label: t`Account Type`,
-      placeholder: t`Account Type`,
-      fieldtype: 'Select',
-      options: [
-        'Accumulated Depreciation',
-        'Bank',
-        'Cash',
-        'Chargeable',
-        'Cost of Goods Sold',
-        'Depreciation',
-        'Equity',
-        'Expense Account',
-        'Expenses Included In Valuation',
-        'Fixed Asset',
-        'Income Account',
-        'Payable',
-        'Receivable',
-        'Round Off',
-        'Stock',
-        'Stock Adjustment',
-        'Stock Received But Not Billed',
-        'Tax',
-        'Temporary',
-      ],
-    },
-    {
-      fieldname: 'balance',
-      label: t`Balance`,
-      fieldtype: 'Currency',
-      readOnly: 1,
-    },
-    {
-      fieldname: 'isGroup',
-      label: t`Is Group`,
-      fieldtype: 'Check',
-    },
-  ],
-
-  quickEditFields: [
-    'name',
-    'rootType',
-    'parentAccount',
-    'accountType',
-    'isGroup',
-  ],
-
-  treeSettings: {
-    parentField: 'parentAccount',
-    async getRootLabel() {
-      let accountingSettings = await frappe.getSingle('AccountingSettings');
-      return accountingSettings.companyName;
-    },
-  },
-};
diff --git a/models/doctype/Account/AccountDocument.js b/models/doctype/Account/AccountDocument.js
deleted file mode 100644
index d83a7129..00000000
--- a/models/doctype/Account/AccountDocument.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import frappe from 'frappe';
-import Document from 'frappe/model/document';
-
-export default class Account extends Document {
-  async validate() {
-    if (!this.accountType && this.parentAccount) {
-      const account = frappe.db.get('Account', this.parentAccount);
-      this.accountType = account.accountType;
-    }
-  }
-}
diff --git a/models/doctype/Account/AccountList.js b/models/doctype/Account/AccountList.js
deleted file mode 100644
index e7ecf690..00000000
--- a/models/doctype/Account/AccountList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  doctype: 'Account',
-  title: t`Account`,
-  columns: ['name', 'parentAccount', 'rootType'],
-};
diff --git a/models/doctype/AccountingLedgerEntry/AccountingLedgerEntry.js b/models/doctype/AccountingLedgerEntry/AccountingLedgerEntry.js
deleted file mode 100644
index b82ceda8..00000000
--- a/models/doctype/AccountingLedgerEntry/AccountingLedgerEntry.js
+++ /dev/null
@@ -1,85 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'AccountingLedgerEntry',
-  label: t`Ledger Entry`,
-  naming: 'autoincrement',
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: ['account', 'party', 'referenceName'],
-  fields: [
-    {
-      fieldname: 'date',
-      label: t`Date`,
-      fieldtype: 'Date',
-    },
-    {
-      fieldname: 'account',
-      label: t`Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-    },
-    {
-      fieldname: 'description',
-      label: t`Description`,
-      fieldtype: 'Text',
-    },
-    {
-      fieldname: 'party',
-      label: t`Party`,
-      fieldtype: 'Link',
-      target: 'Party',
-    },
-    {
-      fieldname: 'debit',
-      label: t`Debit`,
-      fieldtype: 'Currency',
-    },
-    {
-      fieldname: 'credit',
-      label: t`Credit`,
-      fieldtype: 'Currency',
-    },
-    {
-      fieldname: 'againstAccount',
-      label: t`Against Account`,
-      fieldtype: 'Text',
-    },
-    {
-      fieldname: 'referenceType',
-      label: t`Ref. Type`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'referenceName',
-      label: t`Ref. Name`,
-      fieldtype: 'DynamicLink',
-      references: 'referenceType',
-    },
-    {
-      fieldname: 'balance',
-      label: t`Balance`,
-      fieldtype: 'Currency',
-    },
-    {
-      fieldname: 'reverted',
-      label: t`Reverted`,
-      fieldtype: 'Check',
-      default: 0,
-    },
-  ],
-  quickEditFields: [
-    'date',
-    'account',
-    'description',
-    'party',
-    'debit',
-    'credit',
-    'againstAccount',
-    'referenceType',
-    'referenceName',
-    'balance',
-  ],
-};
diff --git a/models/doctype/AccountingLedgerEntry/AccountingLedgerEntryList.js b/models/doctype/AccountingLedgerEntry/AccountingLedgerEntryList.js
deleted file mode 100644
index 7d70814b..00000000
--- a/models/doctype/AccountingLedgerEntry/AccountingLedgerEntryList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  doctype: 'AccountingLedgerEntry',
-  title: t`Accounting Ledger Entries`,
-  columns: ['account', 'party', 'debit', 'credit', 'balance'],
-};
diff --git a/models/doctype/AccountingSettings/AccountingSettings.js b/models/doctype/AccountingSettings/AccountingSettings.js
deleted file mode 100644
index 5de9cc9a..00000000
--- a/models/doctype/AccountingSettings/AccountingSettings.js
+++ /dev/null
@@ -1,129 +0,0 @@
-import { t } from 'frappe';
-import countryInfo from '~/fixtures/countryInfo.json';
-
-const countryList = Object.keys(countryInfo).sort();
-export default {
-  name: 'AccountingSettings',
-  label: t`Accounting Settings`,
-  naming: 'name', // {random|autoincrement}
-  isSingle: 1,
-  isChild: 0,
-  isSubmittable: 0,
-  settings: null,
-  keywordFields: [],
-  fields: [
-    {
-      label: t`Company Name`,
-      fieldname: 'companyName',
-      fieldtype: 'Data',
-      required: 1,
-    },
-
-    {
-      label: t`Write Off Account`,
-      fieldname: 'writeOffAccount',
-      fieldtype: 'Link',
-      target: 'Account',
-      default: 'Write Off',
-      getFilters() {
-        return {
-          isGroup: 0,
-          rootType: 'Expense',
-        };
-      },
-    },
-
-    {
-      label: t`Round Off Account`,
-      fieldname: 'roundOffAccount',
-      fieldtype: 'Link',
-      target: 'Account',
-      default: 'Rounded Off',
-      getFilters() {
-        return {
-          isGroup: 0,
-          rootType: 'Expense',
-        };
-      },
-    },
-
-    {
-      fieldname: 'country',
-      label: t`Country`,
-      fieldtype: 'AutoComplete',
-      placeholder: t`Select Country`,
-      readOnly: 1,
-      required: 1,
-      getList: () => countryList,
-    },
-
-    {
-      fieldname: 'currency',
-      label: t`Currency`,
-      fieldtype: 'Data',
-      readOnly: 1,
-      required: 0,
-    },
-
-    {
-      fieldname: 'fullname',
-      label: t`Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-
-    {
-      fieldname: 'email',
-      label: t`Email`,
-      fieldtype: 'Data',
-      required: 1,
-      validate: {
-        type: 'email',
-      },
-    },
-
-    {
-      fieldname: 'bankName',
-      label: t`Bank Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-
-    {
-      fieldname: 'fiscalYearStart',
-      label: t`Fiscal Year Start Date`,
-      fieldtype: 'Date',
-      required: 1,
-    },
-
-    {
-      fieldname: 'fiscalYearEnd',
-      label: t`Fiscal Year End Date`,
-      fieldtype: 'Date',
-      required: 1,
-    },
-
-    {
-      fieldname: 'setupComplete',
-      label: t`Setup Complete`,
-      fieldtype: 'Check',
-      default: 0,
-    },
-    {
-      fieldname: 'gstin',
-      label: t`GSTIN`,
-      fieldtype: 'Data',
-      placeholder: t`27AAAAA0000A1Z5`,
-    },
-  ],
-  quickEditFields: [
-    'fullname',
-    'email',
-    'companyName',
-    'country',
-    'currency',
-    'fiscalYearStart',
-    'fiscalYearEnd',
-    'gstin',
-  ],
-};
diff --git a/models/doctype/Color/Color.js b/models/doctype/Color/Color.js
deleted file mode 100644
index 11250616..00000000
--- a/models/doctype/Color/Color.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'Color',
-  doctype: 'DocType',
-  fields: [
-    {
-      fieldname: 'name',
-      fieldtype: 'Data',
-      label: t`Color`,
-    },
-    {
-      fieldname: 'hexvalue',
-      fieldtype: 'Data',
-      label: t`Hex Value`,
-    },
-  ],
-};
diff --git a/models/doctype/CompanySettings/CompanySettings.js b/models/doctype/CompanySettings/CompanySettings.js
deleted file mode 100644
index d52fa316..00000000
--- a/models/doctype/CompanySettings/CompanySettings.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'CompanySettings',
-  label: t`Company Settings`,
-  naming: 'autoincrement',
-  isSingle: true,
-  isChild: false,
-  keywordFields: ['companyName'],
-  fields: [
-    {
-      fieldname: 'companyName',
-      label: t`Company Name`,
-      fieldtype: 'Data',
-      disabled: false,
-      required: true,
-    },
-    {
-      fieldname: 'companyAddress',
-      label: t`Company Address`,
-      fieldtype: 'Link',
-      disabled: false,
-      required: true,
-      target: 'Address',
-    },
-  ],
-};
diff --git a/models/doctype/Contact/Contact.js b/models/doctype/Contact/Contact.js
deleted file mode 100644
index b9fcb263..00000000
--- a/models/doctype/Contact/Contact.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'Contact',
-  doctype: 'DocType',
-  isSingle: 0,
-  naming: 'autoincrement',
-  pageSettings: {
-    hideTitle: true,
-  },
-  titleField: 'fullName',
-  keywordFields: ['fullName'],
-  fields: [
-    {
-      fieldname: 'fullName',
-      label: t`Full Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'emailAddress',
-      label: t`Email Address`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'userId',
-      label: t`User ID`,
-      fieldtype: 'Link',
-      target: 'User',
-      hidden: 1,
-    },
-    {
-      fieldname: 'status',
-      label: t`Status`,
-      fieldtype: 'Select',
-      options: ['Passive', 'Open', 'Replied'],
-    },
-    {
-      fieldname: 'gender',
-      label: t`Gender`,
-      fieldtype: 'Select',
-      options: ['Male', 'Female', 'Gender'],
-    },
-    {
-      fieldname: 'mobileNumber',
-      label: t`Mobile Number`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'phone',
-      label: t`Phone`,
-      fieldtype: 'Data',
-    },
-  ],
-
-  events: {
-    validate: (doc) => {},
-  },
-
-  listSettings: {
-    getFields(list) {
-      return ['fullName'];
-    },
-    getRowHTML(list, data) {
-      return `<div class="col-11">${list.getNameHTML(data)}</div>`;
-    },
-  },
-
-  layout: [
-    // section 1
-    {
-      columns: [
-        { fields: ['fullName', 'emailAddress', 'userId', 'status'] },
-        { fields: ['postalCode', 'gender', 'phone', 'mobileNumber'] },
-      ],
-    },
-  ],
-};
diff --git a/models/doctype/Currency/Currency.js b/models/doctype/Currency/Currency.js
deleted file mode 100644
index ef474632..00000000
--- a/models/doctype/Currency/Currency.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'Currency',
-  label: t`Currency`,
-  doctype: 'DocType',
-  isSingle: 0,
-  keywordFields: ['name', 'symbol'],
-  quickEditFields: ['name', 'symbol'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Currency Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'fraction',
-      label: t`Fraction`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'fractionUnits',
-      label: t`Fraction Units`,
-      fieldtype: 'Int',
-    },
-    {
-      label: t`Smallest Currency Fraction Value`,
-      fieldname: 'smallestValue',
-      fieldtype: 'Currency',
-    },
-    {
-      label: t`Symbol`,
-      fieldname: 'symbol',
-      fieldtype: 'Data',
-    },
-  ],
-};
diff --git a/models/doctype/GetStarted/GetStarted.js b/models/doctype/GetStarted/GetStarted.js
deleted file mode 100644
index a0619e73..00000000
--- a/models/doctype/GetStarted/GetStarted.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'GetStarted',
-  isSingle: 1,
-  fields: [
-    {
-      fieldname: 'onboardingComplete',
-      label: t`Onboarding Complete`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'companySetup',
-      label: t`Company Setup`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'systemSetup',
-      label: t`System Setup`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'invoiceSetup',
-      label: t`Invoice Setup`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'itemCreated',
-      label: t`Item Created`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'customerCreated',
-      label: t`Customer Created`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'supplierCreated',
-      label: t`Supplier Created`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'invoiceCreated',
-      label: t`Invoice Created`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'billCreated',
-      label: t`Bill Created`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'chartOfAccountsReviewed',
-      label: t`Chart Of Accounts Reviewed`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'openingBalanceChecked',
-      label: t`Opening Balances`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'taxesAdded',
-      label: t`Add Taxes`,
-      fieldtype: 'Check',
-    },
-  ],
-};
diff --git a/models/doctype/JournalEntryAccount/JournalEntryAccount.js b/models/doctype/JournalEntryAccount/JournalEntryAccount.js
deleted file mode 100644
index 244c27f9..00000000
--- a/models/doctype/JournalEntryAccount/JournalEntryAccount.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'JournalEntryAccount',
-  isChild: 1,
-  fields: [
-    {
-      fieldname: 'account',
-      label: t`Account`,
-      placeholder: t`Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-      groupBy: 'rootType',
-      getFilters: () => ({ isGroup: 0 }),
-    },
-    {
-      fieldname: 'debit',
-      label: t`Debit`,
-      fieldtype: 'Currency',
-      formula: autoDebitCredit('debit'),
-    },
-    {
-      fieldname: 'credit',
-      label: t`Credit`,
-      fieldtype: 'Currency',
-      formula: autoDebitCredit('credit'),
-    },
-  ],
-  tableFields: ['account', 'debit', 'credit'],
-};
-
-function autoDebitCredit(type) {
-  let otherType = type === 'debit' ? 'credit' : 'debit';
-
-  return (row, doc) => {
-    if (!row[otherType].isZero()) return frappe.pesa(0);
-
-    let totalType = doc.getSum('accounts', type, false);
-    let totalOtherType = doc.getSum('accounts', otherType, false);
-
-    if (totalType.lt(totalOtherType)) {
-      return totalOtherType.sub(totalType);
-    }
-  };
-}
diff --git a/models/doctype/JournalEntrySettings/JournalEntrySettings.js b/models/doctype/JournalEntrySettings/JournalEntrySettings.js
deleted file mode 100644
index 36f0ec3e..00000000
--- a/models/doctype/JournalEntrySettings/JournalEntrySettings.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'JournalEntrySettings',
-  label: t`Journal Entry Setting`,
-  doctype: 'DocType',
-  isSingle: 1,
-  isChild: 0,
-  keywordFields: [],
-  fields: [],
-};
diff --git a/models/doctype/PaymentFor/PaymentFor.js b/models/doctype/PaymentFor/PaymentFor.js
deleted file mode 100644
index 96e9b173..00000000
--- a/models/doctype/PaymentFor/PaymentFor.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import frappe, { t } from 'frappe';
-
-const referenceTypeMap = {
-  SalesInvoice: t`Invoice`,
-  PurchaseInvoice: t`Bill`,
-};
-
-export default {
-  name: 'PaymentFor',
-  label: t`Payment For`,
-  isSingle: 0,
-  isChild: 1,
-  keywordFields: [],
-  tableFields: ['referenceType', 'referenceName', 'amount'],
-  fields: [
-    {
-      fieldname: 'referenceType',
-      label: t`Reference Type`,
-      placeholder: t`Type`,
-      fieldtype: 'Select',
-      options: Object.keys(referenceTypeMap),
-      map: referenceTypeMap,
-      required: 1,
-    },
-    {
-      fieldname: 'referenceName',
-      label: t`Reference Name`,
-      fieldtype: 'DynamicLink',
-      references: 'referenceType',
-      placeholder: t`Name`,
-      getFilters() {
-        return {
-          outstandingAmount: ['>', 0],
-        };
-      },
-      required: 1,
-    },
-    {
-      fieldname: 'amount',
-      label: t`Allocated Amount`,
-      fieldtype: 'Currency',
-      formula: (row, doc) => {
-        return (
-          doc.getFrom(
-            row.referenceType,
-            row.referenceName,
-            'outstandingAmount'
-          ) || frappe.pesa(0)
-        );
-      },
-      required: 1,
-    },
-  ],
-};
diff --git a/models/doctype/PaymentSettings/PaymentSettings.js b/models/doctype/PaymentSettings/PaymentSettings.js
deleted file mode 100644
index c71a9199..00000000
--- a/models/doctype/PaymentSettings/PaymentSettings.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  name: 'PaymentSettings',
-  label: t`Payment Settings`,
-  isSingle: 1,
-  isChild: 0,
-  keywordFields: [],
-  fields: [],
-};
diff --git a/models/doctype/PrintSettings/PrintSettings.js b/models/doctype/PrintSettings/PrintSettings.js
deleted file mode 100644
index 72210ed5..00000000
--- a/models/doctype/PrintSettings/PrintSettings.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import theme from '@/theme';
-import { t } from 'frappe';
-
-export default {
-  name: 'PrintSettings',
-  label: t`Print Settings`,
-  isSingle: 1,
-  fields: [
-    {
-      fieldname: 'logo',
-      label: t`Logo`,
-      fieldtype: 'AttachImage',
-    },
-    {
-      fieldname: 'companyName',
-      label: t`Company Name`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'email',
-      label: t`Email`,
-      fieldtype: 'Data',
-      placeholder: t`john@doe.com`,
-      validate: {
-        type: 'email',
-      },
-    },
-    {
-      fieldname: 'displayLogo',
-      label: t`Display Logo in Invoice`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'phone',
-      label: t`Phone`,
-      fieldtype: 'Data',
-      placeholder: t`9888900000`,
-      validate: {
-        type: 'phone',
-      },
-    },
-    {
-      fieldname: 'address',
-      label: t`Address`,
-      fieldtype: 'Link',
-      target: 'Address',
-      placeholder: t`Click to create`,
-      inline: true,
-    },
-    {
-      fieldname: 'template',
-      label: t`Template`,
-      placeholder: t`Template`,
-      fieldtype: 'Select',
-      options: ['Basic', 'Minimal', 'Business'],
-      default: 'Basic',
-    },
-    {
-      fieldname: 'color',
-      label: t`Color`,
-      placeholder: t`Select Color`,
-      fieldtype: 'Color',
-      colors: [
-        'red',
-        'orange',
-        'yellow',
-        'green',
-        'teal',
-        'blue',
-        'indigo',
-        'purple',
-        'pink',
-      ]
-        .map((color) => {
-          let label = color[0].toUpperCase() + color.slice(1);
-          return {
-            label,
-            value: theme.colors[color]['500'],
-          };
-        })
-        .concat({
-          label: t`Black`,
-          value: theme.colors['black'],
-        }),
-    },
-    {
-      fieldname: 'font',
-      label: t`Font`,
-      placeholder: t`Font`,
-      fieldtype: 'Select',
-      options: ['Inter', 'Times New Roman', 'Arial', 'Courier'],
-      default: 'Inter',
-    },
-  ],
-  quickEditFields: [
-    'logo',
-    'displayLogo',
-    'template',
-    'color',
-    'font',
-    'email',
-    'phone',
-    'address',
-  ],
-};
diff --git a/models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js b/models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js
deleted file mode 100644
index 6ff16278..00000000
--- a/models/doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'PurchaseInvoiceSettings',
-  label: t`Bills Settings`,
-  doctype: 'DocType',
-  isSingle: 1,
-  isChild: 0,
-  keywordFields: [],
-  fields: [],
-};
diff --git a/models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js b/models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js
deleted file mode 100644
index 7150f585..00000000
--- a/models/doctype/SalesInvoiceSettings/SalesInvoiceSettings.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'SalesInvoiceSettings',
-  label: t`SalesInvoice Settings`,
-  doctype: 'DocType',
-  isSingle: 1,
-  isChild: 0,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'template',
-      label: t`Template`,
-      placeholder: t`Template`,
-      fieldtype: 'Select',
-      options: ['Basic I', 'Basic II', 'Modern'],
-      required: 1,
-      default: 'Basic I',
-    },
-    {
-      fieldname: 'font',
-      label: t`Font`,
-      placeholder: t`Font`,
-      fieldtype: 'Select',
-      options: ['Montserrat', 'Open Sans', 'Oxygen', 'Merriweather'],
-      required: 1,
-      default: 'Montserrat',
-    },
-    {
-      fieldname: 'themeColor',
-      label: t`Theme Color`,
-      fieldtype: 'Data',
-      required: 1,
-      default: '#000000',
-      hidden: 1,
-    },
-  ],
-};
diff --git a/models/doctype/SetupWizard/SetupWizard.js b/models/doctype/SetupWizard/SetupWizard.js
deleted file mode 100644
index fca8396e..00000000
--- a/models/doctype/SetupWizard/SetupWizard.js
+++ /dev/null
@@ -1,150 +0,0 @@
-import { t } from 'frappe';
-import { DateTime } from 'luxon';
-import countryList from '~/fixtures/countryInfo.json';
-import { getCOAList } from '../../../src/utils';
-
-export default {
-  name: 'SetupWizard',
-  label: t`Setup Wizard`,
-  naming: 'name',
-  isSingle: 1,
-  isChild: 0,
-  isSubmittable: 0,
-  settings: null,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'companyLogo',
-      label: t`Company Logo`,
-      fieldtype: 'AttachImage',
-    },
-    {
-      fieldname: 'country',
-      label: t`Country`,
-      fieldtype: 'AutoComplete',
-      placeholder: t`Select Country`,
-      required: 1,
-      getList: () => Object.keys(countryList).sort(),
-    },
-
-    {
-      fieldname: 'fullname',
-      label: t`Your Name`,
-      fieldtype: 'Data',
-      placeholder: t`John Doe`,
-      required: 1,
-    },
-
-    {
-      fieldname: 'email',
-      label: t`Email`,
-      fieldtype: 'Data',
-      placeholder: t`john@doe.com`,
-      required: 1,
-      validate: {
-        type: 'email',
-      },
-    },
-
-    {
-      fieldname: 'companyName',
-      label: t`Company Name`,
-      placeholder: t`Company Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-
-    {
-      fieldname: 'bankName',
-      label: t`Bank Name`,
-      fieldtype: 'Data',
-      placeholder: t`Prime Bank`,
-      required: 1,
-    },
-
-    {
-      fieldname: 'fiscalYearStart',
-      label: t`Fiscal Year Start Date`,
-      placeholder: t`Fiscal Year Start Date`,
-      fieldtype: 'Date',
-      formulaDependsOn: ['country'],
-      formula: (doc) => {
-        if (!doc.country) return;
-        let today = DateTime.local();
-        let fyStart = countryList[doc.country].fiscal_year_start;
-        if (fyStart) {
-          return DateTime.fromFormat(fyStart, 'MM-dd')
-            .plus({ year: [1, 2, 3].includes(today.month) ? -1 : 0 })
-            .toISODate();
-        }
-      },
-      required: 1,
-    },
-
-    {
-      fieldname: 'fiscalYearEnd',
-      label: t`Fiscal Year End Date`,
-      placeholder: t`Fiscal Year End Date`,
-      fieldtype: 'Date',
-      formulaDependsOn: ['country'],
-      formula: (doc) => {
-        if (!doc.country) return;
-        let today = DateTime.local();
-        let fyEnd = countryList[doc.country].fiscal_year_end;
-        if (fyEnd) {
-          return DateTime.fromFormat(fyEnd, 'MM-dd')
-            .plus({ year: [1, 2, 3].includes(today.month) ? 0 : 1 })
-            .toISODate();
-        }
-      },
-      required: 1,
-    },
-    {
-      fieldname: 'currency',
-      label: t`Currency`,
-      fieldtype: 'Data',
-      placeholder: t`Currency`,
-      formulaDependsOn: ['country'],
-      formula: (doc) => {
-        if (!doc.country) return;
-        return countryList[doc.country].currency;
-      },
-      required: 1,
-    },
-    {
-      fieldname: 'completed',
-      label: t`Completed`,
-      fieldtype: 'Check',
-      readonly: 1,
-    },
-    {
-      fieldname: 'chartOfAccounts',
-      label: t`Chart of Accounts`,
-      fieldtype: 'AutoComplete',
-      placeholder: t`Select CoA`,
-      formulaDependsOn: ['country'],
-      formula: async (doc) => {
-        if (!doc.country) return;
-
-        const { code } = countryList[doc.country];
-        const coaList = getCOAList();
-        const coa = coaList.find(({ countryCode }) => countryCode === code);
-
-        if (coa === undefined) {
-          return coaList[0].name;
-        }
-        return coa.name;
-      },
-      getList: () => getCOAList().map(({ name }) => name),
-    },
-  ],
-  quickEditFields: [
-    'fullname',
-    'bankName',
-    'country',
-    'currency',
-    'chartOfAccounts',
-    'fiscalYearStart',
-    'fiscalYearEnd',
-  ],
-};
diff --git a/models/doctype/TaxDetail/TaxDetail.js b/models/doctype/TaxDetail/TaxDetail.js
deleted file mode 100644
index a4c7bcd1..00000000
--- a/models/doctype/TaxDetail/TaxDetail.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'TaxDetail',
-  label: t`Tax Detail`,
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 1,
-  keywordFields: [],
-  fields: [
-    {
-      fieldname: 'account',
-      label: t`Tax Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-    },
-    {
-      fieldname: 'rate',
-      label: t`Rate`,
-      fieldtype: 'Float',
-      required: 1,
-      placeholder: t`0%`,
-    },
-  ],
-  tableFields: ['account', 'rate'],
-};
diff --git a/models/doctype/TaxSummary/TaxSummary.js b/models/doctype/TaxSummary/TaxSummary.js
deleted file mode 100644
index 90897e0d..00000000
--- a/models/doctype/TaxSummary/TaxSummary.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'TaxSummary',
-  doctype: 'DocType',
-  isChild: 1,
-  fields: [
-    {
-      fieldname: 'account',
-      label: t`Tax Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-    },
-    {
-      fieldname: 'rate',
-      label: t`Rate`,
-      fieldtype: 'Float',
-      required: 1,
-    },
-    {
-      fieldname: 'amount',
-      label: t`Amount`,
-      fieldtype: 'Currency',
-      required: 1,
-    },
-    {
-      fieldname: 'baseAmount',
-      label: t`Amount (Company Currency)`,
-      fieldtype: 'Currency',
-      formula: (row, doc) => row.amount.mul(doc.exchangeRate),
-      readOnly: 1,
-    },
-  ],
-};
diff --git a/utils/db/types.ts b/utils/db/types.ts
index 4937aade..f517273f 100644
--- a/utils/db/types.ts
+++ b/utils/db/types.ts
@@ -6,7 +6,7 @@
  * match on both ends.
  */
 
-import { SchemaMap } from "schemas/types";
+import { SchemaMap } from 'schemas/types';
 
 type UnknownMap = Record<string, unknown>;
 export abstract class DatabaseBase {
@@ -62,24 +62,32 @@ export interface GetAllOptions {
   order?: 'asc' | 'desc';
 }
 
-export type QueryFilter = Record<string, string | string[]>;
-
+export type QueryFilter = Record<
+  string,
+  boolean | string | (string | number)[]
+>;
 
 /**
  * DatabaseDemuxBase is an abstract class that ensures that the function signatures
  * match between the DatabaseManager and the DatabaseDemux.
- * 
+ *
  * This allows testing the frontend code while directly plugging in the DatabaseManager
  * and bypassing all the API and IPC calls.
  */
 export abstract class DatabaseDemuxBase {
-  abstract getSchemaMap(): Promise<SchemaMap> | SchemaMap
+  abstract getSchemaMap(): Promise<SchemaMap> | SchemaMap;
 
-  abstract createNewDatabase(dbPath: string, countryCode?: string): Promise<void> 
+  abstract createNewDatabase(
+    dbPath: string,
+    countryCode?: string
+  ): Promise<void>;
 
-  abstract connectToDatabase(dbPath: string, countryCode?: string): Promise<void> 
+  abstract connectToDatabase(
+    dbPath: string,
+    countryCode?: string
+  ): Promise<void>;
 
-  abstract call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown> 
-  
-  abstract callBespoke(method: string, ...args: unknown[]): Promise<unknown>
+  abstract call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown>;
+
+  abstract callBespoke(method: string, ...args: unknown[]): Promise<unknown>;
 }

From 781c1d70e96a59ef1a008641475cdbc125f862e0 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 11 Apr 2022 18:14:36 +0530
Subject: [PATCH 041/163] refactor: Item and Address models to ts Doc subcls

---
 accounting/gst.js                            |  41 +----
 frappe/model/doc.ts                          |   7 +-
 frappe/model/types.ts                        |  12 +-
 models/baseModels/Address/Address.js         | 121 -------------
 models/baseModels/Address/Address.ts         |  48 ++++++
 models/baseModels/Address/RegionalChanges.js |  31 ----
 models/baseModels/Item/Item.js               | 168 -------------------
 models/baseModels/Item/Item.ts               |  98 +++++++++++
 models/baseModels/Item/ItemList.js           |   7 -
 models/baseModels/Item/RegionalChanges.js    |  29 ----
 models/regionalModels/in/Address.ts          |  37 ++++
 regional/in.ts                               |  39 +++++
 schemas/app/Address.json                     |   3 +-
 schemas/types.ts                             |   1 +
 src/utils.js                                 |  13 --
 tsconfig.json                                |   1 +
 utils/index.ts                               |  13 ++
 vue.config.js                                |   1 +
 18 files changed, 258 insertions(+), 412 deletions(-)
 delete mode 100644 models/baseModels/Address/Address.js
 create mode 100644 models/baseModels/Address/Address.ts
 delete mode 100644 models/baseModels/Address/RegionalChanges.js
 delete mode 100644 models/baseModels/Item/Item.js
 create mode 100644 models/baseModels/Item/Item.ts
 delete mode 100644 models/baseModels/Item/ItemList.js
 delete mode 100644 models/baseModels/Item/RegionalChanges.js
 create mode 100644 models/regionalModels/in/Address.ts
 create mode 100644 regional/in.ts

diff --git a/accounting/gst.js b/accounting/gst.js
index 2bb19bbf..3635ae5d 100644
--- a/accounting/gst.js
+++ b/accounting/gst.js
@@ -1,49 +1,10 @@
 import { showMessageDialog } from '@/utils';
 import frappe, { t } from 'frappe';
 import { DateTime } from 'luxon';
+import { stateCodeMap } from '../regional/in';
 import { exportCsv, saveExportData } from '../reports/commonExporter';
 import { getSavePath } from '../src/utils';
 
-// prettier-ignore
-export const stateCodeMap = {
-  'JAMMU AND KASHMIR': '1',
-  'HIMACHAL PRADESH': '2',
-  'PUNJAB': '3',
-  'CHANDIGARH': '4',
-  'UTTARAKHAND': '5',
-  'HARYANA': '6',
-  'DELHI': '7',
-  'RAJASTHAN': '8',
-  'UTTAR PRADESH': '9',
-  'BIHAR': '10',
-  'SIKKIM': '11',
-  'ARUNACHAL PRADESH': '12',
-  'NAGALAND': '13',
-  'MANIPUR': '14',
-  'MIZORAM': '15',
-  'TRIPURA': '16',
-  'MEGHALAYA': '17',
-  'ASSAM': '18',
-  'WEST BENGAL': '19',
-  'JHARKHAND': '20',
-  'ODISHA': '21',
-  'CHATTISGARH': '22',
-  'MADHYA PRADESH': '23',
-  'GUJARAT': '24',
-  'DADRA AND NAGAR HAVELI AND DAMAN AND DIU': '26',
-  'MAHARASHTRA': '27',
-  'KARNATAKA': '29',
-  'GOA': '30',
-  'LAKSHADWEEP': '31',
-  'KERALA': '32',
-  'TAMIL NADU': '33',
-  'PUDUCHERRY': '34',
-  'ANDAMAN AND NICOBAR ISLANDS': '35',
-  'TELANGANA': '36',
-  'ANDHRA PRADESH': '37',
-  'LADAKH': '38',
-};
-
 const GST = {
   'GST-0': 0,
   'GST-0.25': 0.25,
diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
index 1ffd3e63..6f43dd4d 100644
--- a/frappe/model/doc.ts
+++ b/frappe/model/doc.ts
@@ -27,8 +27,10 @@ import {
 } from './helpers';
 import { setName } from './naming';
 import {
+  Action,
   DefaultMap,
   DependsOnMap,
+  EmptyMessageMap,
   FiltersMap,
   FormulaMap,
   ListsMap,
@@ -504,7 +506,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async getValueFromFormula(field: Field, doc: Doc) {
-    let value: Doc[] | DocValue;
+    let value: Doc[] | DocValue | undefined;
 
     const formula = doc.formulas[field.fieldtype];
     if (formula === undefined) {
@@ -704,6 +706,9 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
   static lists: ListsMap = {};
   static filters: FiltersMap = {};
+  static emptyMessages: EmptyMessageMap = {};
   static listSettings: ListViewSettings = {};
   static treeSettings?: TreeViewSettings;
+
+  static actions: Action[] = [];
 }
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
index b86c06db..07f5a680 100644
--- a/frappe/model/types.ts
+++ b/frappe/model/types.ts
@@ -1,6 +1,7 @@
 import { DocValue } from 'frappe/core/types';
 import { FieldType } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
+import { Router } from 'vue-router';
 import Doc from './doc';
 
 /**
@@ -39,9 +40,18 @@ export type DocMap = Record<string, Doc | undefined>;
 export type FilterFunction = (doc: Doc) => QueryFilter;
 export type FiltersMap = Record<string, FilterFunction>;
 
-export type ListFunction = () => string[];
+export type EmptyMessageFunction = (doc: Doc) => string;
+export type EmptyMessageMap = Record<string, EmptyMessageFunction>;
+
+export type ListFunction = (doc?: Doc) => string[];
 export type ListsMap = Record<string, ListFunction>;
 
+export interface Action {
+  label: string;
+  condition: (doc: Doc) => boolean;
+  action: (doc: Doc, router: Router) => Promise<void>;
+}
+
 export interface ColumnConfig {
   label: string;
   fieldtype: FieldType;
diff --git a/models/baseModels/Address/Address.js b/models/baseModels/Address/Address.js
deleted file mode 100644
index c768c07e..00000000
--- a/models/baseModels/Address/Address.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import { t } from 'frappe';
-import { stateCodeMap } from '../../../accounting/gst';
-import countryList from '../../../fixtures/countryInfo.json';
-import { titleCase } from '../../../src/utils';
-
-function getStates(doc) {
-  switch (doc.country) {
-    case 'India':
-      return Object.keys(stateCodeMap).map(titleCase).sort();
-    default:
-      return [];
-  }
-}
-
-export default {
-  name: 'Address',
-  doctype: 'DocType',
-  regional: 1,
-  isSingle: 0,
-  keywordFields: [
-    'addressLine1',
-    'addressLine2',
-    'city',
-    'state',
-    'country',
-    'postalCode',
-  ],
-  fields: [
-    {
-      fieldname: 'addressLine1',
-      label: t`Address Line 1`,
-      placeholder: t`Address Line 1`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'addressLine2',
-      label: t`Address Line 2`,
-      placeholder: t`Address Line 2`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'city',
-      label: t`City / Town`,
-      placeholder: t`City / Town`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'state',
-      label: t`State`,
-      placeholder: t`State`,
-      fieldtype: 'AutoComplete',
-      emptyMessage: (doc) => {
-        if (doc.country) {
-          return 'Enter State';
-        }
-        return 'Enter Country to load States';
-      },
-      getList: getStates,
-    },
-    {
-      fieldname: 'country',
-      label: t`Country`,
-      placeholder: t`Country`,
-      fieldtype: 'AutoComplete',
-      getList: () => Object.keys(countryList).sort(),
-      required: 1,
-    },
-    {
-      fieldname: 'postalCode',
-      label: t`Postal Code`,
-      placeholder: t`Postal Code`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'emailAddress',
-      label: t`Email Address`,
-      placeholder: t`Email Address`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'phone',
-      label: t`Phone`,
-      placeholder: t`Phone`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'fax',
-      label: t`Fax`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'addressDisplay',
-      fieldtype: 'Text',
-      label: t`Address Display`,
-      readOnly: true,
-      formula: (doc) => {
-        return [
-          doc.addressLine1,
-          doc.addressLine2,
-          doc.city,
-          doc.state,
-          doc.country,
-          doc.postalCode,
-        ]
-          .filter(Boolean)
-          .join(', ');
-      },
-    },
-  ],
-  quickEditFields: [
-    'addressLine1',
-    'addressLine2',
-    'city',
-    'state',
-    'country',
-    'postalCode',
-  ],
-  inlineEditDisplayField: 'addressDisplay',
-};
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
new file mode 100644
index 00000000..2acef2bf
--- /dev/null
+++ b/models/baseModels/Address/Address.ts
@@ -0,0 +1,48 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import { EmptyMessageMap, FormulaMap, ListsMap } from 'frappe/model/types';
+import { stateCodeMap } from 'regional/in';
+import { titleCase } from 'utils';
+import countryInfo from '../../../fixtures/countryInfo.json';
+
+export class Address extends Doc {
+  formulas: FormulaMap = {
+    addressDisplay: async () => {
+      return [
+        this.addressLine1,
+        this.addressLine2,
+        this.city,
+        this.state,
+        this.country,
+        this.postalCode,
+      ]
+        .filter(Boolean)
+        .join(', ');
+    },
+  };
+
+  static lists: ListsMap = {
+    state(doc?: Doc) {
+      const country = doc?.country as string | undefined;
+      switch (country) {
+        case 'India':
+          return Object.keys(stateCodeMap).map(titleCase).sort();
+        default:
+          return [] as string[];
+      }
+    },
+    country() {
+      return Object.keys(countryInfo).sort();
+    },
+  };
+
+  static emptyMessages: EmptyMessageMap = {
+    state: (doc: Doc) => {
+      if (doc.country) {
+        return frappe.t`Enter State`;
+      }
+
+      return frappe.t`Enter Country to load States`;
+    },
+  };
+}
diff --git a/models/baseModels/Address/RegionalChanges.js b/models/baseModels/Address/RegionalChanges.js
deleted file mode 100644
index cae759cb..00000000
--- a/models/baseModels/Address/RegionalChanges.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import { stateCodeMap } from '../../../accounting/gst';
-import { titleCase } from '../../../src/utils';
-import AddressOriginal from './Address';
-
-export default function getAugmentedAddress({ country }) {
-  const Address = cloneDeep(AddressOriginal);
-  if (!country) {
-    return Address;
-  }
-
-  const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
-  if (country === 'India') {
-    Address.fields = [
-      ...Address.fields,
-      {
-        fieldname: 'pos',
-        label: t`Place of Supply`,
-        fieldtype: 'AutoComplete',
-        placeholder: t`Place of Supply`,
-        formula: (doc) => (stateList.includes(doc.state) ? doc.state : ''),
-        getList: () => stateList,
-      },
-    ];
-
-    Address.quickEditFields = [...Address.quickEditFields, 'pos'];
-  }
-
-  return Address;
-}
diff --git a/models/baseModels/Item/Item.js b/models/baseModels/Item/Item.js
deleted file mode 100644
index 7833e2cf..00000000
--- a/models/baseModels/Item/Item.js
+++ /dev/null
@@ -1,168 +0,0 @@
-import frappe, { t } from 'frappe';
-
-const itemForMap = {
-  purchases: t`Purchases`,
-  sales: t`Sales`,
-  both: t`Both`,
-};
-
-export default {
-  name: 'Item',
-  label: t`Item`,
-  doctype: 'DocType',
-  isSingle: 0,
-  regional: 1,
-  keywordFields: ['name', 'description'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Item Name`,
-      fieldtype: 'Data',
-      placeholder: t`Item Name`,
-      required: 1,
-    },
-    {
-      fieldname: 'image',
-      label: t`Image`,
-      fieldtype: 'AttachImage',
-    },
-    {
-      fieldname: 'description',
-      label: t`Description`,
-      placeholder: t`Item Description`,
-      fieldtype: 'Text',
-    },
-    {
-      fieldname: 'unit',
-      label: t`Unit Type`,
-      fieldtype: 'Select',
-      placeholder: t`Unit Type`,
-      default: 'Unit',
-      options: ['Unit', 'Kg', 'Gram', 'Hour', 'Day'],
-    },
-    {
-      fieldname: 'itemType',
-      label: t`Type`,
-      placeholder: t`Type`,
-      fieldtype: 'Select',
-      default: 'Product',
-      options: ['Product', 'Service'],
-    },
-    {
-      fieldname: 'for',
-      label: t`For`,
-      fieldtype: 'Select',
-      options: Object.keys(itemForMap),
-      map: itemForMap,
-      default: 'both',
-    },
-    {
-      fieldname: 'incomeAccount',
-      label: t`Income`,
-      fieldtype: 'Link',
-      target: 'Account',
-      placeholder: t`Income`,
-      required: 1,
-      disableCreation: true,
-      getFilters: () => {
-        return {
-          isGroup: 0,
-          rootType: 'Income',
-        };
-      },
-      formulaDependsOn: ['itemType'],
-      async formula(doc) {
-        let accountName = 'Service';
-        if (doc.itemType === 'Product') {
-          accountName = 'Sales';
-        }
-
-        const accountExists = await frappe.db.exists('Account', accountName);
-        return accountExists ? accountName : '';
-      },
-    },
-    {
-      fieldname: 'expenseAccount',
-      label: t`Expense`,
-      fieldtype: 'Link',
-      target: 'Account',
-      placeholder: t`Expense`,
-      required: 1,
-      disableCreation: true,
-      getFilters: () => {
-        return {
-          isGroup: 0,
-          rootType: 'Expense',
-        };
-      },
-      formulaDependsOn: ['itemType'],
-      async formula() {
-        const cogs = await frappe.db.getAllRaw('Account', {
-          filters: {
-            accountType: 'Cost of Goods Sold',
-          },
-        });
-        if (cogs.length === 0) {
-          return '';
-        } else {
-          return cogs[0].name;
-        }
-      },
-    },
-    {
-      fieldname: 'tax',
-      label: t`Tax`,
-      fieldtype: 'Link',
-      target: 'Tax',
-      placeholder: t`Tax`,
-    },
-    {
-      fieldname: 'rate',
-      label: t`Rate`,
-      fieldtype: 'Currency',
-      validate(value) {
-        if (value.isNegative()) {
-          throw new frappe.errors.ValidationError(t`Rate can't be negative.`);
-        }
-      },
-    },
-  ],
-  quickEditFields: [
-    'rate',
-    'unit',
-    'itemType',
-    'for',
-    'tax',
-    'description',
-    'incomeAccount',
-    'expenseAccount',
-  ],
-  actions: [
-    {
-      label: t`New Invoice`,
-      condition: (doc) => !doc.isNew(),
-      action: async (doc, router) => {
-        const invoice = await frappe.getEmptyDoc('SalesInvoice');
-        invoice.append('items', {
-          item: doc.name,
-          rate: doc.rate,
-          tax: doc.tax,
-        });
-        router.push(`/edit/SalesInvoice/${invoice.name}`);
-      },
-    },
-    {
-      label: t`New Bill`,
-      condition: (doc) => !doc.isNew(),
-      action: async (doc, router) => {
-        const invoice = await frappe.getEmptyDoc('PurchaseInvoice');
-        invoice.append('items', {
-          item: doc.name,
-          rate: doc.rate,
-          tax: doc.tax,
-        });
-        router.push(`/edit/PurchaseInvoice/${invoice.name}`);
-      },
-    },
-  ],
-};
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
new file mode 100644
index 00000000..69bf875c
--- /dev/null
+++ b/models/baseModels/Item/Item.ts
@@ -0,0 +1,98 @@
+import frappe from 'frappe';
+import { DocValue } from 'frappe/core/types';
+import Doc from 'frappe/model/doc';
+import {
+  Action,
+  DependsOnMap,
+  FiltersMap,
+  FormulaMap,
+  ListViewSettings,
+  ValidationMap,
+} from 'frappe/model/types';
+import Money from 'pesa/dist/types/src/money';
+
+export class Item extends Doc {
+  formulas: FormulaMap = {
+    incomeAccount: async () => {
+      let accountName = 'Service';
+      if (this.itemType === 'Product') {
+        accountName = 'Sales';
+      }
+
+      const accountExists = await frappe.db.exists('Account', accountName);
+      return accountExists ? accountName : '';
+    },
+    expenseAccount: async () => {
+      const cogs = await frappe.db.getAllRaw('Account', {
+        filters: {
+          accountType: 'Cost of Goods Sold',
+        },
+      });
+
+      if (cogs.length === 0) {
+        return '';
+      } else {
+        return cogs[0].name as string;
+      }
+    },
+  };
+
+  static filters: FiltersMap = {
+    incomeAccount: () => ({
+      isGroup: false,
+      rootType: 'Income',
+    }),
+    expenseAccount: () => ({
+      isGroup: false,
+      rootType: 'Expense',
+    }),
+  };
+
+  dependsOn: DependsOnMap = {
+    incomeAccount: ['itemType'],
+    expenseAccount: ['itemType'],
+  };
+
+  validations: ValidationMap = {
+    rate: async (value: DocValue) => {
+      if ((value as Money).isNegative()) {
+        throw new frappe.errors.ValidationError(
+          frappe.t`Rate can't be negative.`
+        );
+      }
+    },
+  };
+
+  actions: Action[] = [
+    {
+      label: frappe.t`New Invoice`,
+      condition: (doc) => !doc.isNew,
+      action: async (doc, router) => {
+        const invoice = await frappe.doc.getEmptyDoc('SalesInvoice');
+        invoice.append('items', {
+          item: doc.name as string,
+          rate: doc.rate as Money,
+          tax: doc.tax as string,
+        });
+        router.push(`/edit/SalesInvoice/${invoice.name}`);
+      },
+    },
+    {
+      label: frappe.t`New Bill`,
+      condition: (doc) => !doc.isNew,
+      action: async (doc, router) => {
+        const invoice = await frappe.doc.getEmptyDoc('PurchaseInvoice');
+        invoice.append('items', {
+          item: doc.name as string,
+          rate: doc.rate as Money,
+          tax: doc.tax as string,
+        });
+        router.push(`/edit/PurchaseInvoice/${invoice.name}`);
+      },
+    },
+  ];
+
+  listSettings: ListViewSettings = {
+    columns: ['name', 'unit', 'tax', 'rate'],
+  };
+}
diff --git a/models/baseModels/Item/ItemList.js b/models/baseModels/Item/ItemList.js
deleted file mode 100644
index 84981bf9..00000000
--- a/models/baseModels/Item/ItemList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  doctype: 'Item',
-  title: t`Items`,
-  columns: ['name', 'unit', 'tax', 'rate'],
-};
diff --git a/models/baseModels/Item/RegionalChanges.js b/models/baseModels/Item/RegionalChanges.js
deleted file mode 100644
index 7b88b41d..00000000
--- a/models/baseModels/Item/RegionalChanges.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import ItemOriginal from './Item';
-
-export default function getAugmentedItem({ country }) {
-  const Item = cloneDeep(ItemOriginal);
-  if (!country) {
-    return Item;
-  }
-
-  if (country === 'India') {
-    const nameFieldIndex = Item.fields.findIndex((i) => i.fieldname === 'name');
-
-    Item.fields = [
-      ...Item.fields.slice(0, nameFieldIndex + 1),
-      {
-        fieldname: 'hsnCode',
-        label: t`HSN/SAC`,
-        fieldtype: 'Int',
-        placeholder: t`HSN/SAC Code`,
-      },
-      ...Item.fields.slice(nameFieldIndex + 1, Item.fields.length),
-    ];
-
-    Item.quickEditFields.unshift('hsnCode');
-  }
-
-  return Item;
-}
diff --git a/models/regionalModels/in/Address.ts b/models/regionalModels/in/Address.ts
new file mode 100644
index 00000000..5b554654
--- /dev/null
+++ b/models/regionalModels/in/Address.ts
@@ -0,0 +1,37 @@
+import { FormulaMap, ListsMap } from 'frappe/model/types';
+import { Address as BaseAddress } from 'models/baseModels/Address/Address';
+import { stateCodeMap } from 'regional/in';
+import { titleCase } from 'utils';
+
+export class Address extends BaseAddress {
+  formulas: FormulaMap = {
+    addressDisplay: async () => {
+      return [
+        this.addressLine1,
+        this.addressLine2,
+        this.city,
+        this.state,
+        this.country,
+        this.postalCode,
+      ]
+        .filter(Boolean)
+        .join(', ');
+    },
+
+    pos: async () => {
+      const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
+      const state = this.state as string;
+      if (stateList.includes(state)) {
+        return state;
+      }
+      return '';
+    },
+  };
+
+  static lists: ListsMap = {
+    ...BaseAddress.lists,
+    pos: () => {
+      return Object.keys(stateCodeMap).map(titleCase).sort();
+    },
+  };
+}
diff --git a/regional/in.ts b/regional/in.ts
new file mode 100644
index 00000000..96cf866b
--- /dev/null
+++ b/regional/in.ts
@@ -0,0 +1,39 @@
+// prettier-ignore
+export const stateCodeMap = {
+  'JAMMU AND KASHMIR': '1',
+  'HIMACHAL PRADESH': '2',
+  'PUNJAB': '3',
+  'CHANDIGARH': '4',
+  'UTTARAKHAND': '5',
+  'HARYANA': '6',
+  'DELHI': '7',
+  'RAJASTHAN': '8',
+  'UTTAR PRADESH': '9',
+  'BIHAR': '10',
+  'SIKKIM': '11',
+  'ARUNACHAL PRADESH': '12',
+  'NAGALAND': '13',
+  'MANIPUR': '14',
+  'MIZORAM': '15',
+  'TRIPURA': '16',
+  'MEGHALAYA': '17',
+  'ASSAM': '18',
+  'WEST BENGAL': '19',
+  'JHARKHAND': '20',
+  'ODISHA': '21',
+  'CHATTISGARH': '22',
+  'MADHYA PRADESH': '23',
+  'GUJARAT': '24',
+  'DADRA AND NAGAR HAVELI AND DAMAN AND DIU': '26',
+  'MAHARASHTRA': '27',
+  'KARNATAKA': '29',
+  'GOA': '30',
+  'LAKSHADWEEP': '31',
+  'KERALA': '32',
+  'TAMIL NADU': '33',
+  'PUDUCHERRY': '34',
+  'ANDAMAN AND NICOBAR ISLANDS': '35',
+  'TELANGANA': '36',
+  'ANDHRA PRADESH': '37',
+  'LADAKH': '38',
+};
diff --git a/schemas/app/Address.json b/schemas/app/Address.json
index 12fd1071..f41758f4 100644
--- a/schemas/app/Address.json
+++ b/schemas/app/Address.json
@@ -83,5 +83,6 @@
     "state",
     "country",
     "postalCode"
-  ]
+  ],
+  "inlineEditDisplayField": "addressDisplay"
 }
diff --git a/schemas/types.ts b/schemas/types.ts
index ec90994b..fcd8535d 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -124,6 +124,7 @@ export interface Schema {
   keywordFields?: string[];      // Used to get fields that are to be used for search.
   quickEditFields?: string[];    // Used to get fields for the quickEditForm
   treeSettings?: TreeSettings;   // Used to determine root nodes
+  inlineEditDisplayField?:string,// Display field if inline editable
   naming?: Naming;               // Used for assigning name, default is 'random' else 'numberSeries' if present
 }
 
diff --git a/src/utils.js b/src/utils.js
index 145fb17f..04186b63 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -423,19 +423,6 @@ export function showToast(props) {
   replaceAndAppendMount(toast, 'toast-target');
 }
 
-export function titleCase(phrase) {
-  return phrase
-    .split(' ')
-    .map((word) => {
-      const wordLower = word.toLowerCase();
-      if (['and', 'an', 'a', 'from', 'by', 'on'].includes(wordLower)) {
-        return wordLower;
-      }
-      return wordLower[0].toUpperCase() + wordLower.slice(1);
-    })
-    .join(' ');
-}
-
 export async function getIsSetupComplete() {
   try {
     const { setupComplete } = await frappe.getSingle('AccountingSettings');
diff --git a/tsconfig.json b/tsconfig.json
index 462722a4..e3a8ea0f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,6 +18,7 @@
       "@/*": ["src/*"],
       "schemas/*": ["schemas/*"],
       "backend/*": ["backend/*"],
+      "regional/*": ["regional/*"],
       "utils/*": ["utils/*"]
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
diff --git a/utils/index.ts b/utils/index.ts
index 6b1b3d62..5f46ca0a 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -55,3 +55,16 @@ export function getListFromMap<T>(map: Record<string, T>): T[] {
 export function getIsNullOrUndef(value: unknown): boolean {
   return value === null || value === undefined;
 }
+
+export function titleCase(phrase: string): string {
+  return phrase
+    .split(' ')
+    .map((word) => {
+      const wordLower = word.toLowerCase();
+      if (['and', 'an', 'a', 'from', 'by', 'on'].includes(wordLower)) {
+        return wordLower;
+      }
+      return wordLower[0].toUpperCase() + wordLower.slice(1);
+    })
+    .join(' ');
+}
diff --git a/vue.config.js b/vue.config.js
index ab48daa1..571dc6bf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,6 +44,7 @@ module.exports = {
       schemas: path.resolve(__dirname, './schemas'),
       backend: path.resolve(__dirname, './backend'),
       utils: path.resolve(__dirname, './utils'),
+      regional: path.resolve(__dirname, './regional'),
     });
 
     config.plugins.push(

From 71800dffd624d83c0dcec8fd306ebe15dfefaa15 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 14 Apr 2022 09:57:48 +0530
Subject: [PATCH 042/163] incr: type ledgerposting

---
 .../{ledgerPosting.js => ledgerPosting.ts}    | 111 ++++++++++++------
 accounting/types.ts                           |  27 +++++
 frappe/index.ts                               |   4 +
 3 files changed, 103 insertions(+), 39 deletions(-)
 rename accounting/{ledgerPosting.js => ledgerPosting.ts} (51%)
 create mode 100644 accounting/types.ts

diff --git a/accounting/ledgerPosting.js b/accounting/ledgerPosting.ts
similarity index 51%
rename from accounting/ledgerPosting.js
rename to accounting/ledgerPosting.ts
index aa83689d..ddb7f383 100644
--- a/accounting/ledgerPosting.js
+++ b/accounting/ledgerPosting.ts
@@ -1,33 +1,66 @@
 import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import Money from 'pesa/dist/types/src/money';
+import {
+  AccountEntry,
+  LedgerEntry,
+  LedgerPostingOptions,
+  TransactionType,
+} from './types';
 
-export default class LedgerPosting {
-  constructor({ reference, party, date, description }) {
+export class LedgerPosting {
+  reference: Doc;
+  party?: string;
+  date?: string;
+  description?: string;
+  entries: LedgerEntry[];
+  entryMap: Record<string, LedgerEntry>;
+  reverted: boolean;
+  accountEntries: AccountEntry[];
+
+  constructor({ reference, party, date, description }: LedgerPostingOptions) {
     this.reference = reference;
     this.party = party;
     this.date = date;
-    this.description = description;
+    this.description = description ?? '';
     this.entries = [];
     this.entryMap = {};
-    this.reverted = 0;
+    this.reverted = false;
     // To change balance while entering ledger entries
     this.accountEntries = [];
   }
 
-  async debit(account, amount, referenceType, referenceName) {
+  async debit(
+    account: string,
+    amount: Money,
+    referenceType?: string,
+    referenceName?: string
+  ) {
     const entry = this.getEntry(account, referenceType, referenceName);
     entry.debit = entry.debit.add(amount);
     await this.setAccountBalanceChange(account, 'debit', amount);
   }
 
-  async credit(account, amount, referenceType, referenceName) {
+  async credit(
+    account: string,
+    amount: Money,
+    referenceType?: string,
+    referenceName?: string
+  ) {
     const entry = this.getEntry(account, referenceType, referenceName);
     entry.credit = entry.credit.add(amount);
     await this.setAccountBalanceChange(account, 'credit', amount);
   }
 
-  async setAccountBalanceChange(accountName, type, amount) {
+  async setAccountBalanceChange(
+    accountName: string,
+    type: TransactionType,
+    amount: Money
+  ) {
     const debitAccounts = ['Asset', 'Expense'];
-    const { rootType } = await frappe.doc.getDoc('Account', accountName);
+    const accountDoc = await frappe.doc.getDoc('Account', accountName);
+    const rootType = accountDoc.rootType as string;
+
     if (debitAccounts.indexOf(rootType) === -1) {
       const change = type == 'credit' ? amount : amount.neg();
       this.accountEntries.push({
@@ -43,14 +76,14 @@ export default class LedgerPosting {
     }
   }
 
-  getEntry(account, referenceType, referenceName) {
+  getEntry(account: string, referenceType?: string, referenceName?: string) {
     if (!this.entryMap[account]) {
-      const entry = {
+      const entry: LedgerEntry = {
         account: account,
-        party: this.party || '',
-        date: this.date || this.reference.date,
-        referenceType: referenceType || this.reference.doctype,
-        referenceName: referenceName || this.reference.name,
+        party: this.party ?? '',
+        date: this.date ?? (this.reference.date as string),
+        referenceType: referenceType ?? this.reference.schemaName,
+        referenceName: referenceName ?? this.reference.name!,
         description: this.description,
         reverted: this.reverted,
         debit: frappe.pesa(0),
@@ -72,47 +105,46 @@ export default class LedgerPosting {
   async postReverse() {
     this.validateEntries();
 
-    let data = await frappe.db.getAll({
-      doctype: 'AccountingLedgerEntry',
+    const data = await frappe.db.getAll('AccountingLedgerEntry', {
       fields: ['name'],
       filters: {
-        referenceName: this.reference.name,
-        reverted: 0,
+        referenceName: this.reference.name!,
+        reverted: false,
       },
     });
 
-    for (let entry of data) {
-      let entryDoc = await frappe.doc.getDoc(
+    for (const entry of data) {
+      const entryDoc = await frappe.doc.getDoc(
         'AccountingLedgerEntry',
-        entry.name
+        entry.name as string
       );
-      entryDoc.reverted = 1;
+      entryDoc.reverted = true;
       await entryDoc.update();
     }
 
     let temp;
-    for (let entry of this.entries) {
+    for (const entry of this.entries) {
       temp = entry.debit;
       entry.debit = entry.credit;
       entry.credit = temp;
-      entry.reverted = 1;
+      entry.reverted = true;
     }
-    for (let entry of this.accountEntries) {
-      entry.balanceChange = entry.balanceChange.neg();
+    for (const entry of this.accountEntries) {
+      entry.balanceChange = (entry.balanceChange as Money).neg();
     }
     await this.insertEntries();
   }
 
   makeRoundOffEntry() {
-    let { debit, credit } = this.getTotalDebitAndCredit();
-    let difference = debit.sub(credit);
-    let absoluteValue = difference.abs();
-    let allowance = 0.5;
+    const { debit, credit } = this.getTotalDebitAndCredit();
+    const difference = debit.sub(credit);
+    const absoluteValue = difference.abs();
+    const allowance = 0.5;
     if (absoluteValue.eq(0)) {
       return;
     }
 
-    let roundOffAccount = this.getRoundOffAccount();
+    const roundOffAccount = this.getRoundOffAccount();
     if (absoluteValue.lte(allowance)) {
       if (difference.gt(0)) {
         this.credit(roundOffAccount, absoluteValue);
@@ -123,7 +155,7 @@ export default class LedgerPosting {
   }
 
   validateEntries() {
-    let { debit, credit } = this.getTotalDebitAndCredit();
+    const { debit, credit } = this.getTotalDebitAndCredit();
     if (debit.neq(credit)) {
       throw new frappe.errors.ValidationError(
         `Total Debit: ${frappe.format(
@@ -138,7 +170,7 @@ export default class LedgerPosting {
     let debit = frappe.pesa(0);
     let credit = frappe.pesa(0);
 
-    for (let entry of this.entries) {
+    for (const entry of this.entries) {
       debit = debit.add(entry.debit);
       credit = credit.add(entry.credit);
     }
@@ -147,19 +179,20 @@ export default class LedgerPosting {
   }
 
   async insertEntries() {
-    for (let entry of this.entries) {
-      let entryDoc = frappe.doc.getNewDoc('AccountingLedgerEntry');
+    for (const entry of this.entries) {
+      const entryDoc = frappe.doc.getNewDoc('AccountingLedgerEntry');
       Object.assign(entryDoc, entry);
       await entryDoc.insert();
     }
-    for (let entry of this.accountEntries) {
-      let entryDoc = await frappe.doc.getDoc('Account', entry.name);
-      entryDoc.balance = entryDoc.balance.add(entry.balanceChange);
+    for (const entry of this.accountEntries) {
+      const entryDoc = await frappe.doc.getDoc('Account', entry.name);
+      const balance = entryDoc.get('balance') as Money;
+      entryDoc.balance = balance.add(entry.balanceChange);
       await entryDoc.update();
     }
   }
 
   getRoundOffAccount() {
-    return frappe.AccountingSettings.roundOffAccount;
+    return frappe.singles.AccountingSettings!.roundOffAccount as string;
   }
 }
diff --git a/accounting/types.ts b/accounting/types.ts
new file mode 100644
index 00000000..be5d091c
--- /dev/null
+++ b/accounting/types.ts
@@ -0,0 +1,27 @@
+import Doc from 'frappe/model/doc';
+import Money from 'pesa/dist/types/src/money';
+
+export interface LedgerPostingOptions {
+  reference: Doc;
+  party?: string;
+  date?: string;
+  description?: string;
+}
+export interface LedgerEntry {
+  account: string;
+  party: string;
+  date: string;
+  referenceType: string;
+  referenceName: string;
+  description?: string;
+  reverted: boolean;
+  debit: Money;
+  credit: Money;
+}
+
+export interface AccountEntry {
+  name: string;
+  balanceChange: Money;
+}
+
+export type TransactionType = 'credit' | 'debit';
diff --git a/frappe/index.ts b/frappe/index.ts
index 77181b36..7b5e7b8c 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -72,6 +72,10 @@ export class Frappe {
     return this.doc.models;
   }
 
+  get singles() {
+    return this.doc.singles;
+  }
+
   get schemaMap() {
     return this.db.schemaMap;
   }

From b08a3b9d527cb85dd66e05b37d053aa467777b9f Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 14 Apr 2022 10:54:11 +0530
Subject: [PATCH 043/163] incr: type Party, JournalEntry - add removeFields -
 fix Party schema

---
 frappe/model/doc.ts                           |   2 +
 frappe/model/types.ts                         |   4 +-
 models/baseModels/Item/Item.ts                |   2 +-
 .../baseModels/JournalEntry/JournalEntry.js   |  92 ----------
 .../baseModels/JournalEntry/JournalEntry.ts   |  99 +++++++++++
 .../JournalEntry/JournalEntryList.js          |  44 -----
 .../JournalEntry/JournalEntryServer.js        |  34 ----
 models/baseModels/Party/Customer.js           |  53 ------
 models/baseModels/Party/CustomerList.js       |   7 -
 models/baseModels/Party/Party.js              | 105 ------------
 models/baseModels/Party/Party.ts              | 161 ++++++++++++++++++
 models/baseModels/Party/PartyList.js          |   4 -
 models/baseModels/Party/PartyServer.js        |  37 ----
 models/baseModels/Party/RegionalChanges.js    |  43 -----
 models/baseModels/Party/Supplier.js           |  53 ------
 models/baseModels/Party/SupplierList.js       |   7 -
 models/baseModels/Party/types.ts              |   1 +
 models/helpers.ts                             |  24 +++
 models/regionalModels/in/Party.ts             |  18 ++
 models/regionalModels/in/types.ts             |   1 +
 schemas/app/Party.json                        |  14 +-
 schemas/index.ts                              |  29 ++++
 schemas/regional/in/Party.json                |   3 +-
 schemas/types.ts                              |   3 +-
 .../components/Widgets}/PartyWidget.vue       |   0
 25 files changed, 349 insertions(+), 491 deletions(-)
 delete mode 100644 models/baseModels/JournalEntry/JournalEntry.js
 create mode 100644 models/baseModels/JournalEntry/JournalEntry.ts
 delete mode 100644 models/baseModels/JournalEntry/JournalEntryList.js
 delete mode 100644 models/baseModels/JournalEntry/JournalEntryServer.js
 delete mode 100644 models/baseModels/Party/Customer.js
 delete mode 100644 models/baseModels/Party/CustomerList.js
 delete mode 100644 models/baseModels/Party/Party.js
 create mode 100644 models/baseModels/Party/Party.ts
 delete mode 100644 models/baseModels/Party/PartyList.js
 delete mode 100644 models/baseModels/Party/PartyServer.js
 delete mode 100644 models/baseModels/Party/RegionalChanges.js
 delete mode 100644 models/baseModels/Party/Supplier.js
 delete mode 100644 models/baseModels/Party/SupplierList.js
 create mode 100644 models/baseModels/Party/types.ts
 create mode 100644 models/helpers.ts
 create mode 100644 models/regionalModels/in/Party.ts
 create mode 100644 models/regionalModels/in/types.ts
 rename {models/baseModels/Party => src/components/Widgets}/PartyWidget.vue (100%)

diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
index 6f43dd4d..97000a59 100644
--- a/frappe/model/doc.ts
+++ b/frappe/model/doc.ts
@@ -33,6 +33,7 @@ import {
   EmptyMessageMap,
   FiltersMap,
   FormulaMap,
+  HiddenMap,
   ListsMap,
   ListViewSettings,
   RequiredMap,
@@ -702,6 +703,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   defaults: DefaultMap = {};
   validations: ValidationMap = {};
   required: RequiredMap = {};
+  hidden: HiddenMap = {};
   dependsOn: DependsOnMap = {};
 
   static lists: ListsMap = {};
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
index 07f5a680..581e823d 100644
--- a/frappe/model/types.ts
+++ b/frappe/model/types.ts
@@ -20,12 +20,13 @@ export type Formula = () => Promise<DocValue | undefined>;
 export type Default = () => DocValue;
 export type Validation = (value: DocValue) => Promise<void>;
 export type Required = () => boolean;
+export type Hidden = () => boolean;
 
 export type FormulaMap = Record<string, Formula | undefined>;
 export type DefaultMap = Record<string, Default | undefined>;
 export type ValidationMap = Record<string, Validation | undefined>;
 export type RequiredMap = Record<string, Required | undefined>;
-
+export type HiddenMap = Record<string, Hidden>;
 export type DependsOnMap = Record<string, string[]>;
 
 /**
@@ -55,6 +56,7 @@ export interface Action {
 export interface ColumnConfig {
   label: string;
   fieldtype: FieldType;
+  fieldname?: string;
   size?: string;
   render?: (doc: Doc) => { template: string };
   getValue?: (doc: Doc) => string;
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 69bf875c..3bef01d7 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -63,7 +63,7 @@ export class Item extends Doc {
     },
   };
 
-  actions: Action[] = [
+  static actions: Action[] = [
     {
       label: frappe.t`New Invoice`,
       condition: (doc) => !doc.isNew,
diff --git a/models/baseModels/JournalEntry/JournalEntry.js b/models/baseModels/JournalEntry/JournalEntry.js
deleted file mode 100644
index 8cc3cb44..00000000
--- a/models/baseModels/JournalEntry/JournalEntry.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import { t } from 'frappe';
-import { DateTime } from 'luxon';
-import { ledgerLink } from '../../../accounting/utils';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-
-export const journalEntryTypeMap = {
-  'Journal Entry': t`Journal Entry`,
-  'Bank Entry': t`Bank Entry`,
-  'Cash Entry': t`Cash Entry`,
-  'Credit Card Entry': t`Credit Card Entry`,
-  'Debit Note': t`Debit Note`,
-  'Credit Note': t`Credit Note`,
-  'Contra Entry': t`Contra Entry`,
-  'Excise Entry': t`Excise Entry`,
-  'Write Off Entry': t`Write Off Entry`,
-  'Opening Entry': t`Opening Entry`,
-  'Depreciation Entry': t`Depreciation Entry`,
-};
-
-export default {
-  label: t`Journal Entry`,
-  name: 'JournalEntry',
-  doctype: 'DocType',
-  isSubmittable: 1,
-  settings: 'JournalEntrySettings',
-  fields: [
-    {
-      fieldname: 'entryType',
-      label: t`Entry Type`,
-      fieldtype: 'Select',
-      placeholder: t`Entry Type`,
-      options: Object.keys(journalEntryTypeMap),
-      map: journalEntryTypeMap,
-      required: 1,
-    },
-    {
-      label: t`Entry No`,
-      fieldname: 'name',
-      fieldtype: 'Data',
-      required: 1,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'date',
-      label: t`Date`,
-      fieldtype: 'Date',
-      default: () => DateTime.local().toISODate(),
-    },
-    {
-      fieldname: 'accounts',
-      label: t`Account Entries`,
-      fieldtype: 'Table',
-      childtype: 'JournalEntryAccount',
-      required: true,
-    },
-    {
-      fieldname: 'referenceNumber',
-      label: t`Reference Number`,
-      fieldtype: 'Data',
-    },
-    {
-      fieldname: 'referenceDate',
-      label: t`Reference Date`,
-      fieldtype: 'Date',
-    },
-    {
-      fieldname: 'userRemark',
-      label: t`User Remark`,
-      fieldtype: 'Text',
-      placeholder: t`User Remark`,
-    },
-    {
-      fieldname: 'cancelled',
-      label: t`Cancelled`,
-      fieldtype: 'Check',
-      default: 0,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'numberSeries',
-      label: t`Number Series`,
-      fieldtype: 'Link',
-      target: 'NumberSeries',
-      required: 1,
-      getFilters: () => {
-        return { referenceType: 'JournalEntry' };
-      },
-      default: DEFAULT_NUMBER_SERIES['JournalEntry'],
-    },
-  ],
-  actions: [ledgerLink],
-};
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
new file mode 100644
index 00000000..f0f38c25
--- /dev/null
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -0,0 +1,99 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import {
+  Action,
+  DefaultMap,
+  FiltersMap,
+  ListViewSettings,
+} from 'frappe/model/types';
+import { DateTime } from 'luxon';
+import { getLedgerLinkAction } from 'models/helpers';
+import Money from 'pesa/dist/types/src/money';
+import { LedgerPosting } from '../../../accounting/ledgerPosting';
+
+export class JournalEntry extends Doc {
+  accounts: Doc[] = [];
+
+  getPosting() {
+    const entries = new LedgerPosting({ reference: this });
+
+    for (const row of this.accounts) {
+      const debit = row.debit as Money;
+      const credit = row.credit as Money;
+      const account = row.account as string;
+
+      if (!debit.isZero()) {
+        entries.debit(account, debit);
+      } else if (!credit.isZero()) {
+        entries.credit(account, credit);
+      }
+    }
+
+    return entries;
+  }
+
+  beforeUpdate() {
+    this.getPosting().validateEntries();
+  }
+
+  beforeInsert() {
+    this.getPosting().validateEntries();
+  }
+
+  async beforeSubmit() {
+    await this.getPosting().post();
+  }
+
+  async afterRevert() {
+    await this.getPosting().postReverse();
+  }
+
+  defaults: DefaultMap = {
+    date: () => DateTime.local().toISODate(),
+  };
+
+  static filters: FiltersMap = {
+    numberSeries: () => ({ referenceType: 'JournalEntry' }),
+  };
+
+  static actions: Action[] = [getLedgerLinkAction()];
+
+  static listSettings: ListViewSettings = {
+    formRoute: (name) => `/edit/JournalEntry/${name}`,
+    columns: [
+      'date',
+      {
+        label: frappe.t`Status`,
+        fieldtype: 'Select',
+        size: 'small',
+        render(doc) {
+          let status = 'Draft';
+          let color = 'gray';
+          if (doc.submitted) {
+            color = 'green';
+            status = 'Submitted';
+          }
+
+          if (doc.cancelled) {
+            color = 'red';
+            status = 'Cancelled';
+          }
+
+          return {
+            template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
+          };
+        },
+      },
+      {
+        label: frappe.t`Entry ID`,
+        fieldtype: 'Data',
+        fieldname: 'name',
+        getValue(doc) {
+          return doc.name as string;
+        },
+      },
+      'entryType',
+      'referenceNumber',
+    ],
+  };
+}
diff --git a/models/baseModels/JournalEntry/JournalEntryList.js b/models/baseModels/JournalEntry/JournalEntryList.js
deleted file mode 100644
index 12d607d0..00000000
--- a/models/baseModels/JournalEntry/JournalEntryList.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import Badge from '@/components/Badge';
-import { t } from 'frappe';
-
-export default {
-  doctype: 'JournalEntry',
-  title: t`Journal Entry`,
-  formRoute: (name) => `/edit/JournalEntry/${name}`,
-  columns: [
-    'date',
-    {
-      label: t`Status`,
-      fieldtype: 'Select',
-      size: 'small',
-      render(doc) {
-        let status = 'Draft';
-        let color = 'gray';
-        if (doc.submitted === 1) {
-          color = 'green';
-          status = 'Submitted';
-        }
-
-        if (doc.cancelled === 1) {
-          color = 'red';
-          status = 'Cancelled';
-        }
-
-        return {
-          template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
-          components: { Badge },
-        };
-      },
-    },
-    {
-      label: t`Entry ID`,
-      fieldname: 'name',
-      fieldtype: 'Data',
-      getValue(doc) {
-        return doc.name;
-      },
-    },
-    'entryType',
-    'referenceNumber',
-  ],
-};
diff --git a/models/baseModels/JournalEntry/JournalEntryServer.js b/models/baseModels/JournalEntry/JournalEntryServer.js
deleted file mode 100644
index f10f6ce3..00000000
--- a/models/baseModels/JournalEntry/JournalEntryServer.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import Document from 'frappe/model/document';
-import LedgerPosting from '../../../accounting/ledgerPosting';
-
-export default class JournalEntryServer extends Document {
-  getPosting() {
-    let entries = new LedgerPosting({ reference: this });
-
-    for (let row of this.accounts) {
-      if (!row.debit.isZero()) {
-        entries.debit(row.account, row.debit);
-      } else if (!row.credit.isZero()) {
-        entries.credit(row.account, row.credit);
-      }
-    }
-
-    return entries;
-  }
-
-  beforeUpdate() {
-    this.getPosting().validateEntries();
-  }
-
-  beforeInsert() {
-    this.getPosting().validateEntries();
-  }
-
-  async beforeSubmit() {
-    await this.getPosting().post();
-  }
-
-  async afterRevert() {
-    await this.getPosting().postReverse();
-  }
-}
diff --git a/models/baseModels/Party/Customer.js b/models/baseModels/Party/Customer.js
deleted file mode 100644
index 197ddf5e..00000000
--- a/models/baseModels/Party/Customer.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import router from '@/router';
-import frappe, { t } from 'frappe';
-import { h } from 'vue';
-import PartyWidget from './PartyWidget.vue';
-
-export default {
-  name: 'Customer',
-  label: t`Customer`,
-  basedOn: 'Party',
-  filters: {
-    customer: 1,
-  },
-  actions: [
-    {
-      label: t`Create Invoice`,
-      condition: (doc) => !doc.isNew(),
-      action: async (customer) => {
-        let doc = await frappe.getEmptyDoc('SalesInvoice');
-        router.push({
-          path: `/edit/SalesInvoice/${doc.name}`,
-          query: {
-            doctype: 'SalesInvoice',
-            values: {
-              customer: customer.name,
-            },
-          },
-        });
-      },
-    },
-    {
-      label: t`View Invoices`,
-      condition: (doc) => !doc.isNew(),
-      action: (customer) => {
-        router.push({
-          name: 'ListView',
-          params: {
-            doctype: 'SalesInvoice',
-            filters: {
-              customer: customer.name,
-            },
-          },
-        });
-      },
-    },
-  ],
-  quickEditWidget: (doc) => ({
-    render() {
-      return h(PartyWidget, {
-        doc,
-      });
-    },
-  }),
-};
diff --git a/models/baseModels/Party/CustomerList.js b/models/baseModels/Party/CustomerList.js
deleted file mode 100644
index 6fa014b5..00000000
--- a/models/baseModels/Party/CustomerList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  doctype: 'Customer',
-  title: t`Customers`,
-  columns: ['name', 'phone', 'outstandingAmount'],
-};
diff --git a/models/baseModels/Party/Party.js b/models/baseModels/Party/Party.js
deleted file mode 100644
index a159c8c2..00000000
--- a/models/baseModels/Party/Party.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import frappe, { t } from 'frappe';
-
-export default {
-  name: 'Party',
-  label: t`Party`,
-  regional: 1,
-  keywordFields: ['name'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Name`,
-      fieldtype: 'Data',
-      required: 1,
-      placeholder: t`Full Name`,
-    },
-    {
-      fieldname: 'image',
-      label: t`Image`,
-      fieldtype: 'AttachImage',
-    },
-    {
-      fieldname: 'customer',
-      label: t`Is Customer`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'supplier',
-      label: t`Is Supplier`,
-      fieldtype: 'Check',
-    },
-    {
-      fieldname: 'defaultAccount',
-      label: t`Default Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      getFilters: (query, doc) => {
-        return {
-          isGroup: 0,
-          accountType: doc.customer ? 'Receivable' : 'Payable',
-        };
-      },
-      async formula(doc) {
-        let accountName = 'Debtors'; // if Party is a Customer
-        if (doc.supplier) {
-          accountName = 'Creditors';
-        }
-
-        const accountExists = await frappe.db.exists('Account', accountName);
-        return accountExists ? accountName : '';
-      },
-    },
-    {
-      fieldname: 'outstandingAmount',
-      label: t`Outstanding Amount`,
-      fieldtype: 'Currency',
-    },
-    {
-      fieldname: 'currency',
-      label: t`Currency`,
-      fieldtype: 'Link',
-      target: 'Currency',
-      placeholder: t`INR`,
-      formula: () => frappe.AccountingSettings.currency,
-    },
-    {
-      fieldname: 'email',
-      label: t`Email`,
-      fieldtype: 'Data',
-      placeholder: t`john@doe.com`,
-      validate: {
-        type: 'email',
-      },
-    },
-    {
-      fieldname: 'phone',
-      label: t`Phone`,
-      fieldtype: 'Data',
-      placeholder: t`Phone`,
-      validate: {
-        type: 'phone',
-      },
-    },
-    {
-      fieldname: 'address',
-      label: t`Address`,
-      fieldtype: 'Link',
-      target: 'Address',
-      placeholder: t`Click to create`,
-      inline: true,
-    },
-    {
-      fieldname: 'addressDisplay',
-      label: t`Address Display`,
-      fieldtype: 'Text',
-      readOnly: true,
-      formula: (doc) => {
-        if (doc.address) {
-          return doc.getFrom('Address', doc.address, 'addressDisplay');
-        }
-      },
-    },
-  ],
-
-  quickEditFields: ['email', 'phone', 'address', 'defaultAccount', 'currency'],
-};
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
new file mode 100644
index 00000000..e963e055
--- /dev/null
+++ b/models/baseModels/Party/Party.ts
@@ -0,0 +1,161 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import {
+  Action,
+  FiltersMap,
+  FormulaMap,
+  ListViewSettings,
+} from 'frappe/model/types';
+import { PartyRole } from './types';
+
+export class Party extends Doc {
+  async updateOutstandingAmounts() {
+    const role = this.role as PartyRole;
+    switch (role) {
+      case 'Customer':
+        await this._updateOutstandingAmount('SalesInvoice');
+        break;
+      case 'Supplier':
+        await this._updateOutstandingAmount('PurchaseInvoice');
+        break;
+      case 'Both':
+        await this._updateOutstandingAmount('SalesInvoice');
+        await this._updateOutstandingAmount('PurchaseInvoice');
+        break;
+    }
+  }
+
+  async _updateOutstandingAmount(
+    schemaName: 'SalesInvoice' | 'PurchaseInvoice'
+  ) {
+    const outstandingAmounts = (
+      await frappe.db.getAllRaw(schemaName, {
+        fields: ['outstandingAmount', 'party'],
+        filters: { submitted: true },
+      })
+    ).filter(({ party }) => party === this.name);
+
+    const totalOutstanding = outstandingAmounts
+      .map(({ outstandingAmount }) => frappe.pesa(outstandingAmount as number))
+      .reduce((a, b) => a.add(b), frappe.pesa(0));
+
+    await this.set('outstandingAmount', totalOutstanding);
+    await this.update();
+  }
+
+  formulas: FormulaMap = {
+    defaultAccount: async () => {
+      const role = this.role as PartyRole;
+      if (role === 'Both') {
+        return '';
+      }
+
+      let accountName = 'Debtors';
+      if (role === 'Supplier') {
+        accountName = 'Creditors';
+      }
+
+      const accountExists = await frappe.db.exists('Account', accountName);
+      return accountExists ? accountName : '';
+    },
+    currency: async () => frappe.singles.AccountingSettings!.currency as string,
+    addressDisplay: async () => {
+      const address = this.address as string | undefined;
+      if (address) {
+        return this.getFrom('Address', address, 'addressDisplay') as string;
+      }
+      return '';
+    },
+  };
+
+  static filters: FiltersMap = {
+    defaultAccount: (doc: Doc) => {
+      const role = doc.role as PartyRole;
+      if (role === 'Both') {
+        return { isGroup: false, accountType: ['Payable', 'Receivable'] };
+      }
+
+      return {
+        isGroup: false,
+        accountType: role === 'Customer' ? 'Receivable' : 'Payable',
+      };
+    },
+  };
+
+  static listSettings: ListViewSettings = {
+    columns: ['name', 'phone', 'outstandingAmount'],
+  };
+
+  static actions: Action[] = [
+    {
+      label: frappe.t`Create Bill`,
+      condition: (doc: Doc) =>
+        !doc.isNew && (doc.role as PartyRole) !== 'Customer',
+      action: async (partyDoc, router) => {
+        const doc = await frappe.doc.getEmptyDoc('PurchaseInvoice');
+        router.push({
+          path: `/edit/PurchaseInvoice/${doc.name}`,
+          query: {
+            doctype: 'PurchaseInvoice',
+            values: {
+              // @ts-ignore
+              party: partyDoc.name!,
+            },
+          },
+        });
+      },
+    },
+    {
+      label: frappe.t`View Bills`,
+      condition: (doc: Doc) =>
+        !doc.isNew && (doc.role as PartyRole) !== 'Customer',
+      action: async (partyDoc, router) => {
+        router.push({
+          name: 'ListView',
+          params: {
+            doctype: 'PurchaseInvoice',
+            filters: {
+              // @ts-ignore
+              party: partyDoc.name!,
+            },
+          },
+        });
+      },
+    },
+    {
+      label: frappe.t`Create Invoice`,
+      condition: (doc: Doc) =>
+        !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
+      action: async (partyDoc, router) => {
+        const doc = await frappe.doc.getEmptyDoc('SalesInvoice');
+        router.push({
+          path: `/edit/SalesInvoice/${doc.name}`,
+          query: {
+            doctype: 'SalesInvoice',
+            values: {
+              // @ts-ignore
+              party: partyDoc.name!,
+            },
+          },
+        });
+      },
+    },
+    {
+      label: frappe.t`View Invoices`,
+      condition: (doc: Doc) =>
+        !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
+      action: async (partyDoc, router) => {
+        router.push({
+          name: 'ListView',
+          params: {
+            doctype: 'SalesInvoice',
+            filters: {
+              // @ts-ignore
+              party: partyDoc.name!,
+            },
+          },
+        });
+      },
+    },
+  ];
+}
diff --git a/models/baseModels/Party/PartyList.js b/models/baseModels/Party/PartyList.js
deleted file mode 100644
index ee158c71..00000000
--- a/models/baseModels/Party/PartyList.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  doctype: 'Party',
-  columns: ['name', 'phone', 'outstandingAmount'],
-};
diff --git a/models/baseModels/Party/PartyServer.js b/models/baseModels/Party/PartyServer.js
deleted file mode 100644
index 02b54a24..00000000
--- a/models/baseModels/Party/PartyServer.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import frappe from 'frappe';
-import Document from 'frappe/model/document';
-
-export default class PartyServer extends Document {
-  beforeInsert() {
-    if (this.customer && this.supplier) {
-      throw new Error('Select a single party type.');
-    }
-
-    if (!this.customer && !this.supplier) {
-      this.supplier = 1;
-    }
-
-    if (this.gstin && ['Unregistered', 'Consumer'].includes(this.gstType)) {
-      this.gstin = '';
-    }
-  }
-
-  async updateOutstandingAmount() {
-    let isCustomer = this.customer;
-    let doctype = isCustomer ? 'SalesInvoice' : 'PurchaseInvoice';
-
-    const outstandingAmounts = (
-      await frappe.db.getAllRaw(doctype, {
-        fields: ['outstandingAmount', 'party'],
-        filters: { submitted: true },
-      })
-    ).filter(({ party }) => party === this.name);
-
-    const totalOutstanding = outstandingAmounts
-      .map(({ outstandingAmount }) => frappe.pesa(outstandingAmount))
-      .reduce((a, b) => a.add(b), frappe.pesa(0));
-
-    await this.set('outstandingAmount', totalOutstanding);
-    await this.update();
-  }
-}
diff --git a/models/baseModels/Party/RegionalChanges.js b/models/baseModels/Party/RegionalChanges.js
deleted file mode 100644
index 955cc365..00000000
--- a/models/baseModels/Party/RegionalChanges.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import PartyOriginal from './Party';
-
-const gstTypes = ['Unregistered', 'Registered Regular', 'Consumer'];
-
-export default function getAugmentedParty({ country }) {
-  const Party = cloneDeep(PartyOriginal);
-  if (!country) {
-    return Party;
-  }
-
-  if (country === 'India') {
-    Party.fields.splice(
-      3,
-      0,
-      {
-        fieldname: 'gstin',
-        label: t`GSTIN No.`,
-        fieldtype: 'Data',
-        hidden: (doc) => (doc.gstType === 'Registered Regular' ? 0 : 1),
-      },
-      {
-        fieldname: 'gstType',
-        label: t`GST Registration`,
-        placeholder: t`GST Registration`,
-        fieldtype: 'Select',
-        default: gstTypes[0],
-        options: gstTypes,
-      }
-    );
-    Party.quickEditFields.push('gstType');
-    Party.quickEditFields.push('gstin');
-  } else {
-    Party.fields.splice(3, 0, {
-      fieldname: 'taxId',
-      label: t`Tax ID`,
-      fieldtype: 'Data',
-    });
-    Party.quickEditFields.push('taxId');
-  }
-  return Party;
-}
diff --git a/models/baseModels/Party/Supplier.js b/models/baseModels/Party/Supplier.js
deleted file mode 100644
index b5f09ea8..00000000
--- a/models/baseModels/Party/Supplier.js
+++ /dev/null
@@ -1,53 +0,0 @@
-import router from '@/router';
-import frappe, { t } from 'frappe';
-import { h } from 'vue';
-import PartyWidget from './PartyWidget.vue';
-
-export default {
-  name: 'Supplier',
-  label: t`Supplier`,
-  basedOn: 'Party',
-  filters: {
-    supplier: 1,
-  },
-  actions: [
-    {
-      label: t`Create Bill`,
-      condition: (doc) => !doc.isNew(),
-      action: async (supplier) => {
-        let doc = await frappe.getEmptyDoc('PurchaseInvoice');
-        router.push({
-          path: `/edit/PurchaseInvoice/${doc.name}`,
-          query: {
-            doctype: 'PurchaseInvoice',
-            values: {
-              supplier: supplier.name,
-            },
-          },
-        });
-      },
-    },
-    {
-      label: t`View Bills`,
-      condition: (doc) => !doc.isNew(),
-      action: (supplier) => {
-        router.push({
-          name: 'ListView',
-          params: {
-            doctype: 'PurchaseInvoice',
-            filters: {
-              supplier: supplier.name,
-            },
-          },
-        });
-      },
-    },
-  ],
-  quickEditWidget: (doc) => ({
-    render() {
-      return h(PartyWidget, {
-        doc,
-      });
-    },
-  }),
-};
diff --git a/models/baseModels/Party/SupplierList.js b/models/baseModels/Party/SupplierList.js
deleted file mode 100644
index 6a4e8a83..00000000
--- a/models/baseModels/Party/SupplierList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  doctype: 'Supplier',
-  title: t`Supplier`,
-  columns: ['name', 'phone', 'outstandingAmount'],
-};
diff --git a/models/baseModels/Party/types.ts b/models/baseModels/Party/types.ts
new file mode 100644
index 00000000..3659b47d
--- /dev/null
+++ b/models/baseModels/Party/types.ts
@@ -0,0 +1 @@
+export type PartyRole = 'Both' | 'Supplier' | 'Customer';
diff --git a/models/helpers.ts b/models/helpers.ts
new file mode 100644
index 00000000..3ecae1dc
--- /dev/null
+++ b/models/helpers.ts
@@ -0,0 +1,24 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import { Action } from 'frappe/model/types';
+import { Router } from 'vue-router';
+
+export function getLedgerLinkAction(): Action {
+  return {
+    label: frappe.t`Ledger Entries`,
+    condition: (doc: Doc) => !!doc.submitted,
+    action: async (doc: Doc, router: Router) => {
+      router.push({
+        name: 'Report',
+        params: {
+          reportName: 'general-ledger',
+          defaultFilters: {
+            // @ts-ignore
+            referenceType: doc.schemaName,
+            referenceName: doc.name,
+          },
+        },
+      });
+    },
+  };
+}
diff --git a/models/regionalModels/in/Party.ts b/models/regionalModels/in/Party.ts
new file mode 100644
index 00000000..6f2aa125
--- /dev/null
+++ b/models/regionalModels/in/Party.ts
@@ -0,0 +1,18 @@
+import { HiddenMap } from 'frappe/model/types';
+import { Party as BaseParty } from 'models/baseModels/Party/Party';
+import { GSTType } from './types';
+
+export class Party extends BaseParty {
+  beforeInsert() {
+    const gstin = this.get('gstin') as string | undefined;
+    const gstType = this.get('gstType') as GSTType;
+
+    if (gstin && gstType !== 'Registered Regular') {
+      this.gstin = '';
+    }
+  }
+
+  hidden: HiddenMap = {
+    gstin: () => (this.gstType as GSTType) !== 'Registered Regular',
+  };
+}
diff --git a/models/regionalModels/in/types.ts b/models/regionalModels/in/types.ts
new file mode 100644
index 00000000..a5c8d256
--- /dev/null
+++ b/models/regionalModels/in/types.ts
@@ -0,0 +1 @@
+export type GSTType = 'Unregistered' | 'Registered Regular' | 'Consumer';
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index f197bade..843359da 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -72,15 +72,13 @@
       "target": "Address",
       "placeholder": "Click to create",
       "inline": true
+    },
+    {
+      "fieldname": "taxId",
+      "label": "Tax ID",
+      "fieldtype": "Data"
     }
   ],
-  "quickEditFields": [
-    "email",
-    "role",
-    "phone",
-    "address",
-    "defaultAccount",
-    "currency"
-  ],
+  "quickEditFields": ["email", "role", "phone", "address", "defaultAccount", "currency", "taxId"],
   "keywordFields": ["name"]
 }
diff --git a/schemas/index.ts b/schemas/index.ts
index ccd3c31d..65e9cbea 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -18,10 +18,39 @@ export function getSchemas(countryCode: string = '-'): Readonly<SchemaMap> {
 
   let schemaMap = Object.assign({}, builtAppSchemas, builtCoreSchemas);
   schemaMap = addMetaFields(schemaMap);
+  schemaMap = removeFields(schemaMap);
+
   deepFreeze(schemaMap);
   return schemaMap;
 }
 
+function removeFields(schemaMap: SchemaMap): SchemaMap {
+  for (const schemaName in schemaMap) {
+    const schema = schemaMap[schemaName]!;
+    if (schema.removeFields === undefined) {
+      continue;
+    }
+
+    for (const fieldname of schema.removeFields) {
+      schema.fields = schema.fields.filter((f) => f.fieldname !== fieldname);
+      schema.tableFields = schema.tableFields?.filter((fn) => fn !== fieldname);
+      schema.quickEditFields = schema.quickEditFields?.filter(
+        (fn) => fn !== fieldname
+      );
+      schema.keywordFields = schema.keywordFields?.filter(
+        (fn) => fn !== fieldname
+      );
+      if (schema.inlineEditDisplayField === fieldname) {
+        delete schema.inlineEditDisplayField;
+      }
+    }
+
+    delete schema.removeFields;
+  }
+
+  return schemaMap;
+}
+
 function deepFreeze(schemaMap: SchemaMap) {
   Object.freeze(schemaMap);
   for (const schemaName in schemaMap) {
diff --git a/schemas/regional/in/Party.json b/schemas/regional/in/Party.json
index 7076ab27..3f12fb3c 100644
--- a/schemas/regional/in/Party.json
+++ b/schemas/regional/in/Party.json
@@ -36,5 +36,6 @@
     "currency",
     "gstType",
     "gstin"
-  ]
+  ],
+  "removeFields": ["taxId"]
 }
diff --git a/schemas/types.ts b/schemas/types.ts
index fcd8535d..f14344d5 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -124,8 +124,9 @@ export interface Schema {
   keywordFields?: string[];      // Used to get fields that are to be used for search.
   quickEditFields?: string[];    // Used to get fields for the quickEditForm
   treeSettings?: TreeSettings;   // Used to determine root nodes
-  inlineEditDisplayField?:string,// Display field if inline editable
+  inlineEditDisplayField?:string;// Display field if inline editable
   naming?: Naming;               // Used for assigning name, default is 'random' else 'numberSeries' if present
+  removeFields?: string[];       // Used by the builder to remove fields.
 }
 
 export interface SchemaStub extends Partial<Schema> {
diff --git a/models/baseModels/Party/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
similarity index 100%
rename from models/baseModels/Party/PartyWidget.vue
rename to src/components/Widgets/PartyWidget.vue

From 1cc05d218f7f44a2e979c7eb47840dc5d3c6b0d6 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 14 Apr 2022 12:13:58 +0530
Subject: [PATCH 044/163] incr: type Payment

---
 backend/database/core.ts                   |  22 +-
 models/baseModels/Party/Party.ts           |   7 +-
 models/baseModels/Payment/Payment.js       | 256 --------------
 models/baseModels/Payment/Payment.ts       | 389 +++++++++++++++++++++
 models/baseModels/Payment/PaymentList.js   |  36 --
 models/baseModels/Payment/PaymentServer.js | 208 -----------
 models/baseModels/Payment/types.ts         |   2 +
 utils/db/types.ts                          |   2 +-
 8 files changed, 411 insertions(+), 511 deletions(-)
 delete mode 100644 models/baseModels/Payment/Payment.js
 create mode 100644 models/baseModels/Payment/Payment.ts
 delete mode 100644 models/baseModels/Payment/PaymentList.js
 delete mode 100644 models/baseModels/Payment/PaymentServer.js
 create mode 100644 models/baseModels/Payment/types.ts

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 5f6b9fce..d6782bbb 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -424,19 +424,22 @@ export default class DatabaseCore extends DatabaseBase {
 
     for (const field in filters) {
       const value = filters[field];
-      let operator = '=';
-      let comparisonValue = value;
+      let operator: string | number = '=';
+      let comparisonValue = value as string | number | (string | number)[];
 
       if (Array.isArray(value)) {
-        operator = value[0];
-        comparisonValue = value[1];
+        operator = value[0] as string;
+        comparisonValue = value[1] as string | number | (string | number)[];
         operator = operator.toLowerCase();
 
         if (operator === 'includes') {
           operator = 'like';
         }
 
-        if (operator === 'like' && !comparisonValue.includes('%')) {
+        if (
+          operator === 'like' &&
+          !(comparisonValue as (string | number)[]).includes('%')
+        ) {
           comparisonValue = `%${comparisonValue}%`;
         }
       }
@@ -452,11 +455,14 @@ export default class DatabaseCore extends DatabaseBase {
     }
 
     filtersArray.map((filter) => {
-      const [field, operator, comparisonValue] = filter;
+      const field = filter[0] as string;
+      const operator = filter[1];
+      const comparisonValue = filter[2];
+
       if (operator === '=') {
-        builder.where(field as string, comparisonValue);
+        builder.where(field, comparisonValue);
       } else {
-        builder.where(field as string, operator as string, comparisonValue);
+        builder.where(field, operator as string, comparisonValue as string);
       }
     });
   }
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index e963e055..ddec170f 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -9,7 +9,7 @@ import {
 import { PartyRole } from './types';
 
 export class Party extends Doc {
-  async updateOutstandingAmounts() {
+  async updateOutstandingAmount() {
     const role = this.role as PartyRole;
     switch (role) {
       case 'Customer':
@@ -72,7 +72,10 @@ export class Party extends Doc {
     defaultAccount: (doc: Doc) => {
       const role = doc.role as PartyRole;
       if (role === 'Both') {
-        return { isGroup: false, accountType: ['Payable', 'Receivable'] };
+        return {
+          isGroup: false,
+          accountType: ['in', ['Payable', 'Receivable']],
+        };
       }
 
       return {
diff --git a/models/baseModels/Payment/Payment.js b/models/baseModels/Payment/Payment.js
deleted file mode 100644
index 76f9f270..00000000
--- a/models/baseModels/Payment/Payment.js
+++ /dev/null
@@ -1,256 +0,0 @@
-import frappe, { t } from 'frappe';
-import utils from '../../../accounting/utils';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-
-const paymentTypeMap = {
-  Receive: t`Receive`,
-  Pay: t`Pay`,
-};
-
-const paymentMethodMap = {
-  Cash: t`Cash`,
-  Cheque: t`Cheque`,
-  Transfer: t`Transfer`,
-};
-
-export default {
-  name: 'Payment',
-  label: t`Payment`,
-  isSingle: 0,
-  isChild: 0,
-  isSubmittable: 1,
-  keywordFields: [],
-  settings: 'PaymentSettings',
-  fields: [
-    {
-      label: t`Payment No`,
-      fieldname: 'name',
-      fieldtype: 'Data',
-      required: 1,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'party',
-      label: t`Party`,
-      fieldtype: 'Link',
-      target: 'Party',
-      required: 1,
-    },
-    {
-      fieldname: 'date',
-      label: t`Posting Date`,
-      fieldtype: 'Date',
-      default: () => new Date().toISOString(),
-    },
-    {
-      fieldname: 'account',
-      label: t`From Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-      getFilters: (query, doc) => {
-        if (doc.paymentType === 'Pay') {
-          if (doc.paymentMethod === 'Cash') {
-            return { accountType: 'Cash', isGroup: 0 };
-          } else {
-            return { accountType: ['in', ['Bank', 'Cash']], isGroup: 0 };
-          }
-        }
-      },
-      formula: (doc) => {
-        if (doc.paymentMethod === 'Cash' && doc.paymentType === 'Pay') {
-          return 'Cash';
-        }
-      },
-    },
-    {
-      fieldname: 'paymentType',
-      label: t`Payment Type`,
-      fieldtype: 'Select',
-      placeholder: t`Payment Type`,
-      options: Object.keys(paymentTypeMap),
-      map: paymentTypeMap,
-      required: 1,
-    },
-    {
-      fieldname: 'paymentAccount',
-      label: t`To Account`,
-      placeholder: t`To Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-      getFilters: (query, doc) => {
-        if (doc.paymentType === 'Receive') {
-          if (doc.paymentMethod === 'Cash') {
-            return { accountType: 'Cash', isGroup: 0 };
-          } else {
-            return { accountType: ['in', ['Bank', 'Cash']], isGroup: 0 };
-          }
-        }
-      },
-      formula: (doc) => {
-        if (doc.paymentMethod === 'Cash' && doc.paymentType === 'Receive') {
-          return 'Cash';
-        }
-      },
-    },
-    {
-      fieldname: 'numberSeries',
-      label: t`Number Series`,
-      fieldtype: 'Link',
-      target: 'NumberSeries',
-      required: 1,
-      getFilters: () => {
-        return { referenceType: 'Payment' };
-      },
-      default: DEFAULT_NUMBER_SERIES['Payment'],
-    },
-    {
-      fieldname: 'paymentMethod',
-      label: t`Payment Method`,
-      placeholder: t`Payment Method`,
-      fieldtype: 'Select',
-      options: Object.keys(paymentMethodMap),
-      map: paymentMethodMap,
-      default: 'Cash',
-      required: 1,
-    },
-    {
-      fieldname: 'referenceId',
-      label: t`Ref. / Cheque No.`,
-      placeholder: t`Ref. / Cheque No.`,
-      fieldtype: 'Data',
-      required: (doc) => doc.paymentMethod !== 'Cash', // TODO: UNIQUE
-      hidden: (doc) => doc.paymentMethod === 'Cash',
-    },
-    {
-      fieldname: 'referenceDate',
-      label: t`Ref. Date`,
-      placeholder: t`Ref. Date`,
-      fieldtype: 'Date',
-    },
-    {
-      fieldname: 'clearanceDate',
-      label: t`Clearance Date`,
-      placeholder: t`Clearance Date`,
-      fieldtype: 'Date',
-      hidden: (doc) => doc.paymentMethod === 'Cash',
-    },
-    {
-      fieldname: 'amount',
-      label: t`Amount`,
-      fieldtype: 'Currency',
-      required: 1,
-      formula: (doc) => doc.getSum('for', 'amount', false),
-      validate(value, doc) {
-        if (value.isNegative()) {
-          throw new frappe.errors.ValidationError(
-            frappe.t`Payment amount cannot be less than zero.`
-          );
-        }
-
-        if (doc.for.length === 0) return;
-        const amount = doc.getSum('for', 'amount', false);
-
-        if (value.gt(amount)) {
-          throw new frappe.errors.ValidationError(
-            frappe.t`Payment amount cannot 
-              exceed ${frappe.format(amount, 'Currency')}.`
-          );
-        } else if (value.isZero()) {
-          throw new frappe.errors.ValidationError(
-            frappe.t`Payment amount cannot
-              be ${frappe.format(value, 'Currency')}.`
-          );
-        }
-      },
-    },
-    {
-      fieldname: 'writeoff',
-      label: t`Write Off / Refund`,
-      fieldtype: 'Currency',
-    },
-    {
-      fieldname: 'for',
-      label: t`Payment Reference`,
-      fieldtype: 'Table',
-      childtype: 'PaymentFor',
-      required: 0,
-    },
-    {
-      fieldname: 'cancelled',
-      label: t`Cancelled`,
-      fieldtype: 'Check',
-      default: 0,
-      readOnly: 1,
-    },
-  ],
-
-  quickEditFields: [
-    'numberSeries',
-    'party',
-    'date',
-    'paymentMethod',
-    'account',
-    'paymentType',
-    'paymentAccount',
-    'referenceId',
-    'referenceDate',
-    'clearanceDate',
-    'amount',
-    'writeoff',
-    'for',
-  ],
-
-  layout: [
-    {
-      columns: [
-        {
-          fields: ['party', 'account'],
-        },
-        {
-          fields: ['date', 'paymentAccount'],
-        },
-      ],
-    },
-    {
-      columns: [
-        {
-          fields: ['paymentMethod'],
-        },
-        {
-          fields: ['paymentType'],
-        },
-        {
-          fields: ['referenceId'],
-        },
-      ],
-    },
-    {
-      columns: [
-        {
-          fields: ['referenceDate'],
-        },
-        {
-          fields: ['clearanceDate'],
-        },
-      ],
-    },
-    {
-      columns: [
-        {
-          fields: ['for'],
-        },
-      ],
-    },
-    {
-      columns: [
-        {
-          fields: ['amount', 'writeoff'],
-        },
-      ],
-    },
-  ],
-  actions: [utils.ledgerLink],
-  links: [utils.ledgerLink],
-};
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
new file mode 100644
index 00000000..ff7c890f
--- /dev/null
+++ b/models/baseModels/Payment/Payment.ts
@@ -0,0 +1,389 @@
+import { LedgerPosting } from 'accounting/ledgerPosting';
+import frappe from 'frappe';
+import { DocValue } from 'frappe/core/types';
+import Doc from 'frappe/model/doc';
+import {
+  Action,
+  DefaultMap,
+  FiltersMap,
+  FormulaMap,
+  HiddenMap,
+  ListViewSettings,
+  RequiredMap,
+  ValidationMap,
+} from 'frappe/model/types';
+import { ValidationError } from 'frappe/utils/errors';
+import { getLedgerLinkAction } from 'models/helpers';
+import Money from 'pesa/dist/types/src/money';
+import { getIsNullOrUndef } from 'utils';
+import { Party } from '../Party/Party';
+import { PaymentMethod, PaymentType } from './types';
+
+export class Payment extends Doc {
+  async change({ changed }: { changed: string }) {
+    switch (changed) {
+      case 'for': {
+        this.updateAmountOnReferenceUpdate();
+        await this.updateDetailsOnReferenceUpdate();
+      }
+      case 'amount': {
+        this.updateReferenceOnAmountUpdate();
+      }
+    }
+  }
+
+  async updateDetailsOnReferenceUpdate() {
+    const forReferences = (this.for ?? []) as Doc[];
+    const { referenceType, referenceName } = forReferences[0];
+    if (
+      forReferences.length !== 1 ||
+      this.party ||
+      this.paymentType ||
+      !referenceName ||
+      !referenceType
+    ) {
+      return;
+    }
+
+    const schemaName = referenceType as string;
+    const doc = await frappe.doc.getDoc(schemaName, referenceName as string);
+
+    let party;
+    let paymentType: PaymentType;
+
+    if (schemaName === 'SalesInvoice') {
+      party = doc.customer;
+      paymentType = 'Receive';
+    } else {
+      party = doc.supplier;
+      paymentType = 'Pay';
+    }
+
+    this.party = party;
+    this.paymentType = paymentType;
+  }
+
+  updateAmountOnReferenceUpdate() {
+    this.amount = frappe.pesa(0);
+    for (const paymentReference of this.for as Doc[]) {
+      this.amount = (this.amount as Money).add(
+        paymentReference.amount as Money
+      );
+    }
+  }
+
+  updateReferenceOnAmountUpdate() {
+    const forReferences = (this.for ?? []) as Doc[];
+    if (forReferences.length !== 1) {
+      return;
+    }
+
+    forReferences[0].amount = this.amount;
+  }
+
+  async validate() {
+    this.validateAccounts();
+    this.validateReferenceAmount();
+    this.validateWriteOff();
+  }
+
+  validateAccounts() {
+    if (this.paymentAccount !== this.account || !this.account) {
+      return;
+    }
+    throw new frappe.errors.ValidationError(
+      `To Account and From Account can't be the same: ${this.account}`
+    );
+  }
+
+  validateReferenceAmount() {
+    const forReferences = (this.for ?? []) as Doc[];
+    if (forReferences.length === 0) {
+      return;
+    }
+
+    const referenceAmountTotal = forReferences
+      .map(({ amount }) => amount as Money)
+      .reduce((a, b) => a.add(b), frappe.pesa(0));
+
+    if (
+      (this.amount as Money)
+        .add((this.writeoff as Money) ?? 0)
+        .gte(referenceAmountTotal)
+    ) {
+      return;
+    }
+
+    const writeoff = frappe.format(this.writeoff, 'Currency');
+    const payment = frappe.format(this.amount, 'Currency');
+    const refAmount = frappe.format(referenceAmountTotal, 'Currency');
+
+    if ((this.writeoff as Money).gt(0)) {
+      throw new frappe.errors.ValidationError(
+        frappe.t`Amount: ${payment} and writeoff: ${writeoff} 
+          is less than the total amount allocated to 
+          references: ${refAmount}.`
+      );
+    }
+
+    throw new frappe.errors.ValidationError(
+      frappe.t`Amount: ${payment} is less than the total
+        amount allocated to references: ${refAmount}.`
+    );
+  }
+
+  validateWriteOff() {
+    if ((this.writeoff as Money).isZero()) {
+      return;
+    }
+
+    if (!frappe.singles.AccountingSettings!.writeOffAccount) {
+      throw new frappe.errors.ValidationError(
+        frappe.t`Write Off Account not set.
+          Please set Write Off Account in General Settings`
+      );
+    }
+  }
+
+  async getPosting() {
+    const account = this.account as string;
+    const paymentAccount = this.paymentAccount as string;
+    const amount = this.amount as Money;
+    const writeoff = this.writeoff as Money;
+    const entries = new LedgerPosting({
+      reference: this,
+      party: this.party as string,
+    });
+
+    await entries.debit(paymentAccount as string, amount.sub(writeoff));
+    await entries.credit(account as string, amount.sub(writeoff));
+
+    if (writeoff.isZero()) {
+      return [entries];
+    }
+
+    const writeoffEntry = new LedgerPosting({
+      reference: this,
+      party: this.party as string,
+    });
+    const writeOffAccount = frappe.singles.AccountingSettings!
+      .writeOffAccount as string;
+
+    if (this.paymentType === 'Pay') {
+      await writeoffEntry.debit(account, writeoff);
+      await writeoffEntry.credit(writeOffAccount, writeoff);
+    } else {
+      await writeoffEntry.debit(writeOffAccount, writeoff);
+      await writeoffEntry.credit(account, writeoff);
+    }
+
+    return [entries, writeoffEntry];
+  }
+
+  async beforeSubmit() {
+    const forReferences = (this.for ?? []) as Doc[];
+    if (forReferences.length === 0) {
+      return;
+    }
+
+    for (const row of forReferences) {
+      if (
+        !['SalesInvoice', 'PurchaseInvoice'].includes(
+          row.referenceType as string
+        )
+      ) {
+        continue;
+      }
+      const referenceDoc = await frappe.doc.getDoc(
+        row.referenceType as string,
+        row.referenceName as string
+      );
+
+      let outstandingAmount = referenceDoc.outstandingAmount as Money;
+      const baseGrandTotal = referenceDoc.baseGrandTotal as Money;
+      const amount = this.amount as Money;
+
+      if (getIsNullOrUndef(outstandingAmount)) {
+        outstandingAmount = baseGrandTotal;
+      }
+
+      if (amount.lte(0) || amount.gt(outstandingAmount)) {
+        let message = frappe.t`Payment amount: ${frappe.format(
+          this.amount,
+          'Currency'
+        )} should be less than Outstanding amount: ${frappe.format(
+          outstandingAmount,
+          'Currency'
+        )}.`;
+
+        if (amount.lte(0)) {
+          const amt = frappe.format(this.amount, 'Currency');
+          message = frappe.t`Payment amount: ${amt} should be greater than 0.`;
+        }
+
+        throw new frappe.errors.ValidationError(message);
+      } else {
+        // update outstanding amounts in invoice and party
+        const newOutstanding = outstandingAmount.sub(amount);
+        await referenceDoc.set('outstandingAmount', newOutstanding);
+        await referenceDoc.update();
+        const party = (await frappe.doc.getDoc(
+          'Party',
+          this.party as string
+        )) as Party;
+
+        await party.updateOutstandingAmount();
+      }
+    }
+  }
+
+  async afterSubmit() {
+    const entryList = await this.getPosting();
+    for (const entry of entryList) {
+      await entry.post();
+    }
+  }
+
+  async afterRevert() {
+    this.updateReferenceOutstandingAmount();
+    const entryList = await this.getPosting();
+    for (const entry of entryList) {
+      await entry.postReverse();
+    }
+  }
+
+  async updateReferenceOutstandingAmount() {
+    await (this.for as Doc[]).forEach(
+      async ({ amount, referenceType, referenceName }) => {
+        const refDoc = await frappe.doc.getDoc(
+          referenceType as string,
+          referenceName as string
+        );
+
+        refDoc.setMultiple({
+          outstandingAmount: (refDoc.outstandingAmount as Money).add(
+            amount as Money
+          ),
+        });
+        refDoc.update();
+      }
+    );
+  }
+
+  defaults: DefaultMap = { date: () => new Date().toISOString() };
+
+  formulas: FormulaMap = {
+    account: async () => {
+      if (this.paymentMethod === 'Cash' && this.paymentType === 'Pay') {
+        return 'Cash';
+      }
+    },
+    paymentAccount: async () => {
+      if (this.paymentMethod === 'Cash' && this.paymentType === 'Receive') {
+        return 'Cash';
+      }
+    },
+    amount: async () => this.getSum('for', 'amount', false),
+  };
+
+  validations: ValidationMap = {
+    amount: async (value: DocValue) => {
+      if ((value as Money).isNegative()) {
+        throw new ValidationError(
+          frappe.t`Payment amount cannot be less than zero.`
+        );
+      }
+
+      if ((this.for as Doc[]).length === 0) return;
+      const amount = this.getSum('for', 'amount', false);
+
+      if ((value as Money).gt(amount)) {
+        throw new frappe.errors.ValidationError(
+          frappe.t`Payment amount cannot 
+              exceed ${frappe.format(amount, 'Currency')}.`
+        );
+      } else if ((value as Money).isZero()) {
+        throw new frappe.errors.ValidationError(
+          frappe.t`Payment amount cannot
+              be ${frappe.format(value, 'Currency')}.`
+        );
+      }
+    },
+  };
+
+  required: RequiredMap = {
+    referenceId: () => this.paymentMethod !== 'Cash',
+    clearanceDate: () => this.paymentMethod === 'Cash',
+  };
+
+  hidden: HiddenMap = {
+    referenceId: () => this.paymentMethod !== 'Cash',
+  };
+
+  static filters: FiltersMap = {
+    numberSeries: () => {
+      return { referenceType: 'Payment' };
+    },
+    account: (doc: Doc) => {
+      const paymentType = doc.paymentType as PaymentType;
+      const paymentMethod = doc.paymentMethod as PaymentMethod;
+
+      if (paymentType === 'Receive') {
+        return { accountType: 'Receivable', isGroup: false };
+      }
+
+      if (paymentMethod === 'Cash') {
+        return { accountType: 'Cash', isGroup: false };
+      } else {
+        return { accountType: ['in', ['Bank', 'Cash']], isGroup: false };
+      }
+    },
+    paymentAccount: (doc: Doc) => {
+      const paymentType = doc.paymentType as PaymentType;
+      const paymentMethod = doc.paymentMethod as PaymentMethod;
+
+      if (paymentType === 'Pay') {
+        return { accountType: 'Payable', isGroup: false };
+      }
+
+      if (paymentMethod === 'Cash') {
+        return { accountType: 'Cash', isGroup: false };
+      } else {
+        return { accountType: ['in', ['Bank', 'Cash']], isGroup: false };
+      }
+    },
+  };
+
+  static actions: Action[] = [getLedgerLinkAction()];
+
+  static listSettings: ListViewSettings = {
+    columns: [
+      'party',
+      {
+        label: frappe.t`Status`,
+        fieldname: 'status',
+        fieldtype: 'Select',
+        size: 'small',
+        render(doc) {
+          let status = 'Draft';
+          let color = 'gray';
+          if (doc.submitted === 1) {
+            color = 'green';
+            status = 'Submitted';
+          }
+          if (doc.cancelled === 1) {
+            color = 'red';
+            status = 'Cancelled';
+          }
+
+          return {
+            template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
+          };
+        },
+      },
+      'paymentType',
+      'date',
+      'amount',
+    ],
+  };
+}
diff --git a/models/baseModels/Payment/PaymentList.js b/models/baseModels/Payment/PaymentList.js
deleted file mode 100644
index 96cc216b..00000000
--- a/models/baseModels/Payment/PaymentList.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import Badge from '@/components/Badge';
-import { t } from 'frappe';
-
-export default {
-  doctype: 'Payment',
-  title: t`Payments`,
-  columns: [
-    'party',
-    {
-      label: t`Status`,
-      fieldname: 'status',
-      fieldtype: 'Select',
-      size: 'small',
-      render(doc) {
-        let status = 'Draft';
-        let color = 'gray';
-        if (doc.submitted === 1) {
-          color = 'green';
-          status = 'Submitted';
-        }
-        if (doc.cancelled === 1) {
-          color = 'red';
-          status = 'Cancelled';
-        }
-
-        return {
-          template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
-          components: { Badge },
-        };
-      },
-    },
-    'paymentType',
-    'date',
-    'amount',
-  ],
-};
diff --git a/models/baseModels/Payment/PaymentServer.js b/models/baseModels/Payment/PaymentServer.js
deleted file mode 100644
index b5845477..00000000
--- a/models/baseModels/Payment/PaymentServer.js
+++ /dev/null
@@ -1,208 +0,0 @@
-import frappe from 'frappe';
-import Document from 'frappe/model/document';
-import LedgerPosting from '../../../accounting/ledgerPosting';
-
-export default class PaymentServer extends Document {
-  async change({ changed }) {
-    switch (changed) {
-      case 'for': {
-        this.updateAmountOnReferenceUpdate();
-        await this.updateDetailsOnReferenceUpdate();
-      }
-      case 'amount': {
-        this.updateReferenceOnAmountUpdate();
-      }
-    }
-  }
-
-  async updateDetailsOnReferenceUpdate() {
-    const { referenceType, referenceName } = this.for[0];
-    if (
-      this.for?.length !== 1 ||
-      this.party ||
-      this.paymentType ||
-      !referenceName ||
-      !referenceType
-    ) {
-      return;
-    }
-
-    const doctype = referenceType;
-    const doc = await frappe.doc.getDoc(doctype, referenceName);
-
-    let party;
-    let paymentType;
-
-    if (doctype === 'SalesInvoice') {
-      party = doc.customer;
-      paymentType = 'Receive';
-    } else if (doctype === 'PurchaseInvoice') {
-      party = doc.supplier;
-      paymentType = 'Pay';
-    }
-
-    this.party = party;
-    this.paymentType = paymentType;
-  }
-
-  updateAmountOnReferenceUpdate() {
-    this.amount = frappe.pesa(0);
-    for (let paymentReference of this.for) {
-      this.amount = this.amount.add(paymentReference.amount);
-    }
-  }
-
-  updateReferenceOnAmountUpdate() {
-    if (this.for?.length !== 1) return;
-    this.for[0].amount = this.amount;
-  }
-
-  async validate() {
-    this.validateAccounts();
-    this.validateReferenceAmount();
-    this.validateWriteOff();
-  }
-
-  validateAccounts() {
-    if (this.paymentAccount !== this.account || !this.account) return;
-    throw new frappe.errors.ValidationError(
-      `To Account and From Account can't be the same: ${this.account}`
-    );
-  }
-
-  validateReferenceAmount() {
-    if (!this.for?.length) return;
-
-    const referenceAmountTotal = this.for
-      .map(({ amount }) => amount)
-      .reduce((a, b) => a.add(b), frappe.pesa(0));
-
-    if (this.amount.add(this.writeoff ?? 0).gte(referenceAmountTotal)) {
-      return;
-    }
-
-    const writeoff = frappe.format(this.writeoff, 'Currency');
-    const payment = frappe.format(this.amount, 'Currency');
-    const refAmount = frappe.format(referenceAmountTotal, 'Currency');
-
-    if (this.writeoff.gt(0)) {
-      throw new frappe.errors.ValidationError(
-        frappe.t`Amount: ${payment} and writeoff: ${writeoff} 
-          is less than the total amount allocated to 
-          references: ${refAmount}.`
-      );
-    }
-
-    throw new frappe.errors.ValidationError(
-      frappe.t`Amount: ${payment} is less than the total
-        amount allocated to references: ${refAmount}.`
-    );
-  }
-
-  validateWriteOff() {
-    if (this.writeoff.isZero()) {
-      return;
-    }
-
-    if (!frappe.AccountingSettings.writeOffAccount) {
-      throw new frappe.errors.ValidationError(
-        frappe.t`Write Off Account not set.
-          Please set Write Off Account in General Settings`
-      );
-    }
-  }
-
-  async getPosting() {
-    let entries = new LedgerPosting({ reference: this, party: this.party });
-
-    await entries.debit(this.paymentAccount, this.amount.sub(this.writeoff));
-    await entries.credit(this.account, this.amount.sub(this.writeoff));
-
-    if (this.writeoff.isZero()) {
-      return [entries];
-    }
-
-    const writeoffEntry = new LedgerPosting({
-      reference: this,
-      party: this.party,
-    });
-    const { writeOffAccount } = frappe.AccountingSettings;
-
-    if (this.paymentType === 'Pay') {
-      await writeoffEntry.debit(this.account, this.writeoff);
-      await writeoffEntry.credit(writeOffAccount, this.writeoff);
-    } else {
-      await writeoffEntry.debit(writeOffAccount, this.writeoff);
-      await writeoffEntry.credit(this.account, this.writeoff);
-    }
-
-    return [entries, writeoffEntry];
-  }
-
-  async beforeSubmit() {
-    if (!this.for || !this.for.length) {
-      return;
-    }
-    for (let row of this.for) {
-      if (!['SalesInvoice', 'PurchaseInvoice'].includes(row.referenceType)) {
-        continue;
-      }
-      let referenceDoc = await frappe.doc.getDoc(
-        row.referenceType,
-        row.referenceName
-      );
-      let { outstandingAmount, baseGrandTotal } = referenceDoc;
-      if (outstandingAmount == null) {
-        outstandingAmount = baseGrandTotal;
-      }
-      if (this.amount.lte(0) || this.amount.gt(outstandingAmount)) {
-        let message = frappe.t`Payment amount: ${frappe.format(
-          this.amount,
-          'Currency'
-        )} should be less than Outstanding amount: ${frappe.format(
-          outstandingAmount,
-          'Currency'
-        )}.`;
-
-        if (this.amount.lte(0)) {
-          const amt = frappe.format(this.amount, 'Currency');
-          message = frappe.t`Payment amount: ${amt} should be greater than 0.`;
-        }
-
-        throw new frappe.errors.ValidationError(message);
-      } else {
-        // update outstanding amounts in invoice and party
-        let newOutstanding = outstandingAmount.sub(this.amount);
-        await referenceDoc.set('outstandingAmount', newOutstanding);
-        await referenceDoc.update();
-        let party = await frappe.doc.getDoc('Party', this.party);
-        await party.updateOutstandingAmount();
-      }
-    }
-  }
-
-  async afterSubmit() {
-    const entryList = await this.getPosting();
-    for (const entry of entryList) {
-      await entry.post();
-    }
-  }
-
-  async afterRevert() {
-    this.updateReferenceOutstandingAmount();
-    const entryList = await this.getPosting();
-    for (const entry of entryList) {
-      await entry.postReverse();
-    }
-  }
-
-  async updateReferenceOutstandingAmount() {
-    await this.for.forEach(async ({ amount, referenceType, referenceName }) => {
-      const refDoc = await frappe.doc.getDoc(referenceType, referenceName);
-      refDoc.setMultiple({
-        outstandingAmount: refDoc.outstandingAmount.add(amount),
-      });
-      refDoc.update();
-    });
-  }
-}
diff --git a/models/baseModels/Payment/types.ts b/models/baseModels/Payment/types.ts
new file mode 100644
index 00000000..03108ef7
--- /dev/null
+++ b/models/baseModels/Payment/types.ts
@@ -0,0 +1,2 @@
+export type PaymentType = 'Receive' | 'Pay';
+export type PaymentMethod = 'Cash' | 'Cheque' | 'Transfer';
diff --git a/utils/db/types.ts b/utils/db/types.ts
index f517273f..f041d5e9 100644
--- a/utils/db/types.ts
+++ b/utils/db/types.ts
@@ -64,7 +64,7 @@ export interface GetAllOptions {
 
 export type QueryFilter = Record<
   string,
-  boolean | string | (string | number)[]
+  boolean | string | (string | number | (string | number)[])[]
 >;
 
 /**

From 91bf6e03fa8b9f17b2c0da5d066b599bf0ee0a58 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 14 Apr 2022 13:31:33 +0530
Subject: [PATCH 045/163] incr: type Transaction and Tax

---
 .../{exchangeRate.js => exchangeRate.ts}      |  33 +++-
 .../PurchaseInvoice.ts}                       |   0
 models/baseModels/Tax/Tax.js                  |  25 ---
 models/baseModels/Tax/Tax.ts                  |   6 +
 models/baseModels/Tax/TaxList.js              |   7 -
 models/baseModels/Transaction/Transaction.js  |  78 ----------
 models/baseModels/Transaction/Transaction.ts  | 144 ++++++++++++++++++
 .../Transaction/TransactionDocument.js        |  62 --------
 .../Transaction/TransactionServer.js          |  62 --------
 models/helpers.ts                             |  96 ++++++++++++
 models/types.ts                               |   2 +
 .../RegionalEntries.js => src/regional/in.ts  |  12 +-
 src/utils.ts                                  |  99 ++++++++++++
 13 files changed, 381 insertions(+), 245 deletions(-)
 rename accounting/{exchangeRate.js => exchangeRate.ts} (55%)
 rename models/baseModels/{Tax/TaxServer.js => PurchaseInvoice/PurchaseInvoice.ts} (100%)
 delete mode 100644 models/baseModels/Tax/Tax.js
 create mode 100644 models/baseModels/Tax/Tax.ts
 delete mode 100644 models/baseModels/Tax/TaxList.js
 delete mode 100644 models/baseModels/Transaction/Transaction.js
 create mode 100644 models/baseModels/Transaction/Transaction.ts
 delete mode 100644 models/baseModels/Transaction/TransactionDocument.js
 delete mode 100644 models/baseModels/Transaction/TransactionServer.js
 rename models/baseModels/Tax/RegionalEntries.js => src/regional/in.ts (69%)
 create mode 100644 src/utils.ts

diff --git a/accounting/exchangeRate.js b/accounting/exchangeRate.ts
similarity index 55%
rename from accounting/exchangeRate.js
rename to accounting/exchangeRate.ts
index 8555fd0b..bdbdf78a 100644
--- a/accounting/exchangeRate.js
+++ b/accounting/exchangeRate.ts
@@ -1,25 +1,45 @@
 import frappe from 'frappe';
 import { DateTime } from 'luxon';
 
-export async function getExchangeRate({ fromCurrency, toCurrency, date }) {
+export async function getExchangeRate({
+  fromCurrency,
+  toCurrency,
+  date,
+}: {
+  fromCurrency: string;
+  toCurrency: string;
+  date?: string;
+}) {
   if (!date) {
     date = DateTime.local().toISODate();
   }
+
   if (!fromCurrency || !toCurrency) {
     throw new frappe.errors.NotFoundError(
       'Please provide `fromCurrency` and `toCurrency` to get exchange rate.'
     );
   }
-  let cacheKey = `currencyExchangeRate:${date}:${fromCurrency}:${toCurrency}`;
-  let exchangeRate = parseFloat(localStorage.getItem(cacheKey));
+
+  const cacheKey = `currencyExchangeRate:${date}:${fromCurrency}:${toCurrency}`;
+
+  let exchangeRate = 0;
+  if (localStorage) {
+    exchangeRate = parseFloat(
+      localStorage.getItem(cacheKey as string) as string
+    );
+  }
+
   if (!exchangeRate) {
     try {
-      let res = await fetch(
+      const res = await fetch(
         ` https://api.vatcomply.com/rates?date=${date}&base=${fromCurrency}&symbols=${toCurrency}`
       );
-      let data = await res.json();
+      const data = await res.json();
       exchangeRate = data.rates[toCurrency];
-      localStorage.setItem(cacheKey, exchangeRate);
+
+      if (localStorage) {
+        localStorage.setItem(cacheKey, String(exchangeRate));
+      }
     } catch (error) {
       console.error(error);
       throw new Error(
@@ -27,5 +47,6 @@ export async function getExchangeRate({ fromCurrency, toCurrency, date }) {
       );
     }
   }
+
   return exchangeRate;
 }
diff --git a/models/baseModels/Tax/TaxServer.js b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
similarity index 100%
rename from models/baseModels/Tax/TaxServer.js
rename to models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
diff --git a/models/baseModels/Tax/Tax.js b/models/baseModels/Tax/Tax.js
deleted file mode 100644
index dbef0392..00000000
--- a/models/baseModels/Tax/Tax.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'Tax',
-  label: t`Tax`,
-  doctype: 'DocType',
-  isSingle: 0,
-  isChild: 0,
-  keywordFields: ['name'],
-  fields: [
-    {
-      fieldname: 'name',
-      label: t`Name`,
-      fieldtype: 'Data',
-      required: 1,
-    },
-    {
-      fieldname: 'details',
-      label: t`Details`,
-      fieldtype: 'Table',
-      childtype: 'TaxDetail',
-      required: 1,
-    },
-  ],
-  quickEditFields: ['details'],
-};
diff --git a/models/baseModels/Tax/Tax.ts b/models/baseModels/Tax/Tax.ts
new file mode 100644
index 00000000..8c148252
--- /dev/null
+++ b/models/baseModels/Tax/Tax.ts
@@ -0,0 +1,6 @@
+import Doc from 'frappe/model/doc';
+import { ListViewSettings } from 'frappe/model/types';
+
+export class Tax extends Doc {
+  static listSettings: ListViewSettings = { columns: ['name'] };
+}
diff --git a/models/baseModels/Tax/TaxList.js b/models/baseModels/Tax/TaxList.js
deleted file mode 100644
index ac75b530..00000000
--- a/models/baseModels/Tax/TaxList.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { t } from 'frappe';
-
-export default {
-  doctype: 'Tax',
-  title: t`Taxes`,
-  columns: ['name'],
-};
diff --git a/models/baseModels/Transaction/Transaction.js b/models/baseModels/Transaction/Transaction.js
deleted file mode 100644
index 6e6c302f..00000000
--- a/models/baseModels/Transaction/Transaction.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import Badge from '@/components/Badge';
-import { getInvoiceStatus, openQuickEdit, routeTo } from '@/utils';
-import frappe, { t } from 'frappe';
-import utils from '../../../accounting/utils';
-import { statusColor } from '../../../src/colors';
-
-export function getStatusColumn() {
-  const statusMap = {
-    Unpaid: t`Unpaid`,
-    Paid: t`Paid`,
-    Draft: t`Draft`,
-    Cancelled: t`Cancelled`,
-  };
-  return {
-    label: t`Status`,
-    fieldname: 'status',
-    fieldtype: 'Select',
-    render(doc) {
-      const status = getInvoiceStatus(doc);
-      const color = statusColor[status];
-      const label = statusMap[status];
-      return {
-        template: `<Badge class="text-xs" color="${color}">${label}</Badge>`,
-        components: { Badge },
-      };
-    },
-  };
-}
-
-export function getActions(doctype) {
-  return [
-    {
-      label: t`Make Payment`,
-      condition: (doc) => doc.submitted && doc.outstandingAmount > 0,
-      action: async function makePayment(doc) {
-        let payment = await frappe.getEmptyDoc('Payment');
-        payment.once('afterInsert', async () => {
-          await payment.submit();
-        });
-        let isSales = doctype === 'SalesInvoice';
-        let party = isSales ? doc.customer : doc.supplier;
-        let paymentType = isSales ? 'Receive' : 'Pay';
-        let hideAccountField = isSales ? 'account' : 'paymentAccount';
-        openQuickEdit({
-          doctype: 'Payment',
-          name: payment.name,
-          hideFields: ['party', 'date', hideAccountField, 'paymentType', 'for'],
-          defaults: {
-            party,
-            [hideAccountField]: doc.account,
-            date: new Date().toISOString().slice(0, 10),
-            paymentType,
-            for: [
-              {
-                referenceType: doc.doctype,
-                referenceName: doc.name,
-                amount: doc.outstandingAmount,
-              },
-            ],
-          },
-        });
-      },
-    },
-    {
-      label: t`Print`,
-      condition: (doc) => doc.submitted,
-      action(doc) {
-        routeTo(`/print/${doc.doctype}/${doc.name}`);
-      },
-    },
-    utils.ledgerLink,
-  ];
-}
-
-export default {
-  getStatusColumn,
-  getActions,
-};
diff --git a/models/baseModels/Transaction/Transaction.ts b/models/baseModels/Transaction/Transaction.ts
new file mode 100644
index 00000000..e825921f
--- /dev/null
+++ b/models/baseModels/Transaction/Transaction.ts
@@ -0,0 +1,144 @@
+import { LedgerPosting } from 'accounting/ledgerPosting';
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import Money from 'pesa/dist/types/src/money';
+import { getExchangeRate } from '../../../accounting/exchangeRate';
+import { Party } from '../Party/Party';
+import { Payment } from '../Payment/Payment';
+import { Tax } from '../Tax/Tax';
+
+export abstract class Transaction extends Doc {
+  _taxes: Record<string, Tax> = {};
+
+  abstract getPosting(): LedgerPosting;
+
+  async getPayments() {
+    const payments = await frappe.db.getAll('PaymentFor', {
+      fields: ['parent'],
+      filters: { referenceName: this.name as string },
+      orderBy: 'name',
+    });
+
+    if (payments.length != 0) {
+      return payments;
+    }
+    return [];
+  }
+
+  async beforeUpdate() {
+    const entries = await this.getPosting();
+    await entries.validateEntries();
+  }
+
+  async beforeInsert() {
+    const entries = await this.getPosting();
+    await entries.validateEntries();
+  }
+
+  async afterSubmit() {
+    // post ledger entries
+    const entries = await this.getPosting();
+    await entries.post();
+
+    // update outstanding amounts
+    await frappe.db.update(this.schemaName, {
+      name: this.name as string,
+      outstandingAmount: this.baseGrandTotal as Money,
+    });
+
+    const party = (await frappe.doc.getDoc(
+      'Party',
+      this.party as string
+    )) as Party;
+    await party.updateOutstandingAmount();
+  }
+
+  async afterRevert() {
+    const paymentRefList = await this.getPayments();
+    for (const paymentFor of paymentRefList) {
+      const paymentReference = paymentFor.parent;
+      const payment = (await frappe.doc.getDoc(
+        'Payment',
+        paymentReference as string
+      )) as Payment;
+
+      const paymentEntries = await payment.getPosting();
+      for (const entry of paymentEntries) {
+        await entry.postReverse();
+      }
+
+      // To set the payment status as unsubmitted.
+      await frappe.db.update('Payment', {
+        name: paymentReference,
+        submitted: false,
+        cancelled: true,
+      });
+    }
+    const entries = await this.getPosting();
+    await entries.postReverse();
+  }
+
+  async getExchangeRate() {
+    if (!this.currency) return 1.0;
+
+    const accountingSettings = await frappe.doc.getSingle('AccountingSettings');
+    const companyCurrency = accountingSettings.currency;
+    if (this.currency === companyCurrency) {
+      return 1.0;
+    }
+    return await getExchangeRate({
+      fromCurrency: this.currency as string,
+      toCurrency: companyCurrency as string,
+    });
+  }
+
+  async getTaxSummary() {
+    const taxes: Record<
+      string,
+      { account: string; rate: number; amount: Money; baseAmount?: Money }
+    > = {};
+
+    for (const row of this.items as Doc[]) {
+      if (!row.tax) {
+        continue;
+      }
+
+      const tax = await this.getTax(row.tax as string);
+      for (const d of tax.details as Doc[]) {
+        const account = d.account as string;
+        const rate = d.rate as number;
+
+        taxes[account] = taxes[account] || {
+          account,
+          rate,
+          amount: frappe.pesa(0),
+        };
+
+        const amount = (row.amount as Money).mul(rate).div(100);
+        taxes[account].amount = taxes[account].amount.add(amount);
+      }
+    }
+
+    return Object.keys(taxes)
+      .map((account) => {
+        const tax = taxes[account];
+        tax.baseAmount = tax.amount.mul(this.exchangeRate as number);
+        return tax;
+      })
+      .filter((tax) => !tax.amount.isZero());
+  }
+
+  async getTax(tax: string) {
+    if (!this._taxes![tax]) {
+      this._taxes[tax] = await frappe.doc.getDoc('Tax', tax);
+    }
+
+    return this._taxes[tax];
+  }
+
+  async getGrandTotal() {
+    return ((this.taxes ?? []) as Doc[])
+      .map((doc) => doc.amount as Money)
+      .reduce((a, b) => a.add(b), this.netTotal as Money);
+  }
+}
diff --git a/models/baseModels/Transaction/TransactionDocument.js b/models/baseModels/Transaction/TransactionDocument.js
deleted file mode 100644
index 6ca2dc4a..00000000
--- a/models/baseModels/Transaction/TransactionDocument.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import frappe from 'frappe';
-import Document from 'frappe/model/document';
-import { getExchangeRate } from '../../../accounting/exchangeRate';
-
-export default class TransactionDocument extends Document {
-  async getExchangeRate() {
-    if (!this.currency) return 1.0;
-
-    let accountingSettings = await frappe.getSingle('AccountingSettings');
-    const companyCurrency = accountingSettings.currency;
-    if (this.currency === companyCurrency) {
-      return 1.0;
-    }
-    return await getExchangeRate({
-      fromCurrency: this.currency,
-      toCurrency: companyCurrency,
-    });
-  }
-
-  async getTaxSummary() {
-    let taxes = {};
-
-    for (let row of this.items) {
-      if (!row.tax) {
-        continue;
-      }
-
-      const tax = await this.getTax(row.tax);
-      for (let d of tax.details) {
-        taxes[d.account] = taxes[d.account] || {
-          account: d.account,
-          rate: d.rate,
-          amount: frappe.pesa(0),
-        };
-
-        const amount = row.amount.mul(d.rate).div(100);
-        taxes[d.account].amount = taxes[d.account].amount.add(amount);
-      }
-    }
-
-    return Object.keys(taxes)
-      .map((account) => {
-        const tax = taxes[account];
-        tax.baseAmount = tax.amount.mul(this.exchangeRate);
-        return tax;
-      })
-      .filter((tax) => !tax.amount.isZero());
-  }
-
-  async getTax(tax) {
-    if (!this._taxes) this._taxes = {};
-    if (!this._taxes[tax])
-      this._taxes[tax] = await frappe.doc.getDoc('Tax', tax);
-    return this._taxes[tax];
-  }
-
-  async getGrandTotal() {
-    return (this.taxes || [])
-      .map(({ amount }) => amount)
-      .reduce((a, b) => a.add(b), this.netTotal);
-  }
-}
diff --git a/models/baseModels/Transaction/TransactionServer.js b/models/baseModels/Transaction/TransactionServer.js
deleted file mode 100644
index fe995bcc..00000000
--- a/models/baseModels/Transaction/TransactionServer.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import frappe from 'frappe';
-
-export default {
-  async getPayments() {
-    let payments = await frappe.db.getAll({
-      doctype: 'PaymentFor',
-      fields: ['parent'],
-      filters: { referenceName: this.name },
-      orderBy: 'name',
-    });
-    if (payments.length != 0) {
-      return payments;
-    }
-    return [];
-  },
-
-  async beforeUpdate() {
-    const entries = await this.getPosting();
-    await entries.validateEntries();
-  },
-
-  async beforeInsert() {
-    const entries = await this.getPosting();
-    await entries.validateEntries();
-  },
-
-  async afterSubmit() {
-    // post ledger entries
-    const entries = await this.getPosting();
-    await entries.post();
-
-    // update outstanding amounts
-    await frappe.db.update(this.doctype, {
-      name: this.name,
-      outstandingAmount: this.baseGrandTotal,
-    });
-
-    let party = await frappe.doc.getDoc(
-      'Party',
-      this.customer || this.supplier
-    );
-    await party.updateOutstandingAmount();
-  },
-
-  async afterRevert() {
-    let paymentRefList = await this.getPayments();
-    for (let paymentFor of paymentRefList) {
-      const paymentReference = paymentFor.parent;
-      const payment = await frappe.doc.getDoc('Payment', paymentReference);
-      const paymentEntries = await payment.getPosting();
-      await paymentEntries.postReverse();
-      // To set the payment status as unsubmitted.
-      await frappe.db.update('Payment', {
-        name: paymentReference,
-        submitted: 0,
-        cancelled: 1,
-      });
-    }
-    const entries = await this.getPosting();
-    await entries.postReverse();
-  },
-};
diff --git a/models/helpers.ts b/models/helpers.ts
index 3ecae1dc..82c77315 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -1,7 +1,10 @@
+import { openQuickEdit } from '@/utils';
 import frappe from 'frappe';
 import Doc from 'frappe/model/doc';
 import { Action } from 'frappe/model/types';
+import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
+import { InvoiceStatus } from './types';
 
 export function getLedgerLinkAction(): Action {
   return {
@@ -22,3 +25,96 @@ export function getLedgerLinkAction(): Action {
     },
   };
 }
+
+export function getTransactionActions(schemaName: string) {
+  return [
+    {
+      label: frappe.t`Make Payment`,
+      condition: (doc: Doc) =>
+        doc.submitted && (doc.outstandingAmount as Money).gt(0),
+      action: async function makePayment(doc: Doc) {
+        const payment = await frappe.doc.getEmptyDoc('Payment');
+        payment.once('afterInsert', async () => {
+          await payment.submit();
+        });
+        const isSales = schemaName === 'SalesInvoice';
+        const party = isSales ? doc.customer : doc.supplier;
+        const paymentType = isSales ? 'Receive' : 'Pay';
+        const hideAccountField = isSales ? 'account' : 'paymentAccount';
+
+        await openQuickEdit({
+          schemaName: 'Payment',
+          name: payment.name as string,
+          hideFields: ['party', 'date', hideAccountField, 'paymentType', 'for'],
+          defaults: {
+            party,
+            [hideAccountField]: doc.account,
+            date: new Date().toISOString().slice(0, 10),
+            paymentType,
+            for: [
+              {
+                referenceType: doc.doctype,
+                referenceName: doc.name,
+                amount: doc.outstandingAmount,
+              },
+            ],
+          },
+        });
+      },
+    },
+    {
+      label: frappe.t`Print`,
+      condition: (doc: Doc) => doc.submitted,
+      action(doc: Doc, router: Router) {
+        router.push({ path: `/print/${doc.doctype}/${doc.name}` });
+      },
+    },
+    getLedgerLinkAction(),
+  ];
+}
+
+export function getTransactionStatusColumn() {
+  const statusMap = {
+    Unpaid: frappe.t`Unpaid`,
+    Paid: frappe.t`Paid`,
+    Draft: frappe.t`Draft`,
+    Cancelled: frappe.t`Cancelled`,
+  };
+
+  return {
+    label: frappe.t`Status`,
+    fieldname: 'status',
+    fieldtype: 'Select',
+    render(doc: Doc) {
+      const status = getInvoiceStatus(doc) as InvoiceStatus;
+      const color = statusColor[status];
+      const label = statusMap[status];
+      return {
+        template: `<Badge class="text-xs" color="${color}">${label}</Badge>`,
+      };
+    },
+  };
+}
+
+export const statusColor = {
+  Draft: 'gray',
+  Unpaid: 'orange',
+  Paid: 'green',
+  Cancelled: 'red',
+};
+
+export function getInvoiceStatus(doc: Doc) {
+  let status = `Unpaid`;
+  if (!doc.submitted) {
+    status = 'Draft';
+  }
+
+  if (doc.submitted && (doc.outstandingAmount as Money).isZero()) {
+    status = 'Paid';
+  }
+
+  if (doc.cancelled) {
+    status = 'Cancelled';
+  }
+  return status;
+}
diff --git a/models/types.ts b/models/types.ts
index 296d171f..2e4fcf14 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -50,3 +50,5 @@ export enum DoctypeName {
   PrintSettings = 'PrintSettings',
   GetStarted = 'GetStarted',
 }
+
+export type InvoiceStatus = 'Draft' | 'Unpaid' | 'Cancelled' | 'Paid';
diff --git a/models/baseModels/Tax/RegionalEntries.js b/src/regional/in.ts
similarity index 69%
rename from models/baseModels/Tax/RegionalEntries.js
rename to src/regional/in.ts
index 7b33cb8d..860839ff 100644
--- a/models/baseModels/Tax/RegionalEntries.js
+++ b/src/regional/in.ts
@@ -1,6 +1,8 @@
 import frappe from 'frappe';
 
-export default async function generateTaxes(country) {
+export type TaxType = 'GST' | 'IGST' | 'Exempt-GST' | 'Exempt-IGST';
+
+export default async function generateTaxes(country: string) {
   if (country === 'India') {
     const GSTs = {
       GST: [28, 18, 12, 6, 5, 3, 0.25, 0],
@@ -8,16 +10,16 @@ export default async function generateTaxes(country) {
       'Exempt-GST': [0],
       'Exempt-IGST': [0],
     };
-    let newTax = await frappe.getEmptyDoc('Tax');
+    const newTax = await frappe.doc.getEmptyDoc('Tax');
 
     for (const type of Object.keys(GSTs)) {
-      for (const percent of GSTs[type]) {
+      for (const percent of GSTs[type as TaxType]) {
         const name = `${type}-${percent}`;
 
         // Not cross checking cause hardcoded values.
         await frappe.db.delete('Tax', name);
 
-        const details = getTaxDetails(type, percent);
+        const details = getTaxDetails(type as TaxType, percent);
         await newTax.set({ name, details });
         await newTax.insert();
       }
@@ -25,7 +27,7 @@ export default async function generateTaxes(country) {
   }
 }
 
-function getTaxDetails(type, percent) {
+function getTaxDetails(type: TaxType, percent: number) {
   if (type === 'GST') {
     return [
       {
diff --git a/src/utils.ts b/src/utils.ts
new file mode 100644
index 00000000..dc3cdce8
--- /dev/null
+++ b/src/utils.ts
@@ -0,0 +1,99 @@
+import Doc from 'frappe/model/doc';
+
+export interface QuickEditOptions {
+  schemaName: string;
+  name: string;
+  hideFields?: string[];
+  showFields?: string[];
+  defaults?: Record<string, unknown>;
+}
+
+export async function openQuickEdit({
+  schemaName,
+  name,
+  hideFields,
+  showFields,
+  defaults = {},
+}: QuickEditOptions) {
+  const router = (await import('./router')).default;
+
+  const currentRoute = router.currentRoute.value;
+  const query = currentRoute.query;
+  let method: 'push' | 'replace' = 'push';
+
+  if (query.edit && query.doctype === schemaName) {
+    // replace the current route if we are
+    // editing another document of the same doctype
+    method = 'replace';
+  }
+  if (query.name === name) return;
+
+  const forWhat = (defaults?.for ?? []) as string[];
+  if (forWhat[0] === 'not in') {
+    const purpose = forWhat[1]?.[0];
+
+    defaults = Object.assign({
+      for:
+        purpose === 'sales'
+          ? 'purchases'
+          : purpose === 'purchases'
+          ? 'sales'
+          : 'both',
+    });
+  }
+
+  if (forWhat[0] === 'not in' && forWhat[1] === 'sales') {
+    defaults = Object.assign({ for: 'purchases' });
+  }
+
+  router[method]({
+    query: {
+      edit: 1,
+      doctype: schemaName,
+      name,
+      showFields: showFields ?? getShowFields(schemaName),
+      hideFields,
+      valueJSON: stringifyCircular(defaults),
+      // @ts-ignore
+      lastRoute: currentRoute,
+    },
+  });
+}
+
+function getShowFields(schemaName: string) {
+  if (schemaName === 'Party') {
+    return ['customer'];
+  }
+  return [];
+}
+
+export function stringifyCircular(
+  obj: Record<string, unknown>,
+  ignoreCircular = false,
+  convertDocument = false
+) {
+  const cacheKey: string[] = [];
+  const cacheValue: unknown[] = [];
+
+  return JSON.stringify(obj, (key, value) => {
+    if (typeof value !== 'object' || value === null) {
+      cacheKey.push(key);
+      cacheValue.push(value);
+      return value;
+    }
+
+    if (cacheValue.includes(value)) {
+      const circularKey = cacheKey[cacheValue.indexOf(value)] || '{self}';
+      return ignoreCircular ? undefined : `[Circular:${circularKey}]`;
+    }
+
+    cacheKey.push(key);
+    cacheValue.push(value);
+
+    if (convertDocument && value instanceof Doc) {
+      return value.getValidDict();
+    }
+
+    return value;
+  });
+}

From 591e7b3163a18c89acccff473c860aac739af2b8 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 14 Apr 2022 14:52:45 +0530
Subject: [PATCH 046/163] incr: complete typing models - fix model exports -
 add a README for models base

---
 frappe/model/doc.ts                           |   4 +-
 frappe/model/types.ts                         |   5 +-
 models/README.md                              |  32 ++++
 models/baseModels/Account/Account.ts          |   2 +-
 .../Transaction.ts => Invoice/Invoice.ts}     |  77 +++++++--
 models/baseModels/InvoiceItem/InvoiceItem.ts  | 106 ++++++++++++
 models/baseModels/Payment/Payment.ts          |  13 +-
 .../PurchaseInvoice/PurchaseInvoice.js        | 152 ------------------
 .../PurchaseInvoice/PurchaseInvoice.ts        |  48 ++++++
 .../PurchaseInvoiceDocument.js                |   3 -
 .../PurchaseInvoice/PurchaseInvoiceList.js    |  16 --
 .../PurchaseInvoice/PurchaseInvoiceServer.js  |  27 ----
 .../PurchaseInvoiceItem.js                    | 109 -------------
 .../PurchaseInvoiceItem.ts                    |   3 +
 .../PurchaseInvoiceItem/RegionalChanges.js    |  25 ---
 .../baseModels/SalesInvoice/SalesInvoice.js   | 152 ------------------
 .../baseModels/SalesInvoice/SalesInvoice.ts   |  46 ++++++
 .../SalesInvoice/SalesInvoiceDocument.js      |   3 -
 .../SalesInvoice/SalesInvoiceList.js          |  16 --
 .../SalesInvoice/SalesInvoiceServer.js        |  27 ----
 .../SalesInvoiceItem/RegionalChanges.js       |  25 ---
 .../SalesInvoiceItem/SalesInvoiceItem.js      | 120 --------------
 .../SalesInvoiceItem/SalesInvoiceItem.ts      |   3 +
 models/baseModels/TaxSummary/TaxSummary.ts    |   5 +
 models/helpers.ts                             |  12 +-
 models/index.js                               |  63 --------
 models/index.ts                               |  47 ++++++
 models/regionalModelUpdates.js                |  20 ---
 models/types.ts                               |  53 ------
 schemas/app/PurchaseInvoiceItem.json          |  12 +-
 schemas/app/SalesInvoiceItem.json             |   8 +-
 .../SalesInvoice/InvoiceTemplate.vue          |   0
 .../SalesInvoice/SalesInvoicePrint.vue        |   0
 .../SalesInvoice/Templates/Base.vue           |   0
 .../SalesInvoice/Templates/Basic.vue          |   0
 .../SalesInvoice/Templates/Business.vue       |   0
 .../SalesInvoice/Templates/Minimal.vue        |   0
 37 files changed, 389 insertions(+), 845 deletions(-)
 create mode 100644 models/README.md
 rename models/baseModels/{Transaction/Transaction.ts => Invoice/Invoice.ts} (60%)
 create mode 100644 models/baseModels/InvoiceItem/InvoiceItem.ts
 delete mode 100644 models/baseModels/PurchaseInvoice/PurchaseInvoice.js
 delete mode 100644 models/baseModels/PurchaseInvoice/PurchaseInvoiceDocument.js
 delete mode 100644 models/baseModels/PurchaseInvoice/PurchaseInvoiceList.js
 delete mode 100644 models/baseModels/PurchaseInvoice/PurchaseInvoiceServer.js
 delete mode 100644 models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.js
 create mode 100644 models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.ts
 delete mode 100644 models/baseModels/PurchaseInvoiceItem/RegionalChanges.js
 delete mode 100644 models/baseModels/SalesInvoice/SalesInvoice.js
 create mode 100644 models/baseModels/SalesInvoice/SalesInvoice.ts
 delete mode 100644 models/baseModels/SalesInvoice/SalesInvoiceDocument.js
 delete mode 100644 models/baseModels/SalesInvoice/SalesInvoiceList.js
 delete mode 100644 models/baseModels/SalesInvoice/SalesInvoiceServer.js
 delete mode 100644 models/baseModels/SalesInvoiceItem/RegionalChanges.js
 delete mode 100644 models/baseModels/SalesInvoiceItem/SalesInvoiceItem.js
 create mode 100644 models/baseModels/SalesInvoiceItem/SalesInvoiceItem.ts
 delete mode 100644 models/index.js
 create mode 100644 models/index.ts
 delete mode 100644 models/regionalModelUpdates.js
 rename {models/baseModels => src/components}/SalesInvoice/InvoiceTemplate.vue (100%)
 rename {models/baseModels => src/components}/SalesInvoice/SalesInvoicePrint.vue (100%)
 rename {models/baseModels => src/components}/SalesInvoice/Templates/Base.vue (100%)
 rename {models/baseModels => src/components}/SalesInvoice/Templates/Basic.vue (100%)
 rename {models/baseModels => src/components}/SalesInvoice/Templates/Business.vue (100%)
 rename {models/baseModels => src/components}/SalesInvoice/Templates/Minimal.vue (100%)

diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
index 97000a59..37b4f116 100644
--- a/frappe/model/doc.ts
+++ b/frappe/model/doc.ts
@@ -33,6 +33,7 @@ import {
   EmptyMessageMap,
   FiltersMap,
   FormulaMap,
+  FormulaReturn,
   HiddenMap,
   ListsMap,
   ListViewSettings,
@@ -507,7 +508,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async getValueFromFormula(field: Field, doc: Doc) {
-    let value: Doc[] | DocValue | undefined;
+    let value: FormulaReturn;
 
     const formula = doc.formulas[field.fieldtype];
     if (formula === undefined) {
@@ -515,7 +516,6 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
 
     value = await formula();
-
     if (Array.isArray(value) && field.fieldtype === FieldTypeEnum.Table) {
       value = value.map((row) => this._initChild(row, field.fieldname));
     }
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
index 581e823d..9b0a8c78 100644
--- a/frappe/model/types.ts
+++ b/frappe/model/types.ts
@@ -1,4 +1,4 @@
-import { DocValue } from 'frappe/core/types';
+import { DocValue, DocValueMap } from 'frappe/core/types';
 import { FieldType } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 import { Router } from 'vue-router';
@@ -16,7 +16,8 @@ import Doc from './doc';
  * - `Validation`: Async function that throw an error if the value is invalid.
  * - `Required`: Regular function used to decide if a value is mandatory (there are !notnul in the db).
  */
-export type Formula = () => Promise<DocValue | undefined>;
+export type FormulaReturn = DocValue | DocValueMap[] | undefined | Doc[];
+export type Formula = () => Promise<FormulaReturn> | FormulaReturn;
 export type Default = () => DocValue;
 export type Validation = (value: DocValue) => Promise<void>;
 export type Required = () => boolean;
diff --git a/models/README.md b/models/README.md
new file mode 100644
index 00000000..054ac915
--- /dev/null
+++ b/models/README.md
@@ -0,0 +1,32 @@
+# Models
+
+The `models` root folder contains all the model files, i.e. files containing all the models. **Models** here, refers to the classes that handle the data, its validation and updation and a bunch of other stuff.
+
+Each model directly or indirectly extends the `Doc` class from `frappe/model/doc.ts` so for more info check that file and the associated types in `frappe/model/types.ts`.
+
+A model class can used even if the class body has no content, for example `PurchaseInvoiceItem`. Else the model used will default to using `Doc`. The class can also be used to provide type information for the field types else they default to the catch all `DocValue` example:
+
+```typescript
+class Todo extends Doc {
+  title?: string;
+  date?: Date;
+  completed?: boolean;
+}
+```
+
+While this has obvious advantages, the drawback is if the underlying fieldtype changes this too will have to be changed.
+
+## Adding Stuff
+
+When adding stuff to `models/**` make sure that it isn't importing any Vue code or other frontend specific code globally. This is cause model file tests will directly use the the `Frappe` class and will be run using `mocha` on `node`.
+
+Importing frontend code will break all the tests. This also implies that one should be wary about transitive dependencies.
+
+_Note: Frontend specific code can be imported but they should be done so, only using dynamic imports i.e. `await import('...')`._
+
+## Regional Models
+
+Regional models should as far as possible extend the base model and override what's required.
+
+They should then be imported dynamicall and returned from `getRegionalModels` in `models/index.ts` on the basis of `countryCode`.
+
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index e296306e..109e11d8 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -7,7 +7,7 @@ import {
 } from 'frappe/model/types';
 import { QueryFilter } from 'utils/db/types';
 
-export default class Account extends Doc {
+export class Account extends Doc {
   async beforeInsert() {
     if (this.accountType || !this.parentAccount) {
       return;
diff --git a/models/baseModels/Transaction/Transaction.ts b/models/baseModels/Invoice/Invoice.ts
similarity index 60%
rename from models/baseModels/Transaction/Transaction.ts
rename to models/baseModels/Invoice/Invoice.ts
index e825921f..3169b776 100644
--- a/models/baseModels/Transaction/Transaction.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -1,21 +1,36 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
 import frappe from 'frappe';
+import { DocValue } from 'frappe/core/types';
 import Doc from 'frappe/model/doc';
+import { DefaultMap, FiltersMap, FormulaMap } from 'frappe/model/types';
 import Money from 'pesa/dist/types/src/money';
 import { getExchangeRate } from '../../../accounting/exchangeRate';
 import { Party } from '../Party/Party';
 import { Payment } from '../Payment/Payment';
 import { Tax } from '../Tax/Tax';
+import { TaxSummary } from '../TaxSummary/TaxSummary';
 
-export abstract class Transaction extends Doc {
+export abstract class Invoice extends Doc {
   _taxes: Record<string, Tax> = {};
+  taxes?: TaxSummary[];
 
-  abstract getPosting(): LedgerPosting;
+  party?: string;
+  account?: string;
+  currency?: string;
+  netTotal?: Money;
+  baseGrandTotal?: Money;
+  exchangeRate?: number;
+
+  abstract getPosting(): Promise<LedgerPosting>;
+
+  get isSales() {
+    return this.schemaName === 'SalesInvoice';
+  }
 
   async getPayments() {
     const payments = await frappe.db.getAll('PaymentFor', {
       fields: ['parent'],
-      filters: { referenceName: this.name as string },
+      filters: { referenceName: this.name! },
       orderBy: 'name',
     });
 
@@ -43,13 +58,10 @@ export abstract class Transaction extends Doc {
     // update outstanding amounts
     await frappe.db.update(this.schemaName, {
       name: this.name as string,
-      outstandingAmount: this.baseGrandTotal as Money,
+      outstandingAmount: this.baseGrandTotal!,
     });
 
-    const party = (await frappe.doc.getDoc(
-      'Party',
-      this.party as string
-    )) as Party;
+    const party = (await frappe.doc.getDoc('Party', this.party!)) as Party;
     await party.updateOutstandingAmount();
   }
 
@@ -87,7 +99,7 @@ export abstract class Transaction extends Doc {
       return 1.0;
     }
     return await getExchangeRate({
-      fromCurrency: this.currency as string,
+      fromCurrency: this.currency!,
       toCurrency: companyCurrency as string,
     });
   }
@@ -95,7 +107,13 @@ export abstract class Transaction extends Doc {
   async getTaxSummary() {
     const taxes: Record<
       string,
-      { account: string; rate: number; amount: Money; baseAmount?: Money }
+      {
+        account: string;
+        rate: number;
+        amount: Money;
+        baseAmount: Money;
+        [key: string]: DocValue;
+      }
     > = {};
 
     for (const row of this.items as Doc[]) {
@@ -112,6 +130,7 @@ export abstract class Transaction extends Doc {
           account,
           rate,
           amount: frappe.pesa(0),
+          baseAmount: frappe.pesa(0),
         };
 
         const amount = (row.amount as Money).mul(rate).div(100);
@@ -122,7 +141,7 @@ export abstract class Transaction extends Doc {
     return Object.keys(taxes)
       .map((account) => {
         const tax = taxes[account];
-        tax.baseAmount = tax.amount.mul(this.exchangeRate as number);
+        tax.baseAmount = tax.amount.mul(this.exchangeRate!);
         return tax;
       })
       .filter((tax) => !tax.amount.isZero());
@@ -139,6 +158,40 @@ export abstract class Transaction extends Doc {
   async getGrandTotal() {
     return ((this.taxes ?? []) as Doc[])
       .map((doc) => doc.amount as Money)
-      .reduce((a, b) => a.add(b), this.netTotal as Money);
+      .reduce((a, b) => a.add(b), this.netTotal!);
   }
+
+  formulas: FormulaMap = {
+    account: async () =>
+      this.getFrom('Party', this.party!, 'defaultAccount') as string,
+    currency: async () =>
+      (this.getFrom('Party', this.party!, 'currency') as string) ||
+      (frappe.singles.AccountingSettings!.currency as string),
+    exchangeRate: async () => await this.getExchangeRate(),
+    netTotal: async () => this.getSum('items', 'amount', false),
+    baseNetTotal: async () => this.netTotal!.mul(this.exchangeRate!),
+    taxes: async () => await this.getTaxSummary(),
+    grandTotal: async () => await this.getGrandTotal(),
+    baseGrandTotal: async () =>
+      (this.grandTotal as Money).mul(this.exchangeRate!),
+    outstandingAmount: async () => {
+      if (this.submitted) {
+        return;
+      }
+
+      return this.baseGrandTotal!;
+    },
+  };
+
+  defaults: DefaultMap = {
+    date: () => new Date().toISOString().slice(0, 10),
+  };
+
+  static filters: FiltersMap = {
+    account: (doc: Doc) => ({
+      isGroup: false,
+      accountType: doc.isSales ? 'Receivable' : 'Payable',
+    }),
+    numberSeries: (doc: Doc) => ({ referenceType: doc.schemaName }),
+  };
 }
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
new file mode 100644
index 00000000..d5fbe68b
--- /dev/null
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -0,0 +1,106 @@
+import frappe from 'frappe';
+import { DocValue } from 'frappe/core/types';
+import Doc from 'frappe/model/doc';
+import {
+  DependsOnMap,
+  FiltersMap,
+  FormulaMap,
+  ValidationMap,
+} from 'frappe/model/types';
+import Money from 'pesa/dist/types/src/money';
+import { Invoice } from '../Invoice/Invoice';
+
+export abstract class InvoiceItem extends Doc {
+  account?: string;
+  baseAmount?: Money;
+  exchangeRate?: number;
+  parentdoc?: Invoice;
+
+  get isSales() {
+    return this.schemaName === 'SalesInvoiceItem';
+  }
+
+  formulas: FormulaMap = {
+    description: () =>
+      this.parentdoc!.getFrom(
+        'Item',
+        this.item as string,
+        'description'
+      ) as string,
+    rate: async () => {
+      const baseRate = ((await this.parentdoc!.getFrom(
+        'Item',
+        this.item as string,
+        'rate'
+      )) || frappe.pesa(0)) as Money;
+
+      return baseRate.div(this.exchangeRate!);
+    },
+    baseRate: () =>
+      (this.rate as Money).mul(this.parentdoc!.exchangeRate as number),
+    account: () => {
+      let accountType = 'expenseAccount';
+      if (this.isSales) {
+        accountType = 'incomeAccount';
+      }
+      return this.parentdoc!.getFrom('Item', this.item as string, accountType);
+    },
+    tax: () => {
+      if (this.tax) {
+        return this.tax as string;
+      }
+
+      return this.parentdoc!.getFrom(
+        'Item',
+        this.item as string,
+        'tax'
+      ) as string;
+    },
+    amount: () => (this.rate as Money).mul(this.quantity as number),
+    baseAmount: () =>
+      (this.amount as Money).mul(this.parentdoc!.exchangeRate as number),
+    hsnCode: () =>
+      this.parentdoc!.getFrom('Item', this.item as string, 'hsnCode'),
+  };
+
+  dependsOn: DependsOnMap = {
+    hsnCode: ['item'],
+  };
+
+  validations: ValidationMap = {
+    rate: async (value: DocValue) => {
+      if ((value as Money).gte(0)) {
+        return;
+      }
+
+      throw new frappe.errors.ValidationError(
+        frappe.t`Rate (${frappe.format(
+          value,
+          'Currency'
+        )}) cannot be less zero.`
+      );
+    },
+  };
+
+  static filters: FiltersMap = {
+    item: (doc: Doc) => {
+      const itemList = doc.parentdoc!.items as Doc[];
+      const items = itemList.map((d) => d.item as string).filter(Boolean);
+
+      let itemNotFor = 'sales';
+      if (doc.isSales) {
+        itemNotFor = 'purchases';
+      }
+
+      const baseFilter = { for: ['not in', [itemNotFor]] };
+      if (items.length <= 0) {
+        return baseFilter;
+      }
+
+      return {
+        name: ['not in', items],
+        ...baseFilter,
+      };
+    },
+  };
+}
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index ff7c890f..7a29bf65 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -20,6 +20,8 @@ import { Party } from '../Party/Party';
 import { PaymentMethod, PaymentType } from './types';
 
 export class Payment extends Doc {
+  party?: string;
+
   async change({ changed }: { changed: string }) {
     switch (changed) {
       case 'for': {
@@ -59,7 +61,7 @@ export class Payment extends Doc {
       paymentType = 'Pay';
     }
 
-    this.party = party;
+    this.party = party as string;
     this.paymentType = paymentType;
   }
 
@@ -152,7 +154,7 @@ export class Payment extends Doc {
     const writeoff = this.writeoff as Money;
     const entries = new LedgerPosting({
       reference: this,
-      party: this.party as string,
+      party: this.party!,
     });
 
     await entries.debit(paymentAccount as string, amount.sub(writeoff));
@@ -164,7 +166,7 @@ export class Payment extends Doc {
 
     const writeoffEntry = new LedgerPosting({
       reference: this,
-      party: this.party as string,
+      party: this.party!,
     });
     const writeOffAccount = frappe.singles.AccountingSettings!
       .writeOffAccount as string;
@@ -227,10 +229,7 @@ export class Payment extends Doc {
         const newOutstanding = outstandingAmount.sub(amount);
         await referenceDoc.set('outstandingAmount', newOutstanding);
         await referenceDoc.update();
-        const party = (await frappe.doc.getDoc(
-          'Party',
-          this.party as string
-        )) as Party;
+        const party = (await frappe.doc.getDoc('Party', this.party!)) as Party;
 
         await party.updateOutstandingAmount();
       }
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.js b/models/baseModels/PurchaseInvoice/PurchaseInvoice.js
deleted file mode 100644
index c67832e7..00000000
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { t } from 'frappe';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-import InvoiceTemplate from '../SalesInvoice/InvoiceTemplate.vue';
-import { getActions } from '../Transaction/Transaction';
-import PurchaseInvoice from './PurchaseInvoiceDocument';
-
-export default {
-  name: 'PurchaseInvoice',
-  doctype: 'DocType',
-  label: t`Bill`,
-  documentClass: PurchaseInvoice,
-  printTemplate: InvoiceTemplate,
-  isSingle: 0,
-  isChild: 0,
-  isSubmittable: 1,
-  keywordFields: ['name', 'supplier'],
-  settings: 'PurchaseInvoiceSettings',
-  showTitle: true,
-  fields: [
-    {
-      label: t`Bill No`,
-      fieldname: 'name',
-      fieldtype: 'Data',
-      required: 1,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'date',
-      label: t`Date`,
-      fieldtype: 'Date',
-      default: () => new Date().toISOString().slice(0, 10),
-    },
-    {
-      fieldname: 'supplier',
-      label: t`Supplier`,
-      fieldtype: 'Link',
-      target: 'Supplier',
-      required: 1,
-    },
-    {
-      fieldname: 'account',
-      label: t`Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      formula: (doc) => doc.getFrom('Party', doc.supplier, 'defaultAccount'),
-      getFilters: () => {
-        return {
-          isGroup: 0,
-          accountType: 'Payable',
-        };
-      },
-    },
-    {
-      fieldname: 'currency',
-      label: t`Supplier Currency`,
-      fieldtype: 'Link',
-      target: 'Currency',
-      hidden: 1,
-      formula: (doc) =>
-        doc.getFrom('Party', doc.supplier, 'currency') ||
-        frappe.AccountingSettings.currency,
-      formulaDependsOn: ['supplier'],
-    },
-    {
-      fieldname: 'exchangeRate',
-      label: t`Exchange Rate`,
-      fieldtype: 'Float',
-      default: 1,
-      formula: async (doc) => await doc.getExchangeRate(),
-    },
-    {
-      fieldname: 'items',
-      label: t`Items`,
-      fieldtype: 'Table',
-      childtype: 'PurchaseInvoiceItem',
-      required: true,
-    },
-    {
-      fieldname: 'netTotal',
-      label: t`Net Total`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.getSum('items', 'amount', false),
-      readOnly: 1,
-      getCurrency: (doc) => doc.currency,
-    },
-    {
-      fieldname: 'baseNetTotal',
-      label: t`Net Total (Company Currency)`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.netTotal.mul(doc.exchangeRate),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'taxes',
-      label: t`Taxes`,
-      fieldtype: 'Table',
-      childtype: 'TaxSummary',
-      formula: (doc) => doc.getTaxSummary(),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'grandTotal',
-      label: t`Grand Total`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.getGrandTotal(),
-      readOnly: 1,
-      getCurrency: (doc) => doc.currency,
-    },
-    {
-      fieldname: 'baseGrandTotal',
-      label: t`Grand Total (Company Currency)`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.grandTotal.mul(doc.exchangeRate),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'outstandingAmount',
-      label: t`Outstanding Amount`,
-      fieldtype: 'Currency',
-      formula: (doc) => {
-        if (doc.submitted) return;
-        return doc.baseGrandTotal;
-      },
-      readOnly: 1,
-    },
-    {
-      fieldname: 'terms',
-      label: t`Terms`,
-      fieldtype: 'Text',
-    },
-    {
-      fieldname: 'cancelled',
-      label: t`Cancelled`,
-      fieldtype: 'Check',
-      default: 0,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'numberSeries',
-      label: t`Number Series`,
-      fieldtype: 'Link',
-      target: 'NumberSeries',
-      required: 1,
-      getFilters: () => {
-        return { referenceType: 'PurchaseInvoice' };
-      },
-      default: DEFAULT_NUMBER_SERIES['PurchaseInvoice'],
-    },
-  ],
-
-  actions: getActions('PurchaseInvoice'),
-};
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index e69de29b..615de850 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -0,0 +1,48 @@
+import { LedgerPosting } from 'accounting/ledgerPosting';
+import { Action, ListViewSettings } from 'frappe/model/types';
+import {
+  getTransactionActions,
+  getTransactionStatusColumn,
+} from '../../helpers';
+import { Invoice } from '../Invoice/Invoice';
+import { PurchaseInvoiceItem } from '../PurchaseInvoiceItem/PurchaseInvoiceItem';
+
+export class PurchaseInvoice extends Invoice {
+  items?: PurchaseInvoiceItem[];
+
+  async getPosting() {
+    const entries: LedgerPosting = new LedgerPosting({
+      reference: this,
+      party: this.party,
+    });
+
+    await entries.credit(this.account!, this.baseGrandTotal!);
+
+    for (const item of this.items!) {
+      await entries.debit(item.account!, item.baseAmount!);
+    }
+
+    if (this.taxes) {
+      for (const tax of this.taxes) {
+        await entries.debit(tax.account!, tax.baseAmount!);
+      }
+    }
+
+    entries.makeRoundOffEntry();
+    return entries;
+  }
+
+  static actions: Action[] = getTransactionActions('PurchaseInvoice');
+
+  static listSettings: ListViewSettings = {
+    formRoute: (name) => `/edit/PurchaseInvoice/${name}`,
+    columns: [
+      'party',
+      'name',
+      getTransactionStatusColumn(),
+      'date',
+      'grandTotal',
+      'outstandingAmount',
+    ],
+  };
+}
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoiceDocument.js b/models/baseModels/PurchaseInvoice/PurchaseInvoiceDocument.js
deleted file mode 100644
index 22ae8f33..00000000
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoiceDocument.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import TransactionDocument from '../Transaction/TransactionDocument';
-
-export default class PurchaseInvoice extends TransactionDocument {};
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoiceList.js b/models/baseModels/PurchaseInvoice/PurchaseInvoiceList.js
deleted file mode 100644
index c28994df..00000000
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoiceList.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { t } from 'frappe';
-import { getStatusColumn } from '../Transaction/Transaction';
-
-export default {
-  doctype: 'PurchaseInvoice',
-  title: t`Bills`,
-  formRoute: (name) => `/edit/PurchaseInvoice/${name}`,
-  columns: [
-    'supplier',
-    'name',
-    getStatusColumn('PurchaseInvoice'),
-    'date',
-    'grandTotal',
-    'outstandingAmount',
-  ],
-};
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoiceServer.js b/models/baseModels/PurchaseInvoice/PurchaseInvoiceServer.js
deleted file mode 100644
index 1e95f6aa..00000000
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoiceServer.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import TransactionServer from '../Transaction/TransactionServer';
-import PurchaseInvoice from './PurchaseInvoiceDocument';
-import LedgerPosting from '../../../accounting/ledgerPosting';
-
-class PurchaseInvoiceServer extends PurchaseInvoice {
-  async getPosting() {
-    let entries = new LedgerPosting({ reference: this, party: this.supplier });
-    await entries.credit(this.account, this.baseGrandTotal);
-
-    for (let item of this.items) {
-      await entries.debit(item.account, item.baseAmount);
-    }
-
-    if (this.taxes) {
-      for (let tax of this.taxes) {
-        await entries.debit(tax.account, tax.baseAmount);
-      }
-    }
-    entries.makeRoundOffEntry();
-    return entries;
-  }
-}
-
-// apply common methods from TransactionServer
-Object.assign(PurchaseInvoiceServer.prototype, TransactionServer);
-
-export default PurchaseInvoiceServer;
diff --git a/models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.js b/models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.js
deleted file mode 100644
index ef8d5da1..00000000
--- a/models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'PurchaseInvoiceItem',
-  doctype: 'DocType',
-  isChild: 1,
-  keywordFields: [],
-  tableFields: ['item', 'tax', 'quantity', 'rate', 'amount'],
-  fields: [
-    {
-      fieldname: 'item',
-      label: t`Item`,
-      fieldtype: 'Link',
-      target: 'Item',
-      required: 1,
-      getFilters(_, doc) {
-        let items = doc.parentdoc.items.map((d) => d.item).filter(Boolean);
-
-        const baseFilter = { for: ['not in', ['sales']] };
-        if (items.length <= 0) {
-          return baseFilter;
-        }
-
-        return {
-          name: ['not in', items],
-          ...baseFilter,
-        };
-      },
-    },
-    {
-      fieldname: 'description',
-      label: t`Description`,
-      fieldtype: 'Text',
-      formula: (row, doc) => doc.getFrom('Item', row.item, 'description'),
-      hidden: 1,
-    },
-    {
-      fieldname: 'quantity',
-      label: t`Quantity`,
-      fieldtype: 'Float',
-      required: 1,
-      default: 1,
-    },
-    {
-      fieldname: 'rate',
-      label: t`Rate`,
-      fieldtype: 'Currency',
-      required: 1,
-      formula: async (row, doc) => {
-        const baseRate =
-          (await doc.getFrom('Item', row.item, 'rate')) || frappe.pesa(0);
-        return baseRate.div(doc.exchangeRate);
-      },
-      getCurrency: (row, doc) => doc.currency,
-      validate(value) {
-        if (value.gte(0)) {
-          return;
-        }
-
-        throw new frappe.errors.ValidationError(
-          frappe.t`Rate (${frappe.format(
-            value,
-            'Currency'
-          )}) cannot be less zero.`
-        );
-      },
-    },
-    {
-      fieldname: 'baseRate',
-      label: t`Rate (Company Currency)`,
-      fieldtype: 'Currency',
-      formula: (row, doc) => row.rate.mul(doc.exchangeRate),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'account',
-      label: t`Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-      readOnly: 1,
-      formula: (row, doc) => doc.getFrom('Item', row.item, 'expenseAccount'),
-    },
-    {
-      fieldname: 'tax',
-      label: t`Tax`,
-      fieldtype: 'Link',
-      target: 'Tax',
-      formula: (row, doc) => {
-        if (row.tax) return row.tax;
-        return doc.getFrom('Item', row.item, 'tax');
-      },
-    },
-    {
-      fieldname: 'amount',
-      label: t`Amount`,
-      fieldtype: 'Currency',
-      readOnly: 1,
-      formula: (row) => row.rate.mul(row.quantity),
-      getCurrency: (row, doc) => doc.currency,
-    },
-    {
-      fieldname: 'baseAmount',
-      label: t`Amount (Company Currency)`,
-      fieldtype: 'Currency',
-      readOnly: 1,
-      formula: (row, doc) => row.amount.mul(doc.exchangeRate),
-    },
-  ],
-};
diff --git a/models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.ts b/models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.ts
new file mode 100644
index 00000000..ec2dd70c
--- /dev/null
+++ b/models/baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem.ts
@@ -0,0 +1,3 @@
+import { InvoiceItem } from '../InvoiceItem/InvoiceItem';
+
+export class PurchaseInvoiceItem extends InvoiceItem {}
diff --git a/models/baseModels/PurchaseInvoiceItem/RegionalChanges.js b/models/baseModels/PurchaseInvoiceItem/RegionalChanges.js
deleted file mode 100644
index 0caaad05..00000000
--- a/models/baseModels/PurchaseInvoiceItem/RegionalChanges.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import PurchaseInvoiceItemOriginal from './PurchaseInvoiceItem';
-
-export default function getAugmentedPurchaseInvoiceItem({ country }) {
-  const PurchaseInvoiceItem = cloneDeep(PurchaseInvoiceItemOriginal);
-  if (!country) {
-    return PurchaseInvoiceItem;
-  }
-
-  if (country === 'India') {
-    PurchaseInvoiceItem.fields = [
-      ...PurchaseInvoiceItem.fields,
-      {
-        fieldname: 'hsnCode',
-        label: t`HSN/SAC`,
-        fieldtype: 'Int',
-        formula: (row, doc) => doc.getFrom('Item', row.item, 'hsnCode'),
-        formulaDependsOn: ['item'],
-      },
-    ];
-  }
-
-  return PurchaseInvoiceItem;
-}
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.js b/models/baseModels/SalesInvoice/SalesInvoice.js
deleted file mode 100644
index 91318cbf..00000000
--- a/models/baseModels/SalesInvoice/SalesInvoice.js
+++ /dev/null
@@ -1,152 +0,0 @@
-import { t } from 'frappe';
-import { DEFAULT_NUMBER_SERIES } from '../../../frappe/utils/consts';
-import { getActions } from '../Transaction/Transaction';
-import InvoiceTemplate from './InvoiceTemplate.vue';
-import SalesInvoice from './SalesInvoiceDocument';
-
-export default {
-  name: 'SalesInvoice',
-  label: t`Invoice`,
-  doctype: 'DocType',
-  documentClass: SalesInvoice,
-  printTemplate: InvoiceTemplate,
-  isSingle: 0,
-  isChild: 0,
-  isSubmittable: 1,
-  keywordFields: ['name', 'customer'],
-  settings: 'SalesInvoiceSettings',
-  fields: [
-    {
-      label: t`Invoice No`,
-      fieldname: 'name',
-      fieldtype: 'Data',
-      required: 1,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'date',
-      label: t`Date`,
-      fieldtype: 'Date',
-      default: () => new Date().toISOString().slice(0, 10),
-    },
-    {
-      fieldname: 'customer',
-      label: t`Customer`,
-      fieldtype: 'Link',
-      target: 'Customer',
-      required: 1,
-    },
-    {
-      fieldname: 'account',
-      label: t`Account`,
-      fieldtype: 'Link',
-      target: 'Account',
-      disableCreation: true,
-      formula: (doc) => doc.getFrom('Party', doc.customer, 'defaultAccount'),
-      getFilters: () => {
-        return {
-          isGroup: 0,
-          accountType: 'Receivable',
-        };
-      },
-    },
-    {
-      fieldname: 'currency',
-      label: t`Customer Currency`,
-      fieldtype: 'Link',
-      target: 'Currency',
-      formula: (doc) =>
-        doc.getFrom('Party', doc.customer, 'currency') ||
-        frappe.AccountingSettings.currency,
-      formulaDependsOn: ['customer'],
-    },
-    {
-      fieldname: 'exchangeRate',
-      label: t`Exchange Rate`,
-      fieldtype: 'Float',
-      default: 1,
-      formula: (doc) => doc.getExchangeRate(),
-      readOnly: true,
-    },
-    {
-      fieldname: 'items',
-      label: t`Items`,
-      fieldtype: 'Table',
-      childtype: 'SalesInvoiceItem',
-      required: true,
-    },
-    {
-      fieldname: 'netTotal',
-      label: t`Net Total`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.getSum('items', 'amount', false),
-      readOnly: 1,
-      getCurrency: (doc) => doc.currency,
-    },
-    {
-      fieldname: 'baseNetTotal',
-      label: t`Net Total (Company Currency)`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.netTotal.mul(doc.exchangeRate),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'taxes',
-      label: t`Taxes`,
-      fieldtype: 'Table',
-      childtype: 'TaxSummary',
-      formula: (doc) => doc.getTaxSummary(),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'grandTotal',
-      label: t`Grand Total`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.getGrandTotal(),
-      readOnly: 1,
-      getCurrency: (doc) => doc.currency,
-    },
-    {
-      fieldname: 'baseGrandTotal',
-      label: t`Grand Total (Company Currency)`,
-      fieldtype: 'Currency',
-      formula: (doc) => doc.grandTotal.mul(doc.exchangeRate),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'outstandingAmount',
-      label: t`Outstanding Amount`,
-      fieldtype: 'Currency',
-      formula: (doc) => {
-        if (doc.submitted) return;
-        return doc.baseGrandTotal;
-      },
-      readOnly: 1,
-    },
-    {
-      fieldname: 'terms',
-      label: t`Notes`,
-      fieldtype: 'Text',
-    },
-    {
-      fieldname: 'cancelled',
-      label: t`Cancelled`,
-      fieldtype: 'Check',
-      default: 0,
-      readOnly: 1,
-    },
-    {
-      fieldname: 'numberSeries',
-      label: t`Number Series`,
-      fieldtype: 'Link',
-      target: 'NumberSeries',
-      required: 1,
-      getFilters: () => {
-        return { referenceType: 'SalesInvoice' };
-      },
-      default: DEFAULT_NUMBER_SERIES['SalesInvoice'],
-    },
-  ],
-
-  actions: getActions('SalesInvoice'),
-};
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
new file mode 100644
index 00000000..bc66337a
--- /dev/null
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -0,0 +1,46 @@
+import { LedgerPosting } from 'accounting/ledgerPosting';
+import { Action, ListViewSettings } from 'frappe/model/types';
+import {
+  getTransactionActions,
+  getTransactionStatusColumn,
+} from '../../helpers';
+import { Invoice } from '../Invoice/Invoice';
+import { SalesInvoiceItem } from '../SalesInvoiceItem/SalesInvoiceItem';
+
+export class SalesInvoice extends Invoice {
+  items?: SalesInvoiceItem[];
+
+  async getPosting() {
+    const entries: LedgerPosting = new LedgerPosting({
+      reference: this,
+      party: this.party,
+    });
+    await entries.debit(this.account!, this.baseGrandTotal!);
+
+    for (const item of this.items!) {
+      await entries.credit(item.account!, item.baseAmount!);
+    }
+
+    if (this.taxes) {
+      for (const tax of this.taxes!) {
+        await entries.credit(tax.account!, tax.baseAmount!);
+      }
+    }
+    entries.makeRoundOffEntry();
+    return entries;
+  }
+
+  static actions: Action[] = getTransactionActions('SalesInvoice');
+
+  static listSettings: ListViewSettings = {
+    formRoute: (name) => `/edit/SalesInvoice/${name}`,
+    columns: [
+      'party',
+      'name',
+      getTransactionStatusColumn(),
+      'date',
+      'grandTotal',
+      'outstandingAmount',
+    ],
+  };
+}
diff --git a/models/baseModels/SalesInvoice/SalesInvoiceDocument.js b/models/baseModels/SalesInvoice/SalesInvoiceDocument.js
deleted file mode 100644
index 8631ac5a..00000000
--- a/models/baseModels/SalesInvoice/SalesInvoiceDocument.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import TransactionDocument from '../Transaction/TransactionDocument';
-
-export default class SalesInvoice extends TransactionDocument {};
diff --git a/models/baseModels/SalesInvoice/SalesInvoiceList.js b/models/baseModels/SalesInvoice/SalesInvoiceList.js
deleted file mode 100644
index e9eae021..00000000
--- a/models/baseModels/SalesInvoice/SalesInvoiceList.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { t } from 'frappe';
-import { getStatusColumn } from '../Transaction/Transaction';
-
-export default {
-  doctype: 'SalesInvoice',
-  title: t`Invoices`,
-  formRoute: (name) => `/edit/SalesInvoice/${name}`,
-  columns: [
-    'customer',
-    'name',
-    getStatusColumn('SalesInvoice'),
-    'date',
-    'grandTotal',
-    'outstandingAmount',
-  ],
-};
diff --git a/models/baseModels/SalesInvoice/SalesInvoiceServer.js b/models/baseModels/SalesInvoice/SalesInvoiceServer.js
deleted file mode 100644
index 46769aa0..00000000
--- a/models/baseModels/SalesInvoice/SalesInvoiceServer.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import TransactionServer from '../Transaction/TransactionServer';
-import SalesInvoice from './SalesInvoiceDocument';
-import LedgerPosting from '../../../accounting/ledgerPosting';
-
-class SalesInvoiceServer extends SalesInvoice {
-  async getPosting() {
-    let entries = new LedgerPosting({ reference: this, party: this.customer });
-    await entries.debit(this.account, this.baseGrandTotal);
-
-    for (let item of this.items) {
-      await entries.credit(item.account, item.baseAmount);
-    }
-
-    if (this.taxes) {
-      for (let tax of this.taxes) {
-        await entries.credit(tax.account, tax.baseAmount);
-      }
-    }
-    entries.makeRoundOffEntry();
-    return entries;
-  }
-}
-
-// apply common methods from TransactionServer
-Object.assign(SalesInvoiceServer.prototype, TransactionServer);
-
-export default SalesInvoiceServer;
diff --git a/models/baseModels/SalesInvoiceItem/RegionalChanges.js b/models/baseModels/SalesInvoiceItem/RegionalChanges.js
deleted file mode 100644
index 4a6eba31..00000000
--- a/models/baseModels/SalesInvoiceItem/RegionalChanges.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { t } from 'frappe';
-import { cloneDeep } from 'lodash';
-import SalesInvoiceItemOriginal from './SalesInvoiceItem';
-
-export default function getAugmentedSalesInvoiceItem({ country }) {
-  const SalesInvoiceItem = cloneDeep(SalesInvoiceItemOriginal);
-  if (!country) {
-    return SalesInvoiceItem;
-  }
-
-  if (country === 'India') {
-    SalesInvoiceItem.fields = [
-      ...SalesInvoiceItem.fields,
-      {
-        fieldname: 'hsnCode',
-        label: t`HSN/SAC`,
-        fieldtype: 'Int',
-        formula: (row, doc) => doc.getFrom('Item', row.item, 'hsnCode'),
-        formulaDependsOn: ['item'],
-      },
-    ];
-  }
-
-  return SalesInvoiceItem;
-}
diff --git a/models/baseModels/SalesInvoiceItem/SalesInvoiceItem.js b/models/baseModels/SalesInvoiceItem/SalesInvoiceItem.js
deleted file mode 100644
index bc548f9d..00000000
--- a/models/baseModels/SalesInvoiceItem/SalesInvoiceItem.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import { t } from 'frappe';
-export default {
-  name: 'SalesInvoiceItem',
-  doctype: 'DocType',
-  isChild: 1,
-  regional: 1,
-  keywordFields: [],
-  tableFields: ['item', 'tax', 'quantity', 'rate', 'amount'],
-  fields: [
-    {
-      fieldname: 'item',
-      label: t`Item`,
-      fieldtype: 'Link',
-      target: 'Item',
-      required: 1,
-      getFilters(_, doc) {
-        let items = doc.parentdoc.items.map((d) => d.item).filter(Boolean);
-
-        const baseFilter = { for: ['not in', ['purchases']] };
-        if (items.length <= 0) {
-          return baseFilter;
-        }
-
-        return {
-          name: ['not in', items],
-          ...baseFilter,
-        };
-      },
-    },
-    {
-      fieldname: 'description',
-      label: t`Description`,
-      fieldtype: 'Text',
-      formula: (row, doc) => doc.getFrom('Item', row.item, 'description'),
-      hidden: 1,
-      formulaDependsOn: ['item'],
-    },
-    {
-      fieldname: 'quantity',
-      label: t`Quantity`,
-      fieldtype: 'Float',
-      required: 1,
-      default: 1,
-      validate(value, doc) {
-        if (value >= 0) {
-          return;
-        }
-
-        throw new frappe.errors.ValidationError(
-          frappe.t`Quantity (${value}) cannot be less than zero.`
-        );
-      },
-    },
-    {
-      fieldname: 'rate',
-      label: t`Rate`,
-      fieldtype: 'Currency',
-      required: 1,
-      formula: async (row, doc) => {
-        const baseRate =
-          (await doc.getFrom('Item', row.item, 'rate')) || frappe.pesa(0);
-        return baseRate.div(doc.exchangeRate);
-      },
-      getCurrency: (row, doc) => doc.currency,
-      formulaDependsOn: ['item'],
-      validate(value, doc) {
-        if (value.gte(0)) {
-          return;
-        }
-
-        throw new frappe.errors.ValidationError(
-          frappe.t`Rate (${frappe.format(
-            value,
-            'Currency'
-          )}) cannot be less zero.`
-        );
-      },
-    },
-    {
-      fieldname: 'baseRate',
-      label: t`Rate (Company Currency)`,
-      fieldtype: 'Currency',
-      formula: (row, doc) => row.rate.mul(doc.exchangeRate),
-      readOnly: 1,
-    },
-    {
-      fieldname: 'account',
-      label: t`Account`,
-      hidden: 1,
-      fieldtype: 'Link',
-      target: 'Account',
-      required: 1,
-      readOnly: 1,
-      formula: (row, doc) => doc.getFrom('Item', row.item, 'incomeAccount'),
-    },
-    {
-      fieldname: 'tax',
-      label: t`Tax`,
-      fieldtype: 'Link',
-      target: 'Tax',
-      formula: (row, doc) => doc.getFrom('Item', row.item, 'tax'),
-      formulaDependsOn: ['item'],
-    },
-    {
-      fieldname: 'amount',
-      label: t`Amount`,
-      fieldtype: 'Currency',
-      readOnly: 1,
-      formula: (row) => row.rate.mul(row.quantity),
-      getCurrency: (row, doc) => doc.currency,
-    },
-    {
-      fieldname: 'baseAmount',
-      label: t`Amount (Company Currency)`,
-      fieldtype: 'Currency',
-      readOnly: 1,
-      formula: (row, doc) => row.amount.mul(doc.exchangeRate),
-    },
-  ],
-};
diff --git a/models/baseModels/SalesInvoiceItem/SalesInvoiceItem.ts b/models/baseModels/SalesInvoiceItem/SalesInvoiceItem.ts
new file mode 100644
index 00000000..d2c0960b
--- /dev/null
+++ b/models/baseModels/SalesInvoiceItem/SalesInvoiceItem.ts
@@ -0,0 +1,3 @@
+import { InvoiceItem } from '../InvoiceItem/InvoiceItem';
+
+export class SalesInvoiceItem extends InvoiceItem {}
diff --git a/models/baseModels/TaxSummary/TaxSummary.ts b/models/baseModels/TaxSummary/TaxSummary.ts
index 3f5c4b0f..7e0cf01d 100644
--- a/models/baseModels/TaxSummary/TaxSummary.ts
+++ b/models/baseModels/TaxSummary/TaxSummary.ts
@@ -3,6 +3,11 @@ import { FormulaMap } from 'frappe/model/types';
 import Money from 'pesa/dist/types/src/money';
 
 export class TaxSummary extends Doc {
+  account?: string;
+  rate?: number;
+  amount?: Money;
+  baseAmount?: Money;
+
   formulas: FormulaMap = {
     baseAmount: async () => {
       const amount = this.amount as Money;
diff --git a/models/helpers.ts b/models/helpers.ts
index 82c77315..de48bc70 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -1,7 +1,7 @@
 import { openQuickEdit } from '@/utils';
 import frappe from 'frappe';
 import Doc from 'frappe/model/doc';
-import { Action } from 'frappe/model/types';
+import { Action, ColumnConfig } from 'frappe/model/types';
 import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
 import { InvoiceStatus } from './types';
@@ -26,12 +26,12 @@ export function getLedgerLinkAction(): Action {
   };
 }
 
-export function getTransactionActions(schemaName: string) {
+export function getTransactionActions(schemaName: string): Action[] {
   return [
     {
       label: frappe.t`Make Payment`,
       condition: (doc: Doc) =>
-        doc.submitted && (doc.outstandingAmount as Money).gt(0),
+        (doc.submitted as boolean) && (doc.outstandingAmount as Money).gt(0),
       action: async function makePayment(doc: Doc) {
         const payment = await frappe.doc.getEmptyDoc('Payment');
         payment.once('afterInsert', async () => {
@@ -64,8 +64,8 @@ export function getTransactionActions(schemaName: string) {
     },
     {
       label: frappe.t`Print`,
-      condition: (doc: Doc) => doc.submitted,
-      action(doc: Doc, router: Router) {
+      condition: (doc: Doc) => doc.submitted as boolean,
+      action: async (doc: Doc, router: Router) => {
         router.push({ path: `/print/${doc.doctype}/${doc.name}` });
       },
     },
@@ -73,7 +73,7 @@ export function getTransactionActions(schemaName: string) {
   ];
 }
 
-export function getTransactionStatusColumn() {
+export function getTransactionStatusColumn(): ColumnConfig {
   const statusMap = {
     Unpaid: frappe.t`Unpaid`,
     Paid: frappe.t`Paid`,
diff --git a/models/index.js b/models/index.js
deleted file mode 100644
index 3ddd0c4f..00000000
--- a/models/index.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import Account from './doctype/Account/Account.js';
-import AccountingLedgerEntry from './doctype/AccountingLedgerEntry/AccountingLedgerEntry.js';
-import AccountingSettings from './doctype/AccountingSettings/AccountingSettings.js';
-import Address from './doctype/Address/Address.js';
-import Color from './doctype/Color/Color.js';
-import CompanySettings from './doctype/CompanySettings/CompanySettings.js';
-import Contact from './doctype/Contact/Contact.js';
-import Currency from './doctype/Currency/Currency.js';
-import GetStarted from './doctype/GetStarted/GetStarted.js';
-import Item from './doctype/Item/Item.js';
-import JournalEntry from './doctype/JournalEntry/JournalEntry.js';
-import JournalEntryAccount from './doctype/JournalEntryAccount/JournalEntryAccount.js';
-import JournalEntrySettings from './doctype/JournalEntrySettings/JournalEntrySettings.js';
-import Customer from './doctype/Party/Customer.js';
-import Party from './doctype/Party/Party.js';
-import Supplier from './doctype/Party/Supplier.js';
-import Payment from './doctype/Payment/Payment.js';
-import PaymentFor from './doctype/PaymentFor/PaymentFor.js';
-import PaymentSettings from './doctype/PaymentSettings/PaymentSettings.js';
-import PrintSettings from './doctype/PrintSettings/PrintSettings.js';
-import PurchaseInvoice from './doctype/PurchaseInvoice/PurchaseInvoice.js';
-import PurchaseInvoiceItem from './doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js';
-import PurchaseInvoiceSettings from './doctype/PurchaseInvoiceSettings/PurchaseInvoiceSettings.js';
-import SalesInvoice from './doctype/SalesInvoice/SalesInvoice.js';
-import SalesInvoiceItem from './doctype/SalesInvoiceItem/SalesInvoiceItem.js';
-import SalesInvoiceSettings from './doctype/SalesInvoiceSettings/SalesInvoiceSettings.js';
-import SetupWizard from './doctype/SetupWizard/SetupWizard.js';
-import Tax from './doctype/Tax/Tax.js';
-import TaxDetail from './doctype/TaxDetail/TaxDetail.js';
-import TaxSummary from './doctype/TaxSummary/TaxSummary.js';
-
-export default {
-  SetupWizard,
-  Currency,
-  Color,
-  Account,
-  AccountingSettings,
-  CompanySettings,
-  AccountingLedgerEntry,
-  Party,
-  Customer,
-  Supplier,
-  Payment,
-  PaymentFor,
-  PaymentSettings,
-  Item,
-  SalesInvoice,
-  SalesInvoiceItem,
-  SalesInvoiceSettings,
-  PurchaseInvoice,
-  PurchaseInvoiceItem,
-  PurchaseInvoiceSettings,
-  Tax,
-  TaxDetail,
-  TaxSummary,
-  Address,
-  Contact,
-  JournalEntry,
-  JournalEntryAccount,
-  JournalEntrySettings,
-  PrintSettings,
-  GetStarted,
-};
diff --git a/models/index.ts b/models/index.ts
new file mode 100644
index 00000000..f7573e4c
--- /dev/null
+++ b/models/index.ts
@@ -0,0 +1,47 @@
+import { Account } from './baseModels/Account/Account';
+import { AccountingLedgerEntry } from './baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
+import { AccountingSettings } from './baseModels/AccountingSettings/AccountingSettings';
+import { Address } from './baseModels/Address/Address';
+import { Item } from './baseModels/Item/Item';
+import { JournalEntry } from './baseModels/JournalEntry/JournalEntry';
+import { JournalEntryAccount } from './baseModels/JournalEntryAccount/JournalEntryAccount';
+import { Party } from './baseModels/Party/Party';
+import { Payment } from './baseModels/Payment/Payment';
+import { PaymentFor } from './baseModels/PaymentFor/PaymentFor';
+import { PurchaseInvoice } from './baseModels/PurchaseInvoice/PurchaseInvoice';
+import { PurchaseInvoiceItem } from './baseModels/PurchaseInvoiceItem/PurchaseInvoiceItem';
+import { SalesInvoice } from './baseModels/SalesInvoice/SalesInvoice';
+import { SalesInvoiceItem } from './baseModels/SalesInvoiceItem/SalesInvoiceItem';
+import { SetupWizard } from './baseModels/SetupWizard/SetupWizard';
+import { Tax } from './baseModels/Tax/Tax';
+import { TaxSummary } from './baseModels/TaxSummary/TaxSummary';
+
+export default {
+  Account,
+  AccountingLedgerEntry,
+  AccountingSettings,
+  Address,
+  Item,
+  JournalEntry,
+  JournalEntryAccount,
+  Party,
+  Payment,
+  PaymentFor,
+  PurchaseInvoice,
+  PurchaseInvoiceItem,
+  SalesInvoice,
+  SalesInvoiceItem,
+  SetupWizard,
+  Tax,
+  TaxSummary,
+};
+
+export async function getRegionalModels(countryCode: string) {
+  if (countryCode !== 'in') {
+    return {};
+  }
+
+  const { Address } = await import('./regionalModels/in/Address');
+  const { Party } = await import('./regionalModels/in/Party');
+  return { Address, Party };
+}
diff --git a/models/regionalModelUpdates.js b/models/regionalModelUpdates.js
deleted file mode 100644
index 6e261ff3..00000000
--- a/models/regionalModelUpdates.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import frappe from 'frappe';
-
-async function setAugmentedModel(model, regionalInfo) {
-  const getAugmentedModel = (
-    await import('./doctype/' + model + '/RegionalChanges')
-  ).default;
-  const augmentedModel = getAugmentedModel(regionalInfo);
-  frappe.models[model] = augmentedModel;
-  frappe.models[model].augmented = 1;
-}
-
-export default async function regionalModelUpdates(regionalInfo) {
-  for (let model in frappe.models) {
-    const { regional, basedOn, augmented } = frappe.models[model];
-    if (!regional || basedOn || augmented) {
-      continue;
-    }
-    await setAugmentedModel(model, regionalInfo);
-  }
-}
diff --git a/models/types.ts b/models/types.ts
index 2e4fcf14..6d62634a 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -1,54 +1 @@
-export enum DoctypeName {
-  SetupWizard = 'SetupWizard',
-  Currency = 'Currency',
-  Color = 'Color',
-  Account = 'Account',
-  AccountingSettings = 'AccountingSettings',
-  CompanySettings = 'CompanySettings',
-  AccountingLedgerEntry = 'AccountingLedgerEntry',
-  Party = 'Party',
-  Customer = 'Customer',
-  Supplier = 'Supplier',
-  Payment = 'Payment',
-  PaymentFor = 'PaymentFor',
-  PaymentSettings = 'PaymentSettings',
-  Item = 'Item',
-  SalesInvoice = 'SalesInvoice',
-  SalesInvoiceItem = 'SalesInvoiceItem',
-  SalesInvoiceSettings = 'SalesInvoiceSettings',
-  PurchaseInvoice = 'PurchaseInvoice',
-  PurchaseInvoiceItem = 'PurchaseInvoiceItem',
-  PurchaseInvoiceSettings = 'PurchaseInvoiceSettings',
-  Tax = 'Tax',
-  TaxDetail = 'TaxDetail',
-  TaxSummary = 'TaxSummary',
-  Address = 'Address',
-  Contact = 'Contact',
-  JournalEntry = 'JournalEntry',
-  JournalEntryAccount = 'JournalEntryAccount',
-  JournalEntrySettings = 'JournalEntrySettings',
-  Quotation = 'Quotation',
-  QuotationItem = 'QuotationItem',
-  QuotationSettings = 'QuotationSettings',
-  SalesOrder = 'SalesOrder',
-  SalesOrderItem = 'SalesOrderItem',
-  SalesOrderSettings = 'SalesOrderSettings',
-  Fulfillment = 'Fulfillment',
-  FulfillmentItem = 'FulfillmentItem',
-  FulfillmentSettings = 'FulfillmentSettings',
-  PurchaseOrder = 'PurchaseOrder',
-  PurchaseOrderItem = 'PurchaseOrderItem',
-  PurchaseOrderSettings = 'PurchaseOrderSettings',
-  PurchaseReceipt = 'PurchaseReceipt',
-  PurchaseReceiptItem = 'PurchaseReceiptItem',
-  PurchaseReceiptSettings = 'PurchaseReceiptSettings',
-  Event = 'Event',
-  EventSchedule = 'EventSchedule',
-  EventSettings = 'EventSettings',
-  Email = 'Email',
-  EmailAccount = 'EmailAccount',
-  PrintSettings = 'PrintSettings',
-  GetStarted = 'GetStarted',
-}
-
 export type InvoiceStatus = 'Draft' | 'Unpaid' | 'Cancelled' | 'Paid';
diff --git a/schemas/app/PurchaseInvoiceItem.json b/schemas/app/PurchaseInvoiceItem.json
index c109ddbe..c85213da 100644
--- a/schemas/app/PurchaseInvoiceItem.json
+++ b/schemas/app/PurchaseInvoiceItem.json
@@ -2,7 +2,6 @@
   "name": "PurchaseInvoiceItem",
   "label": "Purchase Invoice Item",
   "isChild": true,
-  "tableFields": ["item", "tax", "quantity", "rate", "amount"],
   "fields": [
     {
       "fieldname": "item",
@@ -64,6 +63,13 @@
       "fieldtype": "Currency",
       "computed": true,
       "readOnly": true
+    },
+    {
+      "fieldname": "hsnCode",
+      "label": "HSN/SAC",
+      "fieldtype": "Int",
+      "placeholder": "HSN/SAC Code"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "tableFields": ["item", "tax", "quantity", "rate", "amount"]
+}
diff --git a/schemas/app/SalesInvoiceItem.json b/schemas/app/SalesInvoiceItem.json
index 2be59cd5..805d25b8 100644
--- a/schemas/app/SalesInvoiceItem.json
+++ b/schemas/app/SalesInvoiceItem.json
@@ -64,7 +64,13 @@
       "fieldtype": "Currency",
       "computed": true,
       "readOnly": true
+    },
+    {
+      "fieldname": "hsnCode",
+      "label": "HSN/SAC",
+      "fieldtype": "Int",
+      "placeholder": "HSN/SAC Code"
     }
   ],
   "tableFields": ["item", "tax", "quantity", "rate", "amount"]
-}
\ No newline at end of file
+}
diff --git a/models/baseModels/SalesInvoice/InvoiceTemplate.vue b/src/components/SalesInvoice/InvoiceTemplate.vue
similarity index 100%
rename from models/baseModels/SalesInvoice/InvoiceTemplate.vue
rename to src/components/SalesInvoice/InvoiceTemplate.vue
diff --git a/models/baseModels/SalesInvoice/SalesInvoicePrint.vue b/src/components/SalesInvoice/SalesInvoicePrint.vue
similarity index 100%
rename from models/baseModels/SalesInvoice/SalesInvoicePrint.vue
rename to src/components/SalesInvoice/SalesInvoicePrint.vue
diff --git a/models/baseModels/SalesInvoice/Templates/Base.vue b/src/components/SalesInvoice/Templates/Base.vue
similarity index 100%
rename from models/baseModels/SalesInvoice/Templates/Base.vue
rename to src/components/SalesInvoice/Templates/Base.vue
diff --git a/models/baseModels/SalesInvoice/Templates/Basic.vue b/src/components/SalesInvoice/Templates/Basic.vue
similarity index 100%
rename from models/baseModels/SalesInvoice/Templates/Basic.vue
rename to src/components/SalesInvoice/Templates/Basic.vue
diff --git a/models/baseModels/SalesInvoice/Templates/Business.vue b/src/components/SalesInvoice/Templates/Business.vue
similarity index 100%
rename from models/baseModels/SalesInvoice/Templates/Business.vue
rename to src/components/SalesInvoice/Templates/Business.vue
diff --git a/models/baseModels/SalesInvoice/Templates/Minimal.vue b/src/components/SalesInvoice/Templates/Minimal.vue
similarity index 100%
rename from models/baseModels/SalesInvoice/Templates/Minimal.vue
rename to src/components/SalesInvoice/Templates/Minimal.vue

From c7ecdf6ff46a5cc5dd976c8ce9810a7e9ba5e5bd Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sat, 16 Apr 2022 11:13:24 +0530
Subject: [PATCH 047/163] chore: shift readme stuff into a readme

---
 models/README.md  | 36 ++++++++++++++++++++++++++----------
 schemas/README.md | 43 +++++++++++++++++++++++++++++++++++++++++++
 schemas/types.ts  | 39 ---------------------------------------
 3 files changed, 69 insertions(+), 49 deletions(-)
 create mode 100644 schemas/README.md

diff --git a/models/README.md b/models/README.md
index 054ac915..39250989 100644
--- a/models/README.md
+++ b/models/README.md
@@ -1,10 +1,17 @@
 # Models
 
-The `models` root folder contains all the model files, i.e. files containing all the models. **Models** here, refers to the classes that handle the data, its validation and updation and a bunch of other stuff.
+The `models` root folder contains all the model files, i.e. files containing all
+the models. **Models** here, refers to the classes that handle the data, its
+validation and updation and a bunch of other stuff.
 
-Each model directly or indirectly extends the `Doc` class from `frappe/model/doc.ts` so for more info check that file and the associated types in `frappe/model/types.ts`.
+Each model directly or indirectly extends the `Doc` class from
+`frappe/model/doc.ts` so for more info check that file and the associated types
+in `frappe/model/types.ts`.
 
-A model class can used even if the class body has no content, for example `PurchaseInvoiceItem`. Else the model used will default to using `Doc`. The class can also be used to provide type information for the field types else they default to the catch all `DocValue` example:
+A model class can used even if the class body has no content, for example
+`PurchaseInvoiceItem`. Else the model used will default to using `Doc`. The
+class can also be used to provide type information for the field types else they
+default to the catch all `DocValue` example:
 
 ```typescript
 class Todo extends Doc {
@@ -14,19 +21,28 @@ class Todo extends Doc {
 }
 ```
 
-While this has obvious advantages, the drawback is if the underlying fieldtype changes this too will have to be changed.
+While this has obvious advantages, the drawback is if the underlying fieldtype
+changes this too will have to be changed.
+
+The data stored by the models is decided by the schema passed to it's
+constructor. Check `schemas/README.md` for info on this.
 
 ## Adding Stuff
 
-When adding stuff to `models/**` make sure that it isn't importing any Vue code or other frontend specific code globally. This is cause model file tests will directly use the the `Frappe` class and will be run using `mocha` on `node`.
+When adding stuff to `models/**` make sure that it isn't importing any Vue code
+or other frontend specific code globally. This is cause model file tests will
+directly use the the `Frappe` class and will be run using `mocha` on `node`.
 
-Importing frontend code will break all the tests. This also implies that one should be wary about transitive dependencies.
+Importing frontend code will break all the tests. This also implies that one
+should be wary about transitive dependencies.
 
-_Note: Frontend specific code can be imported but they should be done so, only using dynamic imports i.e. `await import('...')`._
+_Note: Frontend specific code can be imported but they should be done so, only
+using dynamic imports i.e. `await import('...')`._
 
 ## Regional Models
 
-Regional models should as far as possible extend the base model and override what's required.
-
-They should then be imported dynamicall and returned from `getRegionalModels` in `models/index.ts` on the basis of `countryCode`.
+Regional models should as far as possible extend the base model and override
+what's required.
 
+They should then be imported dynamicall and returned from `getRegionalModels` in
+`models/index.ts` on the basis of `countryCode`.
diff --git a/schemas/README.md b/schemas/README.md
new file mode 100644
index 00000000..c4c3d8be
--- /dev/null
+++ b/schemas/README.md
@@ -0,0 +1,43 @@
+# Schema
+
+Main purpose of this is to describe the shape of the models' table in the
+database. But there is some irrelevant information in the schemas with
+respect to this goal. This is information is allowed as long as it is not
+dynamic, which is impossible anyways as the files are data (`.json`, not `.js`)
+
+If any field has to have a dynamic value, it should be added to the controller
+file by the same name, check the `books/models` subdirectory for this.
+
+There are a few types of schemas:
+
+- **Regional**: Schemas that are in the _'../regional'_ subdirectories
+  these can be of any of the below types.
+- **Abstract**: Schemas that are not used as they are but only after they are
+  extended by Stub schemas. Indentified by the `isAbstract` field
+- **Subclass**: Schemas that have an `"extends"` field on them, the value of which
+  points to an Abstract schema.
+- **Complete**: Schemas which are neither abstract nor stub.
+    
+For more detail on the meta structure of the schema check `books/schemas/types.ts`.
+
+## Final Schema
+
+This is the schema which is used by the database and app code and is built by
+combining the above types of schemas.
+
+The order in which a schema is built is:
+
+1. Build _Regional_ schemas by overriding the fields and other properties of the
+   non regional variants.
+2. Combine _Subclass_ schemas with _Abstract_ schemas to get complete schemas.
+
+_Note: if a Regional schema is not present as a non regional
+variant it's used as it is._
+
+## Additional Notes
+
+In all the schemas, the `"name"` field/column is the primary key. If it isn't
+explicitly added, the schema builder will add it in.
+
+The following schema fields will be implicitly translated by the frontend:
+`"label"`, `"description"`, and `"placeholder"`, irrespective of nesting.
\ No newline at end of file
diff --git a/schemas/types.ts b/schemas/types.ts
index f14344d5..c76ee860 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -1,42 +1,3 @@
-/**
- * # Schema
- *
- * Main purpose of this is to describe the shape of the Models table in the
- * database. But there is some irrelevant information in the schemas with
- * respect to this goal. This is information is allowed as long as it is not
- * dynamic, which is impossible anyways as the files are data (.json !.js)
- *
- * If any field has to have a dynamic value, it should be added to the controller
- * file by the same name.
- *
- * There are a few types of schemas:
- * - _Regional_: Schemas that are in the '../regional' subdirectories
- *      these can be of any of the below types.
- * - _Abstract_: Schemas that are not used as they are but only after they are
- *      extended by Stub schemas. Indentified by the `isAbstract` field
- * - _Subclass_: Schemas that have an "extends" field on them, the value of which
- *      points to an Abstract schema.
- * - _Complete_: Schemas which are neither abstract nor stub.
- *
- *
- * ## Final Schema
- *
- * This is the schema which is used by the database and app code.
- *
- * The order in which a schema is built is:
- * 1. Build _Regional_ schemas by overriding the fields and other properties of the
- *      non regional variants.
- * 2. Combine _Subclass_ schemas with _Abstract_ schemas to get complete schemas.
- *
- * Note: if a Regional schema is not present as a non regional variant it's used
- * as it is.
- * 
- * ## Additional Notes
- * 
- * In all the schemas, the 'name' field/column is the primary key. If it isn't
- * explicitly added, the schema builder will add it in.
- */
-
 export enum FieldTypeEnum {
   Data = 'Data',
   Select = 'Select',

From cb7ac55357a1bfa0482d6e7a73afbfef682593ed Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sat, 16 Apr 2022 12:28:50 +0530
Subject: [PATCH 048/163] chore: add META.md and shift frappe tests into frappe

---
 META.md                                    | 90 ++++++++++++++++++++++
 {tests => frappe/tests}/testFrappe.spec.ts |  4 +-
 2 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 META.md
 rename {tests => frappe/tests}/testFrappe.spec.ts (87%)

diff --git a/META.md b/META.md
new file mode 100644
index 00000000..24b1b570
--- /dev/null
+++ b/META.md
@@ -0,0 +1,90 @@
+This `md` lays out how this project is structured.
+
+## Execution
+
+Since it's an electron project, there are two points from where the execution
+begins.
+
+1. **Main Process**: Think of this as the _server_, the file where this beings
+   is `books/main.ts`
+2. **Renderer Process**: Think of this as the _client_, the file where this
+   begins is `books/src/main.js`
+
+_Note: For more insight into how electron execution is structured check out electron's
+[Process Model](https://www.electronjs.org/docs/latest/tutorial/process-model)._
+
+This process is architected in a _client-server_ manner. If the _client_ side
+requires resources from the _server_ side, it does so by making use of
+`ipcRenderer.send` or `ipcRenderer.invoke` i.e. if the front end is being run on
+electron.
+
+The `ipcRenderer` calls are done only in `frappe/demux/*.ts` files. I.e. these
+are the only files on the _client_ side that are aware of the platform the
+_client_ is being run on i.e. `electron` or Browser. So all platform specific
+calls should go through these _demux_ files.
+
+## Code Structure
+
+Code is structured in a way so as to maintain clear separation between what each
+set of files structured under some subdirectory does. It is also to maintain a
+clear separation between the _client_ and the _server_.
+
+The _client_ code should not be calling _server_ code directly (i.e. by
+importing it) and vice-versa. This is to maintain the _client_ code in a
+platform agnostic manner.
+
+Some of the code is side agnostic, i.e. can be called from the _client_ or the
+_server_. Only code that doesn't have platform specific calls example using
+`node` `fs` or the browsers `window`. Ideally this code won't have an imports.
+
+### Special Folders
+
+Here's a list of subdirectories and their purposes, for more details on
+individual ones, check the `README.md` in those subdirectories:
+
+| Folder         | Side       | Description                                                                                                                |
+| -------------- | ---------- | -------------------------------------------------------------------------------------------------------------------------- |
+| `main`         | _server_   | Electron main process specific code called from `books/main.ts`                                                            |
+| `schemas`      | _server_   | Collection of database schemas in a `json` format and the code to combine them                                             |
+| `backend`      | _server_   | Database management and CRUD calls                                                                                         |
+| `scripts`      | _server_   | Code that is not called when the project is running, but separately to run some task for instance to generate translations |
+| `build`        | _server_   | Build specific files not used unless building the project                                                                  |
+| `translations` | _server_   | Collection of csv files containing translations                                                                            |
+| `src`          | _client_   | Code that mainly deals with the view layer (all `.vue` are stored here)                                                    |
+| `reports`      | _client_   | Collection of logic code and view layer config files for displaying reports.                                               |
+| `models`       | _client\*_ | Collection of `Model.ts` files that manage the data and some business logic on the client side.                            |
+| `frappe`       | _client\*_ | Code for the underlying library that manages the client side                                                               |
+| `utils`        | _agnostic_ | Collection of code used by either sides.                                                                                   |
+
+#### _client\*_
+
+The code in these folders is called during runtime from the _client_
+side but since they contain business logic, they are tested using `mocha` on the
+_server_ side. This is a bit stupid and so will be fixed later.
+
+Due to this, the code in these files should not be calling _client_ side code
+directly. If client side code is to be called, it should be done so only by
+using dynamic imports, i.e. `await import('...')` along pathways that won't run
+in a test.
+
+### Special Files
+
+Other than this there are two special types of files:
+
+#### `**/types.ts`
+
+These contains all the type information, these files are side agnostic and
+should only import code from other type files.
+
+The type information contained depends on the folder it is under i.e. where the
+code associated with the types is written.
+
+If trying to understand the code in this project I'd suggest not ignoring these.
+
+#### `**/test/*.spec.ts`
+
+These contain tests, as of now all tests run on the _server_ side using `mocha`.
+
+The tests files are located in `**/test` folders which are nested under the
+directories of what they are testing. No code from these files is called during
+runtime.
diff --git a/tests/testFrappe.spec.ts b/frappe/tests/testFrappe.spec.ts
similarity index 87%
rename from tests/testFrappe.spec.ts
rename to frappe/tests/testFrappe.spec.ts
index 22160ef6..5bc4ce96 100644
--- a/tests/testFrappe.spec.ts
+++ b/frappe/tests/testFrappe.spec.ts
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 import 'mocha';
-import { DatabaseManager } from '../backend/database/manager';
-import { Frappe } from '../frappe';
+import { DatabaseManager } from '../../backend/database/manager';
+import { Frappe } from '..';
 
 describe('Frappe', function () {
   const frappe = new Frappe(DatabaseManager);

From 8ba8d7a284b9eb0206549c6ac414ce9cfee8b4fe Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sat, 16 Apr 2022 12:55:36 +0530
Subject: [PATCH 049/163] refactor: make getCountryCode a static db core
 function

---
 backend/database/core.ts    | 25 ++++++++++++++++++++++++-
 backend/database/manager.ts | 25 ++-----------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index d6782bbb..b2630801 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -29,7 +29,7 @@ import { ColumnDiff, FieldValueMap, GetQueryBuilderOptions } from './types';
  *
  * 1. Init core: `const db = new DatabaseCore(dbPath)`.
  * 2. Connect db: `db.connect()`. This will allow for raw queries to be executed.
- * 3. Set schemas: `bb.setSchemaMap(schemaMap)`. This will allow for ORM functions to be executed.
+ * 3. Set schemas: `db.setSchemaMap(schemaMap)`. This will allow for ORM functions to be executed.
  * 4. Migrate: `await db.migrate()`. This will create absent tables and update the tables' shape.
  * 5. ORM function execution: `db.get(...)`, `db.insert(...)`, etc.
  * 6. Close connection: `await db.close()`.
@@ -65,6 +65,29 @@ export default class DatabaseCore extends DatabaseBase {
     };
   }
 
+  static async getCountryCode(dbPath: string): Promise<string> {
+    let countryCode = 'in';
+    const db = new DatabaseCore(dbPath);
+    db.connect();
+
+    let query: { countryCode: string }[] = [];
+    try {
+      query = await db.knex!('SingleValue').where({
+        fieldname: 'countryCode',
+        parent: 'SystemSettings',
+      });
+    } catch {
+      // Database not inialized and no countryCode passed
+    }
+
+    if (query.length > 0) {
+      countryCode = query[0].countryCode as string;
+    }
+
+    await db.close();
+    return countryCode;
+  }
+
   setSchemaMap(schemaMap: SchemaMap) {
     this.schemaMap = schemaMap;
   }
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index edf9d5c3..084c13ba 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -25,10 +25,11 @@ export class DatabaseManager extends DatabaseDemuxBase {
   }
 
   async connectToDatabase(dbPath: string, countryCode?: string) {
+    countryCode ??= await DatabaseCore.getCountryCode(dbPath);
+
     this.db = new DatabaseCore(dbPath);
     this.db.connect();
 
-    countryCode ??= await this.#getCountryCode();
     const schemaMap = getSchemas(countryCode);
     this.db.setSchemaMap(schemaMap);
 
@@ -102,28 +103,6 @@ export class DatabaseManager extends DatabaseDemuxBase {
     return patches.filter((p) => !executedPatches.includes(p.name));
   }
 
-  async #getCountryCode(): Promise<string | undefined> {
-    if (this.db === undefined) {
-      return undefined;
-    }
-
-    let query: { countryCode: string }[] = [];
-    try {
-      query = await this.db.knex!('SingleValue').where({
-        fieldname: 'countryCode',
-        parent: 'SystemSettings',
-      });
-    } catch {
-      // Database not inialized and no countryCode passed
-    }
-
-    if (query.length > 0) {
-      return query[0].countryCode as string;
-    }
-
-    return undefined;
-  }
-
   async #unlinkIfExists(dbPath: string) {
     try {
       fs.unlink(dbPath);

From af0d897020677cbd38d026e231bf5657f57cadbd Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sun, 17 Apr 2022 11:19:18 +0530
Subject: [PATCH 050/163] chore: type generateTranslations - shift csvParser to
 utils

---
 frappe/utils/translation.ts                   |  4 +-
 package.json                                  |  2 +-
 ...ranslations.js => generateTranslations.ts} | 92 ++++++++++---------
 src/dataImport.ts                             |  6 +-
 tsconfig.json                                 |  8 +-
 {src => utils}/csvParser.ts                   |  0
 .../helpers.js => utils/translationHelpers.ts | 47 +++++-----
 7 files changed, 85 insertions(+), 74 deletions(-)
 rename scripts/{generateTranslations.js => generateTranslations.ts} (68%)
 rename {src => utils}/csvParser.ts (100%)
 rename scripts/helpers.js => utils/translationHelpers.ts (59%)

diff --git a/frappe/utils/translation.ts b/frappe/utils/translation.ts
index ccf5de0e..f9073504 100644
--- a/frappe/utils/translation.ts
+++ b/frappe/utils/translation.ts
@@ -4,7 +4,7 @@ import {
   getIndexList,
   getSnippets,
   getWhitespaceSanitized,
-} from '../../scripts/helpers';
+} from '../../utils/translationHelpers';
 import { ValueError } from './errors';
 
 type TranslationArgs = boolean | number | string;
@@ -35,7 +35,7 @@ class TranslationString {
   }
 
   #translate() {
-    let indexFormat = getIndexFormat(this.args[0]);
+    let indexFormat = getIndexFormat(this.args[0] as string);
     indexFormat = getWhitespaceSanitized(indexFormat);
 
     const translatedIndexFormat =
diff --git a/package.json b/package.json
index dae51cd5..de560894 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "electron:serve": "vue-cli-service electron:serve",
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
-    "script:translate": "node scripts/generateTranslations.js",
+    "script:translate": "ts-node -O '{\"module\":\"commonjs\"}' scripts/generateTranslations.ts",
     "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --reporter nyan --require ts-node/register --require tsconfig-paths/register ./**/tests/**/*.spec.ts"
   },
   "dependencies": {
diff --git a/scripts/generateTranslations.js b/scripts/generateTranslations.ts
similarity index 68%
rename from scripts/generateTranslations.js
rename to scripts/generateTranslations.ts
index 602b4a71..c082efeb 100644
--- a/scripts/generateTranslations.js
+++ b/scripts/generateTranslations.ts
@@ -1,25 +1,29 @@
-const fs = require('fs/promises');
-const path = require('path');
-const {
+import fs from 'fs/promises';
+import path from 'path';
+import {
   getIndexFormat,
   getWhitespaceSanitized,
-  wrap,
   splitCsvLine,
-} = require('./helpers');
+  wrap,
+} from '../utils/translationHelpers';
 
 const translationsFolder = path.resolve(__dirname, '..', 'translations');
 const PATTERN = /(?<!\w)t`([^`]+)`/g;
 
-function shouldIgnore(p, ignoreList) {
-  return ignoreList.includes(p.split(path.sep).at(-1));
+function shouldIgnore(p: string, ignoreList: string[]): boolean {
+  const name = p.split(path.sep).at(-1) ?? '';
+  return ignoreList.includes(name);
 }
 
-async function getFileList(root, ignoreList) {
-  const contents = await fs.readdir(root);
-  const files = [];
-  const promises = [];
+async function getFileList(
+  root: string,
+  ignoreList: string[]
+): Promise<string[]> {
+  const contents: string[] = await fs.readdir(root);
+  const files: string[] = [];
+  const promises: Promise<void>[] = [];
 
-  for (let c of contents) {
+  for (const c of contents) {
     const absPath = path.resolve(root, c);
     const isDir = (await fs.stat(absPath)).isDirectory();
 
@@ -37,12 +41,12 @@ async function getFileList(root, ignoreList) {
   return files;
 }
 
-async function getFileContents(fileList) {
-  const contents = [];
-  const promises = [];
-  for (let file of fileList) {
-    const pr = fs.readFile(file, { encoding: 'utf-8' }).then((c) => {
-      contents.push([file, c]);
+async function getFileContents(fileList: string[]): Promise<Content[]> {
+  const contents: Content[] = [];
+  const promises: Promise<void>[] = [];
+  for (const fileName of fileList) {
+    const pr = fs.readFile(fileName, { encoding: 'utf-8' }).then((content) => {
+      contents.push({ fileName, content });
     });
     promises.push(pr);
   }
@@ -50,16 +54,18 @@ async function getFileContents(fileList) {
   return contents;
 }
 
-async function getAllTStringsMap(contents) {
-  const strings = new Map();
-  const promises = [];
+async function getAllTStringsMap(
+  contents: Content[]
+): Promise<Map<string, string[]>> {
+  const strings: Map<string, string[]> = new Map();
+  const promises: Promise<void>[] = [];
 
-  contents.forEach(([f, c]) => {
-    const pr = getTStrings(c).then((ts) => {
+  contents.forEach(({ fileName, content }) => {
+    const pr = getTStrings(content).then((ts) => {
       if (ts.length === 0) {
         return;
       }
-      strings.set(f, ts);
+      strings.set(fileName, ts);
     });
     promises.push(pr);
   });
@@ -68,24 +74,24 @@ async function getAllTStringsMap(contents) {
   return strings;
 }
 
-function getTStrings(content) {
+function getTStrings(content: string): Promise<string[]> {
   return new Promise((resolve) => {
     const tStrings = tStringFinder(content);
     resolve(tStrings);
   });
 }
 
-function tStringFinder(content) {
+function tStringFinder(content: string): string[] {
   return [...content.matchAll(PATTERN)].map(([_, t]) => {
     t = getIndexFormat(t);
     return getWhitespaceSanitized(t);
   });
 }
 
-function mapToTStringArray(tMap) {
-  const tSet = new Set();
-  for (let k of tMap.keys()) {
-    tMap.get(k).forEach((s) => tSet.add(s));
+function mapToTStringArray(tMap: Map<string, string[]>): string[] {
+  const tSet: Set<string> = new Set();
+  for (const k of tMap.keys()) {
+    tMap.get(k)!.forEach((s) => tSet.add(s));
   }
   const tArray = [...tSet];
   return tArray.sort();
@@ -129,14 +135,14 @@ function getLanguageCode() {
   return process.argv[i + 1] ?? '';
 }
 
-function getTranslationFilePath(languageCode) {
+function getTranslationFilePath(languageCode: string) {
   return path.resolve(translationsFolder, `${languageCode}.csv`);
 }
 
-async function regenerateTranslation(tArray, path) {
+async function regenerateTranslation(tArray: string[], path: string) {
   // Removes old strings, adds new strings
   const contents = await fs.readFile(path, { encoding: 'utf-8' });
-  const map = new Map();
+  const map: Map<string, string[]> = new Map();
 
   // Populate map
   contents
@@ -162,9 +168,9 @@ async function regenerateTranslation(tArray, path) {
   console.log(`\tregenerated: ${path}`);
 }
 
-async function regenerateTranslations(languageCode, tArray) {
+async function regenerateTranslations(languageCode: string, tArray: string[]) {
   // regenerate one file
-  if (languageCode) {
+  if (languageCode.length === 0) {
     const path = getTranslationFilePath(languageCode);
     regenerateTranslation(tArray, path);
     return;
@@ -180,7 +186,7 @@ async function regenerateTranslations(languageCode, tArray) {
   );
 }
 
-async function writeTranslations(languageCode, tArray) {
+async function writeTranslations(languageCode: string, tArray: string[]) {
   const path = getTranslationFilePath(languageCode);
   try {
     const stat = await fs.stat(path);
@@ -194,7 +200,7 @@ async function writeTranslations(languageCode, tArray) {
     );
     regenerateTranslations(languageCode, tArray);
   } catch (err) {
-    if (err.errno !== -2) {
+    if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {
       throw err;
     }
 
@@ -204,6 +210,8 @@ async function writeTranslations(languageCode, tArray) {
   }
 }
 
+type Content = { fileName: string; content: string };
+
 async function run() {
   if (printHelp()) {
     return;
@@ -214,15 +222,15 @@ async function run() {
   const languageCode = getLanguageCode();
 
   console.log();
-  const fileList = await getFileList(root, ignoreList);
-  const contents = await getFileContents(fileList);
-  const tMap = await getAllTStringsMap(contents);
-  const tArray = mapToTStringArray(tMap);
+  const fileList: string[] = await getFileList(root, ignoreList);
+  const contents: Content[] = await getFileContents(fileList);
+  const tMap: Map<string, string[]> = await getAllTStringsMap(contents);
+  const tArray: string[] = mapToTStringArray(tMap);
 
   try {
     await fs.stat(translationsFolder);
   } catch (err) {
-    if (err.errno !== -2) {
+    if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {
       throw err;
     }
 
diff --git a/src/dataImport.ts b/src/dataImport.ts
index 2c6e72dc..ab18f3b7 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -3,7 +3,7 @@ import { DocValueMap } from 'frappe/core/types';
 import Doc from 'frappe/model/doc';
 import { isNameAutoSet } from 'frappe/model/naming';
 import { FieldType, FieldTypeEnum } from 'schemas/types';
-import { parseCSV } from './csvParser';
+import { parseCSV } from '../utils/csvParser';
 import telemetry from './telemetry/telemetry';
 import { Noun, Verb } from './telemetry/types';
 
@@ -426,11 +426,11 @@ export class Importer {
   }
 
   handleError(doc: Doc, err: Error, status: Status): Status {
-    const messages = [frappe.t`Could not import ${this.doctype} ${doc.name}.`];
+    const messages = [frappe.t`Could not import ${this.doctype} ${doc.name!}.`];
 
     const message = err.message;
     if (message?.includes('UNIQUE constraint failed')) {
-      messages.push(frappe.t`${doc.name} already exists.`);
+      messages.push(frappe.t`${doc.name!} already exists.`);
     } else if (message) {
       messages.push(message);
     }
diff --git a/tsconfig.json b/tsconfig.json
index e3a8ea0f..eb9a7256 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,6 +23,9 @@
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },
+  "ts-node": {
+    "files": true
+  },
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx",
@@ -37,7 +40,10 @@
     "patches/**/*.js",
     "reports/**/*.ts",
     "accounting/**/*.ts",
-    "accounting/**/*.ts"
+    "accounting/**/*.ts",
+
+    "scripts/**/*.ts",
+    "utils/csvParser.ts"
   ],
   "exclude": ["node_modules"]
 }
diff --git a/src/csvParser.ts b/utils/csvParser.ts
similarity index 100%
rename from src/csvParser.ts
rename to utils/csvParser.ts
diff --git a/scripts/helpers.js b/utils/translationHelpers.ts
similarity index 59%
rename from scripts/helpers.js
rename to utils/translationHelpers.ts
index f84523f5..a028ef6b 100644
--- a/scripts/helpers.js
+++ b/utils/translationHelpers.ts
@@ -1,9 +1,11 @@
-function getIndexFormat(inp) {
+export function getIndexFormat(inp: string | string[]) {
   // converts:
   // ['This is an ', ,' interpolated ',' string.'] and
   // 'This is an ${variableA} interpolated ${variableB} string.'
   // to 'This is an ${0} interpolated ${1} string.'
-  let string, snippets;
+  let string: string | undefined = undefined;
+  let snippets: string[] | undefined = undefined;
+
   if (typeof inp === 'string') {
     string = inp;
   } else if (inp instanceof Array) {
@@ -13,7 +15,7 @@ function getIndexFormat(inp) {
   }
 
   if (snippets === undefined) {
-    snippets = getSnippets(string);
+    snippets = getSnippets(string as string);
   }
 
   if (snippets.length === 1) {
@@ -22,41 +24,45 @@ function getIndexFormat(inp) {
 
   let str = '';
   snippets.forEach((s, i) => {
-    if (i === snippets.length - 1) {
+    if (i === snippets!.length - 1) {
       str += s;
       return;
     }
     str += s + '${' + i + '}';
   });
+
   return str;
 }
 
-function getSnippets(string) {
+export function getSnippets(str: string) {
   let start = 0;
-  const snippets = [...string.matchAll(/\${[^}]+}/g)].map((m) => {
-    let end = m.index;
-    let snip = string.slice(start, end);
+  const snippets = [...str.matchAll(/\${[^}]+}/g)].map((m) => {
+    const end = m.index;
+    if (end === undefined) {
+      return '';
+    }
+    const snip = str.slice(start, end);
     start = end + m[0].length;
     return snip;
   });
 
-  snippets.push(string.slice(start));
+  snippets.push(str.slice(start));
   return snippets;
 }
 
-function getWhitespaceSanitized(s) {
-  return s.replace(/\s+/g, ' ').trim();
+export function getWhitespaceSanitized(str: string) {
+  return str.replace(/\s+/g, ' ').trim();
 }
 
-function getIndexList(s) {
-  return [...s.matchAll(/\${([^}]+)}/g)].map(([_, i]) => parseInt(i));
+export function getIndexList(str: string) {
+  return [...str.matchAll(/\${([^}]+)}/g)].map(([_, i]) => parseInt(i));
 }
 
-function wrap(s) {
-  return '`' + s + '`';
+export function wrap(str: string) {
+  return '`' + str + '`';
 }
 
-function splitCsvLine(line) {
+export function splitCsvLine(line: string) {
   let t = true;
   const chars = [...line];
   const indices = chars
@@ -82,12 +88,3 @@ function splitCsvLine(line) {
   splits.push(line.slice(s).trim());
   return splits.filter((s) => s !== ',' && s !== '');
 }
-
-module.exports = {
-  getIndexFormat,
-  getWhitespaceSanitized,
-  getSnippets,
-  getIndexList,
-  wrap,
-  splitCsvLine,
-};

From a39d7ed555f3a5dbda5cbec6f35b1dd713604e70 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 18 Apr 2022 10:37:36 +0530
Subject: [PATCH 051/163] incr: complete dbHandler.ts

---
 frappe/core/converter.ts | 149 +++++++++++++++++++++++++++++++++++++++
 frappe/core/dbHandler.ts | 142 ++++++++++++++-----------------------
 utils/db/types.ts        |   2 +-
 3 files changed, 203 insertions(+), 90 deletions(-)
 create mode 100644 frappe/core/converter.ts

diff --git a/frappe/core/converter.ts b/frappe/core/converter.ts
new file mode 100644
index 00000000..60eb5b9e
--- /dev/null
+++ b/frappe/core/converter.ts
@@ -0,0 +1,149 @@
+import frappe from 'frappe';
+import Doc from 'frappe/model/doc';
+import Money from 'pesa/dist/types/src/money';
+import { FieldType, FieldTypeEnum, RawValue } from 'schemas/types';
+import { DatabaseHandler } from './dbHandler';
+import { DocValue, DocValueMap, RawValueMap } from './types';
+
+/**
+ * # Converter
+ *
+ * Basically converts serializable RawValues from the db to DocValues used
+ * by the frontend and vice versa.
+ *
+ * ## Value Conversion
+ * It exposes two static methods: `toRawValue` and `toDocValue` that can be
+ * used elsewhere given the fieldtype.
+ *
+ * ## Map Conversion
+ * Two methods `toDocValueMap` and `toRawValueMap` are exposed but should be
+ * used only from the `dbHandler`.
+ */
+
+export class Converter {
+  db: DatabaseHandler;
+
+  constructor(db: DatabaseHandler) {
+    this.db = db;
+  }
+
+  toDocValueMap(
+    schemaName: string,
+    rawValueMap: RawValueMap | RawValueMap[]
+  ): DocValueMap | DocValueMap[] {
+    if (Array.isArray(rawValueMap)) {
+      return rawValueMap.map((dv) => this.#toDocValueMap(schemaName, dv));
+    } else {
+      return this.#toDocValueMap(schemaName, rawValueMap);
+    }
+  }
+
+  toRawValueMap(
+    schemaName: string,
+    docValueMap: DocValueMap | DocValueMap[]
+  ): RawValueMap | RawValueMap[] {
+    if (Array.isArray(docValueMap)) {
+      return docValueMap.map((dv) => this.#toRawValueMap(schemaName, dv));
+    } else {
+      return this.#toRawValueMap(schemaName, docValueMap);
+    }
+  }
+
+  static toDocValue(value: RawValue, fieldtype: FieldType): DocValue {
+    switch (fieldtype) {
+      case FieldTypeEnum.Currency:
+        return frappe.pesa((value ?? 0) as string | number);
+      case FieldTypeEnum.Date:
+        return new Date(value as string);
+      case FieldTypeEnum.Datetime:
+        return new Date(value as string);
+      case FieldTypeEnum.Int:
+        return +(value as string | number);
+      case FieldTypeEnum.Float:
+        return +(value as string | number);
+      case FieldTypeEnum.Check:
+        return Boolean(value as number);
+      default:
+        return String(value);
+    }
+  }
+
+  static toRawValue(value: DocValue, fieldtype: FieldType): RawValue {
+    switch (fieldtype) {
+      case FieldTypeEnum.Currency:
+        return (value as Money).store;
+      case FieldTypeEnum.Date:
+        return (value as Date).toISOString().split('T')[0];
+      case FieldTypeEnum.Datetime:
+        return (value as Date).toISOString();
+      case FieldTypeEnum.Int: {
+        if (typeof value === 'string') {
+          return parseInt(value);
+        }
+
+        return Math.floor(value as number);
+      }
+      case FieldTypeEnum.Float: {
+        if (typeof value === 'string') {
+          return parseFloat(value);
+        }
+
+        return value as number;
+      }
+      case FieldTypeEnum.Check:
+        return Number(value);
+      default:
+        return String(value);
+    }
+  }
+
+  #toDocValueMap(schemaName: string, rawValueMap: RawValueMap): DocValueMap {
+    const fieldValueMap = this.db.fieldValueMap[schemaName];
+    const docValueMap: DocValueMap = {};
+
+    for (const fieldname in rawValueMap) {
+      const field = fieldValueMap[fieldname];
+      const rawValue = rawValueMap[fieldname];
+
+      if (Array.isArray(rawValue)) {
+        docValueMap[fieldname] = rawValue.map((rv) =>
+          this.#toDocValueMap(schemaName, rv)
+        );
+      } else {
+        docValueMap[fieldname] = Converter.toDocValue(
+          rawValue,
+          field.fieldtype
+        );
+      }
+    }
+
+    return docValueMap;
+  }
+
+  #toRawValueMap(schemaName: string, docValueMap: DocValueMap): RawValueMap {
+    const fieldValueMap = this.db.fieldValueMap[schemaName];
+    const rawValueMap: RawValueMap = {};
+
+    for (const fieldname in docValueMap) {
+      const field = fieldValueMap[fieldname];
+      const docValue = docValueMap[fieldname];
+
+      if (Array.isArray(docValue)) {
+        rawValueMap[fieldname] = docValue.map((value) => {
+          if (value instanceof Doc) {
+            return this.#toRawValueMap(schemaName, value.getValidDict());
+          }
+
+          return this.#toRawValueMap(schemaName, value as DocValueMap);
+        });
+      } else {
+        rawValueMap[fieldname] = Converter.toRawValue(
+          docValue,
+          field.fieldtype
+        );
+      }
+    }
+
+    return rawValueMap;
+  }
+}
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index 747463be..094b4444 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -1,8 +1,9 @@
 import { Frappe } from 'frappe';
 import { DatabaseDemux } from 'frappe/demux/db';
-import Money from 'pesa/dist/types/src/money';
-import { FieldType, FieldTypeEnum, RawValue, SchemaMap } from 'schemas/types';
+import { Field, RawValue, SchemaMap } from 'schemas/types';
+import { getMapFromList } from 'utils';
 import { DatabaseBase, DatabaseDemuxBase, GetAllOptions } from 'utils/db/types';
+import { Converter } from './converter';
 import {
   DatabaseDemuxConstructor,
   DocValue,
@@ -18,12 +19,15 @@ type Cashflow = { inflow: number; outflow: number; 'month-year': string }[];
 
 export class DatabaseHandler extends DatabaseBase {
   #frappe: Frappe;
+  converter: Converter;
   #demux: DatabaseDemuxBase;
   schemaMap: Readonly<SchemaMap> = {};
+  fieldValueMap: Record<string, Record<string, Field>> = {};
 
   constructor(frappe: Frappe, Demux?: DatabaseDemuxConstructor) {
     super();
     this.#frappe = frappe;
+    this.converter = new Converter(this);
 
     if (Demux !== undefined) {
       this.#demux = new Demux(frappe.isElectron);
@@ -42,13 +46,18 @@ export class DatabaseHandler extends DatabaseBase {
 
   async init() {
     this.schemaMap = (await this.#demux.getSchemaMap()) as Readonly<SchemaMap>;
+
+    for (const schemaName in this.schemaMap) {
+      const fields = this.schemaMap[schemaName]!.fields!;
+      this.fieldValueMap[schemaName] = getMapFromList(fields, 'fieldname');
+    }
   }
 
   async insert(
     schemaName: string,
     docValueMap: DocValueMap
   ): Promise<DocValueMap> {
-    let rawValueMap = this.#toRawValueMap(
+    let rawValueMap = this.converter.toRawValueMap(
       schemaName,
       docValueMap
     ) as RawValueMap;
@@ -57,7 +66,7 @@ export class DatabaseHandler extends DatabaseBase {
       schemaName,
       rawValueMap
     )) as RawValueMap;
-    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap;
+    return this.converter.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
   }
 
   // Read
@@ -72,7 +81,7 @@ export class DatabaseHandler extends DatabaseBase {
       name,
       fields
     )) as RawValueMap;
-    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap;
+    return this.converter.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
   }
 
   async getAll(
@@ -80,7 +89,10 @@ export class DatabaseHandler extends DatabaseBase {
     options: GetAllOptions = {}
   ): Promise<DocValueMap[]> {
     const rawValueMap = await this.#getAll(schemaName, options);
-    return this.#toDocValueMap(schemaName, rawValueMap) as DocValueMap[];
+    return this.converter.toDocValueMap(
+      schemaName,
+      rawValueMap
+    ) as DocValueMap[];
   }
 
   async getAllRaw(
@@ -90,25 +102,6 @@ export class DatabaseHandler extends DatabaseBase {
     return await this.#getAll(schemaName, options);
   }
 
-  async count(
-    schemaName: string,
-    options: GetAllOptions = {}
-  ): Promise<number> {
-    const rawValueMap = await this.#getAll(schemaName, options);
-    return rawValueMap.length;
-  }
-
-  async #getAll(
-    schemaName: string,
-    options: GetAllOptions = {}
-  ): Promise<RawValueMap[]> {
-    return (await this.#demux.call(
-      'getAll',
-      schemaName,
-      options
-    )) as RawValueMap[];
-  }
-
   async getSingleValues(
     ...fieldnames: ({ fieldname: string; parent?: string } | string)[]
   ): Promise<SingleValue<DocValue>> {
@@ -117,8 +110,27 @@ export class DatabaseHandler extends DatabaseBase {
       ...fieldnames
     )) as SingleValue<RawValue>;
 
-    // TODO: Complete this
-    throw new Error('Not implemented');
+    const docSingleValue: SingleValue<DocValue> = [];
+    for (const sv of rawSingleValue) {
+      const fieldtype = this.fieldValueMap[sv.parent][sv.fieldname].fieldtype;
+      const value = Converter.toDocValue(sv.value, fieldtype);
+
+      docSingleValue.push({
+        value,
+        parent: sv.parent,
+        fieldname: sv.fieldname,
+      });
+    }
+
+    return docSingleValue;
+  }
+
+  async count(
+    schemaName: string,
+    options: GetAllOptions = {}
+  ): Promise<number> {
+    const rawValueMap = await this.#getAll(schemaName, options);
+    return rawValueMap.length;
   }
 
   // Update
@@ -131,7 +143,7 @@ export class DatabaseHandler extends DatabaseBase {
   }
 
   async update(schemaName: string, docValueMap: DocValueMap): Promise<void> {
-    const rawValueMap = this.#toRawValueMap(schemaName, docValueMap);
+    const rawValueMap = this.converter.toRawValueMap(schemaName, docValueMap);
     await this.#demux.call('update', schemaName, rawValueMap);
   }
 
@@ -153,7 +165,8 @@ export class DatabaseHandler extends DatabaseBase {
    * Bespoke function
    *
    * These are functions to run custom queries that are too complex for
-   * DatabaseCore and require use of knex or raw queries.
+   * DatabaseCore and require use of knex or raw queries. The output
+   * of these is not converted to DocValue and is used as is (RawValue).
    *
    * The query logic for these is in backend/database/bespoke.ts
    */
@@ -186,66 +199,17 @@ export class DatabaseHandler extends DatabaseBase {
     )) as Cashflow;
   }
 
-  #toDocValueMap(
+  /**
+   * Internal methods
+   */
+  async #getAll(
     schemaName: string,
-    rawValueMap: RawValueMap | RawValueMap[]
-  ): DocValueMap | DocValueMap[] {
-    // TODO: Complete this
-    throw new Error('Not implemented');
-  }
-  #toRawValueMap(
-    schemaName: string,
-    docValueMap: DocValueMap | DocValueMap[]
-  ): RawValueMap | RawValueMap[] {
-    // TODO: Complete this
-    throw new Error('Not implemented');
-  }
-
-  #toDocValue(value: RawValue, fieldtype: FieldType): DocValue {
-    switch (fieldtype) {
-      case FieldTypeEnum.Currency:
-        return this.#frappe.pesa((value ?? 0) as string | number);
-      case FieldTypeEnum.Date:
-        return new Date(value as string);
-      case FieldTypeEnum.Datetime:
-        return new Date(value as string);
-      case FieldTypeEnum.Int:
-        return +(value as string | number);
-      case FieldTypeEnum.Float:
-        return +(value as string | number);
-      case FieldTypeEnum.Check:
-        return Boolean(value as number);
-      default:
-        return String(value);
-    }
-  }
-
-  #toRawValue(value: DocValue, fieldtype: FieldType): RawValue {
-    switch (fieldtype) {
-      case FieldTypeEnum.Currency:
-        return (value as Money).store;
-      case FieldTypeEnum.Date:
-        return (value as Date).toISOString().split('T')[0];
-      case FieldTypeEnum.Datetime:
-        return (value as Date).toISOString();
-      case FieldTypeEnum.Int: {
-        if (typeof value === 'string') {
-          return parseInt(value);
-        }
-
-        return Math.floor(value as number);
-      }
-      case FieldTypeEnum.Float: {
-        if (typeof value === 'string') {
-          return parseFloat(value);
-        }
-
-        return value as number;
-      }
-      case FieldTypeEnum.Check:
-        return Number(value);
-      default:
-        return String(value);
-    }
+    options: GetAllOptions = {}
+  ): Promise<RawValueMap[]> {
+    return (await this.#demux.call(
+      'getAll',
+      schemaName,
+      options
+    )) as RawValueMap[];
   }
 }
diff --git a/utils/db/types.ts b/utils/db/types.ts
index f041d5e9..820f5cf5 100644
--- a/utils/db/types.ts
+++ b/utils/db/types.ts
@@ -3,7 +3,7 @@
  * backend process and the the frontend db class (dbHandler.ts).
  *
  * DatabaseBase is an abstract class so that the function signatures
- * match on both ends.
+ * match on both ends i.e. DatabaseCore and DatabaseHandler.
  */
 
 import { SchemaMap } from 'schemas/types';

From 9ec004184cc22e0fdb7de12454b7ba351336f64c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 18 Apr 2022 12:12:56 +0530
Subject: [PATCH 052/163] refactor: simplify init flow - add README.md - move
 currency to systemsettings

---
 backend/database/manager.ts            |  4 +-
 frappe/README.md                       | 91 ++++++++++++++++++++++++++
 frappe/core/dbHandler.ts               | 10 ++-
 frappe/core/docHandler.ts              | 15 ++++-
 frappe/demux/db.ts                     | 15 ++++-
 frappe/index.ts                        | 52 ++++++---------
 frappe/models/index.ts                 |  5 +-
 frappe/tests/testFrappe.spec.ts        |  8 +--
 frappe/utils/consts.ts                 |  2 +
 main/registerIpcMainActionListeners.ts |  4 +-
 schemas/app/AccountingSettings.json    |  8 ---
 schemas/core/SystemSettings.json       |  8 +++
 src/pages/SetupWizard/SetupWizard.vue  | 19 ++----
 utils/db/types.ts                      |  6 +-
 14 files changed, 173 insertions(+), 74 deletions(-)
 create mode 100644 frappe/README.md

diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 084c13ba..b08677b9 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -19,9 +19,10 @@ export class DatabaseManager extends DatabaseDemuxBase {
     return this.db?.schemaMap ?? {};
   }
 
-  async createNewDatabase(dbPath: string, countryCode?: string) {
+  async createNewDatabase(dbPath: string, countryCode: string) {
     await this.#unlinkIfExists(dbPath);
     await this.connectToDatabase(dbPath, countryCode);
+    return countryCode;
   }
 
   async connectToDatabase(dbPath: string, countryCode?: string) {
@@ -34,6 +35,7 @@ export class DatabaseManager extends DatabaseDemuxBase {
     this.db.setSchemaMap(schemaMap);
 
     await this.#migrate();
+    return countryCode;
   }
 
   async call(method: DatabaseMethod, ...args: unknown[]) {
diff --git a/frappe/README.md b/frappe/README.md
new file mode 100644
index 00000000..f38d2f6c
--- /dev/null
+++ b/frappe/README.md
@@ -0,0 +1,91 @@
+# Fyo
+
+This is the underlying framework that runs **Books**, at some point it may be
+removed into a separate repo, but as of now it's in gestation.
+
+The reason for maintaining a framework is to allow for varied backends.
+Currently Books runs on the electron renderer process and all db stuff happens
+on the electron main process which has access to node libs. As the development
+of `Fyo` progresses it will allow for a browser frontend and a node server
+backend.
+
+This platform variablity will be handled by code in the `fyo/demux` subdirectory.
+
+## Pre Req
+
+**Singleton**: The `Fyo` class is used as a singleton throughout Books, this
+allows for a single source of truth and a common interface to access different
+modules such as `db`, `doc` an `auth`.
+
+**Localization**: Since Books' functionality changes depending on region,
+regional information is required in the initialization process.
+
+**Doc**: This is `fyo`'s abstraction for an ORM, the associated files are
+located in `model`, all classes exported from `books/models` extend this.
+
+### Terminology
+
+- **Schema**: object that defines shape of the data in the database
+- **Model**: the controller class that extends the `Doc` class or the `Doc`
+  class itself (if a controller doesn't exist).
+- **Doc**: instance of a Model, i.e. what has the data.
+
+## Initialization
+
+There are a set of core models which are maintained in the `fyo/models`
+subdirectory, from this the _SystemSettings_ field `countryCode` is used to
+config regional information.
+
+A few things have to be done on initialization:
+
+#### 1. Connect To DB
+
+If creating a new instance then `fyo.db.createNewDatabase` or if loading an
+instance `fyo.db.connectToDatabase`.
+
+Both of them take `countryCode` as an argument, `fyo.db.createNewDatabase`
+should be passed the `countryCode` as the schemas are built on the basis of
+this.
+
+#### 2. Initialize and Register
+
+Done using `fyo.initializeAndRegister` after a database is connected, this should be
+passed the models and regional models.
+
+This sets the schemas and associated models on the `fyo` object along with a few
+other things.
+
+### Sequence
+
+**First Load**: i.e. registering or creating a new instance.
+
+- Get `countryCode` from the setup wizard.
+- Create a new DB using `fyo.db.createNewDatabase` with the `countryCode`.
+- Get models and `regionalModels` using `countryCode` from `models/index.ts/getRegionalModels`.
+- Call `fyo.initializeAndRegister` with the all models.
+
+**Next Load**: i.e. logging in or opening an existing instance.
+
+- Connect to DB using `fyo.db.connectToDatabase` and get `countryCode` from the return.
+- Get models and `regionalModels` using `countryCode` from `models/index.ts/getRegionalModels`.
+- Call `fyo.initializeAndRegister` with the all models.
+
+## Testing
+
+For testing the `fyo` class, `mocha` is used (`node` side). So for this the
+demux classes are directly replaced by `node` side managers such as
+`DatabaseManager`.
+
+For this to work the class signatures of the demux class and the manager have to
+be the same.
+
+## Translations
+
+All translations take place during runtime, for translations to work, a
+`LanguageMap` (for def check `utils/types.ts`) has to be set. 
+
+This can be done using `fyo/utils/translation.ts/setLanguageMapOnTranslationString`.
+
+Since translations are runtime, if the code is evaluated before the language map
+is loaded, translations won't work. To prevent this, don't maintain translation
+strings globally.
\ No newline at end of file
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index 094b4444..ff6edad3 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -36,12 +36,16 @@ export class DatabaseHandler extends DatabaseBase {
     }
   }
 
-  async createNewDatabase(dbPath: string, countryCode?: string) {
-    await this.#demux.createNewDatabase(dbPath, countryCode);
+  async createNewDatabase(dbPath: string, countryCode: string) {
+    countryCode = await this.#demux.createNewDatabase(dbPath, countryCode);
+    await this.init();
+    return countryCode;
   }
 
   async connectToDatabase(dbPath: string, countryCode?: string) {
-    await this.#demux.connectToDatabase(dbPath, countryCode);
+    countryCode = await this.#demux.connectToDatabase(dbPath, countryCode);
+    await this.init();
+    return countryCode;
   }
 
   async init() {
diff --git a/frappe/core/docHandler.ts b/frappe/core/docHandler.ts
index 299c79d6..8896a929 100644
--- a/frappe/core/docHandler.ts
+++ b/frappe/core/docHandler.ts
@@ -1,5 +1,6 @@
 import Doc from 'frappe/model/doc';
 import { DocMap, ModelMap } from 'frappe/model/types';
+import { coreModels } from 'frappe/models';
 import { getRandomString } from 'frappe/utils';
 import Observable from 'frappe/utils/observable';
 import { Frappe } from '..';
@@ -20,9 +21,17 @@ export class DocHandler {
     this.docs = new Observable();
   }
 
-  registerModels(models: ModelMap) {
-    for (const schemaName in models) {
-      this.models[schemaName] = models[schemaName];
+  registerModels(models: ModelMap, regionalModels: ModelMap = {}) {
+    for (const schemaName in this.frappe.db.schemaMap) {
+      if (coreModels[schemaName] !== undefined) {
+        this.models[schemaName] = coreModels[schemaName];
+      } else if (regionalModels[schemaName] !== undefined) {
+        this.models[schemaName] = regionalModels[schemaName];
+      } else if (models[schemaName] !== undefined) {
+        this.models[schemaName] = models[schemaName];
+      } else {
+        this.models[schemaName] = Doc;
+      }
     }
   }
 
diff --git a/frappe/demux/db.ts b/frappe/demux/db.ts
index 76b5b8ad..9cb5eae9 100644
--- a/frappe/demux/db.ts
+++ b/frappe/demux/db.ts
@@ -1,4 +1,5 @@
 import { ipcRenderer } from 'electron';
+import { DEFAULT_COUNTRY_CODE } from 'frappe/utils/consts';
 import { SchemaMap } from 'schemas/types';
 import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { DatabaseResponse } from 'utils/ipc/types';
@@ -27,7 +28,10 @@ export class DatabaseDemux extends DatabaseDemuxBase {
     return response.data as SchemaMap;
   }
 
-  async createNewDatabase(dbPath: string, countryCode?: string): Promise<void> {
+  async createNewDatabase(
+    dbPath: string,
+    countryCode?: string
+  ): Promise<string> {
     let response: DatabaseResponse;
     if (this.#isElectron) {
       response = await ipcRenderer.invoke(
@@ -43,9 +47,14 @@ export class DatabaseDemux extends DatabaseDemuxBase {
     if (response.error) {
       throw new Error(response.error);
     }
+
+    return (response.data ?? DEFAULT_COUNTRY_CODE) as string;
   }
 
-  async connectToDatabase(dbPath: string, countryCode?: string): Promise<void> {
+  async connectToDatabase(
+    dbPath: string,
+    countryCode?: string
+  ): Promise<string> {
     let response: DatabaseResponse;
     if (this.#isElectron) {
       response = await ipcRenderer.invoke(
@@ -61,6 +70,8 @@ export class DatabaseDemux extends DatabaseDemuxBase {
     if (response.error) {
       throw new Error(response.error);
     }
+
+    return (response.data ?? DEFAULT_COUNTRY_CODE) as string;
   }
 
   async call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown> {
diff --git a/frappe/index.ts b/frappe/index.ts
index 7b5e7b8c..a0ce0030 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -5,8 +5,8 @@ import { DatabaseHandler } from './core/dbHandler';
 import { DocHandler } from './core/docHandler';
 import { DatabaseDemuxConstructor } from './core/types';
 import { ModelMap } from './model/types';
-import coreModels from './models';
 import {
+  DEFAULT_CURRENCY,
   DEFAULT_DISPLAY_PRECISION,
   DEFAULT_INTERNAL_PRECISION,
 } from './utils/consts';
@@ -15,13 +15,6 @@ import { format } from './utils/format';
 import { t, T } from './utils/translation';
 import { ErrorLog } from './utils/types';
 
-/**
- * Terminology
- * - Schema: object that defines shape of the data in the database
- * - Model: the controller class that extends the Doc class or the Doc
- *    class itself.
- * - Doc: instance of a Model, i.e. what has the data.
- */
 
 export class Frappe {
   t = t;
@@ -81,18 +74,20 @@ export class Frappe {
   }
 
   async initializeAndRegister(
-    customModels: ModelMap = {},
+    models: ModelMap = {},
+    regionalModels: ModelMap = {},
     force: boolean = false
   ) {
-    await this.init(force);
-
-    this.doc.registerModels(coreModels as ModelMap);
-    this.doc.registerModels(customModels);
-  }
-
-  async init(force?: boolean) {
     if (this._initialized && !force) return;
 
+    await this.#initializeModules();
+    await this.#initializeMoneyMaker();
+
+    this.doc.registerModels(models, regionalModels);
+    this._initialized = true;
+  }
+
+  async #initializeModules() {
     this.methods = {};
     this.errorLog = [];
 
@@ -102,11 +97,9 @@ export class Frappe {
     await this.doc.init();
     await this.auth.init();
     await this.db.init();
-    this._initialized = true;
   }
 
-  async initializeMoneyMaker(currency: string = 'XXX') {
-    // to be called after db initialization
+  async #initializeMoneyMaker() {
     const values =
       (await this.db?.getSingleValues(
         {
@@ -116,6 +109,10 @@ export class Frappe {
         {
           fieldname: 'displayPrecision',
           parent: 'SystemSettings',
+        },
+        {
+          fieldname: 'currency',
+          parent: 'SystemSettings',
         }
       )) ?? [];
 
@@ -124,18 +121,11 @@ export class Frappe {
       return acc;
     }, {} as Record<string, string | number | undefined>);
 
-    let precision: string | number =
-      acc.internalPrecision ?? DEFAULT_INTERNAL_PRECISION;
-    let display: string | number =
-      acc.displayPrecision ?? DEFAULT_DISPLAY_PRECISION;
-
-    if (typeof precision === 'string') {
-      precision = parseInt(precision);
-    }
-
-    if (typeof display === 'string') {
-      display = parseInt(display);
-    }
+    const precision: number =
+      (acc.internalPrecision as number) ?? DEFAULT_INTERNAL_PRECISION;
+    const display: number =
+      (acc.displayPrecision as number) ?? DEFAULT_DISPLAY_PRECISION;
+    const currency: string = (acc.currency as string) ?? DEFAULT_CURRENCY;
 
     this.pesa = getMoneyMaker({
       currency,
diff --git a/frappe/models/index.ts b/frappe/models/index.ts
index c9c01faf..e19cb795 100644
--- a/frappe/models/index.ts
+++ b/frappe/models/index.ts
@@ -1,7 +1,8 @@
+import { ModelMap } from 'frappe/model/types';
 import NumberSeries from './NumberSeries';
 import SystemSettings from './SystemSettings';
 
-export default {
+export const coreModels = {
   NumberSeries,
   SystemSettings,
-};
+} as ModelMap;
diff --git a/frappe/tests/testFrappe.spec.ts b/frappe/tests/testFrappe.spec.ts
index 5bc4ce96..1b3595b1 100644
--- a/frappe/tests/testFrappe.spec.ts
+++ b/frappe/tests/testFrappe.spec.ts
@@ -1,7 +1,7 @@
 import * as assert from 'assert';
 import 'mocha';
-import { DatabaseManager } from '../../backend/database/manager';
 import { Frappe } from '..';
+import { DatabaseManager } from '../../backend/database/manager';
 
 describe('Frappe', function () {
   const frappe = new Frappe(DatabaseManager);
@@ -12,15 +12,15 @@ describe('Frappe', function () {
       0,
       'zero schemas one'
     );
-    await frappe.init();
+    await frappe.initializeAndRegister();
     assert.strictEqual(
       Object.keys(frappe.schemaMap).length,
       0,
       'zero schemas two'
     );
 
-    await frappe.db.createNewDatabase(':memory:');
-    await frappe.initializeAndRegister({}, true);
+    await frappe.db.createNewDatabase(':memory:', 'in');
+    await frappe.initializeAndRegister({}, {}, true);
     assert.strictEqual(
       Object.keys(frappe.schemaMap).length > 0,
       true,
diff --git a/frappe/utils/consts.ts b/frappe/utils/consts.ts
index 88e741fa..5c9a1aac 100644
--- a/frappe/utils/consts.ts
+++ b/frappe/utils/consts.ts
@@ -1,6 +1,8 @@
 export const DEFAULT_INTERNAL_PRECISION = 11;
 export const DEFAULT_DISPLAY_PRECISION = 2;
 export const DEFAULT_LOCALE = 'en-IN';
+export const DEFAULT_COUNTRY_CODE = 'in';
+export const DEFAULT_CURRENCY = 'XXX';
 export const DEFAULT_LANGUAGE = 'English';
 export const DEFAULT_NUMBER_SERIES = {
   SalesInvoice: 'SINV-',
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 0ff30367..e7b54e2a 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -126,7 +126,7 @@ export default function registerIpcMainActionListeners(main: Main) {
 
   ipcMain.handle(
     IPC_ACTIONS.DB_CREATE,
-    async (_, dbPath: string, countryCode?: string) => {
+    async (_, dbPath: string, countryCode: string) => {
       const response: DatabaseResponse = { error: '', data: undefined };
       try {
         response.data = await databaseManager.createNewDatabase(
@@ -146,7 +146,7 @@ export default function registerIpcMainActionListeners(main: Main) {
     async (_, dbPath: string, countryCode?: string) => {
       const response: DatabaseResponse = { error: '', data: undefined };
       try {
-        response.data = await databaseManager.createNewDatabase(
+        response.data = await databaseManager.connectToDatabase(
           dbPath,
           countryCode
         );
diff --git a/schemas/app/AccountingSettings.json b/schemas/app/AccountingSettings.json
index c147814a..d215d6b7 100644
--- a/schemas/app/AccountingSettings.json
+++ b/schemas/app/AccountingSettings.json
@@ -33,13 +33,6 @@
       "readOnly": true,
       "required": true
     },
-    {
-      "fieldname": "currency",
-      "label": "Currency",
-      "fieldtype": "Data",
-      "readOnly": true,
-      "required": false
-    },
     {
       "fieldname": "fullname",
       "label": "Name",
@@ -82,7 +75,6 @@
     "email",
     "companyName",
     "country",
-    "currency",
     "fiscalYearStart",
     "fiscalYearEnd"
   ]
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 06e5dbaa..392681b7 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -79,11 +79,19 @@
       "label": "Country Code",
       "fieldtype": "Data",
       "description": "Country code used to initialize regional settings."
+    },
+    {
+      "fieldname": "currency",
+      "label": "Currency",
+      "fieldtype": "Data",
+      "readOnly": true,
+      "required": false
     }
   ],
   "quickEditFields": [
     "locale",
     "dateFormat",
+    "currency",
     "displayPrecision",
     "hideGetStarted"
   ],
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index cae87ca8..1ff26c23 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -1,14 +1,3 @@
-import FormControl from '@/components/Controls/FormControl'; import
-LanguageSelector from '@/components/Controls/LanguageSelector.vue'; import
-Popover from '@/components/Popover'; import TwoColumnForm from
-'@/components/TwoColumnForm'; import config from '@/config'; import {
-connectToLocalDatabase, purgeCache } from '@/initialization'; import {
-IPC_MESSAGES } from '@/messages'; import { setLanguageMap, showMessageDialog }
-from '@/utils'; import { ipcRenderer } from 'electron'; import frappe from
-'frappe'; import fs from 'fs'; import path from 'path'; import {
-getErrorMessage, handleErrorWithDialog, showErrorDialog } from
-'../../errorHandling'; import setupCompany from './setupCompany'; import Slide
-from './Slide.vue';
 <template>
   <div>
     <Slide
@@ -106,16 +95,16 @@ import Popover from '@/components/Popover';
 import TwoColumnForm from '@/components/TwoColumnForm';
 import config from '@/config';
 import { connectToLocalDatabase, purgeCache } from '@/initialization';
-import { IPC_MESSAGES } from 'utils/messages';
 import { setLanguageMap, showMessageDialog } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
 import fs from 'fs';
 import path from 'path';
+import { IPC_MESSAGES } from 'utils/messages';
 import {
-  getErrorMessage,
-  handleErrorWithDialog,
-  showErrorDialog,
+getErrorMessage,
+handleErrorWithDialog,
+showErrorDialog
 } from '../../errorHandling';
 import setupCompany from './setupCompany';
 import Slide from './Slide.vue';
diff --git a/utils/db/types.ts b/utils/db/types.ts
index 820f5cf5..7c33f740 100644
--- a/utils/db/types.ts
+++ b/utils/db/types.ts
@@ -79,13 +79,13 @@ export abstract class DatabaseDemuxBase {
 
   abstract createNewDatabase(
     dbPath: string,
-    countryCode?: string
-  ): Promise<void>;
+    countryCode: string
+  ): Promise<string>;
 
   abstract connectToDatabase(
     dbPath: string,
     countryCode?: string
-  ): Promise<void>;
+  ): Promise<string>;
 
   abstract call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown>;
 

From a8e208a68a5c7e528752408e8e848a555d39cd98 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 18 Apr 2022 13:31:41 +0530
Subject: [PATCH 053/163] incr: type frappe/utils/format

---
 frappe/core/docHandler.ts |   4 +-
 frappe/index.ts           |   5 +-
 frappe/model/doc.ts       |   2 +
 frappe/model/types.ts     |   8 ++
 frappe/utils/consts.ts    |   3 +-
 frappe/utils/format.js    | 113 ----------------------------
 frappe/utils/format.ts    | 150 ++++++++++++++++++++++++++++++++++++++
 7 files changed, 168 insertions(+), 117 deletions(-)
 delete mode 100644 frappe/utils/format.js
 create mode 100644 frappe/utils/format.ts

diff --git a/frappe/core/docHandler.ts b/frappe/core/docHandler.ts
index 8896a929..bdf40063 100644
--- a/frappe/core/docHandler.ts
+++ b/frappe/core/docHandler.ts
@@ -1,5 +1,5 @@
 import Doc from 'frappe/model/doc';
-import { DocMap, ModelMap } from 'frappe/model/types';
+import { DocMap, ModelMap, SinglesMap } from 'frappe/model/types';
 import { coreModels } from 'frappe/models';
 import { getRandomString } from 'frappe/utils';
 import Observable from 'frappe/utils/observable';
@@ -8,7 +8,7 @@ import { DocValue, DocValueMap } from './types';
 
 export class DocHandler {
   frappe: Frappe;
-  singles: DocMap = {};
+  singles: SinglesMap = {};
   docs: Observable<DocMap> = new Observable();
   models: ModelMap = {};
 
diff --git a/frappe/index.ts b/frappe/index.ts
index a0ce0030..398ed0a4 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -15,7 +15,6 @@ import { format } from './utils/format';
 import { t, T } from './utils/translation';
 import { ErrorLog } from './utils/types';
 
-
 export class Frappe {
   t = t;
   T = T;
@@ -36,6 +35,9 @@ export class Frappe {
   methods?: Record<string, Function>;
   temp?: Record<string, unknown>;
 
+  currencyFormatter?: Intl.NumberFormat;
+  currencySymbols: Record<string, string | undefined> = {};
+
   constructor(DatabaseDemux?: DatabaseDemuxConstructor) {
     /**
      * `DatabaseManager` can be passed as the `DatabaseDemux` for
@@ -84,6 +86,7 @@ export class Frappe {
     await this.#initializeMoneyMaker();
 
     this.doc.registerModels(models, regionalModels);
+    await this.doc.getSingle('SystemSettings');
     this._initialized = true;
   }
 
diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
index 37b4f116..dd09ae8c 100644
--- a/frappe/model/doc.ts
+++ b/frappe/model/doc.ts
@@ -28,6 +28,7 @@ import {
 import { setName } from './naming';
 import {
   Action,
+  CurrenciesMap,
   DefaultMap,
   DependsOnMap,
   EmptyMessageMap,
@@ -705,6 +706,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   required: RequiredMap = {};
   hidden: HiddenMap = {};
   dependsOn: DependsOnMap = {};
+  getCurrencies: CurrenciesMap = {};
 
   static lists: ListsMap = {};
   static filters: FiltersMap = {};
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
index 9b0a8c78..215bf0d3 100644
--- a/frappe/model/types.ts
+++ b/frappe/model/types.ts
@@ -1,4 +1,5 @@
 import { DocValue, DocValueMap } from 'frappe/core/types';
+import SystemSettings from 'frappe/models/SystemSettings';
 import { FieldType } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 import { Router } from 'vue-router';
@@ -22,11 +23,13 @@ export type Default = () => DocValue;
 export type Validation = (value: DocValue) => Promise<void>;
 export type Required = () => boolean;
 export type Hidden = () => boolean;
+export type GetCurrency = () => string;
 
 export type FormulaMap = Record<string, Formula | undefined>;
 export type DefaultMap = Record<string, Default | undefined>;
 export type ValidationMap = Record<string, Validation | undefined>;
 export type RequiredMap = Record<string, Required | undefined>;
+export type CurrenciesMap = Record<string, GetCurrency>;
 export type HiddenMap = Record<string, Hidden>;
 export type DependsOnMap = Record<string, string[]>;
 
@@ -37,6 +40,11 @@ export type DependsOnMap = Record<string, string[]>;
 export type ModelMap = Record<string, typeof Doc | undefined>;
 export type DocMap = Record<string, Doc | undefined>;
 
+export interface SinglesMap {
+  SystemSettings?: SystemSettings
+  [key: string]: Doc | undefined
+}
+
 // Static Config properties
 
 export type FilterFunction = (doc: Doc) => QueryFilter;
diff --git a/frappe/utils/consts.ts b/frappe/utils/consts.ts
index 5c9a1aac..c9ccba20 100644
--- a/frappe/utils/consts.ts
+++ b/frappe/utils/consts.ts
@@ -1,8 +1,9 @@
 export const DEFAULT_INTERNAL_PRECISION = 11;
 export const DEFAULT_DISPLAY_PRECISION = 2;
+export const DEFAULT_DATE_FORMAT = 'yyyy-MM-dd';
 export const DEFAULT_LOCALE = 'en-IN';
 export const DEFAULT_COUNTRY_CODE = 'in';
-export const DEFAULT_CURRENCY = 'XXX';
+export const DEFAULT_CURRENCY = 'INR';
 export const DEFAULT_LANGUAGE = 'English';
 export const DEFAULT_NUMBER_SERIES = {
   SalesInvoice: 'SINV-',
diff --git a/frappe/utils/format.js b/frappe/utils/format.js
deleted file mode 100644
index 53c63ebf..00000000
--- a/frappe/utils/format.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import frappe from 'frappe';
-import { DateTime } from 'luxon';
-import { DEFAULT_DISPLAY_PRECISION, DEFAULT_LOCALE } from './consts';
-
-export function format(value, df, doc) {
-  if (!df) {
-    return value;
-  }
-
-  if (typeof df === 'string') {
-    df = { fieldtype: df };
-  }
-
-  if (df.fieldtype === 'Currency') {
-    const currency = getCurrency(df, doc);
-    value = formatCurrency(value, currency);
-  } else if (df.fieldtype === 'Date') {
-    let dateFormat;
-    if (!frappe.SystemSettings) {
-      dateFormat = 'yyyy-MM-dd';
-    } else {
-      dateFormat = frappe.SystemSettings.dateFormat;
-    }
-
-    if (typeof value === 'string') {
-      // ISO String
-      value = DateTime.fromISO(value);
-    } else if (Object.prototype.toString.call(value) === '[object Date]') {
-      // JS Date
-      value = DateTime.fromJSDate(value);
-    }
-
-    value = value.toFormat(dateFormat);
-    if (value === 'Invalid DateTime') {
-      value = '';
-    }
-  } else if (df.fieldtype === 'Check') {
-    typeof parseInt(value) === 'number'
-      ? (value = parseInt(value))
-      : (value = Boolean(value));
-  } else {
-    if (value === null || value === undefined) {
-      value = '';
-    } else {
-      value = value + '';
-    }
-  }
-  return value;
-}
-
-function formatCurrency(value, currency) {
-  let valueString;
-  try {
-    valueString = formatNumber(value);
-  } catch (err) {
-    err.message += ` value: '${value}', type: ${typeof value}`;
-    throw err;
-  }
-
-  const currencySymbol = frappe.currencySymbols[currency];
-  if (currencySymbol) {
-    return currencySymbol + ' ' + valueString;
-  }
-
-  return valueString;
-}
-
-function formatNumber(value) {
-  const numberFormatter = getNumberFormatter();
-  if (typeof value === 'number') {
-    return numberFormatter.format(value);
-  }
-
-  if (value.round) {
-    return numberFormatter.format(value.round());
-  }
-
-  const formattedNumber = numberFormatter.format(value);
-  if (formattedNumber === 'NaN') {
-    throw Error(
-      `invalid value passed to formatNumber: '${value}' of type ${typeof value}`
-    );
-  }
-
-  return formattedNumber;
-}
-
-function getNumberFormatter() {
-  if (frappe.currencyFormatter) {
-    return frappe.currencyFormatter;
-  }
-
-  const locale = frappe.SystemSettings.locale ?? DEFAULT_LOCALE;
-  const display =
-    frappe.SystemSettings.displayPrecision ?? DEFAULT_DISPLAY_PRECISION;
-
-  return (frappe.currencyFormatter = Intl.NumberFormat(locale, {
-    style: 'decimal',
-    minimumFractionDigits: display,
-  }));
-}
-
-function getCurrency(df, doc) {
-  if (!(doc && df.getCurrency)) {
-    return df.currency || frappe.AccountingSettings.currency || '';
-  }
-
-  if (doc.meta && doc.meta.isChild) {
-    return df.getCurrency(doc, doc.parentdoc);
-  }
-
-  return df.getCurrency(doc);
-}
diff --git a/frappe/utils/format.ts b/frappe/utils/format.ts
new file mode 100644
index 00000000..2a324647
--- /dev/null
+++ b/frappe/utils/format.ts
@@ -0,0 +1,150 @@
+import frappe from 'frappe';
+import { DocValue } from 'frappe/core/types';
+import Doc from 'frappe/model/doc';
+import { DateTime } from 'luxon';
+import Money from 'pesa/dist/types/src/money';
+import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
+import { getIsNullOrUndef } from 'utils';
+import {
+  DEFAULT_CURRENCY,
+  DEFAULT_DATE_FORMAT,
+  DEFAULT_DISPLAY_PRECISION,
+  DEFAULT_LOCALE,
+} from './consts';
+
+export function format(
+  value: DocValue,
+  df?: string | Field,
+  doc?: Doc
+): string {
+  if (!df) {
+    return String(value);
+  }
+
+  const field: Field = getField(df);
+
+  if (field.fieldtype === FieldTypeEnum.Currency) {
+    return formatCurrency(value, field, doc);
+  }
+
+  if (field.fieldtype === FieldTypeEnum.Date) {
+    return formatDate(value);
+  }
+
+  if (field.fieldtype === FieldTypeEnum.Check) {
+    return Boolean(value).toString();
+  }
+
+  if (getIsNullOrUndef(value)) {
+    return '';
+  }
+
+  return String(value);
+}
+
+function formatDate(value: DocValue): string {
+  const dateFormat =
+    (frappe.singles.SystemSettings?.dateFormat as string) ??
+    DEFAULT_DATE_FORMAT;
+
+  let dateValue: DateTime;
+  if (typeof value === 'string') {
+    dateValue = DateTime.fromISO(value);
+  } else if (value instanceof Date) {
+    dateValue = DateTime.fromJSDate(value);
+  } else {
+    dateValue = DateTime.fromSeconds(value as number);
+  }
+
+  const formattedDate = dateValue.toFormat(dateFormat);
+  if (value === 'Invalid DateTime') {
+    return '';
+  }
+
+  return formattedDate;
+}
+
+function formatCurrency(value: DocValue, field: Field, doc?: Doc): string {
+  const currency = getCurrency(field, doc);
+
+  let valueString;
+  try {
+    valueString = formatNumber(value);
+  } catch (err) {
+    (err as Error).message += ` value: '${value}', type: ${typeof value}`;
+    throw err;
+  }
+
+  const currencySymbol = frappe.currencySymbols[currency];
+  if (currencySymbol !== undefined) {
+    return currencySymbol + ' ' + valueString;
+  }
+
+  return valueString;
+}
+
+function formatNumber(value: DocValue): string {
+  const numberFormatter = getNumberFormatter();
+  if (typeof value === 'number') {
+    return numberFormatter.format(value);
+  }
+
+  if ((value as Money).round) {
+    const floatValue = parseFloat((value as Money).round());
+    return numberFormatter.format(floatValue);
+  }
+
+  const floatValue = parseFloat(value as string);
+  const formattedNumber = numberFormatter.format(floatValue);
+
+  if (formattedNumber === 'NaN') {
+    throw Error(
+      `invalid value passed to formatNumber: '${value}' of type ${typeof value}`
+    );
+  }
+
+  return formattedNumber;
+}
+
+function getNumberFormatter() {
+  if (frappe.currencyFormatter) {
+    return frappe.currencyFormatter;
+  }
+
+  const locale =
+    (frappe.singles.SystemSettings?.locale as string) ?? DEFAULT_LOCALE;
+  const display =
+    (frappe.singles.SystemSettings?.displayPrecision as number) ??
+    DEFAULT_DISPLAY_PRECISION;
+
+  return (frappe.currencyFormatter = Intl.NumberFormat(locale, {
+    style: 'decimal',
+    minimumFractionDigits: display,
+  }));
+}
+
+function getCurrency(field: Field, doc?: Doc): string {
+  if (doc && doc.getCurrencies[field.fieldname]) {
+    return doc.getCurrencies[field.fieldname]();
+  }
+
+  if (doc && doc.parentdoc?.getCurrencies[field.fieldname]) {
+    return doc.parentdoc.getCurrencies[field.fieldname]();
+  }
+
+  return (
+    (frappe.singles.SystemSettings?.currency as string) ?? DEFAULT_CURRENCY
+  );
+}
+
+function getField(df: string | Field): Field {
+  if (typeof df === 'string') {
+    return {
+      label: '',
+      fieldname: '',
+      fieldtype: df as FieldType,
+    };
+  }
+
+  return df;
+}

From ffdacc9637345201f92ccca51a82c0819cc0d121 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 18 Apr 2022 13:41:47 +0530
Subject: [PATCH 054/163] incr: type post start

---
 server/postStart.js | 47 ---------------------------------------------
 src/postStart.ts    | 33 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 47 deletions(-)
 delete mode 100644 server/postStart.js
 create mode 100644 src/postStart.ts

diff --git a/server/postStart.js b/server/postStart.js
deleted file mode 100644
index 7383a004..00000000
--- a/server/postStart.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import frappe from 'frappe';
-import { createNumberSeries } from 'frappe/model/naming';
-import JournalEntryServer from '../models/doctype/JournalEntry/JournalEntryServer.js';
-import PartyServer from '../models/doctype/Party/PartyServer.js';
-import PaymentServer from '../models/doctype/Payment/PaymentServer.js';
-import PurchaseInvoiceServer from '../models/doctype/PurchaseInvoice/PurchaseInvoiceServer.js';
-import SalesInvoiceServer from '../models/doctype/SalesInvoice/SalesInvoiceServer.js';
-
-export default async function postStart() {
-  // set server-side modules
-  frappe.models.SalesInvoice.documentClass = SalesInvoiceServer;
-  frappe.models.Payment.documentClass = PaymentServer;
-  frappe.models.Party.documentClass = PartyServer;
-  frappe.models.PurchaseInvoice.documentClass = PurchaseInvoiceServer;
-  frappe.models.JournalEntry.documentClass = JournalEntryServer;
-
-  frappe.metaCache = {};
-
-  // init naming series if missing
-  await createNumberSeries('SINV-', 'SalesInvoice');
-  await createNumberSeries('PINV-', 'PurchaseInvoice');
-  await createNumberSeries('PAY-', 'Payment');
-  await createNumberSeries('JV-', 'JournalEntry');
-
-  // fetch singles
-  // so that they are available synchronously
-  await frappe.getSingle('SystemSettings');
-  await frappe.getSingle('AccountingSettings');
-  await frappe.getSingle('GetStarted');
-
-  // cache currency symbols for frappe.format
-  await setCurrencySymbols();
-}
-
-export async function setCurrencySymbols() {
-  frappe.currencySymbols = await frappe.db
-    .getAll({
-      doctype: 'Currency',
-      fields: ['name', 'symbol'],
-    })
-    .then((data) => {
-      return data.reduce((obj, currency) => {
-        obj[currency.name] = currency.symbol;
-        return obj;
-      }, {});
-    });
-}
diff --git a/src/postStart.ts b/src/postStart.ts
new file mode 100644
index 00000000..0196b22f
--- /dev/null
+++ b/src/postStart.ts
@@ -0,0 +1,33 @@
+import frappe from 'frappe';
+import { createNumberSeries } from 'frappe/model/naming';
+import { getValueMapFromList } from 'utils';
+
+export default async function postStart() {
+  await createDefaultNumberSeries();
+  await setSingles();
+  await setCurrencySymbols();
+}
+
+async function createDefaultNumberSeries() {
+  await createNumberSeries('SINV-', 'SalesInvoice');
+  await createNumberSeries('PINV-', 'PurchaseInvoice');
+  await createNumberSeries('PAY-', 'Payment');
+  await createNumberSeries('JV-', 'JournalEntry');
+}
+
+async function setSingles() {
+  await frappe.doc.getSingle('AccountingSettings');
+  await frappe.doc.getSingle('GetStarted');
+}
+
+async function setCurrencySymbols() {
+  const currencies = (await frappe.db.getAll('Currency', {
+    fields: ['name', 'symbol'],
+  })) as { name: string; symbol: string }[];
+
+  frappe.currencySymbols = getValueMapFromList(
+    currencies,
+    'name',
+    'symbol'
+  ) as Record<string, string | undefined>;
+}

From 76bf6cfda5ab93700f8130500eabdaa02fb84153 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 18 Apr 2022 16:59:20 +0530
Subject: [PATCH 055/163] incr: rem singleton from index.ts cause can't test -
 update models to not use singleton export

---
 accounting/exchangeRate.ts                    |   4 +-
 accounting/ledgerPosting.ts                   |  41 +++--
 backend/database/core.ts                      |   9 +-
 backend/database/manager.ts                   |   3 +-
 backend/database/types.ts                     |   7 +-
 frappe/README.md                              |  14 +-
 frappe/core/authHandler.ts                    |  16 +-
 frappe/core/converter.ts                      |  15 +-
 frappe/core/dbHandler.ts                      |   6 +-
 frappe/core/docHandler.ts                     |   2 +-
 frappe/core/types.ts                          |  38 ++++-
 frappe/demux/auth.ts                          |  22 +++
 frappe/demux/config.ts                        |  55 ++++++
 frappe/index.ts                               |  51 ++++--
 frappe/model/doc.ts                           |  94 +++++++----
 frappe/model/helpers.ts                       |   7 +-
 frappe/model/naming.ts                        |  28 ++--
 frappe/model/types.ts                         |   7 +-
 frappe/models/NumberSeries.ts                 |   3 +-
 frappe/telemetry/helpers.ts                   | 116 +++++++++++++
 {src => frappe}/telemetry/telemetry.ts        |  50 ++++--
 {src => frappe}/telemetry/types.ts            |  12 +-
 frappe/tests/helpers.ts                       |   7 +
 frappe/tests/testFrappe.spec.ts               |  39 ++++-
 frappe/utils/consts.ts                        |  12 +-
 frappe/utils/format.ts                        |  32 ++--
 models/README.md                              |   3 +
 models/baseModels/Account/Account.ts          |  41 +++--
 models/baseModels/Account/types.ts            |  27 +++
 .../AccountingLedgerEntry.ts                  |   8 +-
 models/baseModels/Address/Address.ts          |   3 +-
 models/baseModels/Invoice/Invoice.ts          |  23 +--
 models/baseModels/InvoiceItem/InvoiceItem.ts  |   8 +-
 models/baseModels/Item/Item.ts                |  73 ++++----
 .../baseModels/JournalEntry/JournalEntry.ts   |  82 ++++-----
 .../JournalEntryAccount.ts                    |   3 +-
 models/baseModels/Party/Party.ts              | 153 +++++++++--------
 models/baseModels/Payment/Payment.ts          | 157 ++++++++++--------
 models/baseModels/PaymentFor/PaymentFor.ts    |   3 +-
 .../PurchaseInvoice/PurchaseInvoice.ts        |  40 +++--
 .../baseModels/SalesInvoice/SalesInvoice.ts   |  40 +++--
 models/baseModels/SetupWizard/SetupWizard.ts  |   4 +-
 models/baseModels/Tax/Tax.ts                  |   4 +-
 models/helpers.ts                             |  15 +-
 models/index.ts                               |   7 +-
 models/regionalModels/in/Party.ts             |   2 +-
 models/types.ts                               |  30 ++++
 schemas/app/Account.json                      |   5 +-
 schemas/index.ts                              |   8 +-
 schemas/types.ts                              |   2 -
 src/config.ts                                 |  26 ---
 src/dataImport.ts                             |   4 +-
 src/errorHandling.ts                          |   6 +-
 src/initFyo.ts                                |   3 +
 src/postStart.ts                              |  24 ++-
 src/renderer/helpers.ts                       |   7 +-
 src/renderer/registerIpcRendererListeners.ts  |   2 +-
 src/router.js                                 |   4 +-
 src/telemetry/helpers.ts                      | 129 --------------
 tsconfig.json                                 |   2 +-
 utils/auth/types.ts                           |   5 +
 utils/config.ts                               |   4 +
 62 files changed, 1009 insertions(+), 638 deletions(-)
 create mode 100644 frappe/demux/auth.ts
 create mode 100644 frappe/demux/config.ts
 create mode 100644 frappe/telemetry/helpers.ts
 rename {src => frappe}/telemetry/telemetry.ts (79%)
 rename {src => frappe}/telemetry/types.ts (83%)
 create mode 100644 frappe/tests/helpers.ts
 create mode 100644 models/baseModels/Account/types.ts
 delete mode 100644 src/config.ts
 create mode 100644 src/initFyo.ts
 delete mode 100644 src/telemetry/helpers.ts
 create mode 100644 utils/auth/types.ts
 create mode 100644 utils/config.ts

diff --git a/accounting/exchangeRate.ts b/accounting/exchangeRate.ts
index bdbdf78a..e40ca95c 100644
--- a/accounting/exchangeRate.ts
+++ b/accounting/exchangeRate.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { NotFoundError } from 'frappe/utils/errors';
 import { DateTime } from 'luxon';
 
 export async function getExchangeRate({
@@ -15,7 +15,7 @@ export async function getExchangeRate({
   }
 
   if (!fromCurrency || !toCurrency) {
-    throw new frappe.errors.NotFoundError(
+    throw new NotFoundError(
       'Please provide `fromCurrency` and `toCurrency` to get exchange rate.'
     );
   }
diff --git a/accounting/ledgerPosting.ts b/accounting/ledgerPosting.ts
index ddb7f383..5868620b 100644
--- a/accounting/ledgerPosting.ts
+++ b/accounting/ledgerPosting.ts
@@ -1,5 +1,6 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import Doc from 'frappe/model/doc';
+import { ValidationError } from 'frappe/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 import {
   AccountEntry,
@@ -18,7 +19,12 @@ export class LedgerPosting {
   reverted: boolean;
   accountEntries: AccountEntry[];
 
-  constructor({ reference, party, date, description }: LedgerPostingOptions) {
+  frappe: Frappe;
+
+  constructor(
+    { reference, party, date, description }: LedgerPostingOptions,
+    frappe: Frappe
+  ) {
     this.reference = reference;
     this.party = party;
     this.date = date;
@@ -28,6 +34,8 @@ export class LedgerPosting {
     this.reverted = false;
     // To change balance while entering ledger entries
     this.accountEntries = [];
+
+    this.frappe = frappe;
   }
 
   async debit(
@@ -58,7 +66,7 @@ export class LedgerPosting {
     amount: Money
   ) {
     const debitAccounts = ['Asset', 'Expense'];
-    const accountDoc = await frappe.doc.getDoc('Account', accountName);
+    const accountDoc = await this.frappe.doc.getDoc('Account', accountName);
     const rootType = accountDoc.rootType as string;
 
     if (debitAccounts.indexOf(rootType) === -1) {
@@ -86,8 +94,8 @@ export class LedgerPosting {
         referenceName: referenceName ?? this.reference.name!,
         description: this.description,
         reverted: this.reverted,
-        debit: frappe.pesa(0),
-        credit: frappe.pesa(0),
+        debit: this.frappe.pesa(0),
+        credit: this.frappe.pesa(0),
       };
 
       this.entries.push(entry);
@@ -105,7 +113,7 @@ export class LedgerPosting {
   async postReverse() {
     this.validateEntries();
 
-    const data = await frappe.db.getAll('AccountingLedgerEntry', {
+    const data = await this.frappe.db.getAll('AccountingLedgerEntry', {
       fields: ['name'],
       filters: {
         referenceName: this.reference.name!,
@@ -114,7 +122,7 @@ export class LedgerPosting {
     });
 
     for (const entry of data) {
-      const entryDoc = await frappe.doc.getDoc(
+      const entryDoc = await this.frappe.doc.getDoc(
         'AccountingLedgerEntry',
         entry.name as string
       );
@@ -157,18 +165,21 @@ export class LedgerPosting {
   validateEntries() {
     const { debit, credit } = this.getTotalDebitAndCredit();
     if (debit.neq(credit)) {
-      throw new frappe.errors.ValidationError(
-        `Total Debit: ${frappe.format(
+      throw new ValidationError(
+        `Total Debit: ${this.frappe.format(
           debit,
           'Currency'
-        )} must be equal to Total Credit: ${frappe.format(credit, 'Currency')}`
+        )} must be equal to Total Credit: ${this.frappe.format(
+          credit,
+          'Currency'
+        )}`
       );
     }
   }
 
   getTotalDebitAndCredit() {
-    let debit = frappe.pesa(0);
-    let credit = frappe.pesa(0);
+    let debit = this.frappe.pesa(0);
+    let credit = this.frappe.pesa(0);
 
     for (const entry of this.entries) {
       debit = debit.add(entry.debit);
@@ -180,12 +191,12 @@ export class LedgerPosting {
 
   async insertEntries() {
     for (const entry of this.entries) {
-      const entryDoc = frappe.doc.getNewDoc('AccountingLedgerEntry');
+      const entryDoc = this.frappe.doc.getNewDoc('AccountingLedgerEntry');
       Object.assign(entryDoc, entry);
       await entryDoc.insert();
     }
     for (const entry of this.accountEntries) {
-      const entryDoc = await frappe.doc.getDoc('Account', entry.name);
+      const entryDoc = await this.frappe.doc.getDoc('Account', entry.name);
       const balance = entryDoc.get('balance') as Money;
       entryDoc.balance = balance.add(entry.balanceChange);
       await entryDoc.update();
@@ -193,6 +204,6 @@ export class LedgerPosting {
   }
 
   getRoundOffAccount() {
-    return frappe.singles.AccountingSettings!.roundOffAccount as string;
+    return this.frappe.singles.AccountingSettings!.roundOffAccount as string;
   }
 }
diff --git a/backend/database/core.ts b/backend/database/core.ts
index b2630801..14dab13f 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -18,7 +18,12 @@ import {
 import { getRandomString, getValueMapFromList } from '../../utils';
 import { DatabaseBase, GetAllOptions, QueryFilter } from '../../utils/db/types';
 import { getDefaultMetaFieldValueMap, sqliteTypeMap, SYSTEM } from '../helpers';
-import { ColumnDiff, FieldValueMap, GetQueryBuilderOptions } from './types';
+import {
+  ColumnDiff,
+  FieldValueMap,
+  GetQueryBuilderOptions,
+  SingleValue,
+} from './types';
 
 /**
  * # DatabaseCore
@@ -256,7 +261,7 @@ export default class DatabaseCore extends DatabaseBase {
 
   async getSingleValues(
     ...fieldnames: ({ fieldname: string; parent?: string } | string)[]
-  ): Promise<{ fieldname: string; parent: string; value: RawValue }[]> {
+  ): Promise<SingleValue<RawValue>> {
     const fieldnameList = fieldnames.map((fieldname) => {
       if (typeof fieldname === 'string') {
         return { fieldname };
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index b08677b9..2555a99a 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -21,8 +21,7 @@ export class DatabaseManager extends DatabaseDemuxBase {
 
   async createNewDatabase(dbPath: string, countryCode: string) {
     await this.#unlinkIfExists(dbPath);
-    await this.connectToDatabase(dbPath, countryCode);
-    return countryCode;
+    return await this.connectToDatabase(dbPath, countryCode);
   }
 
   async connectToDatabase(dbPath: string, countryCode?: string) {
diff --git a/backend/database/types.ts b/backend/database/types.ts
index 6dcf0ab8..6ccd0cce 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -45,4 +45,9 @@ export interface SqliteTableInfo {
   dflt_value: string | null;
 }
 
-export type BespokeFunction = (db:DatabaseCore, ...args: unknown[]) => Promise<unknown>
\ No newline at end of file
+export type BespokeFunction = (db:DatabaseCore, ...args: unknown[]) => Promise<unknown>
+export type SingleValue<T> = {
+  fieldname: string;
+  parent: string;
+  value: T;
+}[];
\ No newline at end of file
diff --git a/frappe/README.md b/frappe/README.md
index f38d2f6c..5271c738 100644
--- a/frappe/README.md
+++ b/frappe/README.md
@@ -5,7 +5,7 @@ removed into a separate repo, but as of now it's in gestation.
 
 The reason for maintaining a framework is to allow for varied backends.
 Currently Books runs on the electron renderer process and all db stuff happens
-on the electron main process which has access to node libs. As the development
+on the electron main process which has access to nodelibs. As the development
 of `Fyo` progresses it will allow for a browser frontend and a node server
 backend.
 
@@ -70,6 +70,9 @@ other things.
 - Get models and `regionalModels` using `countryCode` from `models/index.ts/getRegionalModels`.
 - Call `fyo.initializeAndRegister` with the all models.
 
+_Note: since **SystemSettings** are initialized on `fyo.initializeAndRegister`
+db needs to be set first else an error will be thrown_
+
 ## Testing
 
 For testing the `fyo` class, `mocha` is used (`node` side). So for this the
@@ -77,15 +80,18 @@ demux classes are directly replaced by `node` side managers such as
 `DatabaseManager`.
 
 For this to work the class signatures of the demux class and the manager have to
-be the same.
+be the same which is maintained by abstract demux classes.
+
+`DatabaseManager` is used as the `DatabaseDemux` for testing without API or IPC
+calls. For `AuthDemux` the `DummyAuthDemux` class is used.
 
 ## Translations
 
 All translations take place during runtime, for translations to work, a
-`LanguageMap` (for def check `utils/types.ts`) has to be set. 
+`LanguageMap` (for def check `utils/types.ts`) has to be set.
 
 This can be done using `fyo/utils/translation.ts/setLanguageMapOnTranslationString`.
 
 Since translations are runtime, if the code is evaluated before the language map
 is loaded, translations won't work. To prevent this, don't maintain translation
-strings globally.
\ No newline at end of file
+strings globally.
diff --git a/frappe/core/authHandler.ts b/frappe/core/authHandler.ts
index d1f727c0..5bd6f1fb 100644
--- a/frappe/core/authHandler.ts
+++ b/frappe/core/authHandler.ts
@@ -1,4 +1,7 @@
 import { Frappe } from 'frappe';
+import { AuthDemux } from 'frappe/demux/auth';
+import { AuthDemuxBase, TelemetryCreds } from 'utils/auth/types';
+import { AuthDemuxConstructor } from './types';
 
 interface AuthConfig {
   serverURL: string;
@@ -15,8 +18,9 @@ export class AuthHandler {
   #config: AuthConfig;
   #session: Session;
   frappe: Frappe;
+  #demux: AuthDemuxBase;
 
-  constructor(frappe: Frappe) {
+  constructor(frappe: Frappe, Demux?: AuthDemuxConstructor) {
     this.frappe = frappe;
     this.#config = {
       serverURL: '',
@@ -28,6 +32,12 @@ export class AuthHandler {
       user: '',
       token: '',
     };
+
+    if (Demux !== undefined) {
+      this.#demux = new Demux(frappe.isElectron);
+    } else {
+      this.#demux = new AuthDemux(frappe.isElectron);
+    }
   }
 
   get session(): Readonly<Session> {
@@ -90,4 +100,8 @@ export class AuthHandler {
   #getServerURL() {
     return this.#config.serverURL || '';
   }
+
+  async getTelemetryCreds(): Promise<TelemetryCreds> {
+    return await this.#demux.getTelemetryCreds();
+  }
 }
diff --git a/frappe/core/converter.ts b/frappe/core/converter.ts
index 60eb5b9e..0d70c042 100644
--- a/frappe/core/converter.ts
+++ b/frappe/core/converter.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import Doc from 'frappe/model/doc';
 import Money from 'pesa/dist/types/src/money';
 import { FieldType, FieldTypeEnum, RawValue } from 'schemas/types';
@@ -22,9 +22,11 @@ import { DocValue, DocValueMap, RawValueMap } from './types';
 
 export class Converter {
   db: DatabaseHandler;
+  frappe: Frappe;
 
-  constructor(db: DatabaseHandler) {
+  constructor(db: DatabaseHandler, frappe: Frappe) {
     this.db = db;
+    this.frappe = frappe;
   }
 
   toDocValueMap(
@@ -49,7 +51,11 @@ export class Converter {
     }
   }
 
-  static toDocValue(value: RawValue, fieldtype: FieldType): DocValue {
+  static toDocValue(
+    value: RawValue,
+    fieldtype: FieldType,
+    frappe: Frappe
+  ): DocValue {
     switch (fieldtype) {
       case FieldTypeEnum.Currency:
         return frappe.pesa((value ?? 0) as string | number);
@@ -112,7 +118,8 @@ export class Converter {
       } else {
         docValueMap[fieldname] = Converter.toDocValue(
           rawValue,
-          field.fieldtype
+          field.fieldtype,
+          this.frappe
         );
       }
     }
diff --git a/frappe/core/dbHandler.ts b/frappe/core/dbHandler.ts
index ff6edad3..7014e486 100644
--- a/frappe/core/dbHandler.ts
+++ b/frappe/core/dbHandler.ts
@@ -1,3 +1,4 @@
+import { SingleValue } from 'backend/database/types';
 import { Frappe } from 'frappe';
 import { DatabaseDemux } from 'frappe/demux/db';
 import { Field, RawValue, SchemaMap } from 'schemas/types';
@@ -9,7 +10,6 @@ import {
   DocValue,
   DocValueMap,
   RawValueMap,
-  SingleValue,
 } from './types';
 
 // Return types of Bespoke Queries
@@ -27,7 +27,7 @@ export class DatabaseHandler extends DatabaseBase {
   constructor(frappe: Frappe, Demux?: DatabaseDemuxConstructor) {
     super();
     this.#frappe = frappe;
-    this.converter = new Converter(this);
+    this.converter = new Converter(this, this.#frappe);
 
     if (Demux !== undefined) {
       this.#demux = new Demux(frappe.isElectron);
@@ -117,7 +117,7 @@ export class DatabaseHandler extends DatabaseBase {
     const docSingleValue: SingleValue<DocValue> = [];
     for (const sv of rawSingleValue) {
       const fieldtype = this.fieldValueMap[sv.parent][sv.fieldname].fieldtype;
-      const value = Converter.toDocValue(sv.value, fieldtype);
+      const value = Converter.toDocValue(sv.value, fieldtype, this.#frappe);
 
       docSingleValue.push({
         value,
diff --git a/frappe/core/docHandler.ts b/frappe/core/docHandler.ts
index bdf40063..8db4e1e2 100644
--- a/frappe/core/docHandler.ts
+++ b/frappe/core/docHandler.ts
@@ -164,7 +164,7 @@ export class DocHandler {
       throw new Error(`Schema not found for ${schemaName}`);
     }
 
-    const doc = new Model(schema, data);
+    const doc = new Model(schema, data, this.frappe);
     doc.setDefaults();
     return doc;
   }
diff --git a/frappe/core/types.ts b/frappe/core/types.ts
index 4a8afa49..8b7ae7ba 100644
--- a/frappe/core/types.ts
+++ b/frappe/core/types.ts
@@ -1,21 +1,45 @@
 import Doc from 'frappe/model/doc';
 import Money from 'pesa/dist/types/src/money';
 import { RawValue } from 'schemas/types';
+import { AuthDemuxBase } from 'utils/auth/types';
 import { DatabaseDemuxBase } from 'utils/db/types';
 
 export type DocValue = string | number | boolean | Date | Money | null;
 export type DocValueMap = Record<string, DocValue | Doc[] | DocValueMap[]>;
 export type RawValueMap = Record<string, RawValue | RawValueMap[]>;
 
-export type SingleValue<T> = {
-  fieldname: string;
-  parent: string;
-  value: T;
-}[];
-
 /**
  * DatabaseDemuxConstructor: type for a constructor that returns a DatabaseDemuxBase
  * it's typed this way because `typeof AbstractClass` is invalid as abstract classes
  * can't be initialized using `new`.
+ *
+ * AuthDemuxConstructor: same as the above but for AuthDemuxBase
  */
-export type DatabaseDemuxConstructor = new (isElectron?: boolean)=> DatabaseDemuxBase
\ No newline at end of file
+
+export type DatabaseDemuxConstructor = new (
+  isElectron?: boolean
+) => DatabaseDemuxBase;
+
+export type AuthDemuxConstructor = new (isElectron?: boolean) => AuthDemuxBase;
+
+export enum ConfigKeys {
+  Files = 'files',
+  LastSelectedFilePath = 'lastSelectedFilePath',
+  Language = 'language',
+  DeviceId = 'deviceId',
+  Telemetry = 'telemetry',
+  OpenCount = 'openCount',
+}
+
+export interface ConfigFile {
+  id: string;
+  companyName: string;
+  filePath: string;
+}
+
+export interface FyoConfig {
+  DatabaseDemux?: DatabaseDemuxConstructor;
+  AuthDemux?: AuthDemuxConstructor;
+  isElectron?: boolean;
+  isTest?: boolean;
+}
diff --git a/frappe/demux/auth.ts b/frappe/demux/auth.ts
new file mode 100644
index 00000000..e9ea5136
--- /dev/null
+++ b/frappe/demux/auth.ts
@@ -0,0 +1,22 @@
+import { ipcRenderer } from 'electron';
+import { AuthDemuxBase, TelemetryCreds } from 'utils/auth/types';
+import { IPC_ACTIONS } from 'utils/messages';
+
+export class AuthDemux extends AuthDemuxBase {
+  #isElectron: boolean = false;
+  constructor(isElectron: boolean) {
+    super();
+    this.#isElectron = isElectron;
+  }
+
+  async getTelemetryCreds(): Promise<TelemetryCreds> {
+    if (this.#isElectron) {
+      const creds = await ipcRenderer.invoke(IPC_ACTIONS.GET_CREDS);
+      const url: string = creds?.telemetryUrl ?? '';
+      const token: string = creds?.tokenString ?? '';
+      return { url, token };
+    } else {
+      return { url: '', token: '' };
+    }
+  }
+}
diff --git a/frappe/demux/config.ts b/frappe/demux/config.ts
new file mode 100644
index 00000000..2126c631
--- /dev/null
+++ b/frappe/demux/config.ts
@@ -0,0 +1,55 @@
+import config from 'utils/config';
+
+export class Config {
+  #isElectron: boolean;
+  fallback: Map<string, unknown> = new Map();
+  constructor(isElectron: boolean) {
+    this.#isElectron = isElectron;
+  }
+
+  get store(): Record<string, unknown> {
+    if (this.#isElectron) {
+      return config.store;
+    } else {
+      const store: Record<string, unknown> = {};
+
+      for (const key of this.fallback.keys()) {
+        store[key] = this.fallback.get(key);
+      }
+
+      return store;
+    }
+  }
+
+  get(key: string, defaultValue?: unknown): unknown {
+    if (this.#isElectron) {
+      return config.get(key, defaultValue);
+    } else {
+      return this.fallback.get(key) ?? defaultValue;
+    }
+  }
+
+  set(key: string, value: unknown) {
+    if (this.#isElectron) {
+      config.set(key, value);
+    } else {
+      this.fallback.set(key, value);
+    }
+  }
+
+  delete(key: string) {
+    if (this.#isElectron) {
+      config.delete(key);
+    } else {
+      this.fallback.delete(key);
+    }
+  }
+
+  clear() {
+    if (this.#isElectron) {
+      config.clear();
+    } else {
+      this.fallback.clear();
+    }
+  }
+}
diff --git a/frappe/index.ts b/frappe/index.ts
index 398ed0a4..c14d705f 100644
--- a/frappe/index.ts
+++ b/frappe/index.ts
@@ -1,10 +1,14 @@
 import { getMoneyMaker, MoneyMaker } from 'pesa';
+import { Field } from 'schemas/types';
 import { markRaw } from 'vue';
 import { AuthHandler } from './core/authHandler';
 import { DatabaseHandler } from './core/dbHandler';
 import { DocHandler } from './core/docHandler';
-import { DatabaseDemuxConstructor } from './core/types';
+import { DocValue, FyoConfig } from './core/types';
+import { Config } from './demux/config';
+import Doc from './model/doc';
 import { ModelMap } from './model/types';
+import { TelemetryManager } from './telemetry/telemetry';
 import {
   DEFAULT_CURRENCY,
   DEFAULT_DISPLAY_PRECISION,
@@ -18,10 +22,9 @@ import { ErrorLog } from './utils/types';
 export class Frappe {
   t = t;
   T = T;
-  format = format;
 
   errors = errors;
-  isElectron = false;
+  isElectron: boolean;
 
   pesa: MoneyMaker;
 
@@ -38,21 +41,27 @@ export class Frappe {
   currencyFormatter?: Intl.NumberFormat;
   currencySymbols: Record<string, string | undefined> = {};
 
-  constructor(DatabaseDemux?: DatabaseDemuxConstructor) {
-    /**
-     * `DatabaseManager` can be passed as the `DatabaseDemux` for
-     * testing this class without API or IPC calls.
-     */
-    this.auth = new AuthHandler(this);
-    this.db = new DatabaseHandler(this, DatabaseDemux);
+  isTest: boolean;
+  telemetry: TelemetryManager;
+  config: Config;
+
+  constructor(conf: FyoConfig = {}) {
+    this.isTest = conf.isTest ?? false;
+    this.isElectron = conf.isElectron ?? true;
+
+    this.auth = new AuthHandler(this, conf.AuthDemux);
+    this.db = new DatabaseHandler(this, conf.DatabaseDemux);
     this.doc = new DocHandler(this);
 
     this.pesa = getMoneyMaker({
-      currency: 'XXX',
+      currency: DEFAULT_CURRENCY,
       precision: DEFAULT_INTERNAL_PRECISION,
       display: DEFAULT_DISPLAY_PRECISION,
       wrapper: markRaw,
     });
+
+    this.telemetry = new TelemetryManager(this);
+    this.config = new Config(this.isElectron);
   }
 
   get initialized() {
@@ -75,6 +84,19 @@ export class Frappe {
     return this.db.schemaMap;
   }
 
+  format(value: DocValue, field: string | Field, doc?: Doc) {
+    return format(value, field, doc ?? null, this);
+  }
+
+  async setIsElectron() {
+    try {
+      const { ipcRenderer } = await import('electron');
+      this.isElectron = Boolean(ipcRenderer);
+    } catch {
+      this.isElectron = false;
+    }
+  }
+
   async initializeAndRegister(
     models: ModelMap = {},
     regionalModels: ModelMap = {},
@@ -138,9 +160,9 @@ export class Frappe {
     });
   }
 
-  close() {
-    this.db.close();
-    this.auth.logout();
+  async close() {
+    await this.db.close();
+    await this.auth.logout();
   }
 
   store = {
@@ -150,4 +172,3 @@ export class Frappe {
 }
 
 export { T, t };
-export default new Frappe();
diff --git a/frappe/model/doc.ts b/frappe/model/doc.ts
index dd09ae8c..1451c4ca 100644
--- a/frappe/model/doc.ts
+++ b/frappe/model/doc.ts
@@ -1,6 +1,6 @@
-import telemetry from '@/telemetry/telemetry';
-import { Verb } from '@/telemetry/types';
+import { Frappe } from 'frappe';
 import { DocValue, DocValueMap } from 'frappe/core/types';
+import { Verb } from 'frappe/telemetry/types';
 import {
   Conflict,
   MandatoryError,
@@ -17,7 +17,6 @@ import {
   TargetField,
 } from 'schemas/types';
 import { getIsNullOrUndef, getMapFromList } from 'utils';
-import frappe from '..';
 import { getRandomString, isPesa } from '../utils/index';
 import {
   areDocValuesEqual,
@@ -47,6 +46,7 @@ import { validateSelect } from './validationFunction';
 export default class Doc extends Observable<DocValue | Doc[]> {
   name?: string;
   schema: Readonly<Schema>;
+  frappe: Frappe;
   fieldMap: Record<string, Field>;
 
   /**
@@ -66,11 +66,16 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     revertAction: false,
   };
 
-  constructor(schema: Schema, data: DocValueMap) {
+  constructor(schema: Schema, data: DocValueMap, frappe: Frappe) {
     super();
+    this.frappe = frappe;
     this.schema = schema;
     this._setInitialValues(data);
     this.fieldMap = getMapFromList(schema.fields, 'fieldname');
+
+    if (this.schema.isSingle) {
+      this.name = this.schemaName;
+    }
   }
 
   get schemaName(): string {
@@ -183,7 +188,10 @@ export default class Doc extends Observable<DocValue | Doc[]> {
         continue;
       }
 
-      let defaultValue: DocValue | Doc[] = getPreDefaultValues(field.fieldtype);
+      let defaultValue: DocValue | Doc[] = getPreDefaultValues(
+        field.fieldtype,
+        this.frappe
+      );
       const defaultFunction = this.defaults[field.fieldname];
 
       if (defaultFunction !== undefined) {
@@ -193,7 +201,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       }
 
       if (field.fieldtype === 'Currency' && !isPesa(defaultValue)) {
-        defaultValue = frappe.pesa!(defaultValue as string | number);
+        defaultValue = this.frappe.pesa!(defaultValue as string | number);
       }
 
       this[field.fieldname] = defaultValue;
@@ -235,8 +243,8 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
 
     const childSchemaName = this.fieldMap[fieldname] as TargetField;
-    const schema = frappe.db.schemaMap[childSchemaName.target] as Schema;
-    const childDoc = new Doc(schema, data as DocValueMap);
+    const schema = this.frappe.db.schemaMap[childSchemaName.target] as Schema;
+    const childDoc = new Doc(schema, data as DocValueMap, this.frappe);
     childDoc.setDefaults();
     return childDoc;
   }
@@ -263,7 +271,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
     if (missingMandatoryMessage.length > 0) {
       const fields = missingMandatoryMessage.join('\n');
-      const message = frappe.t`Value missing for ${fields}`;
+      const message = this.frappe.t`Value missing for ${fields}`;
       throw new MandatoryError(message);
     }
   }
@@ -322,7 +330,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
 
     if (!this.createdBy) {
-      this.createdBy = frappe.auth.session.user;
+      this.createdBy = this.frappe.auth.session.user;
     }
 
     if (!this.created) {
@@ -333,7 +341,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   }
 
   updateModified() {
-    this.modifiedBy = frappe.auth.session.user;
+    this.modifiedBy = this.frappe.auth.session.user;
     this.modified = new Date();
   }
 
@@ -342,7 +350,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
 
-    const data = await frappe.db.get(this.schemaName, this.name);
+    const data = await this.frappe.db.get(this.schemaName, this.name);
+    if (this.schema.isSingle && !data?.name) {
+      data.name = this.name!;
+    }
+
     if (data && data.name) {
       this.syncValues(data);
       if (this.schema.isSingle) {
@@ -375,7 +387,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
 
-    this._links[fieldname] = await frappe.doc.getDoc(
+    this._links[fieldname] = await this.frappe.doc.getDoc(
       field.target,
       value as string
     );
@@ -422,7 +434,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
 
-    const currentDoc = await frappe.db.get(this.schemaName, this.name);
+    const currentDoc = await this.frappe.db.get(this.schemaName, this.name);
 
     // check for conflict
     if (
@@ -430,13 +442,14 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       (this.modified as Date) !== (currentDoc.modified as Date)
     ) {
       throw new Conflict(
-        frappe.t`Document ${this.schemaName} ${this.name} has been modified after loading`
+        this.frappe
+          .t`Document ${this.schemaName} ${this.name} has been modified after loading`
       );
     }
 
     if (this.submitted && !this.schema.isSubmittable) {
       throw new ValidationError(
-        frappe.t`Document type ${this.schemaName} is not submittable`
+        this.frappe.t`Document type ${this.schemaName} is not submittable`
       );
     }
 
@@ -532,24 +545,27 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async insert() {
-    await setName(this);
+    await setName(this, this.frappe);
     this.setBaseMetaValues();
     await this.commit();
     await this.validateInsert();
     await this.trigger('beforeInsert', null);
 
     const oldName = this.name!;
-    const data = await frappe.db.insert(this.schemaName, this.getValidDict());
+    const data = await this.frappe.db.insert(
+      this.schemaName,
+      this.getValidDict()
+    );
     this.syncValues(data);
 
     if (oldName !== this.name) {
-      frappe.doc.removeFromCache(this.schemaName, oldName);
+      this.frappe.doc.removeFromCache(this.schemaName, oldName);
     }
 
     await this.trigger('afterInsert', null);
     await this.trigger('afterSave', null);
 
-    telemetry.log(Verb.Created, this.schemaName);
+    this.frappe.telemetry.log(Verb.Created, this.schemaName);
     return this;
   }
 
@@ -566,7 +582,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     this.updateModified();
 
     const data = this.getValidDict();
-    await frappe.db.update(this.schemaName, data);
+    await this.frappe.db.update(this.schemaName, data);
     this.syncValues(data);
 
     await this.trigger('afterUpdate');
@@ -589,10 +605,10 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
   async delete() {
     await this.trigger('beforeDelete');
-    await frappe.db.delete(this.schemaName, this.name!);
+    await this.frappe.db.delete(this.schemaName, this.name!);
     await this.trigger('afterDelete');
 
-    telemetry.log(Verb.Deleted, this.schemaName);
+    this.frappe.telemetry.log(Verb.Deleted, this.schemaName);
   }
 
   async submitOrRevert(isSubmit: boolean) {
@@ -617,7 +633,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
   async rename(newName: string) {
     await this.trigger('beforeRename');
-    await frappe.db.rename(this.schemaName, this.name!, newName);
+    await this.frappe.db.rename(this.schemaName, this.name!, newName);
     this.name = newName;
     await this.trigger('afterRename');
   }
@@ -637,7 +653,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
         const value = d.get(childfield) ?? 0;
         if (!isPesa(value)) {
           try {
-            return frappe.pesa(value as string | number);
+            return this.frappe.pesa(value as string | number);
           } catch (err) {
             (
               err as Error
@@ -647,7 +663,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
         }
         return value as Money;
       })
-      .reduce((a, b) => a.add(b), frappe.pesa(0));
+      .reduce((a, b) => a.add(b), this.frappe.pesa(0));
 
     if (convertToFloat) {
       return sum.float;
@@ -660,7 +676,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return '';
     }
 
-    return frappe.doc.getCachedValue(schemaName, name, fieldname);
+    return this.frappe.doc.getCachedValue(schemaName, name, fieldname);
   }
 
   async duplicate(shouldInsert: boolean = true): Promise<Doc> {
@@ -690,7 +706,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       updateMap.name = updateMap.name + ' CPY';
     }
 
-    const doc = frappe.doc.getEmptyDoc(this.schemaName, false);
+    const doc = this.frappe.doc.getEmptyDoc(this.schemaName, false);
     await doc.setMultiple(updateMap);
 
     if (shouldInsert) {
@@ -700,6 +716,16 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return doc;
   }
 
+  async beforeInsert() {}
+  async afterInsert() {}
+  async beforeUpdate() {}
+  async afterUpdate() {}
+  async afterSave() {}
+  async beforeDelete() {}
+  async afterDelete() {}
+  async beforeRevert() {}
+  async afterRevert() {}
+
   formulas: FormulaMap = {};
   defaults: DefaultMap = {};
   validations: ValidationMap = {};
@@ -711,8 +737,14 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   static lists: ListsMap = {};
   static filters: FiltersMap = {};
   static emptyMessages: EmptyMessageMap = {};
-  static listSettings: ListViewSettings = {};
-  static treeSettings?: TreeViewSettings;
 
-  static actions: Action[] = [];
+  static getListViewSettings(frappe: Frappe): ListViewSettings {
+    return {};
+  }
+
+  static getTreeSettings(frappe: Frappe): TreeViewSettings | void {}
+
+  static getActions(frappe: Frappe): Action[] {
+    return [];
+  }
 }
diff --git a/frappe/model/helpers.ts b/frappe/model/helpers.ts
index 7a2c7088..4cb73afd 100644
--- a/frappe/model/helpers.ts
+++ b/frappe/model/helpers.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import { DocValue } from 'frappe/core/types';
 import { isPesa } from 'frappe/utils';
 import { isEqual } from 'lodash';
@@ -26,7 +26,10 @@ export function areDocValuesEqual(
   return isEqual(dvOne, dvTwo);
 }
 
-export function getPreDefaultValues(fieldtype: FieldType): DocValue | Doc[] {
+export function getPreDefaultValues(
+  fieldtype: FieldType,
+  frappe: Frappe
+): DocValue | Doc[] {
   switch (fieldtype) {
     case FieldTypeEnum.Table:
       return [] as Doc[];
diff --git a/frappe/model/naming.ts b/frappe/model/naming.ts
index 5a7b0ee6..9e3f399e 100644
--- a/frappe/model/naming.ts
+++ b/frappe/model/naming.ts
@@ -1,6 +1,7 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import NumberSeries from 'frappe/models/NumberSeries';
 import { getRandomString } from 'frappe/utils';
+import { DEFAULT_SERIES_START } from 'frappe/utils/consts';
 import { BaseError } from 'frappe/utils/errors';
 import { Field, Schema } from 'schemas/types';
 import Doc from './doc';
@@ -12,7 +13,7 @@ export function getNumberSeries(schema: Schema): Field | undefined {
   return numberSeries;
 }
 
-export function isNameAutoSet(schemaName: string): boolean {
+export function isNameAutoSet(schemaName: string, frappe: Frappe): boolean {
   const schema = frappe.schemaMap[schemaName]!;
   if (schema.naming === 'autoincrement') {
     return true;
@@ -26,17 +27,17 @@ export function isNameAutoSet(schemaName: string): boolean {
   return false;
 }
 
-export async function setName(doc: Doc) {
+export async function setName(doc: Doc, frappe: Frappe) {
   // if is server, always name again if autoincrement or other
   if (doc.schema.naming === 'autoincrement') {
-    doc.name = await getNextId(doc.schemaName);
+    doc.name = await getNextId(doc.schemaName, frappe);
     return;
   }
 
   // Current, per doc number series
   const numberSeries = doc.numberSeries as string | undefined;
   if (numberSeries !== undefined) {
-    doc.name = await getSeriesNext(numberSeries, doc.schemaName);
+    doc.name = await getSeriesNext(numberSeries, doc.schemaName, frappe);
     return;
   }
 
@@ -57,9 +58,9 @@ export async function setName(doc: Doc) {
   }
 }
 
-export async function getNextId(schemaName: string) {
+export async function getNextId(schemaName: string, frappe: Frappe) {
   // get the last inserted row
-  const lastInserted = await getLastInserted(schemaName);
+  const lastInserted = await getLastInserted(schemaName, frappe);
   let name = 1;
   if (lastInserted) {
     let lastNumber = parseInt(lastInserted.name as string);
@@ -69,7 +70,7 @@ export async function getNextId(schemaName: string) {
   return (name + '').padStart(9, '0');
 }
 
-export async function getLastInserted(schemaName: string) {
+export async function getLastInserted(schemaName: string, frappe: Frappe) {
   const lastInserted = await frappe.db.getAll(schemaName, {
     fields: ['name'],
     limit: 1,
@@ -79,7 +80,11 @@ export async function getLastInserted(schemaName: string) {
   return lastInserted && lastInserted.length ? lastInserted[0] : null;
 }
 
-export async function getSeriesNext(prefix: string, schemaName: string) {
+export async function getSeriesNext(
+  prefix: string,
+  schemaName: string,
+  frappe: Frappe
+) {
   let series: NumberSeries;
 
   try {
@@ -90,7 +95,7 @@ export async function getSeriesNext(prefix: string, schemaName: string) {
       throw e;
     }
 
-    await createNumberSeries(prefix, schemaName);
+    await createNumberSeries(prefix, schemaName, DEFAULT_SERIES_START, frappe);
     series = (await frappe.doc.getDoc('NumberSeries', prefix)) as NumberSeries;
   }
 
@@ -100,7 +105,8 @@ export async function getSeriesNext(prefix: string, schemaName: string) {
 export async function createNumberSeries(
   prefix: string,
   referenceType: string,
-  start = 1001
+  start: number,
+  frappe: Frappe
 ) {
   const exists = await frappe.db.exists('NumberSeries', prefix);
   if (exists) {
diff --git a/frappe/model/types.ts b/frappe/model/types.ts
index 215bf0d3..33e5032a 100644
--- a/frappe/model/types.ts
+++ b/frappe/model/types.ts
@@ -1,3 +1,4 @@
+import { Frappe } from 'frappe';
 import { DocValue, DocValueMap } from 'frappe/core/types';
 import SystemSettings from 'frappe/models/SystemSettings';
 import { FieldType } from 'schemas/types';
@@ -41,8 +42,8 @@ export type ModelMap = Record<string, typeof Doc | undefined>;
 export type DocMap = Record<string, Doc | undefined>;
 
 export interface SinglesMap {
-  SystemSettings?: SystemSettings
-  [key: string]: Doc | undefined
+  SystemSettings?: SystemSettings;
+  [key: string]: Doc | undefined;
 }
 
 // Static Config properties
@@ -50,7 +51,7 @@ export interface SinglesMap {
 export type FilterFunction = (doc: Doc) => QueryFilter;
 export type FiltersMap = Record<string, FilterFunction>;
 
-export type EmptyMessageFunction = (doc: Doc) => string;
+export type EmptyMessageFunction = (doc: Doc, frappe: Frappe) => string;
 export type EmptyMessageMap = Record<string, EmptyMessageFunction>;
 
 export type ListFunction = (doc?: Doc) => string[];
diff --git a/frappe/models/NumberSeries.ts b/frappe/models/NumberSeries.ts
index 96fbcc50..351ed8b1 100644
--- a/frappe/models/NumberSeries.ts
+++ b/frappe/models/NumberSeries.ts
@@ -1,4 +1,3 @@
-import frappe from 'frappe';
 import Doc from 'frappe/model/doc';
 
 function getPaddedName(prefix: string, next: number, padZeros: number): string {
@@ -32,7 +31,7 @@ export default class NumberSeries extends Doc {
     }
 
     const name = this.getPaddedName(this.current as number);
-    return await frappe.db.exists(schemaName, name);
+    return await this.frappe.db.exists(schemaName, name);
   }
 
   getPaddedName(next: number): string {
diff --git a/frappe/telemetry/helpers.ts b/frappe/telemetry/helpers.ts
new file mode 100644
index 00000000..6c0fa15f
--- /dev/null
+++ b/frappe/telemetry/helpers.ts
@@ -0,0 +1,116 @@
+import { Frappe } from 'frappe';
+import { ConfigFile, ConfigKeys } from 'frappe/core/types';
+import { DEFAULT_COUNTRY_CODE } from 'frappe/utils/consts';
+import { Count, TelemetrySetting, UniqueId } from './types';
+
+export function getId(): string {
+  let id: string = '';
+
+  for (let i = 0; i < 4; i++) {
+    id += Math.random().toString(36).slice(2, 9);
+  }
+
+  return id;
+}
+
+export function getCountry(): string {
+  // @ts-ignore
+  return frappe.singles.SystemSettings?.countryCode ?? DEFAULT_COUNTRY_CODE;
+}
+
+export function getLanguage(frappe: Frappe): string {
+  return frappe.config.get('language') as string;
+}
+
+export async function getCounts(
+  interestingDocs: string[],
+  frappe: Frappe
+): Promise<Count> {
+  const countMap: Count = {};
+  // @ts-ignore
+  if (frappe.db === undefined) {
+    return countMap;
+  }
+
+  for (const name of interestingDocs) {
+    const count: number = (await frappe.db.getAll(name)).length;
+    countMap[name] = count;
+  }
+
+  return countMap;
+}
+
+export function getDeviceId(frappe: Frappe): UniqueId {
+  let deviceId = frappe.config.get(ConfigKeys.DeviceId) as string | undefined;
+  if (deviceId === undefined) {
+    deviceId = getId();
+    frappe.config.set(ConfigKeys.DeviceId, deviceId);
+  }
+
+  return deviceId;
+}
+
+export function getInstanceId(frappe: Frappe): UniqueId {
+  const files = frappe.config.get(ConfigKeys.Files) as ConfigFile[];
+
+  // @ts-ignore
+  const companyName = frappe.AccountingSettings?.companyName;
+  if (companyName === undefined) {
+    return '';
+  }
+
+  const file = files.find((f) => f.companyName === companyName);
+
+  if (file === undefined) {
+    return addNewFile(companyName, files, frappe);
+  }
+
+  if (file.id === undefined) {
+    return setInstanceId(companyName, files, frappe);
+  }
+
+  return file.id;
+}
+
+function addNewFile(
+  companyName: string,
+  files: ConfigFile[],
+  frappe: Frappe
+): UniqueId {
+  const newFile: ConfigFile = {
+    companyName,
+    filePath: frappe.config.get(ConfigKeys.LastSelectedFilePath, '') as string,
+    id: getId(),
+  };
+
+  files.push(newFile);
+  frappe.config.set(ConfigKeys.Files, files);
+  return newFile.id;
+}
+
+function setInstanceId(
+  companyName: string,
+  files: ConfigFile[],
+  frappe: Frappe
+): UniqueId {
+  let id = '';
+  for (const file of files) {
+    if (file.id) {
+      continue;
+    }
+
+    file.id = getId();
+    if (file.companyName === companyName) {
+      id = file.id;
+    }
+  }
+
+  frappe.config.set(ConfigKeys.Files, files);
+  return id;
+}
+
+export const getTelemetryOptions = (frappe: Frappe) => ({
+  [TelemetrySetting.allow]: frappe.t`Allow Telemetry`,
+  [TelemetrySetting.dontLogUsage]: frappe.t`Don't Log Usage`,
+  [TelemetrySetting.dontLogAnything]: frappe.t`Don't Log Anything`,
+});
diff --git a/src/telemetry/telemetry.ts b/frappe/telemetry/telemetry.ts
similarity index 79%
rename from src/telemetry/telemetry.ts
rename to frappe/telemetry/telemetry.ts
index e2f286e4..7fe517c4 100644
--- a/src/telemetry/telemetry.ts
+++ b/frappe/telemetry/telemetry.ts
@@ -1,15 +1,21 @@
-import config, { ConfigKeys, TelemetrySetting } from '@/config';
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
+import { ConfigKeys } from 'frappe/core/types';
 import { cloneDeep } from 'lodash';
 import {
   getCountry,
   getCounts,
-  getCreds,
   getDeviceId,
   getInstanceId,
   getLanguage,
 } from './helpers';
-import { Noun, NounEnum, Platform, Telemetry, Verb } from './types';
+import {
+  Noun,
+  NounEnum,
+  Platform,
+  Telemetry,
+  TelemetrySetting,
+  Verb,
+} from './types';
 
 /**
  * # Telemetry
@@ -44,16 +50,26 @@ import { Noun, NounEnum, Platform, Telemetry, Verb } from './types';
  * telemetry and not app usage.
  */
 
-class TelemetryManager {
+export class TelemetryManager {
   #url: string = '';
   #token: string = '';
   #started = false;
   #telemetryObject: Partial<Telemetry> = {};
+  #interestingDocs: string[] = [];
+  frappe: Frappe;
+
+  constructor(frappe: Frappe) {
+    this.frappe = frappe;
+  }
 
   set platform(value: Platform) {
     this.#telemetryObject.platform ||= value;
   }
 
+  set interestingDocs(schemaNames: string[]) {
+    this.#interestingDocs = schemaNames;
+  }
+
   get hasCreds() {
     return !!this.#url && !!this.#token;
   }
@@ -68,9 +84,9 @@ class TelemetryManager {
 
   async start() {
     this.#telemetryObject.country ||= getCountry();
-    this.#telemetryObject.language ??= getLanguage();
-    this.#telemetryObject.deviceId ||= getDeviceId();
-    this.#telemetryObject.instanceId ||= getInstanceId();
+    this.#telemetryObject.language ??= getLanguage(this.frappe);
+    this.#telemetryObject.deviceId ||= getDeviceId(this.frappe);
+    this.#telemetryObject.instanceId ||= getInstanceId(this.frappe);
     this.#telemetryObject.openTime ||= new Date().valueOf();
     this.#telemetryObject.timeline ??= [];
     this.#telemetryObject.errors ??= {};
@@ -120,7 +136,10 @@ class TelemetryManager {
 
     this.#clear();
 
-    if (config.get(ConfigKeys.Telemetry) === TelemetrySetting.dontLogAnything) {
+    if (
+      this.frappe.config.get(ConfigKeys.Telemetry) ===
+      TelemetrySetting.dontLogAnything
+    ) {
       return;
     }
     navigator.sendBeacon(this.#url, data);
@@ -141,7 +160,10 @@ class TelemetryManager {
       return;
     }
 
-    this.#telemetryObject.counts = await getCounts();
+    this.#telemetryObject.counts = await getCounts(
+      this.#interestingDocs,
+      this.frappe
+    );
   }
 
   async #setCreds() {
@@ -149,13 +171,15 @@ class TelemetryManager {
       return;
     }
 
-    const { url, token } = await getCreds();
+    const { url, token } = await this.frappe.auth.getTelemetryCreds();
     this.#url = url;
     this.#token = token;
   }
 
   #getCanLog(): boolean {
-    const telemetrySetting = config.get(ConfigKeys.Telemetry) as string;
+    const telemetrySetting = this.frappe.config.get(
+      ConfigKeys.Telemetry
+    ) as string;
     return telemetrySetting === TelemetrySetting.allow;
   }
 
@@ -170,5 +194,3 @@ class TelemetryManager {
     delete this.#telemetryObject.country;
   }
 }
-
-export default new TelemetryManager();
diff --git a/src/telemetry/types.ts b/frappe/telemetry/types.ts
similarity index 83%
rename from src/telemetry/types.ts
rename to frappe/telemetry/types.ts
index 804232e0..16eded28 100644
--- a/src/telemetry/types.ts
+++ b/frappe/telemetry/types.ts
@@ -1,5 +1,3 @@
-import { DoctypeName } from 'models/types';
-
 export type AppVersion = string;
 export type UniqueId = string;
 export type Timestamp = number;
@@ -11,9 +9,7 @@ export interface InteractionEvent {
   more?: Record<string, unknown>;
 }
 
-export type Count = Partial<{
-  [key in DoctypeName]: number;
-}>;
+export type Count = Record<string, number>;
 export type Platform = 'Windows' | 'Mac' | 'Linux';
 
 export interface Telemetry {
@@ -46,3 +42,9 @@ export enum NounEnum {
 }
 
 export type Noun = string | NounEnum;
+
+export enum TelemetrySetting {
+  allow = 'allow',
+  dontLogUsage = 'dontLogUsage',
+  dontLogAnything = 'dontLogAnything',
+}
diff --git a/frappe/tests/helpers.ts b/frappe/tests/helpers.ts
new file mode 100644
index 00000000..d91f9fbd
--- /dev/null
+++ b/frappe/tests/helpers.ts
@@ -0,0 +1,7 @@
+import { AuthDemuxBase, TelemetryCreds } from 'utils/auth/types';
+
+export class DummyAuthDemux extends AuthDemuxBase {
+  async getTelemetryCreds(): Promise<TelemetryCreds> {
+    return { url: '', token: '' };
+  }
+}
diff --git a/frappe/tests/testFrappe.spec.ts b/frappe/tests/testFrappe.spec.ts
index 1b3595b1..156035a2 100644
--- a/frappe/tests/testFrappe.spec.ts
+++ b/frappe/tests/testFrappe.spec.ts
@@ -1,10 +1,18 @@
 import * as assert from 'assert';
 import 'mocha';
+import models, { getRegionalModels } from 'models';
+import { getSchemas } from 'schemas';
 import { Frappe } from '..';
 import { DatabaseManager } from '../../backend/database/manager';
+import { DummyAuthDemux } from './helpers';
 
 describe('Frappe', function () {
-  const frappe = new Frappe(DatabaseManager);
+  const frappe = new Frappe({
+    DatabaseDemux: DatabaseManager,
+    AuthDemux: DummyAuthDemux,
+    isTest: true,
+    isElectron: false,
+  });
 
   specify('Init', async function () {
     assert.strictEqual(
@@ -12,7 +20,7 @@ describe('Frappe', function () {
       0,
       'zero schemas one'
     );
-    await frappe.initializeAndRegister();
+
     assert.strictEqual(
       Object.keys(frappe.schemaMap).length,
       0,
@@ -20,7 +28,7 @@ describe('Frappe', function () {
     );
 
     await frappe.db.createNewDatabase(':memory:', 'in');
-    await frappe.initializeAndRegister({}, {}, true);
+    await frappe.initializeAndRegister({}, {});
     assert.strictEqual(
       Object.keys(frappe.schemaMap).length > 0,
       true,
@@ -29,3 +37,28 @@ describe('Frappe', function () {
     await frappe.db.close();
   });
 });
+
+describe('Frappe', function () {
+  const countryCode = 'in';
+  let frappe: Frappe;
+  const schemas = getSchemas(countryCode);
+  this.beforeEach(async function () {
+    frappe = new Frappe({
+      DatabaseDemux: DatabaseManager,
+      isTest: true,
+      isElectron: false,
+    });
+
+    const regionalModels = await getRegionalModels(countryCode);
+    await frappe.db.createNewDatabase(':memory:', countryCode);
+    await frappe.initializeAndRegister(models, regionalModels);
+  });
+
+  this.afterEach(async function () {
+    await frappe.close();
+  });
+
+  specify('temp', async function () {
+    frappe.db.schemaMap;
+  });
+});
diff --git a/frappe/utils/consts.ts b/frappe/utils/consts.ts
index c9ccba20..1f35baf4 100644
--- a/frappe/utils/consts.ts
+++ b/frappe/utils/consts.ts
@@ -5,14 +5,4 @@ export const DEFAULT_LOCALE = 'en-IN';
 export const DEFAULT_COUNTRY_CODE = 'in';
 export const DEFAULT_CURRENCY = 'INR';
 export const DEFAULT_LANGUAGE = 'English';
-export const DEFAULT_NUMBER_SERIES = {
-  SalesInvoice: 'SINV-',
-  PurchaseInvoice: 'PINV-',
-  Payment: 'PAY-',
-  JournalEntry: 'JV-',
-  Quotation: 'QTN-',
-  SalesOrder: 'SO-',
-  Fulfillment: 'OF-',
-  PurchaseOrder: 'PO-',
-  PurchaseReceipt: 'PREC-',
-};
+export const DEFAULT_SERIES_START = 1001;
\ No newline at end of file
diff --git a/frappe/utils/format.ts b/frappe/utils/format.ts
index 2a324647..6fefcfc7 100644
--- a/frappe/utils/format.ts
+++ b/frappe/utils/format.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import { DocValue } from 'frappe/core/types';
 import Doc from 'frappe/model/doc';
 import { DateTime } from 'luxon';
@@ -14,8 +14,9 @@ import {
 
 export function format(
   value: DocValue,
-  df?: string | Field,
-  doc?: Doc
+  df: string | Field | null,
+  doc: Doc | null,
+  frappe: Frappe
 ): string {
   if (!df) {
     return String(value);
@@ -24,11 +25,11 @@ export function format(
   const field: Field = getField(df);
 
   if (field.fieldtype === FieldTypeEnum.Currency) {
-    return formatCurrency(value, field, doc);
+    return formatCurrency(value, field, doc, frappe);
   }
 
   if (field.fieldtype === FieldTypeEnum.Date) {
-    return formatDate(value);
+    return formatDate(value, frappe);
   }
 
   if (field.fieldtype === FieldTypeEnum.Check) {
@@ -42,7 +43,7 @@ export function format(
   return String(value);
 }
 
-function formatDate(value: DocValue): string {
+function formatDate(value: DocValue, frappe: Frappe): string {
   const dateFormat =
     (frappe.singles.SystemSettings?.dateFormat as string) ??
     DEFAULT_DATE_FORMAT;
@@ -64,12 +65,17 @@ function formatDate(value: DocValue): string {
   return formattedDate;
 }
 
-function formatCurrency(value: DocValue, field: Field, doc?: Doc): string {
-  const currency = getCurrency(field, doc);
+function formatCurrency(
+  value: DocValue,
+  field: Field,
+  doc: Doc | null,
+  frappe: Frappe
+): string {
+  const currency = getCurrency(field, doc, frappe);
 
   let valueString;
   try {
-    valueString = formatNumber(value);
+    valueString = formatNumber(value, frappe);
   } catch (err) {
     (err as Error).message += ` value: '${value}', type: ${typeof value}`;
     throw err;
@@ -83,8 +89,8 @@ function formatCurrency(value: DocValue, field: Field, doc?: Doc): string {
   return valueString;
 }
 
-function formatNumber(value: DocValue): string {
-  const numberFormatter = getNumberFormatter();
+function formatNumber(value: DocValue, frappe: Frappe): string {
+  const numberFormatter = getNumberFormatter(frappe);
   if (typeof value === 'number') {
     return numberFormatter.format(value);
   }
@@ -106,7 +112,7 @@ function formatNumber(value: DocValue): string {
   return formattedNumber;
 }
 
-function getNumberFormatter() {
+function getNumberFormatter(frappe: Frappe) {
   if (frappe.currencyFormatter) {
     return frappe.currencyFormatter;
   }
@@ -123,7 +129,7 @@ function getNumberFormatter() {
   }));
 }
 
-function getCurrency(field: Field, doc?: Doc): string {
+function getCurrency(field: Field, doc: Doc | null, frappe: Frappe): string {
   if (doc && doc.getCurrencies[field.fieldname]) {
     return doc.getCurrencies[field.fieldname]();
   }
diff --git a/models/README.md b/models/README.md
index 39250989..f7bc95b1 100644
--- a/models/README.md
+++ b/models/README.md
@@ -36,6 +36,9 @@ directly use the the `Frappe` class and will be run using `mocha` on `node`.
 Importing frontend code will break all the tests. This also implies that one
 should be wary about transitive dependencies.
 
+It should also not import the `frappe` object (singleton) from `src`, where ever
+frappe is required in models it should be passed to it.
+
 _Note: Frontend specific code can be imported but they should be done so, only
 using dynamic imports i.e. `await import('...')`._
 
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index 109e11d8..49fb9366 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import Doc from 'frappe/model/doc';
 import {
   FiltersMap,
@@ -6,36 +6,45 @@ import {
   TreeViewSettings,
 } from 'frappe/model/types';
 import { QueryFilter } from 'utils/db/types';
+import { AccountRootType, AccountType } from './types';
 
 export class Account extends Doc {
+  rootType?: AccountRootType;
+  accountType?: AccountType;
+  parentAccount?: string;
+
   async beforeInsert() {
     if (this.accountType || !this.parentAccount) {
       return;
     }
 
-    const account = await frappe.db.get(
+    const account = await this.frappe.db.get(
       'Account',
       this.parentAccount as string
     );
-    this.accountType = account.accountType as string;
+    this.accountType = account.accountType as AccountType;
   }
 
-  static listSettings: ListViewSettings = {
-    columns: ['name', 'parentAccount', 'rootType'],
-  };
+  static getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['name', 'parentAccount', 'rootType'],
+    };
+  }
 
-  static treeSettings: TreeViewSettings = {
-    parentField: 'parentAccount',
-    async getRootLabel(): Promise<string> {
-      const accountingSettings = await frappe.doc.getSingle(
-        'AccountingSettings'
-      );
-      return accountingSettings.companyName as string;
-    },
-  };
+  static getTreeSettings(frappe: Frappe): void | TreeViewSettings {
+    return {
+      parentField: 'parentAccount',
+      async getRootLabel(): Promise<string> {
+        const accountingSettings = await frappe.doc.getSingle(
+          'AccountingSettings'
+        );
+        return accountingSettings.companyName as string;
+      },
+    };
+  }
 
   static filters: FiltersMap = {
-    parentAccount: (doc: Doc) => {
+    parentAccount: (doc: Account) => {
       const filter: QueryFilter = {
         isGroup: true,
       };
diff --git a/models/baseModels/Account/types.ts b/models/baseModels/Account/types.ts
new file mode 100644
index 00000000..8b9c4b33
--- /dev/null
+++ b/models/baseModels/Account/types.ts
@@ -0,0 +1,27 @@
+export type AccountType =
+  | 'Accumulated Depreciation'
+  | 'Bank'
+  | 'Cash'
+  | 'Chargeable'
+  | 'Cost of Goods Sold'
+  | 'Depreciation'
+  | 'Equity'
+  | 'Expense Account'
+  | 'Expenses Included In Valuation'
+  | 'Fixed Asset'
+  | 'Income Account'
+  | 'Payable'
+  | 'Receivable'
+  | 'Round Off'
+  | 'Stock'
+  | 'Stock Adjustment'
+  | 'Stock Received But Not Billed'
+  | 'Tax'
+  | 'Temporary';
+
+export type AccountRootType =
+  | 'Asset'
+  | 'Liability'
+  | 'Equity'
+  | 'Income'
+  | 'Expense';
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
index b14e36e0..00851407 100644
--- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
+++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
@@ -2,7 +2,9 @@ import Doc from 'frappe/model/doc';
 import { ListViewSettings } from 'frappe/model/types';
 
 export class AccountingLedgerEntry extends Doc {
-  static listSettings: ListViewSettings = {
-    columns: ['account', 'party', 'debit', 'credit', 'balance'],
-  };
+  static getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['account', 'party', 'debit', 'credit', 'balance'],
+    };
+  }
 }
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
index 2acef2bf..6c26d116 100644
--- a/models/baseModels/Address/Address.ts
+++ b/models/baseModels/Address/Address.ts
@@ -1,4 +1,3 @@
-import frappe from 'frappe';
 import Doc from 'frappe/model/doc';
 import { EmptyMessageMap, FormulaMap, ListsMap } from 'frappe/model/types';
 import { stateCodeMap } from 'regional/in';
@@ -37,7 +36,7 @@ export class Address extends Doc {
   };
 
   static emptyMessages: EmptyMessageMap = {
-    state: (doc: Doc) => {
+    state: (doc: Doc, frappe) => {
       if (doc.country) {
         return frappe.t`Enter State`;
       }
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 3169b776..30ef65a7 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -1,5 +1,4 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
-import frappe from 'frappe';
 import { DocValue } from 'frappe/core/types';
 import Doc from 'frappe/model/doc';
 import { DefaultMap, FiltersMap, FormulaMap } from 'frappe/model/types';
@@ -28,7 +27,7 @@ export abstract class Invoice extends Doc {
   }
 
   async getPayments() {
-    const payments = await frappe.db.getAll('PaymentFor', {
+    const payments = await this.frappe.db.getAll('PaymentFor', {
       fields: ['parent'],
       filters: { referenceName: this.name! },
       orderBy: 'name',
@@ -56,12 +55,12 @@ export abstract class Invoice extends Doc {
     await entries.post();
 
     // update outstanding amounts
-    await frappe.db.update(this.schemaName, {
+    await this.frappe.db.update(this.schemaName, {
       name: this.name as string,
       outstandingAmount: this.baseGrandTotal!,
     });
 
-    const party = (await frappe.doc.getDoc('Party', this.party!)) as Party;
+    const party = (await this.frappe.doc.getDoc('Party', this.party!)) as Party;
     await party.updateOutstandingAmount();
   }
 
@@ -69,7 +68,7 @@ export abstract class Invoice extends Doc {
     const paymentRefList = await this.getPayments();
     for (const paymentFor of paymentRefList) {
       const paymentReference = paymentFor.parent;
-      const payment = (await frappe.doc.getDoc(
+      const payment = (await this.frappe.doc.getDoc(
         'Payment',
         paymentReference as string
       )) as Payment;
@@ -80,7 +79,7 @@ export abstract class Invoice extends Doc {
       }
 
       // To set the payment status as unsubmitted.
-      await frappe.db.update('Payment', {
+      await this.frappe.db.update('Payment', {
         name: paymentReference,
         submitted: false,
         cancelled: true,
@@ -93,7 +92,9 @@ export abstract class Invoice extends Doc {
   async getExchangeRate() {
     if (!this.currency) return 1.0;
 
-    const accountingSettings = await frappe.doc.getSingle('AccountingSettings');
+    const accountingSettings = await this.frappe.doc.getSingle(
+      'AccountingSettings'
+    );
     const companyCurrency = accountingSettings.currency;
     if (this.currency === companyCurrency) {
       return 1.0;
@@ -129,8 +130,8 @@ export abstract class Invoice extends Doc {
         taxes[account] = taxes[account] || {
           account,
           rate,
-          amount: frappe.pesa(0),
-          baseAmount: frappe.pesa(0),
+          amount: this.frappe.pesa(0),
+          baseAmount: this.frappe.pesa(0),
         };
 
         const amount = (row.amount as Money).mul(rate).div(100);
@@ -149,7 +150,7 @@ export abstract class Invoice extends Doc {
 
   async getTax(tax: string) {
     if (!this._taxes![tax]) {
-      this._taxes[tax] = await frappe.doc.getDoc('Tax', tax);
+      this._taxes[tax] = await this.frappe.doc.getDoc('Tax', tax);
     }
 
     return this._taxes[tax];
@@ -166,7 +167,7 @@ export abstract class Invoice extends Doc {
       this.getFrom('Party', this.party!, 'defaultAccount') as string,
     currency: async () =>
       (this.getFrom('Party', this.party!, 'currency') as string) ||
-      (frappe.singles.AccountingSettings!.currency as string),
+      (this.frappe.singles.AccountingSettings!.currency as string),
     exchangeRate: async () => await this.getExchangeRate(),
     netTotal: async () => this.getSum('items', 'amount', false),
     baseNetTotal: async () => this.netTotal!.mul(this.exchangeRate!),
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index d5fbe68b..ceee496f 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -1,4 +1,3 @@
-import frappe from 'frappe';
 import { DocValue } from 'frappe/core/types';
 import Doc from 'frappe/model/doc';
 import {
@@ -7,6 +6,7 @@ import {
   FormulaMap,
   ValidationMap,
 } from 'frappe/model/types';
+import { ValidationError } from 'frappe/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 import { Invoice } from '../Invoice/Invoice';
 
@@ -32,7 +32,7 @@ export abstract class InvoiceItem extends Doc {
         'Item',
         this.item as string,
         'rate'
-      )) || frappe.pesa(0)) as Money;
+      )) || this.frappe.pesa(0)) as Money;
 
       return baseRate.div(this.exchangeRate!);
     },
@@ -73,8 +73,8 @@ export abstract class InvoiceItem extends Doc {
         return;
       }
 
-      throw new frappe.errors.ValidationError(
-        frappe.t`Rate (${frappe.format(
+      throw new ValidationError(
+        this.frappe.t`Rate (${this.frappe.format(
           value,
           'Currency'
         )}) cannot be less zero.`
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 3bef01d7..02d899f0 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import { DocValue } from 'frappe/core/types';
 import Doc from 'frappe/model/doc';
 import {
@@ -9,6 +9,7 @@ import {
   ListViewSettings,
   ValidationMap,
 } from 'frappe/model/types';
+import { ValidationError } from 'frappe/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 
 export class Item extends Doc {
@@ -19,11 +20,11 @@ export class Item extends Doc {
         accountName = 'Sales';
       }
 
-      const accountExists = await frappe.db.exists('Account', accountName);
+      const accountExists = await this.frappe.db.exists('Account', accountName);
       return accountExists ? accountName : '';
     },
     expenseAccount: async () => {
-      const cogs = await frappe.db.getAllRaw('Account', {
+      const cogs = await this.frappe.db.getAllRaw('Account', {
         filters: {
           accountType: 'Cost of Goods Sold',
         },
@@ -56,43 +57,45 @@ export class Item extends Doc {
   validations: ValidationMap = {
     rate: async (value: DocValue) => {
       if ((value as Money).isNegative()) {
-        throw new frappe.errors.ValidationError(
-          frappe.t`Rate can't be negative.`
-        );
+        throw new ValidationError(this.frappe.t`Rate can't be negative.`);
       }
     },
   };
 
-  static actions: Action[] = [
-    {
-      label: frappe.t`New Invoice`,
-      condition: (doc) => !doc.isNew,
-      action: async (doc, router) => {
-        const invoice = await frappe.doc.getEmptyDoc('SalesInvoice');
-        invoice.append('items', {
-          item: doc.name as string,
-          rate: doc.rate as Money,
-          tax: doc.tax as string,
-        });
-        router.push(`/edit/SalesInvoice/${invoice.name}`);
+  static getActions(frappe: Frappe): Action[] {
+    return [
+      {
+        label: frappe.t`New Invoice`,
+        condition: (doc) => !doc.isNew,
+        action: async (doc, router) => {
+          const invoice = await frappe.doc.getEmptyDoc('SalesInvoice');
+          invoice.append('items', {
+            item: doc.name as string,
+            rate: doc.rate as Money,
+            tax: doc.tax as string,
+          });
+          router.push(`/edit/SalesInvoice/${invoice.name}`);
+        },
       },
-    },
-    {
-      label: frappe.t`New Bill`,
-      condition: (doc) => !doc.isNew,
-      action: async (doc, router) => {
-        const invoice = await frappe.doc.getEmptyDoc('PurchaseInvoice');
-        invoice.append('items', {
-          item: doc.name as string,
-          rate: doc.rate as Money,
-          tax: doc.tax as string,
-        });
-        router.push(`/edit/PurchaseInvoice/${invoice.name}`);
+      {
+        label: frappe.t`New Bill`,
+        condition: (doc) => !doc.isNew,
+        action: async (doc, router) => {
+          const invoice = await frappe.doc.getEmptyDoc('PurchaseInvoice');
+          invoice.append('items', {
+            item: doc.name as string,
+            rate: doc.rate as Money,
+            tax: doc.tax as string,
+          });
+          router.push(`/edit/PurchaseInvoice/${invoice.name}`);
+        },
       },
-    },
-  ];
+    ];
+  }
 
-  listSettings: ListViewSettings = {
-    columns: ['name', 'unit', 'tax', 'rate'],
-  };
+  static getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['name', 'unit', 'tax', 'rate'],
+    };
+  }
 }
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index f0f38c25..be27b387 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import Doc from 'frappe/model/doc';
 import {
   Action,
@@ -15,7 +15,7 @@ export class JournalEntry extends Doc {
   accounts: Doc[] = [];
 
   getPosting() {
-    const entries = new LedgerPosting({ reference: this });
+    const entries = new LedgerPosting({ reference: this }, this.frappe);
 
     for (const row of this.accounts) {
       const debit = row.debit as Money;
@@ -32,11 +32,11 @@ export class JournalEntry extends Doc {
     return entries;
   }
 
-  beforeUpdate() {
+  async beforeUpdate() {
     this.getPosting().validateEntries();
   }
 
-  beforeInsert() {
+  async beforeInsert() {
     this.getPosting().validateEntries();
   }
 
@@ -56,44 +56,48 @@ export class JournalEntry extends Doc {
     numberSeries: () => ({ referenceType: 'JournalEntry' }),
   };
 
-  static actions: Action[] = [getLedgerLinkAction()];
+  static getActions(frappe: Frappe): Action[] {
+    return [getLedgerLinkAction(frappe)];
+  }
 
-  static listSettings: ListViewSettings = {
-    formRoute: (name) => `/edit/JournalEntry/${name}`,
-    columns: [
-      'date',
-      {
-        label: frappe.t`Status`,
-        fieldtype: 'Select',
-        size: 'small',
-        render(doc) {
-          let status = 'Draft';
-          let color = 'gray';
-          if (doc.submitted) {
-            color = 'green';
-            status = 'Submitted';
-          }
+  static getListViewSettings(frappe: Frappe): ListViewSettings {
+    return {
+      formRoute: (name) => `/edit/JournalEntry/${name}`,
+      columns: [
+        'date',
+        {
+          label: frappe.t`Status`,
+          fieldtype: 'Select',
+          size: 'small',
+          render(doc) {
+            let status = 'Draft';
+            let color = 'gray';
+            if (doc.submitted) {
+              color = 'green';
+              status = 'Submitted';
+            }
 
-          if (doc.cancelled) {
-            color = 'red';
-            status = 'Cancelled';
-          }
+            if (doc.cancelled) {
+              color = 'red';
+              status = 'Cancelled';
+            }
 
-          return {
-            template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
-          };
+            return {
+              template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
+            };
+          },
         },
-      },
-      {
-        label: frappe.t`Entry ID`,
-        fieldtype: 'Data',
-        fieldname: 'name',
-        getValue(doc) {
-          return doc.name as string;
+        {
+          label: frappe.t`Entry ID`,
+          fieldtype: 'Data',
+          fieldname: 'name',
+          getValue(doc) {
+            return doc.name as string;
+          },
         },
-      },
-      'entryType',
-      'referenceNumber',
-    ],
-  };
+        'entryType',
+        'referenceNumber',
+      ],
+    };
+  }
 }
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
index 99a5fe76..dd947885 100644
--- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
+++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
@@ -1,4 +1,3 @@
-import frappe from 'frappe';
 import Doc from 'frappe/model/doc';
 import { FiltersMap, FormulaMap } from 'frappe/model/types';
 import Money from 'pesa/dist/types/src/money';
@@ -9,7 +8,7 @@ export class JournalEntryAccount extends Doc {
 
     const otherTypeValue = this.get(otherType) as Money;
     if (!otherTypeValue.isZero()) {
-      return frappe.pesa(0);
+      return this.frappe.pesa(0);
     }
 
     const totalType = this.parentdoc!.getSum('accounts', type, false) as Money;
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index ddec170f..2c89d3c2 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import Doc from 'frappe/model/doc';
 import {
   Action,
@@ -29,15 +29,17 @@ export class Party extends Doc {
     schemaName: 'SalesInvoice' | 'PurchaseInvoice'
   ) {
     const outstandingAmounts = (
-      await frappe.db.getAllRaw(schemaName, {
+      await this.frappe.db.getAllRaw(schemaName, {
         fields: ['outstandingAmount', 'party'],
         filters: { submitted: true },
       })
     ).filter(({ party }) => party === this.name);
 
     const totalOutstanding = outstandingAmounts
-      .map(({ outstandingAmount }) => frappe.pesa(outstandingAmount as number))
-      .reduce((a, b) => a.add(b), frappe.pesa(0));
+      .map(({ outstandingAmount }) =>
+        this.frappe.pesa(outstandingAmount as number)
+      )
+      .reduce((a, b) => a.add(b), this.frappe.pesa(0));
 
     await this.set('outstandingAmount', totalOutstanding);
     await this.update();
@@ -55,10 +57,11 @@ export class Party extends Doc {
         accountName = 'Creditors';
       }
 
-      const accountExists = await frappe.db.exists('Account', accountName);
+      const accountExists = await this.frappe.db.exists('Account', accountName);
       return accountExists ? accountName : '';
     },
-    currency: async () => frappe.singles.AccountingSettings!.currency as string,
+    currency: async () =>
+      this.frappe.singles.AccountingSettings!.currency as string,
     addressDisplay: async () => {
       const address = this.address as string | undefined;
       if (address) {
@@ -85,80 +88,84 @@ export class Party extends Doc {
     },
   };
 
-  static listSettings: ListViewSettings = {
-    columns: ['name', 'phone', 'outstandingAmount'],
-  };
+  static getListViewSettings(): ListViewSettings {
+    return {
+      columns: ['name', 'phone', 'outstandingAmount'],
+    };
+  }
 
-  static actions: Action[] = [
-    {
-      label: frappe.t`Create Bill`,
-      condition: (doc: Doc) =>
-        !doc.isNew && (doc.role as PartyRole) !== 'Customer',
-      action: async (partyDoc, router) => {
-        const doc = await frappe.doc.getEmptyDoc('PurchaseInvoice');
-        router.push({
-          path: `/edit/PurchaseInvoice/${doc.name}`,
-          query: {
-            doctype: 'PurchaseInvoice',
-            values: {
-              // @ts-ignore
-              party: partyDoc.name!,
+  static getActions(frappe: Frappe): Action[] {
+    return [
+      {
+        label: frappe.t`Create Bill`,
+        condition: (doc: Doc) =>
+          !doc.isNew && (doc.role as PartyRole) !== 'Customer',
+        action: async (partyDoc, router) => {
+          const doc = await frappe.doc.getEmptyDoc('PurchaseInvoice');
+          router.push({
+            path: `/edit/PurchaseInvoice/${doc.name}`,
+            query: {
+              doctype: 'PurchaseInvoice',
+              values: {
+                // @ts-ignore
+                party: partyDoc.name!,
+              },
             },
-          },
-        });
+          });
+        },
       },
-    },
-    {
-      label: frappe.t`View Bills`,
-      condition: (doc: Doc) =>
-        !doc.isNew && (doc.role as PartyRole) !== 'Customer',
-      action: async (partyDoc, router) => {
-        router.push({
-          name: 'ListView',
-          params: {
-            doctype: 'PurchaseInvoice',
-            filters: {
-              // @ts-ignore
-              party: partyDoc.name!,
+      {
+        label: frappe.t`View Bills`,
+        condition: (doc: Doc) =>
+          !doc.isNew && (doc.role as PartyRole) !== 'Customer',
+        action: async (partyDoc, router) => {
+          router.push({
+            name: 'ListView',
+            params: {
+              doctype: 'PurchaseInvoice',
+              filters: {
+                // @ts-ignore
+                party: partyDoc.name!,
+              },
             },
-          },
-        });
+          });
+        },
       },
-    },
-    {
-      label: frappe.t`Create Invoice`,
-      condition: (doc: Doc) =>
-        !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
-      action: async (partyDoc, router) => {
-        const doc = await frappe.doc.getEmptyDoc('SalesInvoice');
-        router.push({
-          path: `/edit/SalesInvoice/${doc.name}`,
-          query: {
-            doctype: 'SalesInvoice',
-            values: {
-              // @ts-ignore
-              party: partyDoc.name!,
+      {
+        label: frappe.t`Create Invoice`,
+        condition: (doc: Doc) =>
+          !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
+        action: async (partyDoc, router) => {
+          const doc = await frappe.doc.getEmptyDoc('SalesInvoice');
+          router.push({
+            path: `/edit/SalesInvoice/${doc.name}`,
+            query: {
+              doctype: 'SalesInvoice',
+              values: {
+                // @ts-ignore
+                party: partyDoc.name!,
+              },
             },
-          },
-        });
+          });
+        },
       },
-    },
-    {
-      label: frappe.t`View Invoices`,
-      condition: (doc: Doc) =>
-        !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
-      action: async (partyDoc, router) => {
-        router.push({
-          name: 'ListView',
-          params: {
-            doctype: 'SalesInvoice',
-            filters: {
-              // @ts-ignore
-              party: partyDoc.name!,
+      {
+        label: frappe.t`View Invoices`,
+        condition: (doc: Doc) =>
+          !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
+        action: async (partyDoc, router) => {
+          router.push({
+            name: 'ListView',
+            params: {
+              doctype: 'SalesInvoice',
+              filters: {
+                // @ts-ignore
+                party: partyDoc.name!,
+              },
             },
-          },
-        });
+          });
+        },
       },
-    },
-  ];
+    ];
+  }
 }
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 7a29bf65..fd9412f3 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -1,5 +1,5 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import { DocValue } from 'frappe/core/types';
 import Doc from 'frappe/model/doc';
 import {
@@ -21,6 +21,8 @@ import { PaymentMethod, PaymentType } from './types';
 
 export class Payment extends Doc {
   party?: string;
+  amount?: Money;
+  writeoff?: Money;
 
   async change({ changed }: { changed: string }) {
     switch (changed) {
@@ -48,7 +50,10 @@ export class Payment extends Doc {
     }
 
     const schemaName = referenceType as string;
-    const doc = await frappe.doc.getDoc(schemaName, referenceName as string);
+    const doc = await this.frappe.doc.getDoc(
+      schemaName,
+      referenceName as string
+    );
 
     let party;
     let paymentType: PaymentType;
@@ -66,7 +71,7 @@ export class Payment extends Doc {
   }
 
   updateAmountOnReferenceUpdate() {
-    this.amount = frappe.pesa(0);
+    this.amount = this.frappe.pesa(0);
     for (const paymentReference of this.for as Doc[]) {
       this.amount = (this.amount as Money).add(
         paymentReference.amount as Money
@@ -93,7 +98,7 @@ export class Payment extends Doc {
     if (this.paymentAccount !== this.account || !this.account) {
       return;
     }
-    throw new frappe.errors.ValidationError(
+    throw new this.frappe.errors.ValidationError(
       `To Account and From Account can't be the same: ${this.account}`
     );
   }
@@ -106,7 +111,7 @@ export class Payment extends Doc {
 
     const referenceAmountTotal = forReferences
       .map(({ amount }) => amount as Money)
-      .reduce((a, b) => a.add(b), frappe.pesa(0));
+      .reduce((a, b) => a.add(b), this.frappe.pesa(0));
 
     if (
       (this.amount as Money)
@@ -116,20 +121,20 @@ export class Payment extends Doc {
       return;
     }
 
-    const writeoff = frappe.format(this.writeoff, 'Currency');
-    const payment = frappe.format(this.amount, 'Currency');
-    const refAmount = frappe.format(referenceAmountTotal, 'Currency');
+    const writeoff = this.frappe.format(this.writeoff!, 'Currency');
+    const payment = this.frappe.format(this.amount!, 'Currency');
+    const refAmount = this.frappe.format(referenceAmountTotal, 'Currency');
 
     if ((this.writeoff as Money).gt(0)) {
-      throw new frappe.errors.ValidationError(
-        frappe.t`Amount: ${payment} and writeoff: ${writeoff} 
+      throw new ValidationError(
+        this.frappe.t`Amount: ${payment} and writeoff: ${writeoff} 
           is less than the total amount allocated to 
           references: ${refAmount}.`
       );
     }
 
-    throw new frappe.errors.ValidationError(
-      frappe.t`Amount: ${payment} is less than the total
+    throw new ValidationError(
+      this.frappe.t`Amount: ${payment} is less than the total
         amount allocated to references: ${refAmount}.`
     );
   }
@@ -139,9 +144,9 @@ export class Payment extends Doc {
       return;
     }
 
-    if (!frappe.singles.AccountingSettings!.writeOffAccount) {
-      throw new frappe.errors.ValidationError(
-        frappe.t`Write Off Account not set.
+    if (!this.frappe.singles.AccountingSettings!.writeOffAccount) {
+      throw new ValidationError(
+        this.frappe.t`Write Off Account not set.
           Please set Write Off Account in General Settings`
       );
     }
@@ -152,10 +157,13 @@ export class Payment extends Doc {
     const paymentAccount = this.paymentAccount as string;
     const amount = this.amount as Money;
     const writeoff = this.writeoff as Money;
-    const entries = new LedgerPosting({
-      reference: this,
-      party: this.party!,
-    });
+    const entries = new LedgerPosting(
+      {
+        reference: this,
+        party: this.party!,
+      },
+      this.frappe
+    );
 
     await entries.debit(paymentAccount as string, amount.sub(writeoff));
     await entries.credit(account as string, amount.sub(writeoff));
@@ -164,11 +172,14 @@ export class Payment extends Doc {
       return [entries];
     }
 
-    const writeoffEntry = new LedgerPosting({
-      reference: this,
-      party: this.party!,
-    });
-    const writeOffAccount = frappe.singles.AccountingSettings!
+    const writeoffEntry = new LedgerPosting(
+      {
+        reference: this,
+        party: this.party!,
+      },
+      this.frappe
+    );
+    const writeOffAccount = this.frappe.singles.AccountingSettings!
       .writeOffAccount as string;
 
     if (this.paymentType === 'Pay') {
@@ -196,7 +207,7 @@ export class Payment extends Doc {
       ) {
         continue;
       }
-      const referenceDoc = await frappe.doc.getDoc(
+      const referenceDoc = await this.frappe.doc.getDoc(
         row.referenceType as string,
         row.referenceName as string
       );
@@ -210,26 +221,30 @@ export class Payment extends Doc {
       }
 
       if (amount.lte(0) || amount.gt(outstandingAmount)) {
-        let message = frappe.t`Payment amount: ${frappe.format(
-          this.amount,
+        let message = this.frappe.t`Payment amount: ${this.frappe.format(
+          this.amount!,
           'Currency'
-        )} should be less than Outstanding amount: ${frappe.format(
+        )} should be less than Outstanding amount: ${this.frappe.format(
           outstandingAmount,
           'Currency'
         )}.`;
 
         if (amount.lte(0)) {
-          const amt = frappe.format(this.amount, 'Currency');
-          message = frappe.t`Payment amount: ${amt} should be greater than 0.`;
+          const amt = this.frappe.format(this.amount!, 'Currency');
+          message = this.frappe
+            .t`Payment amount: ${amt} should be greater than 0.`;
         }
 
-        throw new frappe.errors.ValidationError(message);
+        throw new ValidationError(message);
       } else {
         // update outstanding amounts in invoice and party
         const newOutstanding = outstandingAmount.sub(amount);
         await referenceDoc.set('outstandingAmount', newOutstanding);
         await referenceDoc.update();
-        const party = (await frappe.doc.getDoc('Party', this.party!)) as Party;
+        const party = (await this.frappe.doc.getDoc(
+          'Party',
+          this.party!
+        )) as Party;
 
         await party.updateOutstandingAmount();
       }
@@ -254,7 +269,7 @@ export class Payment extends Doc {
   async updateReferenceOutstandingAmount() {
     await (this.for as Doc[]).forEach(
       async ({ amount, referenceType, referenceName }) => {
-        const refDoc = await frappe.doc.getDoc(
+        const refDoc = await this.frappe.doc.getDoc(
           referenceType as string,
           referenceName as string
         );
@@ -289,7 +304,7 @@ export class Payment extends Doc {
     amount: async (value: DocValue) => {
       if ((value as Money).isNegative()) {
         throw new ValidationError(
-          frappe.t`Payment amount cannot be less than zero.`
+          this.frappe.t`Payment amount cannot be less than zero.`
         );
       }
 
@@ -297,14 +312,14 @@ export class Payment extends Doc {
       const amount = this.getSum('for', 'amount', false);
 
       if ((value as Money).gt(amount)) {
-        throw new frappe.errors.ValidationError(
-          frappe.t`Payment amount cannot 
-              exceed ${frappe.format(amount, 'Currency')}.`
+        throw new ValidationError(
+          this.frappe.t`Payment amount cannot 
+              exceed ${this.frappe.format(amount, 'Currency')}.`
         );
       } else if ((value as Money).isZero()) {
-        throw new frappe.errors.ValidationError(
-          frappe.t`Payment amount cannot
-              be ${frappe.format(value, 'Currency')}.`
+        throw new ValidationError(
+          this.frappe.t`Payment amount cannot
+              be ${this.frappe.format(value, 'Currency')}.`
         );
       }
     },
@@ -353,36 +368,40 @@ export class Payment extends Doc {
     },
   };
 
-  static actions: Action[] = [getLedgerLinkAction()];
+  static getActions(frappe: Frappe): Action[] {
+    return [getLedgerLinkAction(frappe)];
+  }
 
-  static listSettings: ListViewSettings = {
-    columns: [
-      'party',
-      {
-        label: frappe.t`Status`,
-        fieldname: 'status',
-        fieldtype: 'Select',
-        size: 'small',
-        render(doc) {
-          let status = 'Draft';
-          let color = 'gray';
-          if (doc.submitted === 1) {
-            color = 'green';
-            status = 'Submitted';
-          }
-          if (doc.cancelled === 1) {
-            color = 'red';
-            status = 'Cancelled';
-          }
+  static getListViewSettings(frappe: Frappe): ListViewSettings {
+    return {
+      columns: [
+        'party',
+        {
+          label: frappe.t`Status`,
+          fieldname: 'status',
+          fieldtype: 'Select',
+          size: 'small',
+          render(doc) {
+            let status = 'Draft';
+            let color = 'gray';
+            if (doc.submitted === 1) {
+              color = 'green';
+              status = 'Submitted';
+            }
+            if (doc.cancelled === 1) {
+              color = 'red';
+              status = 'Cancelled';
+            }
 
-          return {
-            template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
-          };
+            return {
+              template: `<Badge class="text-xs" color="${color}">${status}</Badge>`,
+            };
+          },
         },
-      },
-      'paymentType',
-      'date',
-      'amount',
-    ],
-  };
+        'paymentType',
+        'date',
+        'amount',
+      ],
+    };
+  }
 }
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index 608389fe..01ebc445 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -1,4 +1,3 @@
-import frappe from 'frappe';
 import Doc from 'frappe/model/doc';
 import { FiltersMap, FormulaMap } from 'frappe/model/types';
 import Money from 'pesa/dist/types/src/money';
@@ -16,7 +15,7 @@ export class PaymentFor extends Doc {
         return outstandingAmount;
       }
 
-      return frappe.pesa(0);
+      return this.frappe.pesa(0);
     },
   };
 
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index 615de850..1a68794b 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -1,4 +1,5 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
+import { Frappe } from 'frappe';
 import { Action, ListViewSettings } from 'frappe/model/types';
 import {
   getTransactionActions,
@@ -11,10 +12,13 @@ export class PurchaseInvoice extends Invoice {
   items?: PurchaseInvoiceItem[];
 
   async getPosting() {
-    const entries: LedgerPosting = new LedgerPosting({
-      reference: this,
-      party: this.party,
-    });
+    const entries: LedgerPosting = new LedgerPosting(
+      {
+        reference: this,
+        party: this.party,
+      },
+      this.frappe
+    );
 
     await entries.credit(this.account!, this.baseGrandTotal!);
 
@@ -32,17 +36,21 @@ export class PurchaseInvoice extends Invoice {
     return entries;
   }
 
-  static actions: Action[] = getTransactionActions('PurchaseInvoice');
+  static getActions(frappe: Frappe): Action[] {
+    return getTransactionActions('PurchaseInvoice', frappe);
+  }
 
-  static listSettings: ListViewSettings = {
-    formRoute: (name) => `/edit/PurchaseInvoice/${name}`,
-    columns: [
-      'party',
-      'name',
-      getTransactionStatusColumn(),
-      'date',
-      'grandTotal',
-      'outstandingAmount',
-    ],
-  };
+  static getListViewSettings(frappe: Frappe): ListViewSettings {
+    return {
+      formRoute: (name) => `/edit/PurchaseInvoice/${name}`,
+      columns: [
+        'party',
+        'name',
+        getTransactionStatusColumn(frappe),
+        'date',
+        'grandTotal',
+        'outstandingAmount',
+      ],
+    };
+  }
 }
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
index bc66337a..260150ff 100644
--- a/models/baseModels/SalesInvoice/SalesInvoice.ts
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -1,4 +1,5 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
+import { Frappe } from 'frappe';
 import { Action, ListViewSettings } from 'frappe/model/types';
 import {
   getTransactionActions,
@@ -11,10 +12,13 @@ export class SalesInvoice extends Invoice {
   items?: SalesInvoiceItem[];
 
   async getPosting() {
-    const entries: LedgerPosting = new LedgerPosting({
-      reference: this,
-      party: this.party,
-    });
+    const entries: LedgerPosting = new LedgerPosting(
+      {
+        reference: this,
+        party: this.party,
+      },
+      this.frappe
+    );
     await entries.debit(this.account!, this.baseGrandTotal!);
 
     for (const item of this.items!) {
@@ -30,17 +34,21 @@ export class SalesInvoice extends Invoice {
     return entries;
   }
 
-  static actions: Action[] = getTransactionActions('SalesInvoice');
+  static getActions(frappe: Frappe): Action[] {
+    return getTransactionActions('SalesInvoice', frappe);
+  }
 
-  static listSettings: ListViewSettings = {
-    formRoute: (name) => `/edit/SalesInvoice/${name}`,
-    columns: [
-      'party',
-      'name',
-      getTransactionStatusColumn(),
-      'date',
-      'grandTotal',
-      'outstandingAmount',
-    ],
-  };
+  static getListViewSettings(frappe: Frappe): ListViewSettings {
+    return {
+      formRoute: (name) => `/edit/SalesInvoice/${name}`,
+      columns: [
+        'party',
+        'name',
+        getTransactionStatusColumn(frappe),
+        'date',
+        'grandTotal',
+        'outstandingAmount',
+      ],
+    };
+  }
 }
diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts
index 3728b2f3..baf1ef70 100644
--- a/models/baseModels/SetupWizard/SetupWizard.ts
+++ b/models/baseModels/SetupWizard/SetupWizard.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { t } from 'frappe';
 import Doc from 'frappe/model/doc';
 import { FormulaMap, ListsMap } from 'frappe/model/types';
 import { DateTime } from 'luxon';
@@ -6,7 +6,7 @@ import countryInfo from '../../../fixtures/countryInfo.json';
 
 export function getCOAList() {
   return [
-    { name: frappe.t`Standard Chart of Accounts`, countryCode: '' },
+    { name: t`Standard Chart of Accounts`, countryCode: '' },
 
     { countryCode: 'ae', name: 'U.A.E - Chart of Accounts' },
     {
diff --git a/models/baseModels/Tax/Tax.ts b/models/baseModels/Tax/Tax.ts
index 8c148252..40dad8bb 100644
--- a/models/baseModels/Tax/Tax.ts
+++ b/models/baseModels/Tax/Tax.ts
@@ -2,5 +2,7 @@ import Doc from 'frappe/model/doc';
 import { ListViewSettings } from 'frappe/model/types';
 
 export class Tax extends Doc {
-  static listSettings: ListViewSettings = { columns: ['name'] };
+  static getListViewSettings(): ListViewSettings {
+    return { columns: ['name'] };
+  }
 }
diff --git a/models/helpers.ts b/models/helpers.ts
index de48bc70..5f226b1d 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -1,12 +1,11 @@
-import { openQuickEdit } from '@/utils';
-import frappe from 'frappe';
+import { Frappe } from 'frappe';
 import Doc from 'frappe/model/doc';
 import { Action, ColumnConfig } from 'frappe/model/types';
 import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
 import { InvoiceStatus } from './types';
 
-export function getLedgerLinkAction(): Action {
+export function getLedgerLinkAction(frappe: Frappe): Action {
   return {
     label: frappe.t`Ledger Entries`,
     condition: (doc: Doc) => !!doc.submitted,
@@ -26,7 +25,10 @@ export function getLedgerLinkAction(): Action {
   };
 }
 
-export function getTransactionActions(schemaName: string): Action[] {
+export function getTransactionActions(
+  schemaName: string,
+  frappe: Frappe
+): Action[] {
   return [
     {
       label: frappe.t`Make Payment`,
@@ -42,6 +44,7 @@ export function getTransactionActions(schemaName: string): Action[] {
         const paymentType = isSales ? 'Receive' : 'Pay';
         const hideAccountField = isSales ? 'account' : 'paymentAccount';
 
+        const { openQuickEdit } = await import('../src/utils');
         await openQuickEdit({
           schemaName: 'Payment',
           name: payment.name as string,
@@ -69,11 +72,11 @@ export function getTransactionActions(schemaName: string): Action[] {
         router.push({ path: `/print/${doc.doctype}/${doc.name}` });
       },
     },
-    getLedgerLinkAction(),
+    getLedgerLinkAction(frappe),
   ];
 }
 
-export function getTransactionStatusColumn(): ColumnConfig {
+export function getTransactionStatusColumn(frappe: Frappe): ColumnConfig {
   const statusMap = {
     Unpaid: frappe.t`Unpaid`,
     Paid: frappe.t`Paid`,
diff --git a/models/index.ts b/models/index.ts
index f7573e4c..e129ebad 100644
--- a/models/index.ts
+++ b/models/index.ts
@@ -1,3 +1,4 @@
+import { ModelMap } from 'frappe/model/types';
 import { Account } from './baseModels/Account/Account';
 import { AccountingLedgerEntry } from './baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
 import { AccountingSettings } from './baseModels/AccountingSettings/AccountingSettings';
@@ -34,9 +35,11 @@ export default {
   SetupWizard,
   Tax,
   TaxSummary,
-};
+} as ModelMap;
 
-export async function getRegionalModels(countryCode: string) {
+export async function getRegionalModels(
+  countryCode: string
+): Promise<ModelMap> {
   if (countryCode !== 'in') {
     return {};
   }
diff --git a/models/regionalModels/in/Party.ts b/models/regionalModels/in/Party.ts
index 6f2aa125..ac49b067 100644
--- a/models/regionalModels/in/Party.ts
+++ b/models/regionalModels/in/Party.ts
@@ -3,7 +3,7 @@ import { Party as BaseParty } from 'models/baseModels/Party/Party';
 import { GSTType } from './types';
 
 export class Party extends BaseParty {
-  beforeInsert() {
+  async beforeInsert() {
     const gstin = this.get('gstin') as string | undefined;
     const gstType = this.get('gstType') as GSTType;
 
diff --git a/models/types.ts b/models/types.ts
index 6d62634a..6d7bb13a 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -1 +1,31 @@
 export type InvoiceStatus = 'Draft' | 'Unpaid' | 'Cancelled' | 'Paid';
+export enum ModelNameEnum {
+  Account = 'Account',
+  AccountingLedgerEntry = 'AccountingLedgerEntry',
+  AccountingSettings = 'AccountingSettings',
+  Address = 'Address',
+  Color = 'Color',
+  CompanySettings = 'CompanySettings',
+  Currency = 'Currency',
+  GetStarted = 'GetStarted',
+  Item = 'Item',
+  JournalEntry = 'JournalEntry',
+  JournalEntryAccount = 'JournalEntryAccount',
+  NumberSeries = 'NumberSeries',
+  Party = 'Party',
+  Payment = 'Payment',
+  PaymentFor = 'PaymentFor',
+  PrintSettings = 'PrintSettings',
+  PurchaseInvoice = 'PurchaseInvoice',
+  PurchaseInvoiceItem = 'PurchaseInvoiceItem',
+  SalesInvoice = 'SalesInvoice',
+  SalesInvoiceItem = 'SalesInvoiceItem',
+  SalesInvoiceSettings = 'SalesInvoiceSettings',
+  SetupWizard = 'SetupWizard',
+  Tax = 'Tax',
+  TaxDetail = 'TaxDetail',
+  TaxSummary = 'TaxSummary',
+  PatchRun = 'PatchRun',
+  SingleValue = 'SingleValue',
+  SystemSettings = 'SystemSettings',
+}
diff --git a/schemas/app/Account.json b/schemas/app/Account.json
index 75a03c30..2c59b8af 100644
--- a/schemas/app/Account.json
+++ b/schemas/app/Account.json
@@ -149,8 +149,5 @@
     "accountType",
     "isGroup"
   ],
-  "keywordFields": ["name", "rootType", "accountType"],
-  "treeSettings": {
-    "parentField": "parentAccount"
-  }
+  "keywordFields": ["name", "rootType", "accountType"]
 }
diff --git a/schemas/index.ts b/schemas/index.ts
index 65e9cbea..b807bd99 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -67,7 +67,7 @@ function deepFreeze(schemaMap: SchemaMap) {
 }
 
 export function addMetaFields(schemaMap: SchemaMap): SchemaMap {
-  const metaSchemaMap = getMapFromList(metaSchemas, 'name');
+  const metaSchemaMap = getMapFromList(cloneDeep(metaSchemas), 'name');
 
   const base = metaSchemaMap.base;
   const tree = getCombined(metaSchemaMap.tree, base);
@@ -115,13 +115,13 @@ function addNameField(schemaMap: SchemaMap) {
 }
 
 function getCoreSchemas(): SchemaMap {
-  const rawSchemaMap = getMapFromList(coreSchemas, 'name');
+  const rawSchemaMap = getMapFromList(cloneDeep(coreSchemas), 'name');
   const coreSchemaMap = getAbstractCombinedSchemas(rawSchemaMap);
   return cleanSchemas(coreSchemaMap);
 }
 
 function getAppSchemas(countryCode: string): SchemaMap {
-  const appSchemaMap = getMapFromList(appSchemas, 'name');
+  const appSchemaMap = getMapFromList(cloneDeep(appSchemas), 'name');
   const regionalSchemaMap = getRegionalSchemaMap(countryCode);
   const combinedSchemas = getRegionalCombinedSchemas(
     appSchemaMap,
@@ -225,7 +225,7 @@ export function getRegionalCombinedSchemas(
 }
 
 function getRegionalSchemaMap(countryCode: string): SchemaStubMap {
-  const countrySchemas = regionalSchemas[countryCode] as
+  const countrySchemas = cloneDeep(regionalSchemas[countryCode]) as
     | SchemaStub[]
     | undefined;
   if (countrySchemas === undefined) {
diff --git a/schemas/types.ts b/schemas/types.ts
index c76ee860..c00ac1e3 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -68,7 +68,6 @@ export type Field =
   | DynamicLinkField
   | NumberField;
 
-export type TreeSettings = { parentField: string };
 export type Naming = 'autoincrement' | 'random' | 'numberSeries'
 
 export interface Schema {
@@ -84,7 +83,6 @@ export interface Schema {
   isSubmittable?: boolean;       // For transactional types, values considered only after submit
   keywordFields?: string[];      // Used to get fields that are to be used for search.
   quickEditFields?: string[];    // Used to get fields for the quickEditForm
-  treeSettings?: TreeSettings;   // Used to determine root nodes
   inlineEditDisplayField?:string;// Display field if inline editable
   naming?: Naming;               // Used for assigning name, default is 'random' else 'numberSeries' if present
   removeFields?: string[];       // Used by the builder to remove fields.
diff --git a/src/config.ts b/src/config.ts
deleted file mode 100644
index a5be5297..00000000
--- a/src/config.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import Store from 'electron-store';
-import frappe from 'frappe';
-
-const config = new Store();
-export default config;
-
-export enum ConfigKeys {
-  Files = 'files',
-  LastSelectedFilePath = 'lastSelectedFilePath',
-  Language = 'language',
-  DeviceId = 'deviceId',
-  Telemetry = 'telemetry',
-  OpenCount = 'openCount',
-}
-
-export enum TelemetrySetting {
-  allow = 'allow',
-  dontLogUsage = 'dontLogUsage',
-  dontLogAnything = 'dontLogAnything',
-}
-
-export interface ConfigFile {
-  id: string;
-  companyName: string;
-  filePath: string;
-}
diff --git a/src/dataImport.ts b/src/dataImport.ts
index ab18f3b7..f1cd86fd 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -4,8 +4,8 @@ import Doc from 'frappe/model/doc';
 import { isNameAutoSet } from 'frappe/model/naming';
 import { FieldType, FieldTypeEnum } from 'schemas/types';
 import { parseCSV } from '../utils/csvParser';
-import telemetry from './telemetry/telemetry';
-import { Noun, Verb } from './telemetry/types';
+import telemetry from '../frappe/telemetry/telemetry';
+import { Noun, Verb } from '../frappe/telemetry/types';
 
 export const importable = [
   'SalesInvoice',
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 476ee615..a463f40e 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -9,9 +9,9 @@ import {
 } from 'frappe/utils/errors';
 import { ErrorLog } from 'frappe/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
-import config, { ConfigKeys, TelemetrySetting } from './config';
-import telemetry from './telemetry/telemetry';
-import { showMessageDialog, showToast } from './utils';
+import telemetry from '../frappe/telemetry/telemetry';
+import config, { ConfigKeys, TelemetrySetting } from '../utils/config';
+import { showMessageDialog, showToast } from './utils.js';
 
 function getCanLog(): boolean {
   const telemetrySetting = config.get(ConfigKeys.Telemetry);
diff --git a/src/initFyo.ts b/src/initFyo.ts
new file mode 100644
index 00000000..917b157f
--- /dev/null
+++ b/src/initFyo.ts
@@ -0,0 +1,3 @@
+import { Frappe } from 'frappe';
+
+export const fyo = new Frappe({ isTest: false, isElectron: true });
diff --git a/src/postStart.ts b/src/postStart.ts
index 0196b22f..03a67eaa 100644
--- a/src/postStart.ts
+++ b/src/postStart.ts
@@ -1,6 +1,7 @@
-import frappe from 'frappe';
 import { createNumberSeries } from 'frappe/model/naming';
+import { DEFAULT_SERIES_START } from 'frappe/utils/consts';
 import { getValueMapFromList } from 'utils';
+import { fyo } from './initFyo';
 
 export default async function postStart() {
   await createDefaultNumberSeries();
@@ -9,23 +10,28 @@ export default async function postStart() {
 }
 
 async function createDefaultNumberSeries() {
-  await createNumberSeries('SINV-', 'SalesInvoice');
-  await createNumberSeries('PINV-', 'PurchaseInvoice');
-  await createNumberSeries('PAY-', 'Payment');
-  await createNumberSeries('JV-', 'JournalEntry');
+  await createNumberSeries('SINV-', 'SalesInvoice', DEFAULT_SERIES_START, fyo);
+  await createNumberSeries(
+    'PINV-',
+    'PurchaseInvoice',
+    DEFAULT_SERIES_START,
+    fyo
+  );
+  await createNumberSeries('PAY-', 'Payment', DEFAULT_SERIES_START, fyo);
+  await createNumberSeries('JV-', 'JournalEntry', DEFAULT_SERIES_START, fyo);
 }
 
 async function setSingles() {
-  await frappe.doc.getSingle('AccountingSettings');
-  await frappe.doc.getSingle('GetStarted');
+  await fyo.doc.getSingle('AccountingSettings');
+  await fyo.doc.getSingle('GetStarted');
 }
 
 async function setCurrencySymbols() {
-  const currencies = (await frappe.db.getAll('Currency', {
+  const currencies = (await fyo.db.getAll('Currency', {
     fields: ['name', 'symbol'],
   })) as { name: string; symbol: string }[];
 
-  frappe.currencySymbols = getValueMapFromList(
+  fyo.currencySymbols = getValueMapFromList(
     currencies,
     'name',
     'symbol'
diff --git a/src/renderer/helpers.ts b/src/renderer/helpers.ts
index 6dd74ec7..6cbfc2d9 100644
--- a/src/renderer/helpers.ts
+++ b/src/renderer/helpers.ts
@@ -1,12 +1,13 @@
-import config, { ConfigKeys } from '@/config';
+import frappe from 'frappe';
+import { ConfigKeys } from 'frappe/core/types';
 
 export function incrementOpenCount() {
-  let openCount = config.get(ConfigKeys.OpenCount);
+  let openCount = frappe.config.get(ConfigKeys.OpenCount);
   if (typeof openCount !== 'number') {
     openCount = 1;
   } else {
     openCount += 1;
   }
 
-  config.set(ConfigKeys.OpenCount, openCount);
+  frappe.config.set(ConfigKeys.OpenCount, openCount);
 }
diff --git a/src/renderer/registerIpcRendererListeners.ts b/src/renderer/registerIpcRendererListeners.ts
index 10171ad0..69ebf2cb 100644
--- a/src/renderer/registerIpcRendererListeners.ts
+++ b/src/renderer/registerIpcRendererListeners.ts
@@ -1,6 +1,6 @@
 import { handleError } from '@/errorHandling';
 import { IPC_CHANNELS, IPC_MESSAGES } from 'utils/messages';
-import telemetry from '@/telemetry/telemetry';
+import telemetry from 'frappe/telemetry/telemetry';
 import { showToast } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
diff --git a/src/router.js b/src/router.js
index e97f6c51..d757958a 100644
--- a/src/router.js
+++ b/src/router.js
@@ -10,8 +10,8 @@ import QuickEditForm from '@/pages/QuickEditForm.vue';
 import Report from '@/pages/Report.vue';
 import Settings from '@/pages/Settings/Settings.vue';
 import { createRouter, createWebHistory } from 'vue-router';
-import telemetry from './telemetry/telemetry';
-import { NounEnum, Verb } from './telemetry/types';
+import telemetry from '../frappe/telemetry/telemetry';
+import { NounEnum, Verb } from '../frappe/telemetry/types';
 
 const routes = [
   {
diff --git a/src/telemetry/helpers.ts b/src/telemetry/helpers.ts
deleted file mode 100644
index 5f80c425..00000000
--- a/src/telemetry/helpers.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import config, { ConfigFile, ConfigKeys, TelemetrySetting } from '@/config';
-import { ipcRenderer } from 'electron';
-import frappe, { t } from 'frappe';
-import { IPC_ACTIONS } from 'utils/messages';
-import { DoctypeName } from '../../models/types';
-import { Count, UniqueId } from './types';
-
-export function getId(): string {
-  let id: string = '';
-
-  for (let i = 0; i < 4; i++) {
-    id += Math.random().toString(36).slice(2, 9);
-  }
-
-  return id;
-}
-
-export function getCountry(): string {
-  // @ts-ignore
-  return frappe.AccountingSettings?.country ?? '';
-}
-
-export function getLanguage(): string {
-  return config.get('language') as string;
-}
-
-export async function getCounts(): Promise<Count> {
-  const interestingDocs = [
-    DoctypeName.Payment,
-    DoctypeName.PaymentFor,
-    DoctypeName.SalesInvoice,
-    DoctypeName.SalesInvoiceItem,
-    DoctypeName.PurchaseInvoice,
-    DoctypeName.PurchaseInvoiceItem,
-    DoctypeName.JournalEntry,
-    DoctypeName.JournalEntryAccount,
-    DoctypeName.Party,
-    DoctypeName.Account,
-    DoctypeName.Tax,
-  ];
-
-  const countMap: Count = {};
-  // @ts-ignore
-  if (frappe.db === undefined) {
-    return countMap;
-  }
-
-  type CountResponse = { 'count(*)': number }[];
-  for (const name of interestingDocs) {
-    const count: number = (await frappe.db.getAll(name)).length;
-    countMap[name] = count;
-  }
-
-  return countMap;
-}
-
-export function getDeviceId(): UniqueId {
-  let deviceId = config.get(ConfigKeys.DeviceId) as string | undefined;
-  if (deviceId === undefined) {
-    deviceId = getId();
-    config.set(ConfigKeys.DeviceId, deviceId);
-  }
-
-  return deviceId;
-}
-
-export function getInstanceId(): UniqueId {
-  const files = config.get(ConfigKeys.Files) as ConfigFile[];
-
-  // @ts-ignore
-  const companyName = frappe.AccountingSettings?.companyName;
-  if (companyName === undefined) {
-    return '';
-  }
-
-  const file = files.find((f) => f.companyName === companyName);
-
-  if (file === undefined) {
-    return addNewFile(companyName, files);
-  }
-
-  if (file.id === undefined) {
-    return setInstanceId(companyName, files);
-  }
-
-  return file.id;
-}
-
-function addNewFile(companyName: string, files: ConfigFile[]): UniqueId {
-  const newFile: ConfigFile = {
-    companyName,
-    filePath: config.get(ConfigKeys.LastSelectedFilePath, '') as string,
-    id: getId(),
-  };
-
-  files.push(newFile);
-  config.set(ConfigKeys.Files, files);
-  return newFile.id;
-}
-
-function setInstanceId(companyName: string, files: ConfigFile[]): UniqueId {
-  let id = '';
-  for (const file of files) {
-    if (file.id) {
-      continue;
-    }
-
-    file.id = getId();
-    if (file.companyName === companyName) {
-      id = file.id;
-    }
-  }
-
-  config.set(ConfigKeys.Files, files);
-  return id;
-}
-
-export async function getCreds() {
-  const creds = await ipcRenderer.invoke(IPC_ACTIONS.GET_CREDS);
-  const url: string = creds?.telemetryUrl ?? '';
-  const token: string = creds?.tokenString ?? '';
-  return { url, token };
-}
-
-export const getTelemetryOptions = () => ({
-  [TelemetrySetting.allow]: t`Allow Telemetry`,
-  [TelemetrySetting.dontLogUsage]: t`Don't Log Usage`,
-  [TelemetrySetting.dontLogAnything]: t`Don't Log Anything`,
-});
diff --git a/tsconfig.json b/tsconfig.json
index eb9a7256..f16aa405 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -44,6 +44,6 @@
 
     "scripts/**/*.ts",
     "utils/csvParser.ts"
-  ],
+, "utils/config.ts"  ],
   "exclude": ["node_modules"]
 }
diff --git a/utils/auth/types.ts b/utils/auth/types.ts
new file mode 100644
index 00000000..d730aaea
--- /dev/null
+++ b/utils/auth/types.ts
@@ -0,0 +1,5 @@
+export type TelemetryCreds = { url: string; token: string };
+
+export abstract class AuthDemuxBase {
+  abstract getTelemetryCreds(): Promise<TelemetryCreds>
+}
diff --git a/utils/config.ts b/utils/config.ts
new file mode 100644
index 00000000..f30346e7
--- /dev/null
+++ b/utils/config.ts
@@ -0,0 +1,4 @@
+import Store from 'electron-store';
+
+const config = new Store();
+export default config;

From de7e5ba807cce7a46556ff1e8270785e96bfccc4 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 19 Apr 2022 11:29:36 +0530
Subject: [PATCH 056/163] refactor: rename 'frappe' to 'fyo' outside src -
 cause now most of it is different from what it was

---
 META.md                                       |   4 +-
 accounting/exchangeRate.ts                    |   2 +-
 accounting/gst.js                             |   2 +-
 accounting/importCOA.js                       |   2 +-
 accounting/ledgerPosting.ts                   |  36 +++---
 accounting/types.ts                           |   2 +-
 accounting/utils.js                           |   2 +-
 backend/database/core.ts                      |   4 +-
 fixtures/standardCOA.js                       |   2 +-
 frappe/telemetry/helpers.ts                   | 116 ------------------
 {frappe => fyo}/README.md                     |   0
 {frappe => fyo}/core/authHandler.ts           |  14 +--
 {frappe => fyo}/core/converter.ts             |  16 +--
 {frappe => fyo}/core/dbHandler.ts             |  18 +--
 {frappe => fyo}/core/docHandler.ts            |  26 ++--
 {frappe => fyo}/core/types.ts                 |   2 +-
 {frappe => fyo}/demux/auth.ts                 |   0
 {frappe => fyo}/demux/config.ts               |   0
 {frappe => fyo}/demux/db.ts                   |   2 +-
 {frappe => fyo}/index.ts                      |   2 +-
 {frappe => fyo}/model/doc.ts                  |  73 ++++++-----
 {frappe => fyo}/model/helpers.ts              |  10 +-
 {frappe => fyo}/model/naming.ts               |  42 +++----
 {frappe => fyo}/model/types.ts                |   8 +-
 {frappe => fyo}/model/validationFunction.ts   |   4 +-
 {frappe => fyo}/models/NumberSeries.ts        |   4 +-
 {frappe => fyo}/models/SystemSettings.ts      |  10 +-
 {frappe => fyo}/models/index.ts               |   2 +-
 fyo/telemetry/helpers.ts                      | 116 ++++++++++++++++++
 {frappe => fyo}/telemetry/telemetry.ts        |  29 +++--
 {frappe => fyo}/telemetry/types.ts            |   0
 {frappe => fyo}/tests/helpers.ts              |   0
 .../tests/testFyo.spec.ts                     |  32 ++---
 {frappe => fyo}/utils/cacheManager.ts         |   0
 {frappe => fyo}/utils/consts.ts               |   0
 {frappe => fyo}/utils/errors.ts               |   0
 {frappe => fyo}/utils/format.ts               |  47 ++++---
 {frappe => fyo}/utils/index.ts                |   0
 {frappe => fyo}/utils/observable.ts           |   0
 {frappe => fyo}/utils/translation.ts          |   0
 {frappe => fyo}/utils/types.ts                |   0
 models/README.md                              |  10 +-
 models/baseModels/Account/Account.ts          |  12 +-
 .../AccountingLedgerEntry.ts                  |   4 +-
 .../AccountingSettings/AccountingSettings.ts  |   4 +-
 models/baseModels/Address/Address.ts          |  11 +-
 models/baseModels/Invoice/Invoice.ts          |  26 ++--
 models/baseModels/InvoiceItem/InvoiceItem.ts  |  12 +-
 models/baseModels/Item/Item.ts                |  26 ++--
 .../baseModels/JournalEntry/JournalEntry.ts   |  18 +--
 .../JournalEntryAccount.ts                    |   6 +-
 models/baseModels/Party/Party.ts              |  30 ++---
 models/baseModels/Payment/Payment.ts          |  73 ++++++-----
 models/baseModels/PaymentFor/PaymentFor.ts    |   6 +-
 .../PurchaseInvoice/PurchaseInvoice.ts        |  14 +--
 .../baseModels/SalesInvoice/SalesInvoice.ts   |  14 +--
 models/baseModels/SetupWizard/SetupWizard.ts  |   6 +-
 models/baseModels/Tax/Tax.ts                  |   4 +-
 models/baseModels/TaxSummary/TaxSummary.ts    |   4 +-
 models/helpers.ts                             |  32 ++---
 models/index.ts                               |   2 +-
 models/regionalModels/in/Address.ts           |   2 +-
 models/regionalModels/in/Party.ts             |   2 +-
 .../AccountsReceivablePayable.js              |   2 +-
 reports/BalanceSheet/BalanceSheet.js          |   2 +-
 reports/BalanceSheet/viewConfig.js            |   2 +-
 .../BankReconciliation/BankReconciliation.js  |   2 +-
 .../BankReconciliationImport.js               |   2 +-
 reports/BankReconciliation/viewConfig.js      |   2 +-
 reports/Cashflow/Cashflow.js                  |   2 +-
 .../FinancialStatements.js                    |  29 +++--
 reports/GeneralLedger/GeneralLedger.js        |   2 +-
 reports/GeneralLedger/viewConfig.js           |   2 +-
 reports/GoodsAndServiceTax/BaseGSTR.js        |   2 +-
 reports/GoodsAndServiceTax/BaseViewConfig.js  |   2 +-
 reports/GoodsAndServiceTax/GSTR1View.js       |   2 +-
 reports/GoodsAndServiceTax/GSTR2View.js       |   2 +-
 reports/ProfitAndLoss/ProfitAndLoss.js        |   2 +-
 reports/ProfitAndLoss/viewConfig.js           |   2 +-
 reports/PurchaseRegister/PurchaseRegister.js  |   2 +-
 reports/PurchaseRegister/viewConfig.js        |   2 +-
 reports/SalesRegister/SalesRegister.js        |   2 +-
 reports/SalesRegister/viewConfig.js           |   2 +-
 reports/TrialBalance/viewConfig.js            |   2 +-
 reports/commonExporter.js                     |   2 +-
 src/App.vue                                   |  10 +-
 src/dataImport.ts                             |  10 +-
 src/errorHandling.ts                          |   8 +-
 src/initFyo.ts                                |   4 +-
 src/pages/ListView/ListView.vue               |  10 +-
 src/pages/PrintView/PrintView.vue             |   2 +-
 src/pages/Settings/Settings.vue               |  18 ++-
 src/pages/Settings/TabGeneral.vue             |   2 +-
 src/pages/Settings/TabInvoice.vue             |   6 +-
 src/pages/Settings/TabSystem.vue              |   2 +-
 src/pages/SetupWizard/SetupWizard.vue         |   2 +-
 src/pages/SetupWizard/setupCompany.js         |   4 +-
 src/regional/in.ts                            |   6 +-
 src/renderer/helpers.ts                       |   8 +-
 src/renderer/registerIpcRendererListeners.ts  |  31 +++--
 src/utils.ts                                  |   2 +-
 tsconfig.json                                 |   2 +-
 vue.config.js                                 |   6 +-
 103 files changed, 570 insertions(+), 581 deletions(-)
 delete mode 100644 frappe/telemetry/helpers.ts
 rename {frappe => fyo}/README.md (100%)
 rename {frappe => fyo}/core/authHandler.ts (87%)
 rename {frappe => fyo}/core/converter.ts (93%)
 rename {frappe => fyo}/core/dbHandler.ts (93%)
 rename {frappe => fyo}/core/docHandler.ts (86%)
 rename {frappe => fyo}/core/types.ts (97%)
 rename {frappe => fyo}/demux/auth.ts (100%)
 rename {frappe => fyo}/demux/config.ts (100%)
 rename {frappe => fyo}/demux/db.ts (97%)
 rename {frappe => fyo}/index.ts (99%)
 rename {frappe => fyo}/model/doc.ts (89%)
 rename {frappe => fyo}/model/helpers.ts (93%)
 rename {frappe => fyo}/model/naming.ts (64%)
 rename {frappe => fyo}/model/types.ts (92%)
 rename {frappe => fyo}/model/validationFunction.ts (88%)
 rename {frappe => fyo}/models/NumberSeries.ts (91%)
 rename {frappe => fyo}/models/SystemSettings.ts (59%)
 rename {frappe => fyo}/models/index.ts (78%)
 create mode 100644 fyo/telemetry/helpers.ts
 rename {frappe => fyo}/telemetry/telemetry.ts (85%)
 rename {frappe => fyo}/telemetry/types.ts (100%)
 rename {frappe => fyo}/tests/helpers.ts (100%)
 rename frappe/tests/testFrappe.spec.ts => fyo/tests/testFyo.spec.ts (61%)
 rename {frappe => fyo}/utils/cacheManager.ts (100%)
 rename {frappe => fyo}/utils/consts.ts (100%)
 rename {frappe => fyo}/utils/errors.ts (100%)
 rename {frappe => fyo}/utils/format.ts (69%)
 rename {frappe => fyo}/utils/index.ts (100%)
 rename {frappe => fyo}/utils/observable.ts (100%)
 rename {frappe => fyo}/utils/translation.ts (100%)
 rename {frappe => fyo}/utils/types.ts (100%)

diff --git a/META.md b/META.md
index 24b1b570..3a73a0eb 100644
--- a/META.md
+++ b/META.md
@@ -18,7 +18,7 @@ requires resources from the _server_ side, it does so by making use of
 `ipcRenderer.send` or `ipcRenderer.invoke` i.e. if the front end is being run on
 electron.
 
-The `ipcRenderer` calls are done only in `frappe/demux/*.ts` files. I.e. these
+The `ipcRenderer` calls are done only in `fyo/demux/*.ts` files. I.e. these
 are the only files on the _client_ side that are aware of the platform the
 _client_ is being run on i.e. `electron` or Browser. So all platform specific
 calls should go through these _demux_ files.
@@ -53,7 +53,7 @@ individual ones, check the `README.md` in those subdirectories:
 | `src`          | _client_   | Code that mainly deals with the view layer (all `.vue` are stored here)                                                    |
 | `reports`      | _client_   | Collection of logic code and view layer config files for displaying reports.                                               |
 | `models`       | _client\*_ | Collection of `Model.ts` files that manage the data and some business logic on the client side.                            |
-| `frappe`       | _client\*_ | Code for the underlying library that manages the client side                                                               |
+| `fyo`          | _client\*_ | Code for the underlying library that manages the client side                                                               |
 | `utils`        | _agnostic_ | Collection of code used by either sides.                                                                                   |
 
 #### _client\*_
diff --git a/accounting/exchangeRate.ts b/accounting/exchangeRate.ts
index e40ca95c..445af0a2 100644
--- a/accounting/exchangeRate.ts
+++ b/accounting/exchangeRate.ts
@@ -1,4 +1,4 @@
-import { NotFoundError } from 'frappe/utils/errors';
+import { NotFoundError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
 
 export async function getExchangeRate({
diff --git a/accounting/gst.js b/accounting/gst.js
index 3635ae5d..d4c3ed60 100644
--- a/accounting/gst.js
+++ b/accounting/gst.js
@@ -1,5 +1,5 @@
 import { showMessageDialog } from '@/utils';
-import frappe, { t } from 'frappe';
+import frappe, { t } from 'fyo';
 import { DateTime } from 'luxon';
 import { stateCodeMap } from '../regional/in';
 import { exportCsv, saveExportData } from '../reports/commonExporter';
diff --git a/accounting/importCOA.js b/accounting/importCOA.js
index d55fac7c..c4315e42 100644
--- a/accounting/importCOA.js
+++ b/accounting/importCOA.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 import standardCOA from '../fixtures/verified/standardCOA.json';
 import { getCOAList } from '../src/utils';
 const accountFields = ['accountType', 'accountNumber', 'rootType', 'isGroup'];
diff --git a/accounting/ledgerPosting.ts b/accounting/ledgerPosting.ts
index 5868620b..4e2d6f38 100644
--- a/accounting/ledgerPosting.ts
+++ b/accounting/ledgerPosting.ts
@@ -1,6 +1,6 @@
-import { Frappe } from 'frappe';
-import Doc from 'frappe/model/doc';
-import { ValidationError } from 'frappe/utils/errors';
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
+import { ValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 import {
   AccountEntry,
@@ -19,11 +19,11 @@ export class LedgerPosting {
   reverted: boolean;
   accountEntries: AccountEntry[];
 
-  frappe: Frappe;
+  fyo: Fyo;
 
   constructor(
     { reference, party, date, description }: LedgerPostingOptions,
-    frappe: Frappe
+    fyo: Fyo
   ) {
     this.reference = reference;
     this.party = party;
@@ -35,7 +35,7 @@ export class LedgerPosting {
     // To change balance while entering ledger entries
     this.accountEntries = [];
 
-    this.frappe = frappe;
+    this.fyo = fyo;
   }
 
   async debit(
@@ -66,7 +66,7 @@ export class LedgerPosting {
     amount: Money
   ) {
     const debitAccounts = ['Asset', 'Expense'];
-    const accountDoc = await this.frappe.doc.getDoc('Account', accountName);
+    const accountDoc = await this.fyo.doc.getDoc('Account', accountName);
     const rootType = accountDoc.rootType as string;
 
     if (debitAccounts.indexOf(rootType) === -1) {
@@ -94,8 +94,8 @@ export class LedgerPosting {
         referenceName: referenceName ?? this.reference.name!,
         description: this.description,
         reverted: this.reverted,
-        debit: this.frappe.pesa(0),
-        credit: this.frappe.pesa(0),
+        debit: this.fyo.pesa(0),
+        credit: this.fyo.pesa(0),
       };
 
       this.entries.push(entry);
@@ -113,7 +113,7 @@ export class LedgerPosting {
   async postReverse() {
     this.validateEntries();
 
-    const data = await this.frappe.db.getAll('AccountingLedgerEntry', {
+    const data = await this.fyo.db.getAll('AccountingLedgerEntry', {
       fields: ['name'],
       filters: {
         referenceName: this.reference.name!,
@@ -122,7 +122,7 @@ export class LedgerPosting {
     });
 
     for (const entry of data) {
-      const entryDoc = await this.frappe.doc.getDoc(
+      const entryDoc = await this.fyo.doc.getDoc(
         'AccountingLedgerEntry',
         entry.name as string
       );
@@ -166,10 +166,10 @@ export class LedgerPosting {
     const { debit, credit } = this.getTotalDebitAndCredit();
     if (debit.neq(credit)) {
       throw new ValidationError(
-        `Total Debit: ${this.frappe.format(
+        `Total Debit: ${this.fyo.format(
           debit,
           'Currency'
-        )} must be equal to Total Credit: ${this.frappe.format(
+        )} must be equal to Total Credit: ${this.fyo.format(
           credit,
           'Currency'
         )}`
@@ -178,8 +178,8 @@ export class LedgerPosting {
   }
 
   getTotalDebitAndCredit() {
-    let debit = this.frappe.pesa(0);
-    let credit = this.frappe.pesa(0);
+    let debit = this.fyo.pesa(0);
+    let credit = this.fyo.pesa(0);
 
     for (const entry of this.entries) {
       debit = debit.add(entry.debit);
@@ -191,12 +191,12 @@ export class LedgerPosting {
 
   async insertEntries() {
     for (const entry of this.entries) {
-      const entryDoc = this.frappe.doc.getNewDoc('AccountingLedgerEntry');
+      const entryDoc = this.fyo.doc.getNewDoc('AccountingLedgerEntry');
       Object.assign(entryDoc, entry);
       await entryDoc.insert();
     }
     for (const entry of this.accountEntries) {
-      const entryDoc = await this.frappe.doc.getDoc('Account', entry.name);
+      const entryDoc = await this.fyo.doc.getDoc('Account', entry.name);
       const balance = entryDoc.get('balance') as Money;
       entryDoc.balance = balance.add(entry.balanceChange);
       await entryDoc.update();
@@ -204,6 +204,6 @@ export class LedgerPosting {
   }
 
   getRoundOffAccount() {
-    return this.frappe.singles.AccountingSettings!.roundOffAccount as string;
+    return this.fyo.singles.AccountingSettings!.roundOffAccount as string;
   }
 }
diff --git a/accounting/types.ts b/accounting/types.ts
index be5d091c..9423ef0a 100644
--- a/accounting/types.ts
+++ b/accounting/types.ts
@@ -1,4 +1,4 @@
-import Doc from 'frappe/model/doc';
+import Doc from 'fyo/model/doc';
 import Money from 'pesa/dist/types/src/money';
 
 export interface LedgerPostingOptions {
diff --git a/accounting/utils.js b/accounting/utils.js
index 5ad2fbb9..091fd8bf 100644
--- a/accounting/utils.js
+++ b/accounting/utils.js
@@ -1,4 +1,4 @@
-import { t } from 'frappe';
+import { t } from 'fyo';
 
 export const ledgerLink = {
   label: t`Ledger Entries`,
diff --git a/backend/database/core.ts b/backend/database/core.ts
index 14dab13f..9e5f8e94 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -1,4 +1,3 @@
-import { knex, Knex } from 'knex';
 import {
   CannotCommitError,
   DatabaseError,
@@ -6,7 +5,8 @@ import {
   LinkValidationError,
   NotFoundError,
   ValueError,
-} from '../../frappe/utils/errors';
+} from 'fyo/utils/errors';
+import { knex, Knex } from 'knex';
 import {
   Field,
   FieldTypeEnum,
diff --git a/fixtures/standardCOA.js b/fixtures/standardCOA.js
index ecb85c85..2a1c481b 100644
--- a/fixtures/standardCOA.js
+++ b/fixtures/standardCOA.js
@@ -1,4 +1,4 @@
-import { t } from 'frappe';
+import { t } from 'fyo';
 
 export default {
   [t`Application of Funds (Assets)`]: {
diff --git a/frappe/telemetry/helpers.ts b/frappe/telemetry/helpers.ts
deleted file mode 100644
index 6c0fa15f..00000000
--- a/frappe/telemetry/helpers.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Frappe } from 'frappe';
-import { ConfigFile, ConfigKeys } from 'frappe/core/types';
-import { DEFAULT_COUNTRY_CODE } from 'frappe/utils/consts';
-import { Count, TelemetrySetting, UniqueId } from './types';
-
-export function getId(): string {
-  let id: string = '';
-
-  for (let i = 0; i < 4; i++) {
-    id += Math.random().toString(36).slice(2, 9);
-  }
-
-  return id;
-}
-
-export function getCountry(): string {
-  // @ts-ignore
-  return frappe.singles.SystemSettings?.countryCode ?? DEFAULT_COUNTRY_CODE;
-}
-
-export function getLanguage(frappe: Frappe): string {
-  return frappe.config.get('language') as string;
-}
-
-export async function getCounts(
-  interestingDocs: string[],
-  frappe: Frappe
-): Promise<Count> {
-  const countMap: Count = {};
-  // @ts-ignore
-  if (frappe.db === undefined) {
-    return countMap;
-  }
-
-  for (const name of interestingDocs) {
-    const count: number = (await frappe.db.getAll(name)).length;
-    countMap[name] = count;
-  }
-
-  return countMap;
-}
-
-export function getDeviceId(frappe: Frappe): UniqueId {
-  let deviceId = frappe.config.get(ConfigKeys.DeviceId) as string | undefined;
-  if (deviceId === undefined) {
-    deviceId = getId();
-    frappe.config.set(ConfigKeys.DeviceId, deviceId);
-  }
-
-  return deviceId;
-}
-
-export function getInstanceId(frappe: Frappe): UniqueId {
-  const files = frappe.config.get(ConfigKeys.Files) as ConfigFile[];
-
-  // @ts-ignore
-  const companyName = frappe.AccountingSettings?.companyName;
-  if (companyName === undefined) {
-    return '';
-  }
-
-  const file = files.find((f) => f.companyName === companyName);
-
-  if (file === undefined) {
-    return addNewFile(companyName, files, frappe);
-  }
-
-  if (file.id === undefined) {
-    return setInstanceId(companyName, files, frappe);
-  }
-
-  return file.id;
-}
-
-function addNewFile(
-  companyName: string,
-  files: ConfigFile[],
-  frappe: Frappe
-): UniqueId {
-  const newFile: ConfigFile = {
-    companyName,
-    filePath: frappe.config.get(ConfigKeys.LastSelectedFilePath, '') as string,
-    id: getId(),
-  };
-
-  files.push(newFile);
-  frappe.config.set(ConfigKeys.Files, files);
-  return newFile.id;
-}
-
-function setInstanceId(
-  companyName: string,
-  files: ConfigFile[],
-  frappe: Frappe
-): UniqueId {
-  let id = '';
-  for (const file of files) {
-    if (file.id) {
-      continue;
-    }
-
-    file.id = getId();
-    if (file.companyName === companyName) {
-      id = file.id;
-    }
-  }
-
-  frappe.config.set(ConfigKeys.Files, files);
-  return id;
-}
-
-export const getTelemetryOptions = (frappe: Frappe) => ({
-  [TelemetrySetting.allow]: frappe.t`Allow Telemetry`,
-  [TelemetrySetting.dontLogUsage]: frappe.t`Don't Log Usage`,
-  [TelemetrySetting.dontLogAnything]: frappe.t`Don't Log Anything`,
-});
diff --git a/frappe/README.md b/fyo/README.md
similarity index 100%
rename from frappe/README.md
rename to fyo/README.md
diff --git a/frappe/core/authHandler.ts b/fyo/core/authHandler.ts
similarity index 87%
rename from frappe/core/authHandler.ts
rename to fyo/core/authHandler.ts
index 5bd6f1fb..c0bb4e94 100644
--- a/frappe/core/authHandler.ts
+++ b/fyo/core/authHandler.ts
@@ -1,5 +1,5 @@
-import { Frappe } from 'frappe';
-import { AuthDemux } from 'frappe/demux/auth';
+import { Fyo } from 'fyo';
+import { AuthDemux } from 'fyo/demux/auth';
 import { AuthDemuxBase, TelemetryCreds } from 'utils/auth/types';
 import { AuthDemuxConstructor } from './types';
 
@@ -17,11 +17,11 @@ interface Session {
 export class AuthHandler {
   #config: AuthConfig;
   #session: Session;
-  frappe: Frappe;
+  fyo: Fyo;
   #demux: AuthDemuxBase;
 
-  constructor(frappe: Frappe, Demux?: AuthDemuxConstructor) {
-    this.frappe = frappe;
+  constructor(fyo: Fyo, Demux?: AuthDemuxConstructor) {
+    this.fyo = fyo;
     this.#config = {
       serverURL: '',
       backend: 'sqlite',
@@ -34,9 +34,9 @@ export class AuthHandler {
     };
 
     if (Demux !== undefined) {
-      this.#demux = new Demux(frappe.isElectron);
+      this.#demux = new Demux(fyo.isElectron);
     } else {
-      this.#demux = new AuthDemux(frappe.isElectron);
+      this.#demux = new AuthDemux(fyo.isElectron);
     }
   }
 
diff --git a/frappe/core/converter.ts b/fyo/core/converter.ts
similarity index 93%
rename from frappe/core/converter.ts
rename to fyo/core/converter.ts
index 0d70c042..41135f3b 100644
--- a/frappe/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -1,5 +1,5 @@
-import { Frappe } from 'frappe';
-import Doc from 'frappe/model/doc';
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
 import Money from 'pesa/dist/types/src/money';
 import { FieldType, FieldTypeEnum, RawValue } from 'schemas/types';
 import { DatabaseHandler } from './dbHandler';
@@ -22,11 +22,11 @@ import { DocValue, DocValueMap, RawValueMap } from './types';
 
 export class Converter {
   db: DatabaseHandler;
-  frappe: Frappe;
+  fyo: Fyo;
 
-  constructor(db: DatabaseHandler, frappe: Frappe) {
+  constructor(db: DatabaseHandler, fyo: Fyo) {
     this.db = db;
-    this.frappe = frappe;
+    this.fyo = fyo;
   }
 
   toDocValueMap(
@@ -54,11 +54,11 @@ export class Converter {
   static toDocValue(
     value: RawValue,
     fieldtype: FieldType,
-    frappe: Frappe
+    fyo: Fyo
   ): DocValue {
     switch (fieldtype) {
       case FieldTypeEnum.Currency:
-        return frappe.pesa((value ?? 0) as string | number);
+        return fyo.pesa((value ?? 0) as string | number);
       case FieldTypeEnum.Date:
         return new Date(value as string);
       case FieldTypeEnum.Datetime:
@@ -119,7 +119,7 @@ export class Converter {
         docValueMap[fieldname] = Converter.toDocValue(
           rawValue,
           field.fieldtype,
-          this.frappe
+          this.fyo
         );
       }
     }
diff --git a/frappe/core/dbHandler.ts b/fyo/core/dbHandler.ts
similarity index 93%
rename from frappe/core/dbHandler.ts
rename to fyo/core/dbHandler.ts
index 7014e486..d1c0cd2b 100644
--- a/frappe/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -1,6 +1,6 @@
 import { SingleValue } from 'backend/database/types';
-import { Frappe } from 'frappe';
-import { DatabaseDemux } from 'frappe/demux/db';
+import { Fyo } from 'fyo';
+import { DatabaseDemux } from 'fyo/demux/db';
 import { Field, RawValue, SchemaMap } from 'schemas/types';
 import { getMapFromList } from 'utils';
 import { DatabaseBase, DatabaseDemuxBase, GetAllOptions } from 'utils/db/types';
@@ -18,21 +18,21 @@ type TotalOutstanding = { total: number; outstanding: number };
 type Cashflow = { inflow: number; outflow: number; 'month-year': string }[];
 
 export class DatabaseHandler extends DatabaseBase {
-  #frappe: Frappe;
+  #fyo: Fyo;
   converter: Converter;
   #demux: DatabaseDemuxBase;
   schemaMap: Readonly<SchemaMap> = {};
   fieldValueMap: Record<string, Record<string, Field>> = {};
 
-  constructor(frappe: Frappe, Demux?: DatabaseDemuxConstructor) {
+  constructor(fyo: Fyo, Demux?: DatabaseDemuxConstructor) {
     super();
-    this.#frappe = frappe;
-    this.converter = new Converter(this, this.#frappe);
+    this.#fyo = fyo;
+    this.converter = new Converter(this, this.#fyo);
 
     if (Demux !== undefined) {
-      this.#demux = new Demux(frappe.isElectron);
+      this.#demux = new Demux(fyo.isElectron);
     } else {
-      this.#demux = new DatabaseDemux(frappe.isElectron);
+      this.#demux = new DatabaseDemux(fyo.isElectron);
     }
   }
 
@@ -117,7 +117,7 @@ export class DatabaseHandler extends DatabaseBase {
     const docSingleValue: SingleValue<DocValue> = [];
     for (const sv of rawSingleValue) {
       const fieldtype = this.fieldValueMap[sv.parent][sv.fieldname].fieldtype;
-      const value = Converter.toDocValue(sv.value, fieldtype, this.#frappe);
+      const value = Converter.toDocValue(sv.value, fieldtype, this.#fyo);
 
       docSingleValue.push({
         value,
diff --git a/frappe/core/docHandler.ts b/fyo/core/docHandler.ts
similarity index 86%
rename from frappe/core/docHandler.ts
rename to fyo/core/docHandler.ts
index 8db4e1e2..84b4e395 100644
--- a/frappe/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -1,19 +1,19 @@
-import Doc from 'frappe/model/doc';
-import { DocMap, ModelMap, SinglesMap } from 'frappe/model/types';
-import { coreModels } from 'frappe/models';
-import { getRandomString } from 'frappe/utils';
-import Observable from 'frappe/utils/observable';
-import { Frappe } from '..';
+import Doc from 'fyo/model/doc';
+import { DocMap, ModelMap, SinglesMap } from 'fyo/model/types';
+import { coreModels } from 'fyo/models';
+import { getRandomString } from 'fyo/utils';
+import Observable from 'fyo/utils/observable';
+import { Fyo } from '..';
 import { DocValue, DocValueMap } from './types';
 
 export class DocHandler {
-  frappe: Frappe;
+  fyo: Fyo;
   singles: SinglesMap = {};
   docs: Observable<DocMap> = new Observable();
   models: ModelMap = {};
 
-  constructor(frappe: Frappe) {
-    this.frappe = frappe;
+  constructor(fyo: Fyo) {
+    this.fyo = fyo;
   }
 
   init() {
@@ -22,7 +22,7 @@ export class DocHandler {
   }
 
   registerModels(models: ModelMap, regionalModels: ModelMap = {}) {
-    for (const schemaName in this.frappe.db.schemaMap) {
+    for (const schemaName in this.fyo.db.schemaMap) {
       if (coreModels[schemaName] !== undefined) {
         this.models[schemaName] = coreModels[schemaName];
       } else if (regionalModels[schemaName] !== undefined) {
@@ -159,12 +159,12 @@ export class DocHandler {
 
   getNewDoc(schemaName: string, data: DocValueMap = {}): Doc {
     const Model = this.getModel(schemaName);
-    const schema = this.frappe.schemaMap[schemaName];
+    const schema = this.fyo.schemaMap[schemaName];
     if (schema === undefined) {
       throw new Error(`Schema not found for ${schemaName}`);
     }
 
-    const doc = new Model(schema, data, this.frappe);
+    const doc = new Model(schema, data, this.fyo);
     doc.setDefaults();
     return doc;
   }
@@ -175,7 +175,7 @@ export class DocHandler {
       return;
     }
 
-    const docExists = await this.frappe.db.exists(schemaName, name);
+    const docExists = await this.fyo.db.exists(schemaName, name);
     if (!docExists) {
       const doc = this.getNewDoc(schemaName, data);
       await doc.insert;
diff --git a/frappe/core/types.ts b/fyo/core/types.ts
similarity index 97%
rename from frappe/core/types.ts
rename to fyo/core/types.ts
index 8b7ae7ba..4f22790d 100644
--- a/frappe/core/types.ts
+++ b/fyo/core/types.ts
@@ -1,4 +1,4 @@
-import Doc from 'frappe/model/doc';
+import Doc from 'fyo/model/doc';
 import Money from 'pesa/dist/types/src/money';
 import { RawValue } from 'schemas/types';
 import { AuthDemuxBase } from 'utils/auth/types';
diff --git a/frappe/demux/auth.ts b/fyo/demux/auth.ts
similarity index 100%
rename from frappe/demux/auth.ts
rename to fyo/demux/auth.ts
diff --git a/frappe/demux/config.ts b/fyo/demux/config.ts
similarity index 100%
rename from frappe/demux/config.ts
rename to fyo/demux/config.ts
diff --git a/frappe/demux/db.ts b/fyo/demux/db.ts
similarity index 97%
rename from frappe/demux/db.ts
rename to fyo/demux/db.ts
index 9cb5eae9..d583c9ca 100644
--- a/frappe/demux/db.ts
+++ b/fyo/demux/db.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron';
-import { DEFAULT_COUNTRY_CODE } from 'frappe/utils/consts';
+import { DEFAULT_COUNTRY_CODE } from 'fyo/utils/consts';
 import { SchemaMap } from 'schemas/types';
 import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { DatabaseResponse } from 'utils/ipc/types';
diff --git a/frappe/index.ts b/fyo/index.ts
similarity index 99%
rename from frappe/index.ts
rename to fyo/index.ts
index c14d705f..eef20690 100644
--- a/frappe/index.ts
+++ b/fyo/index.ts
@@ -19,7 +19,7 @@ import { format } from './utils/format';
 import { t, T } from './utils/translation';
 import { ErrorLog } from './utils/types';
 
-export class Frappe {
+export class Fyo {
   t = t;
   T = T;
 
diff --git a/frappe/model/doc.ts b/fyo/model/doc.ts
similarity index 89%
rename from frappe/model/doc.ts
rename to fyo/model/doc.ts
index 1451c4ca..4e2f4f21 100644
--- a/frappe/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -1,13 +1,13 @@
-import { Frappe } from 'frappe';
-import { DocValue, DocValueMap } from 'frappe/core/types';
-import { Verb } from 'frappe/telemetry/types';
+import { Fyo } from 'fyo';
+import { DocValue, DocValueMap } from 'fyo/core/types';
+import { Verb } from 'fyo/telemetry/types';
 import {
   Conflict,
   MandatoryError,
   NotFoundError,
   ValidationError,
-} from 'frappe/utils/errors';
-import Observable from 'frappe/utils/observable';
+} from 'fyo/utils/errors';
+import Observable from 'fyo/utils/observable';
 import Money from 'pesa/dist/types/src/money';
 import {
   Field,
@@ -46,7 +46,7 @@ import { validateSelect } from './validationFunction';
 export default class Doc extends Observable<DocValue | Doc[]> {
   name?: string;
   schema: Readonly<Schema>;
-  frappe: Frappe;
+  fyo: Fyo;
   fieldMap: Record<string, Field>;
 
   /**
@@ -66,9 +66,9 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     revertAction: false,
   };
 
-  constructor(schema: Schema, data: DocValueMap, frappe: Frappe) {
+  constructor(schema: Schema, data: DocValueMap, fyo: Fyo) {
     super();
-    this.frappe = frappe;
+    this.fyo = fyo;
     this.schema = schema;
     this._setInitialValues(data);
     this.fieldMap = getMapFromList(schema.fields, 'fieldname');
@@ -190,7 +190,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
       let defaultValue: DocValue | Doc[] = getPreDefaultValues(
         field.fieldtype,
-        this.frappe
+        this.fyo
       );
       const defaultFunction = this.defaults[field.fieldname];
 
@@ -201,7 +201,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       }
 
       if (field.fieldtype === 'Currency' && !isPesa(defaultValue)) {
-        defaultValue = this.frappe.pesa!(defaultValue as string | number);
+        defaultValue = this.fyo.pesa!(defaultValue as string | number);
       }
 
       this[field.fieldname] = defaultValue;
@@ -243,8 +243,8 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
 
     const childSchemaName = this.fieldMap[fieldname] as TargetField;
-    const schema = this.frappe.db.schemaMap[childSchemaName.target] as Schema;
-    const childDoc = new Doc(schema, data as DocValueMap, this.frappe);
+    const schema = this.fyo.db.schemaMap[childSchemaName.target] as Schema;
+    const childDoc = new Doc(schema, data as DocValueMap, this.fyo);
     childDoc.setDefaults();
     return childDoc;
   }
@@ -271,7 +271,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
     if (missingMandatoryMessage.length > 0) {
       const fields = missingMandatoryMessage.join('\n');
-      const message = this.frappe.t`Value missing for ${fields}`;
+      const message = this.fyo.t`Value missing for ${fields}`;
       throw new MandatoryError(message);
     }
   }
@@ -330,7 +330,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
 
     if (!this.createdBy) {
-      this.createdBy = this.frappe.auth.session.user;
+      this.createdBy = this.fyo.auth.session.user;
     }
 
     if (!this.created) {
@@ -341,7 +341,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   }
 
   updateModified() {
-    this.modifiedBy = this.frappe.auth.session.user;
+    this.modifiedBy = this.fyo.auth.session.user;
     this.modified = new Date();
   }
 
@@ -350,7 +350,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
 
-    const data = await this.frappe.db.get(this.schemaName, this.name);
+    const data = await this.fyo.db.get(this.schemaName, this.name);
     if (this.schema.isSingle && !data?.name) {
       data.name = this.name!;
     }
@@ -387,7 +387,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
 
-    this._links[fieldname] = await this.frappe.doc.getDoc(
+    this._links[fieldname] = await this.fyo.doc.getDoc(
       field.target,
       value as string
     );
@@ -434,7 +434,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
 
-    const currentDoc = await this.frappe.db.get(this.schemaName, this.name);
+    const currentDoc = await this.fyo.db.get(this.schemaName, this.name);
 
     // check for conflict
     if (
@@ -442,14 +442,14 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       (this.modified as Date) !== (currentDoc.modified as Date)
     ) {
       throw new Conflict(
-        this.frappe
+        this.fyo
           .t`Document ${this.schemaName} ${this.name} has been modified after loading`
       );
     }
 
     if (this.submitted && !this.schema.isSubmittable) {
       throw new ValidationError(
-        this.frappe.t`Document type ${this.schemaName} is not submittable`
+        this.fyo.t`Document type ${this.schemaName} is not submittable`
       );
     }
 
@@ -545,27 +545,24 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async insert() {
-    await setName(this, this.frappe);
+    await setName(this, this.fyo);
     this.setBaseMetaValues();
     await this.commit();
     await this.validateInsert();
     await this.trigger('beforeInsert', null);
 
     const oldName = this.name!;
-    const data = await this.frappe.db.insert(
-      this.schemaName,
-      this.getValidDict()
-    );
+    const data = await this.fyo.db.insert(this.schemaName, this.getValidDict());
     this.syncValues(data);
 
     if (oldName !== this.name) {
-      this.frappe.doc.removeFromCache(this.schemaName, oldName);
+      this.fyo.doc.removeFromCache(this.schemaName, oldName);
     }
 
     await this.trigger('afterInsert', null);
     await this.trigger('afterSave', null);
 
-    this.frappe.telemetry.log(Verb.Created, this.schemaName);
+    this.fyo.telemetry.log(Verb.Created, this.schemaName);
     return this;
   }
 
@@ -582,7 +579,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     this.updateModified();
 
     const data = this.getValidDict();
-    await this.frappe.db.update(this.schemaName, data);
+    await this.fyo.db.update(this.schemaName, data);
     this.syncValues(data);
 
     await this.trigger('afterUpdate');
@@ -605,10 +602,10 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
   async delete() {
     await this.trigger('beforeDelete');
-    await this.frappe.db.delete(this.schemaName, this.name!);
+    await this.fyo.db.delete(this.schemaName, this.name!);
     await this.trigger('afterDelete');
 
-    this.frappe.telemetry.log(Verb.Deleted, this.schemaName);
+    this.fyo.telemetry.log(Verb.Deleted, this.schemaName);
   }
 
   async submitOrRevert(isSubmit: boolean) {
@@ -633,7 +630,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
   async rename(newName: string) {
     await this.trigger('beforeRename');
-    await this.frappe.db.rename(this.schemaName, this.name!, newName);
+    await this.fyo.db.rename(this.schemaName, this.name!, newName);
     this.name = newName;
     await this.trigger('afterRename');
   }
@@ -653,7 +650,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
         const value = d.get(childfield) ?? 0;
         if (!isPesa(value)) {
           try {
-            return this.frappe.pesa(value as string | number);
+            return this.fyo.pesa(value as string | number);
           } catch (err) {
             (
               err as Error
@@ -663,7 +660,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
         }
         return value as Money;
       })
-      .reduce((a, b) => a.add(b), this.frappe.pesa(0));
+      .reduce((a, b) => a.add(b), this.fyo.pesa(0));
 
     if (convertToFloat) {
       return sum.float;
@@ -676,7 +673,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return '';
     }
 
-    return this.frappe.doc.getCachedValue(schemaName, name, fieldname);
+    return this.fyo.doc.getCachedValue(schemaName, name, fieldname);
   }
 
   async duplicate(shouldInsert: boolean = true): Promise<Doc> {
@@ -706,7 +703,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       updateMap.name = updateMap.name + ' CPY';
     }
 
-    const doc = this.frappe.doc.getEmptyDoc(this.schemaName, false);
+    const doc = this.fyo.doc.getEmptyDoc(this.schemaName, false);
     await doc.setMultiple(updateMap);
 
     if (shouldInsert) {
@@ -738,13 +735,13 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   static filters: FiltersMap = {};
   static emptyMessages: EmptyMessageMap = {};
 
-  static getListViewSettings(frappe: Frappe): ListViewSettings {
+  static getListViewSettings(fyo: Fyo): ListViewSettings {
     return {};
   }
 
-  static getTreeSettings(frappe: Frappe): TreeViewSettings | void {}
+  static getTreeSettings(fyo: Fyo): TreeViewSettings | void {}
 
-  static getActions(frappe: Frappe): Action[] {
+  static getActions(fyo: Fyo): Action[] {
     return [];
   }
 }
diff --git a/frappe/model/helpers.ts b/fyo/model/helpers.ts
similarity index 93%
rename from frappe/model/helpers.ts
rename to fyo/model/helpers.ts
index 4cb73afd..ffd4d6c2 100644
--- a/frappe/model/helpers.ts
+++ b/fyo/model/helpers.ts
@@ -1,6 +1,6 @@
-import { Frappe } from 'frappe';
-import { DocValue } from 'frappe/core/types';
-import { isPesa } from 'frappe/utils';
+import { Fyo } from 'fyo';
+import { DocValue } from 'fyo/core/types';
+import { isPesa } from 'fyo/utils';
 import { isEqual } from 'lodash';
 import Money from 'pesa/dist/types/src/money';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
@@ -28,13 +28,13 @@ export function areDocValuesEqual(
 
 export function getPreDefaultValues(
   fieldtype: FieldType,
-  frappe: Frappe
+  fyo: Fyo
 ): DocValue | Doc[] {
   switch (fieldtype) {
     case FieldTypeEnum.Table:
       return [] as Doc[];
     case FieldTypeEnum.Currency:
-      return frappe.pesa!(0.0);
+      return fyo.pesa!(0.0);
     case FieldTypeEnum.Int:
     case FieldTypeEnum.Float:
       return 0;
diff --git a/frappe/model/naming.ts b/fyo/model/naming.ts
similarity index 64%
rename from frappe/model/naming.ts
rename to fyo/model/naming.ts
index 9e3f399e..75c86279 100644
--- a/frappe/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -1,8 +1,8 @@
-import { Frappe } from 'frappe';
-import NumberSeries from 'frappe/models/NumberSeries';
-import { getRandomString } from 'frappe/utils';
-import { DEFAULT_SERIES_START } from 'frappe/utils/consts';
-import { BaseError } from 'frappe/utils/errors';
+import { Fyo } from 'fyo';
+import NumberSeries from 'fyo/models/NumberSeries';
+import { getRandomString } from 'fyo/utils';
+import { DEFAULT_SERIES_START } from 'fyo/utils/consts';
+import { BaseError } from 'fyo/utils/errors';
 import { Field, Schema } from 'schemas/types';
 import Doc from './doc';
 
@@ -13,8 +13,8 @@ export function getNumberSeries(schema: Schema): Field | undefined {
   return numberSeries;
 }
 
-export function isNameAutoSet(schemaName: string, frappe: Frappe): boolean {
-  const schema = frappe.schemaMap[schemaName]!;
+export function isNameAutoSet(schemaName: string, fyo: Fyo): boolean {
+  const schema = fyo.schemaMap[schemaName]!;
   if (schema.naming === 'autoincrement') {
     return true;
   }
@@ -27,17 +27,17 @@ export function isNameAutoSet(schemaName: string, frappe: Frappe): boolean {
   return false;
 }
 
-export async function setName(doc: Doc, frappe: Frappe) {
+export async function setName(doc: Doc, fyo: Fyo) {
   // if is server, always name again if autoincrement or other
   if (doc.schema.naming === 'autoincrement') {
-    doc.name = await getNextId(doc.schemaName, frappe);
+    doc.name = await getNextId(doc.schemaName, fyo);
     return;
   }
 
   // Current, per doc number series
   const numberSeries = doc.numberSeries as string | undefined;
   if (numberSeries !== undefined) {
-    doc.name = await getSeriesNext(numberSeries, doc.schemaName, frappe);
+    doc.name = await getSeriesNext(numberSeries, doc.schemaName, fyo);
     return;
   }
 
@@ -58,9 +58,9 @@ export async function setName(doc: Doc, frappe: Frappe) {
   }
 }
 
-export async function getNextId(schemaName: string, frappe: Frappe) {
+export async function getNextId(schemaName: string, fyo: Fyo) {
   // get the last inserted row
-  const lastInserted = await getLastInserted(schemaName, frappe);
+  const lastInserted = await getLastInserted(schemaName, fyo);
   let name = 1;
   if (lastInserted) {
     let lastNumber = parseInt(lastInserted.name as string);
@@ -70,8 +70,8 @@ export async function getNextId(schemaName: string, frappe: Frappe) {
   return (name + '').padStart(9, '0');
 }
 
-export async function getLastInserted(schemaName: string, frappe: Frappe) {
-  const lastInserted = await frappe.db.getAll(schemaName, {
+export async function getLastInserted(schemaName: string, fyo: Fyo) {
+  const lastInserted = await fyo.db.getAll(schemaName, {
     fields: ['name'],
     limit: 1,
     orderBy: 'creation',
@@ -83,20 +83,20 @@ export async function getLastInserted(schemaName: string, frappe: Frappe) {
 export async function getSeriesNext(
   prefix: string,
   schemaName: string,
-  frappe: Frappe
+  fyo: Fyo
 ) {
   let series: NumberSeries;
 
   try {
-    series = (await frappe.doc.getDoc('NumberSeries', prefix)) as NumberSeries;
+    series = (await fyo.doc.getDoc('NumberSeries', prefix)) as NumberSeries;
   } catch (e) {
     const { statusCode } = e as BaseError;
     if (!statusCode || statusCode !== 404) {
       throw e;
     }
 
-    await createNumberSeries(prefix, schemaName, DEFAULT_SERIES_START, frappe);
-    series = (await frappe.doc.getDoc('NumberSeries', prefix)) as NumberSeries;
+    await createNumberSeries(prefix, schemaName, DEFAULT_SERIES_START, fyo);
+    series = (await fyo.doc.getDoc('NumberSeries', prefix)) as NumberSeries;
   }
 
   return await series.next(schemaName);
@@ -106,14 +106,14 @@ export async function createNumberSeries(
   prefix: string,
   referenceType: string,
   start: number,
-  frappe: Frappe
+  fyo: Fyo
 ) {
-  const exists = await frappe.db.exists('NumberSeries', prefix);
+  const exists = await fyo.db.exists('NumberSeries', prefix);
   if (exists) {
     return;
   }
 
-  const series = frappe.doc.getNewDoc('NumberSeries', {
+  const series = fyo.doc.getNewDoc('NumberSeries', {
     name: prefix,
     start,
     referenceType,
diff --git a/frappe/model/types.ts b/fyo/model/types.ts
similarity index 92%
rename from frappe/model/types.ts
rename to fyo/model/types.ts
index 33e5032a..55c8a5d6 100644
--- a/frappe/model/types.ts
+++ b/fyo/model/types.ts
@@ -1,6 +1,6 @@
-import { Frappe } from 'frappe';
-import { DocValue, DocValueMap } from 'frappe/core/types';
-import SystemSettings from 'frappe/models/SystemSettings';
+import { Fyo } from 'fyo';
+import { DocValue, DocValueMap } from 'fyo/core/types';
+import SystemSettings from 'fyo/models/SystemSettings';
 import { FieldType } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 import { Router } from 'vue-router';
@@ -51,7 +51,7 @@ export interface SinglesMap {
 export type FilterFunction = (doc: Doc) => QueryFilter;
 export type FiltersMap = Record<string, FilterFunction>;
 
-export type EmptyMessageFunction = (doc: Doc, frappe: Frappe) => string;
+export type EmptyMessageFunction = (doc: Doc, fyo: Fyo) => string;
 export type EmptyMessageMap = Record<string, EmptyMessageFunction>;
 
 export type ListFunction = (doc?: Doc) => string[];
diff --git a/frappe/model/validationFunction.ts b/fyo/model/validationFunction.ts
similarity index 88%
rename from frappe/model/validationFunction.ts
rename to fyo/model/validationFunction.ts
index 91703d32..3676eb25 100644
--- a/frappe/model/validationFunction.ts
+++ b/fyo/model/validationFunction.ts
@@ -1,5 +1,5 @@
-import { ValidationError, ValueError } from 'frappe/utils/errors';
-import { t } from 'frappe/utils/translation';
+import { ValidationError, ValueError } from 'fyo/utils/errors';
+import { t } from 'fyo/utils/translation';
 import { OptionField } from 'schemas/types';
 
 export function email(value: string) {
diff --git a/frappe/models/NumberSeries.ts b/fyo/models/NumberSeries.ts
similarity index 91%
rename from frappe/models/NumberSeries.ts
rename to fyo/models/NumberSeries.ts
index 351ed8b1..60088c92 100644
--- a/frappe/models/NumberSeries.ts
+++ b/fyo/models/NumberSeries.ts
@@ -1,4 +1,4 @@
-import Doc from 'frappe/model/doc';
+import Doc from 'fyo/model/doc';
 
 function getPaddedName(prefix: string, next: number, padZeros: number): string {
   return prefix + next.toString().padStart(padZeros ?? 4, '0');
@@ -31,7 +31,7 @@ export default class NumberSeries extends Doc {
     }
 
     const name = this.getPaddedName(this.current as number);
-    return await this.frappe.db.exists(schemaName, name);
+    return await this.fyo.db.exists(schemaName, name);
   }
 
   getPaddedName(next: number): string {
diff --git a/frappe/models/SystemSettings.ts b/fyo/models/SystemSettings.ts
similarity index 59%
rename from frappe/models/SystemSettings.ts
rename to fyo/models/SystemSettings.ts
index dd164bdc..0f7f9dfa 100644
--- a/frappe/models/SystemSettings.ts
+++ b/fyo/models/SystemSettings.ts
@@ -1,8 +1,8 @@
-import { DocValue } from 'frappe/core/types';
-import Doc from 'frappe/model/doc';
-import { ValidationMap } from 'frappe/model/types';
-import { ValidationError } from 'frappe/utils/errors';
-import { t } from 'frappe/utils/translation';
+import { DocValue } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
+import { ValidationMap } from 'fyo/model/types';
+import { ValidationError } from 'fyo/utils/errors';
+import { t } from 'fyo/utils/translation';
 
 export default class SystemSettings extends Doc {
   validations: ValidationMap = {
diff --git a/frappe/models/index.ts b/fyo/models/index.ts
similarity index 78%
rename from frappe/models/index.ts
rename to fyo/models/index.ts
index e19cb795..e67582aa 100644
--- a/frappe/models/index.ts
+++ b/fyo/models/index.ts
@@ -1,4 +1,4 @@
-import { ModelMap } from 'frappe/model/types';
+import { ModelMap } from 'fyo/model/types';
 import NumberSeries from './NumberSeries';
 import SystemSettings from './SystemSettings';
 
diff --git a/fyo/telemetry/helpers.ts b/fyo/telemetry/helpers.ts
new file mode 100644
index 00000000..93a8ef96
--- /dev/null
+++ b/fyo/telemetry/helpers.ts
@@ -0,0 +1,116 @@
+import { Fyo } from 'fyo';
+import { ConfigFile, ConfigKeys } from 'fyo/core/types';
+import { DEFAULT_COUNTRY_CODE } from 'fyo/utils/consts';
+import { t } from 'fyo/utils/translation';
+import { Count, TelemetrySetting, UniqueId } from './types';
+
+export function getId(): string {
+  let id: string = '';
+
+  for (let i = 0; i < 4; i++) {
+    id += Math.random().toString(36).slice(2, 9);
+  }
+
+  return id;
+}
+
+export function getCountry(fyo: Fyo): string {
+  return (
+    (fyo.singles.SystemSettings?.countryCode as string) ?? DEFAULT_COUNTRY_CODE
+  );
+}
+
+export function getLanguage(fyo: Fyo): string {
+  return fyo.config.get('language') as string;
+}
+
+export async function getCounts(
+  interestingDocs: string[],
+  fyo: Fyo
+): Promise<Count> {
+  const countMap: Count = {};
+  if (fyo.db === undefined) {
+    return countMap;
+  }
+
+  for (const name of interestingDocs) {
+    const count: number = (await fyo.db.getAll(name)).length;
+    countMap[name] = count;
+  }
+
+  return countMap;
+}
+
+export function getDeviceId(fyo: Fyo): UniqueId {
+  let deviceId = fyo.config.get(ConfigKeys.DeviceId) as string | undefined;
+  if (deviceId === undefined) {
+    deviceId = getId();
+    fyo.config.set(ConfigKeys.DeviceId, deviceId);
+  }
+
+  return deviceId;
+}
+
+export function getInstanceId(fyo: Fyo): UniqueId {
+  const files = fyo.config.get(ConfigKeys.Files) as ConfigFile[];
+
+  const companyName = fyo.singles.AccountingSettings?.companyName as string;
+  if (companyName === undefined) {
+    return '';
+  }
+
+  const file = files.find((f) => f.companyName === companyName);
+
+  if (file === undefined) {
+    return addNewFile(companyName, files, fyo);
+  }
+
+  if (file.id === undefined) {
+    return setInstanceId(companyName, files, fyo);
+  }
+
+  return file.id;
+}
+
+function addNewFile(
+  companyName: string,
+  files: ConfigFile[],
+  fyo: Fyo
+): UniqueId {
+  const newFile: ConfigFile = {
+    companyName,
+    filePath: fyo.config.get(ConfigKeys.LastSelectedFilePath, '') as string,
+    id: getId(),
+  };
+
+  files.push(newFile);
+  fyo.config.set(ConfigKeys.Files, files);
+  return newFile.id;
+}
+
+function setInstanceId(
+  companyName: string,
+  files: ConfigFile[],
+  fyo: Fyo
+): UniqueId {
+  let id = '';
+  for (const file of files) {
+    if (file.id) {
+      continue;
+    }
+
+    file.id = getId();
+    if (file.companyName === companyName) {
+      id = file.id;
+    }
+  }
+
+  fyo.config.set(ConfigKeys.Files, files);
+  return id;
+}
+
+export const getTelemetryOptions = () => ({
+  [TelemetrySetting.allow]: t`Allow Telemetry`,
+  [TelemetrySetting.dontLogUsage]: t`Don't Log Usage`,
+  [TelemetrySetting.dontLogAnything]: t`Don't Log Anything`,
+});
diff --git a/frappe/telemetry/telemetry.ts b/fyo/telemetry/telemetry.ts
similarity index 85%
rename from frappe/telemetry/telemetry.ts
rename to fyo/telemetry/telemetry.ts
index 7fe517c4..5c8e958e 100644
--- a/frappe/telemetry/telemetry.ts
+++ b/fyo/telemetry/telemetry.ts
@@ -1,5 +1,5 @@
-import { Frappe } from 'frappe';
-import { ConfigKeys } from 'frappe/core/types';
+import { Fyo } from 'fyo';
+import { ConfigKeys } from 'fyo/core/types';
 import { cloneDeep } from 'lodash';
 import {
   getCountry,
@@ -56,10 +56,10 @@ export class TelemetryManager {
   #started = false;
   #telemetryObject: Partial<Telemetry> = {};
   #interestingDocs: string[] = [];
-  frappe: Frappe;
+  fyo: Fyo;
 
-  constructor(frappe: Frappe) {
-    this.frappe = frappe;
+  constructor(fyo: Fyo) {
+    this.fyo = fyo;
   }
 
   set platform(value: Platform) {
@@ -83,10 +83,10 @@ export class TelemetryManager {
   }
 
   async start() {
-    this.#telemetryObject.country ||= getCountry();
-    this.#telemetryObject.language ??= getLanguage(this.frappe);
-    this.#telemetryObject.deviceId ||= getDeviceId(this.frappe);
-    this.#telemetryObject.instanceId ||= getInstanceId(this.frappe);
+    this.#telemetryObject.country ||= getCountry(this.fyo);
+    this.#telemetryObject.language ??= getLanguage(this.fyo);
+    this.#telemetryObject.deviceId ||= getDeviceId(this.fyo);
+    this.#telemetryObject.instanceId ||= getInstanceId(this.fyo);
     this.#telemetryObject.openTime ||= new Date().valueOf();
     this.#telemetryObject.timeline ??= [];
     this.#telemetryObject.errors ??= {};
@@ -125,8 +125,7 @@ export class TelemetryManager {
   stop() {
     this.#started = false;
 
-    //@ts-ignore
-    this.#telemetryObject.version = frappe.store.appVersion ?? '';
+    this.#telemetryObject.version = this.fyo.store.appVersion ?? '';
     this.#telemetryObject.closeTime = new Date().valueOf();
 
     const data = JSON.stringify({
@@ -137,7 +136,7 @@ export class TelemetryManager {
     this.#clear();
 
     if (
-      this.frappe.config.get(ConfigKeys.Telemetry) ===
+      this.fyo.config.get(ConfigKeys.Telemetry) ===
       TelemetrySetting.dontLogAnything
     ) {
       return;
@@ -162,7 +161,7 @@ export class TelemetryManager {
 
     this.#telemetryObject.counts = await getCounts(
       this.#interestingDocs,
-      this.frappe
+      this.fyo
     );
   }
 
@@ -171,13 +170,13 @@ export class TelemetryManager {
       return;
     }
 
-    const { url, token } = await this.frappe.auth.getTelemetryCreds();
+    const { url, token } = await this.fyo.auth.getTelemetryCreds();
     this.#url = url;
     this.#token = token;
   }
 
   #getCanLog(): boolean {
-    const telemetrySetting = this.frappe.config.get(
+    const telemetrySetting = this.fyo.config.get(
       ConfigKeys.Telemetry
     ) as string;
     return telemetrySetting === TelemetrySetting.allow;
diff --git a/frappe/telemetry/types.ts b/fyo/telemetry/types.ts
similarity index 100%
rename from frappe/telemetry/types.ts
rename to fyo/telemetry/types.ts
diff --git a/frappe/tests/helpers.ts b/fyo/tests/helpers.ts
similarity index 100%
rename from frappe/tests/helpers.ts
rename to fyo/tests/helpers.ts
diff --git a/frappe/tests/testFrappe.spec.ts b/fyo/tests/testFyo.spec.ts
similarity index 61%
rename from frappe/tests/testFrappe.spec.ts
rename to fyo/tests/testFyo.spec.ts
index 156035a2..bee00aaf 100644
--- a/frappe/tests/testFrappe.spec.ts
+++ b/fyo/tests/testFyo.spec.ts
@@ -2,12 +2,12 @@ import * as assert from 'assert';
 import 'mocha';
 import models, { getRegionalModels } from 'models';
 import { getSchemas } from 'schemas';
-import { Frappe } from '..';
+import { Fyo } from '..';
 import { DatabaseManager } from '../../backend/database/manager';
 import { DummyAuthDemux } from './helpers';
 
-describe('Frappe', function () {
-  const frappe = new Frappe({
+describe('Fyo Init', function () {
+  const fyo = new Fyo({
     DatabaseDemux: DatabaseManager,
     AuthDemux: DummyAuthDemux,
     isTest: true,
@@ -16,49 +16,49 @@ describe('Frappe', function () {
 
   specify('Init', async function () {
     assert.strictEqual(
-      Object.keys(frappe.schemaMap).length,
+      Object.keys(fyo.schemaMap).length,
       0,
       'zero schemas one'
     );
 
     assert.strictEqual(
-      Object.keys(frappe.schemaMap).length,
+      Object.keys(fyo.schemaMap).length,
       0,
       'zero schemas two'
     );
 
-    await frappe.db.createNewDatabase(':memory:', 'in');
-    await frappe.initializeAndRegister({}, {});
+    await fyo.db.createNewDatabase(':memory:', 'in');
+    await fyo.initializeAndRegister({}, {});
     assert.strictEqual(
-      Object.keys(frappe.schemaMap).length > 0,
+      Object.keys(fyo.schemaMap).length > 0,
       true,
       'non zero schemas'
     );
-    await frappe.db.close();
+    await fyo.db.close();
   });
 });
 
-describe('Frappe', function () {
+describe('Fyo Docs', function () {
   const countryCode = 'in';
-  let frappe: Frappe;
+  let fyo: Fyo;
   const schemas = getSchemas(countryCode);
   this.beforeEach(async function () {
-    frappe = new Frappe({
+    fyo = new Fyo({
       DatabaseDemux: DatabaseManager,
       isTest: true,
       isElectron: false,
     });
 
     const regionalModels = await getRegionalModels(countryCode);
-    await frappe.db.createNewDatabase(':memory:', countryCode);
-    await frappe.initializeAndRegister(models, regionalModels);
+    await fyo.db.createNewDatabase(':memory:', countryCode);
+    await fyo.initializeAndRegister(models, regionalModels);
   });
 
   this.afterEach(async function () {
-    await frappe.close();
+    await fyo.close();
   });
 
   specify('temp', async function () {
-    frappe.db.schemaMap;
+    fyo.db.schemaMap;
   });
 });
diff --git a/frappe/utils/cacheManager.ts b/fyo/utils/cacheManager.ts
similarity index 100%
rename from frappe/utils/cacheManager.ts
rename to fyo/utils/cacheManager.ts
diff --git a/frappe/utils/consts.ts b/fyo/utils/consts.ts
similarity index 100%
rename from frappe/utils/consts.ts
rename to fyo/utils/consts.ts
diff --git a/frappe/utils/errors.ts b/fyo/utils/errors.ts
similarity index 100%
rename from frappe/utils/errors.ts
rename to fyo/utils/errors.ts
diff --git a/frappe/utils/format.ts b/fyo/utils/format.ts
similarity index 69%
rename from frappe/utils/format.ts
rename to fyo/utils/format.ts
index 6fefcfc7..9395e737 100644
--- a/frappe/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -1,6 +1,6 @@
-import { Frappe } from 'frappe';
-import { DocValue } from 'frappe/core/types';
-import Doc from 'frappe/model/doc';
+import { Fyo } from 'fyo';
+import { DocValue } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
 import { DateTime } from 'luxon';
 import Money from 'pesa/dist/types/src/money';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
@@ -16,7 +16,7 @@ export function format(
   value: DocValue,
   df: string | Field | null,
   doc: Doc | null,
-  frappe: Frappe
+  fyo: Fyo
 ): string {
   if (!df) {
     return String(value);
@@ -25,11 +25,11 @@ export function format(
   const field: Field = getField(df);
 
   if (field.fieldtype === FieldTypeEnum.Currency) {
-    return formatCurrency(value, field, doc, frappe);
+    return formatCurrency(value, field, doc, fyo);
   }
 
   if (field.fieldtype === FieldTypeEnum.Date) {
-    return formatDate(value, frappe);
+    return formatDate(value, fyo);
   }
 
   if (field.fieldtype === FieldTypeEnum.Check) {
@@ -43,10 +43,9 @@ export function format(
   return String(value);
 }
 
-function formatDate(value: DocValue, frappe: Frappe): string {
+function formatDate(value: DocValue, fyo: Fyo): string {
   const dateFormat =
-    (frappe.singles.SystemSettings?.dateFormat as string) ??
-    DEFAULT_DATE_FORMAT;
+    (fyo.singles.SystemSettings?.dateFormat as string) ?? DEFAULT_DATE_FORMAT;
 
   let dateValue: DateTime;
   if (typeof value === 'string') {
@@ -69,19 +68,19 @@ function formatCurrency(
   value: DocValue,
   field: Field,
   doc: Doc | null,
-  frappe: Frappe
+  fyo: Fyo
 ): string {
-  const currency = getCurrency(field, doc, frappe);
+  const currency = getCurrency(field, doc, fyo);
 
   let valueString;
   try {
-    valueString = formatNumber(value, frappe);
+    valueString = formatNumber(value, fyo);
   } catch (err) {
     (err as Error).message += ` value: '${value}', type: ${typeof value}`;
     throw err;
   }
 
-  const currencySymbol = frappe.currencySymbols[currency];
+  const currencySymbol = fyo.currencySymbols[currency];
   if (currencySymbol !== undefined) {
     return currencySymbol + ' ' + valueString;
   }
@@ -89,8 +88,8 @@ function formatCurrency(
   return valueString;
 }
 
-function formatNumber(value: DocValue, frappe: Frappe): string {
-  const numberFormatter = getNumberFormatter(frappe);
+function formatNumber(value: DocValue, fyo: Fyo): string {
+  const numberFormatter = getNumberFormatter(fyo);
   if (typeof value === 'number') {
     return numberFormatter.format(value);
   }
@@ -112,24 +111,24 @@ function formatNumber(value: DocValue, frappe: Frappe): string {
   return formattedNumber;
 }
 
-function getNumberFormatter(frappe: Frappe) {
-  if (frappe.currencyFormatter) {
-    return frappe.currencyFormatter;
+function getNumberFormatter(fyo: Fyo) {
+  if (fyo.currencyFormatter) {
+    return fyo.currencyFormatter;
   }
 
   const locale =
-    (frappe.singles.SystemSettings?.locale as string) ?? DEFAULT_LOCALE;
+    (fyo.singles.SystemSettings?.locale as string) ?? DEFAULT_LOCALE;
   const display =
-    (frappe.singles.SystemSettings?.displayPrecision as number) ??
+    (fyo.singles.SystemSettings?.displayPrecision as number) ??
     DEFAULT_DISPLAY_PRECISION;
 
-  return (frappe.currencyFormatter = Intl.NumberFormat(locale, {
+  return (fyo.currencyFormatter = Intl.NumberFormat(locale, {
     style: 'decimal',
     minimumFractionDigits: display,
   }));
 }
 
-function getCurrency(field: Field, doc: Doc | null, frappe: Frappe): string {
+function getCurrency(field: Field, doc: Doc | null, fyo: Fyo): string {
   if (doc && doc.getCurrencies[field.fieldname]) {
     return doc.getCurrencies[field.fieldname]();
   }
@@ -138,9 +137,7 @@ function getCurrency(field: Field, doc: Doc | null, frappe: Frappe): string {
     return doc.parentdoc.getCurrencies[field.fieldname]();
   }
 
-  return (
-    (frappe.singles.SystemSettings?.currency as string) ?? DEFAULT_CURRENCY
-  );
+  return (fyo.singles.SystemSettings?.currency as string) ?? DEFAULT_CURRENCY;
 }
 
 function getField(df: string | Field): Field {
diff --git a/frappe/utils/index.ts b/fyo/utils/index.ts
similarity index 100%
rename from frappe/utils/index.ts
rename to fyo/utils/index.ts
diff --git a/frappe/utils/observable.ts b/fyo/utils/observable.ts
similarity index 100%
rename from frappe/utils/observable.ts
rename to fyo/utils/observable.ts
diff --git a/frappe/utils/translation.ts b/fyo/utils/translation.ts
similarity index 100%
rename from frappe/utils/translation.ts
rename to fyo/utils/translation.ts
diff --git a/frappe/utils/types.ts b/fyo/utils/types.ts
similarity index 100%
rename from frappe/utils/types.ts
rename to fyo/utils/types.ts
diff --git a/models/README.md b/models/README.md
index f7bc95b1..6abad063 100644
--- a/models/README.md
+++ b/models/README.md
@@ -5,8 +5,8 @@ the models. **Models** here, refers to the classes that handle the data, its
 validation and updation and a bunch of other stuff.
 
 Each model directly or indirectly extends the `Doc` class from
-`frappe/model/doc.ts` so for more info check that file and the associated types
-in `frappe/model/types.ts`.
+`fyo/model/doc.ts` so for more info check that file and the associated types
+in `fyo/model/types.ts`.
 
 A model class can used even if the class body has no content, for example
 `PurchaseInvoiceItem`. Else the model used will default to using `Doc`. The
@@ -31,13 +31,13 @@ constructor. Check `schemas/README.md` for info on this.
 
 When adding stuff to `models/**` make sure that it isn't importing any Vue code
 or other frontend specific code globally. This is cause model file tests will
-directly use the the `Frappe` class and will be run using `mocha` on `node`.
+directly use the the `Fyo` class and will be run using `mocha` on `node`.
 
 Importing frontend code will break all the tests. This also implies that one
 should be wary about transitive dependencies.
 
-It should also not import the `frappe` object (singleton) from `src`, where ever
-frappe is required in models it should be passed to it.
+It should also not import the `Fyo` object (singleton) from `src`, where ever
+`fyo` is required in models it should be passed to it.
 
 _Note: Frontend specific code can be imported but they should be done so, only
 using dynamic imports i.e. `await import('...')`._
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index 49fb9366..5a64b6ab 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -1,10 +1,10 @@
-import { Frappe } from 'frappe';
-import Doc from 'frappe/model/doc';
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
 import {
   FiltersMap,
   ListViewSettings,
   TreeViewSettings,
-} from 'frappe/model/types';
+} from 'fyo/model/types';
 import { QueryFilter } from 'utils/db/types';
 import { AccountRootType, AccountType } from './types';
 
@@ -18,7 +18,7 @@ export class Account extends Doc {
       return;
     }
 
-    const account = await this.frappe.db.get(
+    const account = await this.fyo.db.get(
       'Account',
       this.parentAccount as string
     );
@@ -31,11 +31,11 @@ export class Account extends Doc {
     };
   }
 
-  static getTreeSettings(frappe: Frappe): void | TreeViewSettings {
+  static getTreeSettings(fyo: Fyo): void | TreeViewSettings {
     return {
       parentField: 'parentAccount',
       async getRootLabel(): Promise<string> {
-        const accountingSettings = await frappe.doc.getSingle(
+        const accountingSettings = await fyo.doc.getSingle(
           'AccountingSettings'
         );
         return accountingSettings.companyName as string;
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
index 00851407..2bd32b1c 100644
--- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
+++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
@@ -1,5 +1,5 @@
-import Doc from 'frappe/model/doc';
-import { ListViewSettings } from 'frappe/model/types';
+import Doc from 'fyo/model/doc';
+import { ListViewSettings } from 'fyo/model/types';
 
 export class AccountingLedgerEntry extends Doc {
   static getListViewSettings(): ListViewSettings {
diff --git a/models/baseModels/AccountingSettings/AccountingSettings.ts b/models/baseModels/AccountingSettings/AccountingSettings.ts
index f6128e45..ea2c4562 100644
--- a/models/baseModels/AccountingSettings/AccountingSettings.ts
+++ b/models/baseModels/AccountingSettings/AccountingSettings.ts
@@ -1,5 +1,5 @@
-import Doc from 'frappe/model/doc';
-import { FiltersMap, ListsMap } from 'frappe/model/types';
+import Doc from 'fyo/model/doc';
+import { FiltersMap, ListsMap } from 'fyo/model/types';
 import countryInfo from '../../../fixtures/countryInfo.json';
 
 export class AccountingSettings extends Doc {
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
index 6c26d116..3829c309 100644
--- a/models/baseModels/Address/Address.ts
+++ b/models/baseModels/Address/Address.ts
@@ -1,5 +1,6 @@
-import Doc from 'frappe/model/doc';
-import { EmptyMessageMap, FormulaMap, ListsMap } from 'frappe/model/types';
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
+import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types';
 import { stateCodeMap } from 'regional/in';
 import { titleCase } from 'utils';
 import countryInfo from '../../../fixtures/countryInfo.json';
@@ -36,12 +37,12 @@ export class Address extends Doc {
   };
 
   static emptyMessages: EmptyMessageMap = {
-    state: (doc: Doc, frappe) => {
+    state: (doc: Doc, fyo: Fyo) => {
       if (doc.country) {
-        return frappe.t`Enter State`;
+        return fyo.t`Enter State`;
       }
 
-      return frappe.t`Enter Country to load States`;
+      return fyo.t`Enter Country to load States`;
     },
   };
 }
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 30ef65a7..8eed94b4 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -1,7 +1,7 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
-import { DocValue } from 'frappe/core/types';
-import Doc from 'frappe/model/doc';
-import { DefaultMap, FiltersMap, FormulaMap } from 'frappe/model/types';
+import { DocValue } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
+import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 import { getExchangeRate } from '../../../accounting/exchangeRate';
 import { Party } from '../Party/Party';
@@ -27,7 +27,7 @@ export abstract class Invoice extends Doc {
   }
 
   async getPayments() {
-    const payments = await this.frappe.db.getAll('PaymentFor', {
+    const payments = await this.fyo.db.getAll('PaymentFor', {
       fields: ['parent'],
       filters: { referenceName: this.name! },
       orderBy: 'name',
@@ -55,12 +55,12 @@ export abstract class Invoice extends Doc {
     await entries.post();
 
     // update outstanding amounts
-    await this.frappe.db.update(this.schemaName, {
+    await this.fyo.db.update(this.schemaName, {
       name: this.name as string,
       outstandingAmount: this.baseGrandTotal!,
     });
 
-    const party = (await this.frappe.doc.getDoc('Party', this.party!)) as Party;
+    const party = (await this.fyo.doc.getDoc('Party', this.party!)) as Party;
     await party.updateOutstandingAmount();
   }
 
@@ -68,7 +68,7 @@ export abstract class Invoice extends Doc {
     const paymentRefList = await this.getPayments();
     for (const paymentFor of paymentRefList) {
       const paymentReference = paymentFor.parent;
-      const payment = (await this.frappe.doc.getDoc(
+      const payment = (await this.fyo.doc.getDoc(
         'Payment',
         paymentReference as string
       )) as Payment;
@@ -79,7 +79,7 @@ export abstract class Invoice extends Doc {
       }
 
       // To set the payment status as unsubmitted.
-      await this.frappe.db.update('Payment', {
+      await this.fyo.db.update('Payment', {
         name: paymentReference,
         submitted: false,
         cancelled: true,
@@ -92,7 +92,7 @@ export abstract class Invoice extends Doc {
   async getExchangeRate() {
     if (!this.currency) return 1.0;
 
-    const accountingSettings = await this.frappe.doc.getSingle(
+    const accountingSettings = await this.fyo.doc.getSingle(
       'AccountingSettings'
     );
     const companyCurrency = accountingSettings.currency;
@@ -130,8 +130,8 @@ export abstract class Invoice extends Doc {
         taxes[account] = taxes[account] || {
           account,
           rate,
-          amount: this.frappe.pesa(0),
-          baseAmount: this.frappe.pesa(0),
+          amount: this.fyo.pesa(0),
+          baseAmount: this.fyo.pesa(0),
         };
 
         const amount = (row.amount as Money).mul(rate).div(100);
@@ -150,7 +150,7 @@ export abstract class Invoice extends Doc {
 
   async getTax(tax: string) {
     if (!this._taxes![tax]) {
-      this._taxes[tax] = await this.frappe.doc.getDoc('Tax', tax);
+      this._taxes[tax] = await this.fyo.doc.getDoc('Tax', tax);
     }
 
     return this._taxes[tax];
@@ -167,7 +167,7 @@ export abstract class Invoice extends Doc {
       this.getFrom('Party', this.party!, 'defaultAccount') as string,
     currency: async () =>
       (this.getFrom('Party', this.party!, 'currency') as string) ||
-      (this.frappe.singles.AccountingSettings!.currency as string),
+      (this.fyo.singles.AccountingSettings!.currency as string),
     exchangeRate: async () => await this.getExchangeRate(),
     netTotal: async () => this.getSum('items', 'amount', false),
     baseNetTotal: async () => this.netTotal!.mul(this.exchangeRate!),
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index ceee496f..5b6aa581 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -1,12 +1,12 @@
-import { DocValue } from 'frappe/core/types';
-import Doc from 'frappe/model/doc';
+import { DocValue } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
 import {
   DependsOnMap,
   FiltersMap,
   FormulaMap,
   ValidationMap,
-} from 'frappe/model/types';
-import { ValidationError } from 'frappe/utils/errors';
+} from 'fyo/model/types';
+import { ValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 import { Invoice } from '../Invoice/Invoice';
 
@@ -32,7 +32,7 @@ export abstract class InvoiceItem extends Doc {
         'Item',
         this.item as string,
         'rate'
-      )) || this.frappe.pesa(0)) as Money;
+      )) || this.fyo.pesa(0)) as Money;
 
       return baseRate.div(this.exchangeRate!);
     },
@@ -74,7 +74,7 @@ export abstract class InvoiceItem extends Doc {
       }
 
       throw new ValidationError(
-        this.frappe.t`Rate (${this.frappe.format(
+        this.fyo.t`Rate (${this.fyo.format(
           value,
           'Currency'
         )}) cannot be less zero.`
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 02d899f0..891d8205 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -1,6 +1,6 @@
-import { Frappe } from 'frappe';
-import { DocValue } from 'frappe/core/types';
-import Doc from 'frappe/model/doc';
+import { Fyo } from 'fyo';
+import { DocValue } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
 import {
   Action,
   DependsOnMap,
@@ -8,8 +8,8 @@ import {
   FormulaMap,
   ListViewSettings,
   ValidationMap,
-} from 'frappe/model/types';
-import { ValidationError } from 'frappe/utils/errors';
+} from 'fyo/model/types';
+import { ValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 
 export class Item extends Doc {
@@ -20,11 +20,11 @@ export class Item extends Doc {
         accountName = 'Sales';
       }
 
-      const accountExists = await this.frappe.db.exists('Account', accountName);
+      const accountExists = await this.fyo.db.exists('Account', accountName);
       return accountExists ? accountName : '';
     },
     expenseAccount: async () => {
-      const cogs = await this.frappe.db.getAllRaw('Account', {
+      const cogs = await this.fyo.db.getAllRaw('Account', {
         filters: {
           accountType: 'Cost of Goods Sold',
         },
@@ -57,18 +57,18 @@ export class Item extends Doc {
   validations: ValidationMap = {
     rate: async (value: DocValue) => {
       if ((value as Money).isNegative()) {
-        throw new ValidationError(this.frappe.t`Rate can't be negative.`);
+        throw new ValidationError(this.fyo.t`Rate can't be negative.`);
       }
     },
   };
 
-  static getActions(frappe: Frappe): Action[] {
+  static getActions(fyo: Fyo): Action[] {
     return [
       {
-        label: frappe.t`New Invoice`,
+        label: fyo.t`New Invoice`,
         condition: (doc) => !doc.isNew,
         action: async (doc, router) => {
-          const invoice = await frappe.doc.getEmptyDoc('SalesInvoice');
+          const invoice = await fyo.doc.getEmptyDoc('SalesInvoice');
           invoice.append('items', {
             item: doc.name as string,
             rate: doc.rate as Money,
@@ -78,10 +78,10 @@ export class Item extends Doc {
         },
       },
       {
-        label: frappe.t`New Bill`,
+        label: fyo.t`New Bill`,
         condition: (doc) => !doc.isNew,
         action: async (doc, router) => {
-          const invoice = await frappe.doc.getEmptyDoc('PurchaseInvoice');
+          const invoice = await fyo.doc.getEmptyDoc('PurchaseInvoice');
           invoice.append('items', {
             item: doc.name as string,
             rate: doc.rate as Money,
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index be27b387..04621747 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -1,11 +1,11 @@
-import { Frappe } from 'frappe';
-import Doc from 'frappe/model/doc';
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
 import {
   Action,
   DefaultMap,
   FiltersMap,
   ListViewSettings,
-} from 'frappe/model/types';
+} from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { getLedgerLinkAction } from 'models/helpers';
 import Money from 'pesa/dist/types/src/money';
@@ -15,7 +15,7 @@ export class JournalEntry extends Doc {
   accounts: Doc[] = [];
 
   getPosting() {
-    const entries = new LedgerPosting({ reference: this }, this.frappe);
+    const entries = new LedgerPosting({ reference: this }, this.fyo);
 
     for (const row of this.accounts) {
       const debit = row.debit as Money;
@@ -56,17 +56,17 @@ export class JournalEntry extends Doc {
     numberSeries: () => ({ referenceType: 'JournalEntry' }),
   };
 
-  static getActions(frappe: Frappe): Action[] {
-    return [getLedgerLinkAction(frappe)];
+  static getActions(fyo: Fyo): Action[] {
+    return [getLedgerLinkAction(fyo)];
   }
 
-  static getListViewSettings(frappe: Frappe): ListViewSettings {
+  static getListViewSettings(fyo: Fyo): ListViewSettings {
     return {
       formRoute: (name) => `/edit/JournalEntry/${name}`,
       columns: [
         'date',
         {
-          label: frappe.t`Status`,
+          label: fyo.t`Status`,
           fieldtype: 'Select',
           size: 'small',
           render(doc) {
@@ -88,7 +88,7 @@ export class JournalEntry extends Doc {
           },
         },
         {
-          label: frappe.t`Entry ID`,
+          label: fyo.t`Entry ID`,
           fieldtype: 'Data',
           fieldname: 'name',
           getValue(doc) {
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
index dd947885..0768a0ba 100644
--- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
+++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
@@ -1,5 +1,5 @@
-import Doc from 'frappe/model/doc';
-import { FiltersMap, FormulaMap } from 'frappe/model/types';
+import Doc from 'fyo/model/doc';
+import { FiltersMap, FormulaMap } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 
 export class JournalEntryAccount extends Doc {
@@ -8,7 +8,7 @@ export class JournalEntryAccount extends Doc {
 
     const otherTypeValue = this.get(otherType) as Money;
     if (!otherTypeValue.isZero()) {
-      return this.frappe.pesa(0);
+      return this.fyo.pesa(0);
     }
 
     const totalType = this.parentdoc!.getSum('accounts', type, false) as Money;
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 2c89d3c2..3507f4b4 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -1,11 +1,11 @@
-import { Frappe } from 'frappe';
-import Doc from 'frappe/model/doc';
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
 import {
   Action,
   FiltersMap,
   FormulaMap,
   ListViewSettings,
-} from 'frappe/model/types';
+} from 'fyo/model/types';
 import { PartyRole } from './types';
 
 export class Party extends Doc {
@@ -29,7 +29,7 @@ export class Party extends Doc {
     schemaName: 'SalesInvoice' | 'PurchaseInvoice'
   ) {
     const outstandingAmounts = (
-      await this.frappe.db.getAllRaw(schemaName, {
+      await this.fyo.db.getAllRaw(schemaName, {
         fields: ['outstandingAmount', 'party'],
         filters: { submitted: true },
       })
@@ -37,9 +37,9 @@ export class Party extends Doc {
 
     const totalOutstanding = outstandingAmounts
       .map(({ outstandingAmount }) =>
-        this.frappe.pesa(outstandingAmount as number)
+        this.fyo.pesa(outstandingAmount as number)
       )
-      .reduce((a, b) => a.add(b), this.frappe.pesa(0));
+      .reduce((a, b) => a.add(b), this.fyo.pesa(0));
 
     await this.set('outstandingAmount', totalOutstanding);
     await this.update();
@@ -57,11 +57,11 @@ export class Party extends Doc {
         accountName = 'Creditors';
       }
 
-      const accountExists = await this.frappe.db.exists('Account', accountName);
+      const accountExists = await this.fyo.db.exists('Account', accountName);
       return accountExists ? accountName : '';
     },
     currency: async () =>
-      this.frappe.singles.AccountingSettings!.currency as string,
+      this.fyo.singles.AccountingSettings!.currency as string,
     addressDisplay: async () => {
       const address = this.address as string | undefined;
       if (address) {
@@ -94,14 +94,14 @@ export class Party extends Doc {
     };
   }
 
-  static getActions(frappe: Frappe): Action[] {
+  static getActions(fyo: Fyo): Action[] {
     return [
       {
-        label: frappe.t`Create Bill`,
+        label: fyo.t`Create Bill`,
         condition: (doc: Doc) =>
           !doc.isNew && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
-          const doc = await frappe.doc.getEmptyDoc('PurchaseInvoice');
+          const doc = await fyo.doc.getEmptyDoc('PurchaseInvoice');
           router.push({
             path: `/edit/PurchaseInvoice/${doc.name}`,
             query: {
@@ -115,7 +115,7 @@ export class Party extends Doc {
         },
       },
       {
-        label: frappe.t`View Bills`,
+        label: fyo.t`View Bills`,
         condition: (doc: Doc) =>
           !doc.isNew && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
@@ -132,11 +132,11 @@ export class Party extends Doc {
         },
       },
       {
-        label: frappe.t`Create Invoice`,
+        label: fyo.t`Create Invoice`,
         condition: (doc: Doc) =>
           !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
-          const doc = await frappe.doc.getEmptyDoc('SalesInvoice');
+          const doc = await fyo.doc.getEmptyDoc('SalesInvoice');
           router.push({
             path: `/edit/SalesInvoice/${doc.name}`,
             query: {
@@ -150,7 +150,7 @@ export class Party extends Doc {
         },
       },
       {
-        label: frappe.t`View Invoices`,
+        label: fyo.t`View Invoices`,
         condition: (doc: Doc) =>
           !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index fd9412f3..e8f89dfa 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -1,7 +1,7 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
-import { Frappe } from 'frappe';
-import { DocValue } from 'frappe/core/types';
-import Doc from 'frappe/model/doc';
+import { Fyo } from 'fyo';
+import { DocValue } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
 import {
   Action,
   DefaultMap,
@@ -11,8 +11,8 @@ import {
   ListViewSettings,
   RequiredMap,
   ValidationMap,
-} from 'frappe/model/types';
-import { ValidationError } from 'frappe/utils/errors';
+} from 'fyo/model/types';
+import { ValidationError } from 'fyo/utils/errors';
 import { getLedgerLinkAction } from 'models/helpers';
 import Money from 'pesa/dist/types/src/money';
 import { getIsNullOrUndef } from 'utils';
@@ -50,10 +50,7 @@ export class Payment extends Doc {
     }
 
     const schemaName = referenceType as string;
-    const doc = await this.frappe.doc.getDoc(
-      schemaName,
-      referenceName as string
-    );
+    const doc = await this.fyo.doc.getDoc(schemaName, referenceName as string);
 
     let party;
     let paymentType: PaymentType;
@@ -71,7 +68,7 @@ export class Payment extends Doc {
   }
 
   updateAmountOnReferenceUpdate() {
-    this.amount = this.frappe.pesa(0);
+    this.amount = this.fyo.pesa(0);
     for (const paymentReference of this.for as Doc[]) {
       this.amount = (this.amount as Money).add(
         paymentReference.amount as Money
@@ -98,7 +95,7 @@ export class Payment extends Doc {
     if (this.paymentAccount !== this.account || !this.account) {
       return;
     }
-    throw new this.frappe.errors.ValidationError(
+    throw new this.fyo.errors.ValidationError(
       `To Account and From Account can't be the same: ${this.account}`
     );
   }
@@ -111,7 +108,7 @@ export class Payment extends Doc {
 
     const referenceAmountTotal = forReferences
       .map(({ amount }) => amount as Money)
-      .reduce((a, b) => a.add(b), this.frappe.pesa(0));
+      .reduce((a, b) => a.add(b), this.fyo.pesa(0));
 
     if (
       (this.amount as Money)
@@ -121,20 +118,20 @@ export class Payment extends Doc {
       return;
     }
 
-    const writeoff = this.frappe.format(this.writeoff!, 'Currency');
-    const payment = this.frappe.format(this.amount!, 'Currency');
-    const refAmount = this.frappe.format(referenceAmountTotal, 'Currency');
+    const writeoff = this.fyo.format(this.writeoff!, 'Currency');
+    const payment = this.fyo.format(this.amount!, 'Currency');
+    const refAmount = this.fyo.format(referenceAmountTotal, 'Currency');
 
     if ((this.writeoff as Money).gt(0)) {
       throw new ValidationError(
-        this.frappe.t`Amount: ${payment} and writeoff: ${writeoff} 
+        this.fyo.t`Amount: ${payment} and writeoff: ${writeoff} 
           is less than the total amount allocated to 
           references: ${refAmount}.`
       );
     }
 
     throw new ValidationError(
-      this.frappe.t`Amount: ${payment} is less than the total
+      this.fyo.t`Amount: ${payment} is less than the total
         amount allocated to references: ${refAmount}.`
     );
   }
@@ -144,9 +141,9 @@ export class Payment extends Doc {
       return;
     }
 
-    if (!this.frappe.singles.AccountingSettings!.writeOffAccount) {
+    if (!this.fyo.singles.AccountingSettings!.writeOffAccount) {
       throw new ValidationError(
-        this.frappe.t`Write Off Account not set.
+        this.fyo.t`Write Off Account not set.
           Please set Write Off Account in General Settings`
       );
     }
@@ -162,7 +159,7 @@ export class Payment extends Doc {
         reference: this,
         party: this.party!,
       },
-      this.frappe
+      this.fyo
     );
 
     await entries.debit(paymentAccount as string, amount.sub(writeoff));
@@ -177,9 +174,9 @@ export class Payment extends Doc {
         reference: this,
         party: this.party!,
       },
-      this.frappe
+      this.fyo
     );
-    const writeOffAccount = this.frappe.singles.AccountingSettings!
+    const writeOffAccount = this.fyo.singles.AccountingSettings!
       .writeOffAccount as string;
 
     if (this.paymentType === 'Pay') {
@@ -207,7 +204,7 @@ export class Payment extends Doc {
       ) {
         continue;
       }
-      const referenceDoc = await this.frappe.doc.getDoc(
+      const referenceDoc = await this.fyo.doc.getDoc(
         row.referenceType as string,
         row.referenceName as string
       );
@@ -221,17 +218,17 @@ export class Payment extends Doc {
       }
 
       if (amount.lte(0) || amount.gt(outstandingAmount)) {
-        let message = this.frappe.t`Payment amount: ${this.frappe.format(
+        let message = this.fyo.t`Payment amount: ${this.fyo.format(
           this.amount!,
           'Currency'
-        )} should be less than Outstanding amount: ${this.frappe.format(
+        )} should be less than Outstanding amount: ${this.fyo.format(
           outstandingAmount,
           'Currency'
         )}.`;
 
         if (amount.lte(0)) {
-          const amt = this.frappe.format(this.amount!, 'Currency');
-          message = this.frappe
+          const amt = this.fyo.format(this.amount!, 'Currency');
+          message = this.fyo
             .t`Payment amount: ${amt} should be greater than 0.`;
         }
 
@@ -241,7 +238,7 @@ export class Payment extends Doc {
         const newOutstanding = outstandingAmount.sub(amount);
         await referenceDoc.set('outstandingAmount', newOutstanding);
         await referenceDoc.update();
-        const party = (await this.frappe.doc.getDoc(
+        const party = (await this.fyo.doc.getDoc(
           'Party',
           this.party!
         )) as Party;
@@ -269,7 +266,7 @@ export class Payment extends Doc {
   async updateReferenceOutstandingAmount() {
     await (this.for as Doc[]).forEach(
       async ({ amount, referenceType, referenceName }) => {
-        const refDoc = await this.frappe.doc.getDoc(
+        const refDoc = await this.fyo.doc.getDoc(
           referenceType as string,
           referenceName as string
         );
@@ -304,7 +301,7 @@ export class Payment extends Doc {
     amount: async (value: DocValue) => {
       if ((value as Money).isNegative()) {
         throw new ValidationError(
-          this.frappe.t`Payment amount cannot be less than zero.`
+          this.fyo.t`Payment amount cannot be less than zero.`
         );
       }
 
@@ -313,13 +310,13 @@ export class Payment extends Doc {
 
       if ((value as Money).gt(amount)) {
         throw new ValidationError(
-          this.frappe.t`Payment amount cannot 
-              exceed ${this.frappe.format(amount, 'Currency')}.`
+          this.fyo.t`Payment amount cannot 
+              exceed ${this.fyo.format(amount, 'Currency')}.`
         );
       } else if ((value as Money).isZero()) {
         throw new ValidationError(
-          this.frappe.t`Payment amount cannot
-              be ${this.frappe.format(value, 'Currency')}.`
+          this.fyo.t`Payment amount cannot
+              be ${this.fyo.format(value, 'Currency')}.`
         );
       }
     },
@@ -368,16 +365,16 @@ export class Payment extends Doc {
     },
   };
 
-  static getActions(frappe: Frappe): Action[] {
-    return [getLedgerLinkAction(frappe)];
+  static getActions(fyo: Fyo): Action[] {
+    return [getLedgerLinkAction(fyo)];
   }
 
-  static getListViewSettings(frappe: Frappe): ListViewSettings {
+  static getListViewSettings(fyo: Fyo): ListViewSettings {
     return {
       columns: [
         'party',
         {
-          label: frappe.t`Status`,
+          label: fyo.t`Status`,
           fieldname: 'status',
           fieldtype: 'Select',
           size: 'small',
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index 01ebc445..eb0730ee 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -1,5 +1,5 @@
-import Doc from 'frappe/model/doc';
-import { FiltersMap, FormulaMap } from 'frappe/model/types';
+import Doc from 'fyo/model/doc';
+import { FiltersMap, FormulaMap } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 
 export class PaymentFor extends Doc {
@@ -15,7 +15,7 @@ export class PaymentFor extends Doc {
         return outstandingAmount;
       }
 
-      return this.frappe.pesa(0);
+      return this.fyo.pesa(0);
     },
   };
 
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index 1a68794b..1cc09a10 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -1,6 +1,6 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
-import { Frappe } from 'frappe';
-import { Action, ListViewSettings } from 'frappe/model/types';
+import { Fyo } from 'fyo';
+import { Action, ListViewSettings } from 'fyo/model/types';
 import {
   getTransactionActions,
   getTransactionStatusColumn,
@@ -17,7 +17,7 @@ export class PurchaseInvoice extends Invoice {
         reference: this,
         party: this.party,
       },
-      this.frappe
+      this.fyo
     );
 
     await entries.credit(this.account!, this.baseGrandTotal!);
@@ -36,17 +36,17 @@ export class PurchaseInvoice extends Invoice {
     return entries;
   }
 
-  static getActions(frappe: Frappe): Action[] {
-    return getTransactionActions('PurchaseInvoice', frappe);
+  static getActions(fyo: Fyo): Action[] {
+    return getTransactionActions('PurchaseInvoice', fyo);
   }
 
-  static getListViewSettings(frappe: Frappe): ListViewSettings {
+  static getListViewSettings(fyo: Fyo): ListViewSettings {
     return {
       formRoute: (name) => `/edit/PurchaseInvoice/${name}`,
       columns: [
         'party',
         'name',
-        getTransactionStatusColumn(frappe),
+        getTransactionStatusColumn(fyo),
         'date',
         'grandTotal',
         'outstandingAmount',
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
index 260150ff..4c7d66b7 100644
--- a/models/baseModels/SalesInvoice/SalesInvoice.ts
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -1,6 +1,6 @@
 import { LedgerPosting } from 'accounting/ledgerPosting';
-import { Frappe } from 'frappe';
-import { Action, ListViewSettings } from 'frappe/model/types';
+import { Fyo } from 'fyo';
+import { Action, ListViewSettings } from 'fyo/model/types';
 import {
   getTransactionActions,
   getTransactionStatusColumn,
@@ -17,7 +17,7 @@ export class SalesInvoice extends Invoice {
         reference: this,
         party: this.party,
       },
-      this.frappe
+      this.fyo
     );
     await entries.debit(this.account!, this.baseGrandTotal!);
 
@@ -34,17 +34,17 @@ export class SalesInvoice extends Invoice {
     return entries;
   }
 
-  static getActions(frappe: Frappe): Action[] {
-    return getTransactionActions('SalesInvoice', frappe);
+  static getActions(fyo: Fyo): Action[] {
+    return getTransactionActions('SalesInvoice', fyo);
   }
 
-  static getListViewSettings(frappe: Frappe): ListViewSettings {
+  static getListViewSettings(fyo: Fyo): ListViewSettings {
     return {
       formRoute: (name) => `/edit/SalesInvoice/${name}`,
       columns: [
         'party',
         'name',
-        getTransactionStatusColumn(frappe),
+        getTransactionStatusColumn(fyo),
         'date',
         'grandTotal',
         'outstandingAmount',
diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts
index baf1ef70..17e7fcbe 100644
--- a/models/baseModels/SetupWizard/SetupWizard.ts
+++ b/models/baseModels/SetupWizard/SetupWizard.ts
@@ -1,6 +1,6 @@
-import { t } from 'frappe';
-import Doc from 'frappe/model/doc';
-import { FormulaMap, ListsMap } from 'frappe/model/types';
+import { t } from 'fyo';
+import Doc from 'fyo/model/doc';
+import { FormulaMap, ListsMap } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import countryInfo from '../../../fixtures/countryInfo.json';
 
diff --git a/models/baseModels/Tax/Tax.ts b/models/baseModels/Tax/Tax.ts
index 40dad8bb..4f125a2f 100644
--- a/models/baseModels/Tax/Tax.ts
+++ b/models/baseModels/Tax/Tax.ts
@@ -1,5 +1,5 @@
-import Doc from 'frappe/model/doc';
-import { ListViewSettings } from 'frappe/model/types';
+import Doc from 'fyo/model/doc';
+import { ListViewSettings } from 'fyo/model/types';
 
 export class Tax extends Doc {
   static getListViewSettings(): ListViewSettings {
diff --git a/models/baseModels/TaxSummary/TaxSummary.ts b/models/baseModels/TaxSummary/TaxSummary.ts
index 7e0cf01d..86e9dc4a 100644
--- a/models/baseModels/TaxSummary/TaxSummary.ts
+++ b/models/baseModels/TaxSummary/TaxSummary.ts
@@ -1,5 +1,5 @@
-import Doc from 'frappe/model/doc';
-import { FormulaMap } from 'frappe/model/types';
+import Doc from 'fyo/model/doc';
+import { FormulaMap } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 
 export class TaxSummary extends Doc {
diff --git a/models/helpers.ts b/models/helpers.ts
index 5f226b1d..d3315fed 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -1,13 +1,13 @@
-import { Frappe } from 'frappe';
-import Doc from 'frappe/model/doc';
-import { Action, ColumnConfig } from 'frappe/model/types';
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
+import { Action, ColumnConfig } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
 import { InvoiceStatus } from './types';
 
-export function getLedgerLinkAction(frappe: Frappe): Action {
+export function getLedgerLinkAction(fyo: Fyo): Action {
   return {
-    label: frappe.t`Ledger Entries`,
+    label: fyo.t`Ledger Entries`,
     condition: (doc: Doc) => !!doc.submitted,
     action: async (doc: Doc, router: Router) => {
       router.push({
@@ -27,15 +27,15 @@ export function getLedgerLinkAction(frappe: Frappe): Action {
 
 export function getTransactionActions(
   schemaName: string,
-  frappe: Frappe
+  fyo: Fyo
 ): Action[] {
   return [
     {
-      label: frappe.t`Make Payment`,
+      label: fyo.t`Make Payment`,
       condition: (doc: Doc) =>
         (doc.submitted as boolean) && (doc.outstandingAmount as Money).gt(0),
       action: async function makePayment(doc: Doc) {
-        const payment = await frappe.doc.getEmptyDoc('Payment');
+        const payment = await fyo.doc.getEmptyDoc('Payment');
         payment.once('afterInsert', async () => {
           await payment.submit();
         });
@@ -66,26 +66,26 @@ export function getTransactionActions(
       },
     },
     {
-      label: frappe.t`Print`,
+      label: fyo.t`Print`,
       condition: (doc: Doc) => doc.submitted as boolean,
       action: async (doc: Doc, router: Router) => {
         router.push({ path: `/print/${doc.doctype}/${doc.name}` });
       },
     },
-    getLedgerLinkAction(frappe),
+    getLedgerLinkAction(fyo),
   ];
 }
 
-export function getTransactionStatusColumn(frappe: Frappe): ColumnConfig {
+export function getTransactionStatusColumn(fyo: Fyo): ColumnConfig {
   const statusMap = {
-    Unpaid: frappe.t`Unpaid`,
-    Paid: frappe.t`Paid`,
-    Draft: frappe.t`Draft`,
-    Cancelled: frappe.t`Cancelled`,
+    Unpaid: fyo.t`Unpaid`,
+    Paid: fyo.t`Paid`,
+    Draft: fyo.t`Draft`,
+    Cancelled: fyo.t`Cancelled`,
   };
 
   return {
-    label: frappe.t`Status`,
+    label: fyo.t`Status`,
     fieldname: 'status',
     fieldtype: 'Select',
     render(doc: Doc) {
diff --git a/models/index.ts b/models/index.ts
index e129ebad..139ae4a4 100644
--- a/models/index.ts
+++ b/models/index.ts
@@ -1,4 +1,4 @@
-import { ModelMap } from 'frappe/model/types';
+import { ModelMap } from 'fyo/model/types';
 import { Account } from './baseModels/Account/Account';
 import { AccountingLedgerEntry } from './baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
 import { AccountingSettings } from './baseModels/AccountingSettings/AccountingSettings';
diff --git a/models/regionalModels/in/Address.ts b/models/regionalModels/in/Address.ts
index 5b554654..6a708f14 100644
--- a/models/regionalModels/in/Address.ts
+++ b/models/regionalModels/in/Address.ts
@@ -1,4 +1,4 @@
-import { FormulaMap, ListsMap } from 'frappe/model/types';
+import { FormulaMap, ListsMap } from 'fyo/model/types';
 import { Address as BaseAddress } from 'models/baseModels/Address/Address';
 import { stateCodeMap } from 'regional/in';
 import { titleCase } from 'utils';
diff --git a/models/regionalModels/in/Party.ts b/models/regionalModels/in/Party.ts
index ac49b067..c35d6f0c 100644
--- a/models/regionalModels/in/Party.ts
+++ b/models/regionalModels/in/Party.ts
@@ -1,4 +1,4 @@
-import { HiddenMap } from 'frappe/model/types';
+import { HiddenMap } from 'fyo/model/types';
 import { Party as BaseParty } from 'models/baseModels/Party/Party';
 import { GSTType } from './types';
 
diff --git a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js b/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
index 56d14889..11658ac0 100644
--- a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
+++ b/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 
 export default class AccountsReceivablePayable {
   async run(reportType, { date }) {
diff --git a/reports/BalanceSheet/BalanceSheet.js b/reports/BalanceSheet/BalanceSheet.js
index cd862d06..9daf6430 100644
--- a/reports/BalanceSheet/BalanceSheet.js
+++ b/reports/BalanceSheet/BalanceSheet.js
@@ -1,4 +1,4 @@
-import { unique } from 'frappe/utils';
+import { unique } from 'fyo/utils';
 import { getData } from '../FinancialStatements/FinancialStatements';
 
 class BalanceSheet {
diff --git a/reports/BalanceSheet/viewConfig.js b/reports/BalanceSheet/viewConfig.js
index 14cb96b6..a0a6b669 100644
--- a/reports/BalanceSheet/viewConfig.js
+++ b/reports/BalanceSheet/viewConfig.js
@@ -1,4 +1,4 @@
-import frappe, { t } from 'frappe';
+import frappe, { t } from 'fyo';
 import getCommonExportActions from '../commonExporter';
 
 const periodicityMap = {
diff --git a/reports/BankReconciliation/BankReconciliation.js b/reports/BankReconciliation/BankReconciliation.js
index 76cebb09..7e8bf17f 100644
--- a/reports/BankReconciliation/BankReconciliation.js
+++ b/reports/BankReconciliation/BankReconciliation.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 
 class BankReconciliation {
   async run(params) {
diff --git a/reports/BankReconciliation/BankReconciliationImport.js b/reports/BankReconciliation/BankReconciliationImport.js
index f6534ff6..4af6c2b1 100644
--- a/reports/BankReconciliation/BankReconciliationImport.js
+++ b/reports/BankReconciliation/BankReconciliationImport.js
@@ -1,5 +1,5 @@
 import csv2json from 'csvjson-csv2json';
-import frappe from 'frappe';
+import frappe from 'fyo';
 import ReconciliationValidation from '../../src/components/ReconciliationValidation';
 
 export const fileImportHandler = (file, report) => {
diff --git a/reports/BankReconciliation/viewConfig.js b/reports/BankReconciliation/viewConfig.js
index 9505136a..9524cc66 100644
--- a/reports/BankReconciliation/viewConfig.js
+++ b/reports/BankReconciliation/viewConfig.js
@@ -1,5 +1,5 @@
 const title = 'Bank Reconciliation';
-import { t } from 'frappe';
+import { t } from 'fyo';
 import ImportWizard from '../../src/components/ImportWizart';
 import BankReconciliationImport from './BankReconciliationImport';
 
diff --git a/reports/Cashflow/Cashflow.js b/reports/Cashflow/Cashflow.js
index 3c0bd08f..0fed2e6d 100644
--- a/reports/Cashflow/Cashflow.js
+++ b/reports/Cashflow/Cashflow.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 import { DateTime } from 'luxon';
 import {
   getFiscalYear,
diff --git a/reports/FinancialStatements/FinancialStatements.js b/reports/FinancialStatements/FinancialStatements.js
index 332f6319..2e382a63 100644
--- a/reports/FinancialStatements/FinancialStatements.js
+++ b/reports/FinancialStatements/FinancialStatements.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 import { DateTime } from 'luxon';
 import { convertPesaValuesToFloat } from '../../src/utils';
 
@@ -185,27 +185,36 @@ function getPeriodKey(date, periodicity, fiscalYear) {
   let getKey = {
     Monthly: () => `${dateObj.monthShort} ${year}`,
     Quarterly: () => {
-      const key = month < fisacalStart.month ? `${year-1} - ${year}` : `${year} - ${year+1}`;
+      const key =
+        month < fisacalStart.month
+          ? `${year - 1} - ${year}`
+          : `${year} - ${year + 1}`;
       let strYear = isSplit ? key : `${year}`;
       return {
         1: `Q1 ${strYear}`,
         2: `Q2 ${strYear}`,
         3: `Q3 ${strYear}`,
         4: `Q4 ${strYear}`,
-      }[quarters[month-1]];
+      }[quarters[month - 1]];
     },
     'Half Yearly': () => {
-      const key = month < fisacalStart.month ? `${year-1} - ${year}` : `${year} - ${year+1}`;
+      const key =
+        month < fisacalStart.month
+          ? `${year - 1} - ${year}`
+          : `${year} - ${year + 1}`;
       let strYear = isSplit ? key : `${year}`;
-      return  { 
+      return {
         1: `1st Half ${strYear}`,
         2: `1st Half ${strYear}`,
         3: `2nd Half ${strYear}`,
         4: `2nd Half ${strYear}`,
-      }[quarters[month-1]];
+      }[quarters[month - 1]];
     },
     Yearly: () => {
-      const key = month < fisacalStart.month ? `${year-1} - ${year}` : `${year} - ${year+1}`;
+      const key =
+        month < fisacalStart.month
+          ? `${year - 1} - ${year}`
+          : `${year} - ${year + 1}`;
       let strYear = isSplit ? key : `${year}`;
       return `FY ${strYear}`;
     },
@@ -304,11 +313,11 @@ export async function getFiscalYear() {
   //moving the financial quarters, according to of start of fiscal year month
   let quarters = [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4];
   let start = DateTime.fromISO(fiscalYearStart);
-  quarters.unshift(...quarters.splice(13-start.month, 11));
+  quarters.unshift(...quarters.splice(13 - start.month, 11));
 
-  //check if fiscal year ends in next year  
+  //check if fiscal year ends in next year
   let end = DateTime.fromISO(fiscalYearEnd);
-  let isFiscalSplit = start.year - end.year ;
+  let isFiscalSplit = start.year - end.year;
 
   return {
     start: fiscalYearStart,
diff --git a/reports/GeneralLedger/GeneralLedger.js b/reports/GeneralLedger/GeneralLedger.js
index b3bbce23..a1cdbbec 100644
--- a/reports/GeneralLedger/GeneralLedger.js
+++ b/reports/GeneralLedger/GeneralLedger.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 
 class GeneralLedger {
   async run(params) {
diff --git a/reports/GeneralLedger/viewConfig.js b/reports/GeneralLedger/viewConfig.js
index 87cd442b..db67cff1 100644
--- a/reports/GeneralLedger/viewConfig.js
+++ b/reports/GeneralLedger/viewConfig.js
@@ -1,5 +1,5 @@
 import { partyWithAvatar } from '@/utils';
-import { t } from 'frappe';
+import { t } from 'fyo';
 import getCommonExportActions from '../commonExporter';
 
 let title = t`General Ledger`;
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.js b/reports/GoodsAndServiceTax/BaseGSTR.js
index ce039da7..0577584e 100644
--- a/reports/GoodsAndServiceTax/BaseGSTR.js
+++ b/reports/GoodsAndServiceTax/BaseGSTR.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 import { stateCodeMap } from '../../accounting/gst';
 import { convertPesaValuesToFloat } from '../../src/utils';
 
diff --git a/reports/GoodsAndServiceTax/BaseViewConfig.js b/reports/GoodsAndServiceTax/BaseViewConfig.js
index 54e297e9..3171e755 100644
--- a/reports/GoodsAndServiceTax/BaseViewConfig.js
+++ b/reports/GoodsAndServiceTax/BaseViewConfig.js
@@ -1,4 +1,4 @@
-import { t } from 'frappe';
+import { t } from 'fyo';
 import { DateTime } from 'luxon';
 import { stateCodeMap } from '../../accounting/gst';
 import { titleCase } from '../../src/utils';
diff --git a/reports/GoodsAndServiceTax/GSTR1View.js b/reports/GoodsAndServiceTax/GSTR1View.js
index 0fc54224..68f5d671 100644
--- a/reports/GoodsAndServiceTax/GSTR1View.js
+++ b/reports/GoodsAndServiceTax/GSTR1View.js
@@ -1,5 +1,5 @@
 const title = 'GSTR 1';
-import { t } from 'frappe';
+import { t } from 'fyo';
 import { generateGstr1Csv, generateGstr1Json } from '../../accounting/gst';
 import baseConfig from './BaseViewConfig';
 
diff --git a/reports/GoodsAndServiceTax/GSTR2View.js b/reports/GoodsAndServiceTax/GSTR2View.js
index 62ce9a67..92bb314e 100644
--- a/reports/GoodsAndServiceTax/GSTR2View.js
+++ b/reports/GoodsAndServiceTax/GSTR2View.js
@@ -1,5 +1,5 @@
 const title = 'GSTR 2';
-import { t } from 'frappe';
+import { t } from 'fyo';
 import { generateGstr2Csv } from '../../accounting/gst';
 import baseConfig from './BaseViewConfig';
 
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.js b/reports/ProfitAndLoss/ProfitAndLoss.js
index 558d02b3..06999f4b 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.js
+++ b/reports/ProfitAndLoss/ProfitAndLoss.js
@@ -1,4 +1,4 @@
-import { unique } from 'frappe/utils';
+import { unique } from 'fyo/utils';
 import { getData } from '../FinancialStatements/FinancialStatements';
 
 class ProfitAndLoss {
diff --git a/reports/ProfitAndLoss/viewConfig.js b/reports/ProfitAndLoss/viewConfig.js
index 7be22ccb..654aeb47 100644
--- a/reports/ProfitAndLoss/viewConfig.js
+++ b/reports/ProfitAndLoss/viewConfig.js
@@ -1,4 +1,4 @@
-import frappe, { t } from 'frappe';
+import frappe, { t } from 'fyo';
 import getCommonExportActions from '../commonExporter';
 
 const title = t`Profit and Loss`;
diff --git a/reports/PurchaseRegister/PurchaseRegister.js b/reports/PurchaseRegister/PurchaseRegister.js
index af9b60d9..8d1c9f1a 100644
--- a/reports/PurchaseRegister/PurchaseRegister.js
+++ b/reports/PurchaseRegister/PurchaseRegister.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 
 class PurchaseRegister {
   async run({ fromDate, toDate, supplier }) {
diff --git a/reports/PurchaseRegister/viewConfig.js b/reports/PurchaseRegister/viewConfig.js
index 7617bd90..2434667e 100644
--- a/reports/PurchaseRegister/viewConfig.js
+++ b/reports/PurchaseRegister/viewConfig.js
@@ -1,5 +1,5 @@
 const title = 'Purchase Register';
-import { t } from 'frappe';
+import { t } from 'fyo';
 
 export default {
   title: title,
diff --git a/reports/SalesRegister/SalesRegister.js b/reports/SalesRegister/SalesRegister.js
index 0c93eabf..18b3d203 100644
--- a/reports/SalesRegister/SalesRegister.js
+++ b/reports/SalesRegister/SalesRegister.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 
 class SalesRegister {
   async run({ fromDate, toDate, customer }) {
diff --git a/reports/SalesRegister/viewConfig.js b/reports/SalesRegister/viewConfig.js
index 366f11a7..2036ff8b 100644
--- a/reports/SalesRegister/viewConfig.js
+++ b/reports/SalesRegister/viewConfig.js
@@ -1,5 +1,5 @@
 const title = 'Sales Register';
-import { t } from 'frappe';
+import { t } from 'fyo';
 
 export default {
   title: title,
diff --git a/reports/TrialBalance/viewConfig.js b/reports/TrialBalance/viewConfig.js
index 6b7bf7cf..3ab25e2e 100644
--- a/reports/TrialBalance/viewConfig.js
+++ b/reports/TrialBalance/viewConfig.js
@@ -1,4 +1,4 @@
-import frappe, { t } from 'frappe';
+import frappe, { t } from 'fyo';
 import getCommonExportActions from '../commonExporter';
 
 const title = t`Trial Balance`;
diff --git a/reports/commonExporter.js b/reports/commonExporter.js
index ee0d1f8a..5c19a827 100644
--- a/reports/commonExporter.js
+++ b/reports/commonExporter.js
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import frappe from 'fyo';
 import telemetry from '../src/telemetry/telemetry';
 import { Verb } from '../src/telemetry/types';
 import { getSavePath, saveData, showExportInFolder } from '../src/utils';
diff --git a/src/App.vue b/src/App.vue
index 285cbbf2..84986313 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,14 +33,14 @@
 import WindowsTitleBar from '@/components/WindowsTitleBar';
 import config from '@/config';
 import {
-  connectToLocalDatabase,
-  postSetup,
-  purgeCache,
+connectToLocalDatabase,
+postSetup,
+purgeCache
 } from '@/initialization';
-import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
 import fs from 'fs/promises';
+import frappe from 'fyo';
+import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import TelemetryModal from './components/once/TelemetryModal.vue';
 import { showErrorDialog } from './errorHandling';
 import DatabaseSelector from './pages/DatabaseSelector';
diff --git a/src/dataImport.ts b/src/dataImport.ts
index f1cd86fd..99400962 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -1,11 +1,11 @@
-import frappe from 'frappe';
-import { DocValueMap } from 'frappe/core/types';
-import Doc from 'frappe/model/doc';
-import { isNameAutoSet } from 'frappe/model/naming';
+import frappe from 'fyo';
+import { DocValueMap } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
+import { isNameAutoSet } from 'fyo/model/naming';
 import { FieldType, FieldTypeEnum } from 'schemas/types';
-import { parseCSV } from '../utils/csvParser';
 import telemetry from '../frappe/telemetry/telemetry';
 import { Noun, Verb } from '../frappe/telemetry/types';
+import { parseCSV } from '../utils/csvParser';
 
 export const importable = [
   'SalesInvoice',
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index a463f40e..dbfda00c 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -1,13 +1,13 @@
 import { ipcRenderer } from 'electron';
-import frappe, { t } from 'frappe';
-import Doc from 'frappe/model/doc';
+import frappe, { t } from 'fyo';
+import Doc from 'fyo/model/doc';
 import {
   DuplicateEntryError,
   LinkValidationError,
   MandatoryError,
   ValidationError,
-} from 'frappe/utils/errors';
-import { ErrorLog } from 'frappe/utils/types';
+} from 'fyo/utils/errors';
+import { ErrorLog } from 'fyo/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import telemetry from '../frappe/telemetry/telemetry';
 import config, { ConfigKeys, TelemetrySetting } from '../utils/config';
diff --git a/src/initFyo.ts b/src/initFyo.ts
index 917b157f..a7d7f126 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -1,3 +1,3 @@
-import { Frappe } from 'frappe';
+import { Fyo } from 'fyo';
 
-export const fyo = new Frappe({ isTest: false, isElectron: true });
+export const fyo = new Fyo({ isTest: false, isElectron: true });
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index d42210dd..6622ca4e 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -1,11 +1,3 @@
-import Button from '@/components/Button';
-import FilterDropdown from '@/components/FilterDropdown';
-import PageHeader from '@/components/PageHeader';
-import SearchBar from '@/components/SearchBar';
-import { routeTo } from '@/utils';
-import frappe from 'frappe';
-import List from './List';
-import listConfigs from './listConfig';
 <template>
   <div class="flex flex-col">
     <PageHeader>
@@ -43,7 +35,7 @@ import FilterDropdown from '@/components/FilterDropdown';
 import PageHeader from '@/components/PageHeader';
 import SearchBar from '@/components/SearchBar';
 import { routeTo } from '@/utils';
-import frappe from 'frappe';
+import frappe from 'fyo';
 import List from './List';
 
 export default {
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index dd137507..9cd5ec24 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -60,7 +60,7 @@ import telemetry from '@/telemetry/telemetry';
 import { Verb } from '@/telemetry/types';
 import { makePDF } from '@/utils';
 import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
+import frappe from 'fyo';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 07a39a12..d9541897 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -51,22 +51,20 @@
   </div>
 </template>
 <script>
-import { t } from 'frappe';
-import frappe from 'frappe';
-import WindowControls from '@/components/WindowControls';
-import TabGeneral from './TabGeneral.vue';
-import TabSystem from './TabSystem.vue';
-import TabInvoice from './TabInvoice.vue';
 import Button from '@/components/Button';
-import Row from '@/components/Row';
 import Icon from '@/components/Icon';
 import PageHeader from '@/components/PageHeader';
+import Row from '@/components/Row';
 import StatusBadge from '@/components/StatusBadge';
-import { callInitializeMoneyMaker } from '../../utils';
-import { showToast } from '../../utils';
-import { h, markRaw } from 'vue';
+import WindowControls from '@/components/WindowControls';
 import { ipcRenderer } from 'electron';
+import frappe, { t } from 'fyo';
 import { IPC_MESSAGES } from 'utils/messages';
+import { h, markRaw } from 'vue';
+import { callInitializeMoneyMaker, showToast } from '../../utils';
+import TabGeneral from './TabGeneral.vue';
+import TabInvoice from './TabInvoice.vue';
+import TabSystem from './TabSystem.vue';
 
 export default {
   name: 'Settings',
diff --git a/src/pages/Settings/TabGeneral.vue b/src/pages/Settings/TabGeneral.vue
index 3988ea7d..c45d754d 100644
--- a/src/pages/Settings/TabGeneral.vue
+++ b/src/pages/Settings/TabGeneral.vue
@@ -13,7 +13,7 @@
 
 <script>
 import TwoColumnForm from '@/components/TwoColumnForm';
-import frappe from 'frappe';
+import frappe from 'fyo';
 
 export default {
   name: 'TabGeneral',
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index 02a89a35..3c325496 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -46,10 +46,10 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
-import { ipcRenderer } from 'electron';
-import TwoColumnForm from '@/components/TwoColumnForm';
 import FormControl from '@/components/Controls/FormControl';
+import TwoColumnForm from '@/components/TwoColumnForm';
+import { ipcRenderer } from 'electron';
+import frappe from 'fyo';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index 7bedc8d0..77143621 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -48,7 +48,7 @@ TelemetrySetting
 import { getTelemetryOptions } from '@/telemetry/helpers';
 import telemetry from '@/telemetry/telemetry';
 import { checkForUpdates } from '@/utils';
-import frappe from 'frappe';
+import frappe from 'fyo';
 
 export default {
   name: 'TabSystem',
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 1ff26c23..6dc189e8 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -97,8 +97,8 @@ import config from '@/config';
 import { connectToLocalDatabase, purgeCache } from '@/initialization';
 import { setLanguageMap, showMessageDialog } from '@/utils';
 import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
 import fs from 'fs';
+import frappe from 'fyo';
 import path from 'path';
 import { IPC_MESSAGES } from 'utils/messages';
 import {
diff --git a/src/pages/SetupWizard/setupCompany.js b/src/pages/SetupWizard/setupCompany.js
index 136615b2..a8725ace 100644
--- a/src/pages/SetupWizard/setupCompany.js
+++ b/src/pages/SetupWizard/setupCompany.js
@@ -1,6 +1,6 @@
 import config from '@/config';
-import frappe from 'frappe';
-import { DEFAULT_LOCALE } from 'frappe/utils/consts';
+import frappe from 'fyo';
+import { DEFAULT_LOCALE } from 'fyo/utils/consts';
 import countryList from '~/fixtures/countryInfo.json';
 import importCharts from '../../../accounting/importCOA';
 import generateTaxes from '../../../models/doctype/Tax/RegionalEntries';
diff --git a/src/regional/in.ts b/src/regional/in.ts
index 860839ff..0d10c4fe 100644
--- a/src/regional/in.ts
+++ b/src/regional/in.ts
@@ -1,4 +1,4 @@
-import frappe from 'frappe';
+import { fyo } from '@/initFyo';
 
 export type TaxType = 'GST' | 'IGST' | 'Exempt-GST' | 'Exempt-IGST';
 
@@ -10,14 +10,14 @@ export default async function generateTaxes(country: string) {
       'Exempt-GST': [0],
       'Exempt-IGST': [0],
     };
-    const newTax = await frappe.doc.getEmptyDoc('Tax');
+    const newTax = await fyo.doc.getEmptyDoc('Tax');
 
     for (const type of Object.keys(GSTs)) {
       for (const percent of GSTs[type as TaxType]) {
         const name = `${type}-${percent}`;
 
         // Not cross checking cause hardcoded values.
-        await frappe.db.delete('Tax', name);
+        await fyo.db.delete('Tax', name);
 
         const details = getTaxDetails(type as TaxType, percent);
         await newTax.set({ name, details });
diff --git a/src/renderer/helpers.ts b/src/renderer/helpers.ts
index 6cbfc2d9..d2968f16 100644
--- a/src/renderer/helpers.ts
+++ b/src/renderer/helpers.ts
@@ -1,13 +1,13 @@
-import frappe from 'frappe';
-import { ConfigKeys } from 'frappe/core/types';
+import { fyo } from '@/initFyo';
+import { ConfigKeys } from 'fyo/core/types';
 
 export function incrementOpenCount() {
-  let openCount = frappe.config.get(ConfigKeys.OpenCount);
+  let openCount = fyo.config.get(ConfigKeys.OpenCount);
   if (typeof openCount !== 'number') {
     openCount = 1;
   } else {
     openCount += 1;
   }
 
-  frappe.config.set(ConfigKeys.OpenCount, openCount);
+  fyo.config.set(ConfigKeys.OpenCount, openCount);
 }
diff --git a/src/renderer/registerIpcRendererListeners.ts b/src/renderer/registerIpcRendererListeners.ts
index 69ebf2cb..0590f1f0 100644
--- a/src/renderer/registerIpcRendererListeners.ts
+++ b/src/renderer/registerIpcRendererListeners.ts
@@ -1,39 +1,38 @@
 import { handleError } from '@/errorHandling';
-import { IPC_CHANNELS, IPC_MESSAGES } from 'utils/messages';
-import telemetry from 'frappe/telemetry/telemetry';
+import { fyo } from '@/initFyo';
 import { showToast } from '@/utils';
 import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
+import { IPC_CHANNELS, IPC_MESSAGES } from 'utils/messages';
 
 export default function registerIpcRendererListeners() {
   ipcRenderer.on(IPC_CHANNELS.STORE_ON_WINDOW, (event, message) => {
-    Object.assign(frappe.store, message);
+    Object.assign(fyo.store, message);
   });
 
   ipcRenderer.on(IPC_CHANNELS.CHECKING_FOR_UPDATE, (_) => {
-    showToast({ message: frappe.t`Checking for updates` });
+    showToast({ message: fyo.t`Checking for updates` });
   });
 
   ipcRenderer.on(IPC_CHANNELS.UPDATE_AVAILABLE, (_, version) => {
     const message = version
-      ? frappe.t`Version ${version} available`
-      : frappe.t`New version available`;
+      ? fyo.t`Version ${version} available`
+      : fyo.t`New version available`;
     const action = () => {
       ipcRenderer.send(IPC_MESSAGES.DOWNLOAD_UPDATE);
-      showToast({ message: frappe.t`Downloading update` });
+      showToast({ message: fyo.t`Downloading update` });
     };
 
     showToast({
       message,
       action,
-      actionText: frappe.t`Download Update`,
+      actionText: fyo.t`Download Update`,
       duration: 10000,
       type: 'success',
     });
   });
 
   ipcRenderer.on(IPC_CHANNELS.UPDATE_NOT_AVAILABLE, (_) => {
-    showToast({ message: frappe.t`No updates available` });
+    showToast({ message: fyo.t`No updates available` });
   });
 
   ipcRenderer.on(IPC_CHANNELS.UPDATE_DOWNLOADED, (_) => {
@@ -41,9 +40,9 @@ export default function registerIpcRendererListeners() {
       ipcRenderer.send(IPC_MESSAGES.INSTALL_UPDATE);
     };
     showToast({
-      message: frappe.t`Update downloaded`,
+      message: fyo.t`Update downloaded`,
       action,
-      actionText: frappe.t`Install Update`,
+      actionText: fyo.t`Install Update`,
       duration: 10000,
       type: 'success',
     });
@@ -53,17 +52,17 @@ export default function registerIpcRendererListeners() {
     error.name = 'Updation Error';
     handleError(true, error);
   });
-  
+
   document.addEventListener('visibilitychange', function () {
     const { visibilityState } = document;
-    if (visibilityState === 'visible' && !telemetry.started) {
-      telemetry.start();
+    if (visibilityState === 'visible' && !fyo.telemetry.started) {
+      fyo.telemetry.start();
     }
 
     if (visibilityState !== 'hidden') {
       return;
     }
 
-    telemetry.stop();
+    fyo.telemetry.stop();
   });
 }
diff --git a/src/utils.ts b/src/utils.ts
index dc3cdce8..7b2f1863 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,4 +1,4 @@
-import Doc from 'frappe/model/doc';
+import Doc from 'fyo/model/doc';
 
 export interface QuickEditOptions {
   schemaName: string;
diff --git a/tsconfig.json b/tsconfig.json
index f16aa405..fb437971 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -34,7 +34,7 @@
     "schemas/**/*.ts",
     "backend/**/*.ts",
 
-    "frappe/**/*.ts",
+    "fyo/**/*.ts",
     "models/**/*.ts",
     "patches/**/*.ts",
     "patches/**/*.js",
diff --git a/vue.config.js b/vue.config.js
index 571dc6bf..a79f183a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,11 +12,11 @@ module.exports = {
       mainProcessTypeChecking: true,
       chainWebpackRendererProcess: (config) => {
         config.target('electron-renderer');
-        config.resolve.alias.set('frappe', path.resolve(__dirname, './frappe'));
+        config.resolve.alias.set('fyo', path.resolve(__dirname, './fyo'));
       },
       chainWebpackMainProcess: (config) => {
         config.target('electron-main');
-        config.resolve.alias.set('frappe', path.resolve(__dirname, './frappe'));
+        config.resolve.alias.set('fyo', path.resolve(__dirname, './fyo'));
         config.module
           .rule('js')
           .test(/\.js$/)
@@ -39,7 +39,7 @@ module.exports = {
   lintOnSave: process.env.NODE_ENV !== 'production',
   configureWebpack(config) {
     Object.assign(config.resolve.alias, {
-      frappe: path.resolve(__dirname, './frappe'),
+      fyo: path.resolve(__dirname, './fyo'),
       '~': path.resolve('.'),
       schemas: path.resolve(__dirname, './schemas'),
       backend: path.resolve(__dirname, './backend'),

From ae6a5e52f2cd22703ec59ab29364bbdf5c6d27a4 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 19 Apr 2022 11:35:39 +0530
Subject: [PATCH 057/163] refactor: move ledgerPosting to models - move
 getExchangeRate to helpers - add git blame ignore

---
 .git-blame-ignore-revs                        |  2 +
 accounting/exchangeRate.ts                    | 52 ----------------
 accounting/utils.js                           | 20 -------
 models/baseModels/Invoice/Invoice.ts          |  4 +-
 .../baseModels/JournalEntry/JournalEntry.ts   |  2 +-
 models/baseModels/Payment/Payment.ts          |  2 +-
 .../PurchaseInvoice/PurchaseInvoice.ts        |  2 +-
 .../baseModels/SalesInvoice/SalesInvoice.ts   |  2 +-
 models/exchangeRate.ts                        |  0
 models/helpers.ts                             | 59 +++++++++++++++++--
 .../ledgerPosting}/ledgerPosting.ts           |  0
 {accounting => models/ledgerPosting}/types.ts |  0
 12 files changed, 63 insertions(+), 82 deletions(-)
 create mode 100644 .git-blame-ignore-revs
 delete mode 100644 accounting/exchangeRate.ts
 delete mode 100644 accounting/utils.js
 create mode 100644 models/exchangeRate.ts
 rename {accounting => models/ledgerPosting}/ledgerPosting.ts (100%)
 rename {accounting => models/ledgerPosting}/types.ts (100%)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..21fb8066
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Rename 'frappe' to 'fyo' outside src
+32d282dc9c6f129807a1cf53eae47fc3602aa976
\ No newline at end of file
diff --git a/accounting/exchangeRate.ts b/accounting/exchangeRate.ts
deleted file mode 100644
index 445af0a2..00000000
--- a/accounting/exchangeRate.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { NotFoundError } from 'fyo/utils/errors';
-import { DateTime } from 'luxon';
-
-export async function getExchangeRate({
-  fromCurrency,
-  toCurrency,
-  date,
-}: {
-  fromCurrency: string;
-  toCurrency: string;
-  date?: string;
-}) {
-  if (!date) {
-    date = DateTime.local().toISODate();
-  }
-
-  if (!fromCurrency || !toCurrency) {
-    throw new NotFoundError(
-      'Please provide `fromCurrency` and `toCurrency` to get exchange rate.'
-    );
-  }
-
-  const cacheKey = `currencyExchangeRate:${date}:${fromCurrency}:${toCurrency}`;
-
-  let exchangeRate = 0;
-  if (localStorage) {
-    exchangeRate = parseFloat(
-      localStorage.getItem(cacheKey as string) as string
-    );
-  }
-
-  if (!exchangeRate) {
-    try {
-      const res = await fetch(
-        ` https://api.vatcomply.com/rates?date=${date}&base=${fromCurrency}&symbols=${toCurrency}`
-      );
-      const data = await res.json();
-      exchangeRate = data.rates[toCurrency];
-
-      if (localStorage) {
-        localStorage.setItem(cacheKey, String(exchangeRate));
-      }
-    } catch (error) {
-      console.error(error);
-      throw new Error(
-        `Could not fetch exchange rate for ${fromCurrency} -> ${toCurrency}`
-      );
-    }
-  }
-
-  return exchangeRate;
-}
diff --git a/accounting/utils.js b/accounting/utils.js
deleted file mode 100644
index 091fd8bf..00000000
--- a/accounting/utils.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { t } from 'fyo';
-
-export const ledgerLink = {
-  label: t`Ledger Entries`,
-  condition: (doc) => doc.submitted,
-  action: (doc, router) => {
-    router.push({
-      name: 'Report',
-      params: {
-        reportName: 'general-ledger',
-        defaultFilters: {
-          referenceType: doc.doctype,
-          referenceName: doc.name,
-        },
-      },
-    });
-  },
-};
-
-export default { ledgerLink };
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 8eed94b4..83c5b522 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -1,9 +1,9 @@
-import { LedgerPosting } from 'accounting/ledgerPosting';
 import { DocValue } from 'fyo/core/types';
 import Doc from 'fyo/model/doc';
 import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
+import { getExchangeRate } from 'models/helpers';
+import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import Money from 'pesa/dist/types/src/money';
-import { getExchangeRate } from '../../../accounting/exchangeRate';
 import { Party } from '../Party/Party';
 import { Payment } from '../Payment/Payment';
 import { Tax } from '../Tax/Tax';
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index 04621747..2f11b019 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -9,7 +9,7 @@ import {
 import { DateTime } from 'luxon';
 import { getLedgerLinkAction } from 'models/helpers';
 import Money from 'pesa/dist/types/src/money';
-import { LedgerPosting } from '../../../accounting/ledgerPosting';
+import { LedgerPosting } from '../../ledgerPosting/ledgerPosting';
 
 export class JournalEntry extends Doc {
   accounts: Doc[] = [];
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index e8f89dfa..ef3788b6 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -1,4 +1,4 @@
-import { LedgerPosting } from 'accounting/ledgerPosting';
+import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
 import Doc from 'fyo/model/doc';
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index 1cc09a10..f8489f99 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -1,4 +1,4 @@
-import { LedgerPosting } from 'accounting/ledgerPosting';
+import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
 import {
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
index 4c7d66b7..aba42e44 100644
--- a/models/baseModels/SalesInvoice/SalesInvoice.ts
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -1,4 +1,4 @@
-import { LedgerPosting } from 'accounting/ledgerPosting';
+import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
 import {
diff --git a/models/exchangeRate.ts b/models/exchangeRate.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/models/helpers.ts b/models/helpers.ts
index d3315fed..7d7a7154 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -1,6 +1,8 @@
 import { Fyo } from 'fyo';
 import Doc from 'fyo/model/doc';
 import { Action, ColumnConfig } from 'fyo/model/types';
+import { NotFoundError } from 'fyo/utils/errors';
+import { DateTime } from 'luxon';
 import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
 import { InvoiceStatus } from './types';
@@ -25,10 +27,7 @@ export function getLedgerLinkAction(fyo: Fyo): Action {
   };
 }
 
-export function getTransactionActions(
-  schemaName: string,
-  fyo: Fyo
-): Action[] {
+export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
   return [
     {
       label: fyo.t`Make Payment`,
@@ -121,3 +120,55 @@ export function getInvoiceStatus(doc: Doc) {
   }
   return status;
 }
+
+export async function getExchangeRate({
+  fromCurrency,
+  toCurrency,
+  date,
+}: {
+  fromCurrency: string;
+  toCurrency: string;
+  date?: string;
+}) {
+  if (!date) {
+    date = DateTime.local().toISODate();
+  }
+
+  if (!fromCurrency || !toCurrency) {
+    throw new NotFoundError(
+      'Please provide `fromCurrency` and `toCurrency` to get exchange rate.'
+    );
+  }
+
+  const cacheKey = `currencyExchangeRate:${date}:${fromCurrency}:${toCurrency}`;
+
+  let exchangeRate = 0;
+  if (localStorage) {
+    exchangeRate = parseFloat(
+      localStorage.getItem(cacheKey as string) as string
+    );
+  }
+
+  if (!exchangeRate && fetch) {
+    try {
+      const res = await fetch(
+        ` https://api.vatcomply.com/rates?date=${date}&base=${fromCurrency}&symbols=${toCurrency}`
+      );
+      const data = await res.json();
+      exchangeRate = data.rates[toCurrency];
+
+      if (localStorage) {
+        localStorage.setItem(cacheKey, String(exchangeRate));
+      }
+    } catch (error) {
+      console.error(error);
+      throw new Error(
+        `Could not fetch exchange rate for ${fromCurrency} -> ${toCurrency}`
+      );
+    }
+  } else {
+    exchangeRate = 1;
+  }
+
+  return exchangeRate;
+}
diff --git a/accounting/ledgerPosting.ts b/models/ledgerPosting/ledgerPosting.ts
similarity index 100%
rename from accounting/ledgerPosting.ts
rename to models/ledgerPosting/ledgerPosting.ts
diff --git a/accounting/types.ts b/models/ledgerPosting/types.ts
similarity index 100%
rename from accounting/types.ts
rename to models/ledgerPosting/types.ts

From c56850d08f3d13c6646f61bbbaa23b83757c6248 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 20 Apr 2022 12:08:47 +0530
Subject: [PATCH 058/163] incr: refactor and type src/utils

---
 accounting/gst.js                             |   8 +-
 fyo/model/types.ts                            |   7 +-
 fyo/tests/testFyo.spec.ts                     |  13 +-
 fyo/utils/index.ts                            |  12 +
 fyo/utils/translation.ts                      |   4 +-
 models/baseModels/Invoice/Invoice.ts          |   4 +
 models/helpers.ts                             |   2 +-
 reports/GeneralLedger/viewConfig.js           |  30 +-
 src/App.vue                                   |  12 +-
 src/components/Controls/AutoComplete.vue      |   4 +-
 src/components/Controls/Color.vue             |   4 +-
 src/components/Controls/LanguageSelector.vue  |   6 +-
 src/components/Controls/Link.vue              |   8 +-
 src/components/Controls/Table.vue             |   2 +-
 src/components/Controls/TableRow.vue          |   4 +-
 src/components/DropdownWithActions.vue        |   4 +-
 .../SalesInvoice/SalesInvoicePrint.vue        |   8 +-
 src/components/SearchBar.vue                  |   4 +-
 src/components/Sidebar.vue                    |   6 +-
 src/components/StatusBadge.vue                |   2 +-
 src/components/TwoColumnForm.vue              |   8 +-
 src/components/Widgets/PartyWidget.vue        |   2 +-
 src/components/WindowControls.vue             |   2 +-
 src/components/WindowsTitleBar.vue            |   2 +-
 src/components/once/TelemetryModal.vue        |   8 +-
 src/dataImport.ts                             |  20 +-
 src/errorHandling.ts                          |  22 +-
 src/languageCodeMap.js                        |   9 -
 src/main.js                                   |  19 +-
 src/pages/ChartOfAccounts.vue                 |  12 +-
 src/pages/Dashboard/Cashflow.vue              |   8 +-
 src/pages/Dashboard/Dashboard.vue             |   8 +-
 src/pages/Dashboard/Expenses.vue              |   2 +-
 src/pages/Dashboard/PeriodSelector.vue        |   2 +-
 src/pages/Dashboard/ProfitAndLoss.vue         |  10 +-
 src/pages/Dashboard/UnpaidInvoices.vue        |   4 +-
 src/pages/DataImport.vue                      |  26 +-
 src/pages/DatabaseSelector.vue                |   8 +-
 src/pages/GetStarted.vue                      |   8 +-
 src/pages/InvoiceForm.vue                     |  18 +-
 src/pages/JournalEntryForm.vue                |  14 +-
 src/pages/ListView/List.vue                   |   8 +-
 src/pages/ListView/ListView.vue               |  10 +-
 src/pages/PrintView/PrintView.vue             |  16 +-
 src/pages/QuickEditForm.vue                   |  12 +-
 src/pages/Report.vue                          |  16 +-
 src/pages/Settings/Settings.vue               |  12 +-
 src/pages/Settings/TabGeneral.vue             |   2 +-
 src/pages/Settings/TabInvoice.vue             |   4 +-
 src/pages/Settings/TabSystem.vue              |  16 +-
 src/pages/SetupWizard/SetupWizard.vue         |  14 +-
 src/pages/SetupWizard/Slide.vue               |   2 +-
 src/pages/SetupWizard/setupCompany.js         |   4 +-
 src/postStart.ts                              |   4 +-
 src/regional/in.ts                            |   2 +-
 src/renderer/helpers.ts                       |   2 +-
 src/renderer/registerIpcRendererListeners.ts  |   6 +-
 src/{router.js => router.ts}                  |  30 +-
 src/utils.js                                  | 603 ------------------
 src/utils.ts                                  |  99 ---
 src/{colors.js => utils/colors.ts}            |  10 +-
 src/utils/index.ts                            |  97 +++
 src/utils/ipcCalls.ts                         |  72 +++
 src/utils/language.ts                         |  71 +++
 src/utils/types.ts                            |  29 +
 src/utils/ui.ts                               | 329 ++++++++++
 tsconfig.json                                 |   8 +-
 utils/index.ts                                |  11 +
 vue.config.js                                 |   3 +-
 69 files changed, 902 insertions(+), 946 deletions(-)
 delete mode 100644 src/languageCodeMap.js
 rename src/{router.js => router.ts} (74%)
 delete mode 100644 src/utils.js
 delete mode 100644 src/utils.ts
 rename src/{colors.js => utils/colors.ts} (71%)
 create mode 100644 src/utils/index.ts
 create mode 100644 src/utils/ipcCalls.ts
 create mode 100644 src/utils/language.ts
 create mode 100644 src/utils/types.ts
 create mode 100644 src/utils/ui.ts

diff --git a/accounting/gst.js b/accounting/gst.js
index d4c3ed60..e068f44b 100644
--- a/accounting/gst.js
+++ b/accounting/gst.js
@@ -1,6 +1,6 @@
-import { showMessageDialog } from '@/utils';
 import frappe, { t } from 'fyo';
 import { DateTime } from 'luxon';
+import { showMessageDialog } from 'src/utils';
 import { stateCodeMap } from '../regional/in';
 import { exportCsv, saveExportData } from '../reports/commonExporter';
 import { getSavePath } from '../src/utils';
@@ -50,7 +50,7 @@ export async function generateGstr1Json(getReportData) {
   if (!gstin) {
     showMessageDialog({
       message: t`Export Failed`,
-      description: t`Please set GSTIN in General Settings.`,
+      detail: t`Please set GSTIN in General Settings.`,
     });
     return;
   }
@@ -232,7 +232,7 @@ export async function generateGstr2Csv(getReportData) {
   if (!gstin) {
     showMessageDialog({
       message: t`Export Failed`,
-      description: t`Please set GSTIN in General Settings.`,
+      detail: t`Please set GSTIN in General Settings.`,
     });
     return;
   }
@@ -313,7 +313,7 @@ export async function generateGstr1Csv(getReportData) {
   if (!gstin) {
     showMessageDialog({
       message: t`Export Failed`,
-      description: t`Please set GSTIN in General Settings.`,
+      detail: t`Please set GSTIN in General Settings.`,
     });
     return;
   }
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index 55c8a5d6..7e462f8e 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -59,8 +59,11 @@ export type ListsMap = Record<string, ListFunction>;
 
 export interface Action {
   label: string;
-  condition: (doc: Doc) => boolean;
-  action: (doc: Doc, router: Router) => Promise<void>;
+  action: (doc: Doc, router: Router) => Promise<void> | void;
+  condition?: (doc: Doc) => boolean;
+  component?: {
+    template?: string;
+  };
 }
 
 export interface ColumnConfig {
diff --git a/fyo/tests/testFyo.spec.ts b/fyo/tests/testFyo.spec.ts
index bee00aaf..34e6ce27 100644
--- a/fyo/tests/testFyo.spec.ts
+++ b/fyo/tests/testFyo.spec.ts
@@ -41,7 +41,7 @@ describe('Fyo Init', function () {
 describe('Fyo Docs', function () {
   const countryCode = 'in';
   let fyo: Fyo;
-  const schemas = getSchemas(countryCode);
+  const schemaMap = getSchemas(countryCode);
   this.beforeEach(async function () {
     fyo = new Fyo({
       DatabaseDemux: DatabaseManager,
@@ -58,7 +58,14 @@ describe('Fyo Docs', function () {
     await fyo.close();
   });
 
-  specify('temp', async function () {
-    fyo.db.schemaMap;
+  specify('getEmptyDoc', async function () {
+    for (const schemaName in schemaMap) {
+      const schema = schemaMap[schemaName];
+      if (schema?.isSingle) {
+        continue;
+      }
+
+      const doc = fyo.doc.getEmptyDoc(schemaName);
+    }
   });
 });
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index 0af1b050..b77ffb25 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -1,3 +1,6 @@
+import { Fyo } from 'fyo';
+import Doc from 'fyo/model/doc';
+import { Action } from 'fyo/model/types';
 import { pesa } from 'pesa';
 
 export function slug(str: string) {
@@ -50,3 +53,12 @@ export function getDuplicates(array: unknown[]) {
 export function isPesa(value: unknown): boolean {
   return value instanceof pesa().constructor;
 }
+
+export function getActions(doc: Doc, fyo: Fyo): Action[] {
+  const Model = fyo.models[doc.schemaName];
+  if (Model === undefined) {
+    return [];
+  }
+
+  return Model.getActions(fyo);
+}
diff --git a/fyo/utils/translation.ts b/fyo/utils/translation.ts
index f9073504..316cebbe 100644
--- a/fyo/utils/translation.ts
+++ b/fyo/utils/translation.ts
@@ -90,6 +90,8 @@ export function t(...args: TranslationLiteral[]): string {
   return new TranslationString(...args).s;
 }
 
-export function setLanguageMapOnTranslationString(languageMap: LanguageMap) {
+export function setLanguageMapOnTranslationString(
+  languageMap: LanguageMap | undefined
+) {
   TranslationString.prototype.languageMap = languageMap;
 }
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 83c5b522..4d0311aa 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -18,8 +18,12 @@ export abstract class Invoice extends Doc {
   currency?: string;
   netTotal?: Money;
   baseGrandTotal?: Money;
+  outstandingAmount?: Money;
   exchangeRate?: number;
 
+  submitted?: boolean;
+  cancelled?: boolean;
+
   abstract getPosting(): Promise<LedgerPosting>;
 
   get isSales() {
diff --git a/models/helpers.ts b/models/helpers.ts
index 7d7a7154..72fa8a79 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -43,7 +43,7 @@ export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
         const paymentType = isSales ? 'Receive' : 'Pay';
         const hideAccountField = isSales ? 'account' : 'paymentAccount';
 
-        const { openQuickEdit } = await import('../src/utils');
+        const { openQuickEdit } = await import('src/utils/ui');
         await openQuickEdit({
           schemaName: 'Payment',
           name: payment.name as string,
diff --git a/reports/GeneralLedger/viewConfig.js b/reports/GeneralLedger/viewConfig.js
index db67cff1..09adff14 100644
--- a/reports/GeneralLedger/viewConfig.js
+++ b/reports/GeneralLedger/viewConfig.js
@@ -1,7 +1,33 @@
-import { partyWithAvatar } from '@/utils';
 import { t } from 'fyo';
+import Avatar from 'src/components/Avatar.vue';
+import { fyo } from 'src/initFyo';
 import getCommonExportActions from '../commonExporter';
 
+export function getPartyWithAvatar(partyName) {
+  return {
+    data() {
+      return {
+        imageURL: null,
+        label: null,
+      };
+    },
+    components: {
+      Avatar,
+    },
+    async mounted() {
+      const p = await fyo.db.get('Party', partyName);
+      this.imageURL = p.image;
+      this.label = partyName;
+    },
+    template: `
+      <div class="flex items-center" v-if="label">
+        <Avatar class="flex-shrink-0" :imageURL="imageURL" :label="label" size="sm" />
+        <span class="ml-2 truncate">{{ label }}</span>
+      </div>
+    `,
+  };
+}
+
 let title = t`General Ledger`;
 
 const viewConfig = {
@@ -117,7 +143,7 @@ const viewConfig = {
         fieldtype: 'Link',
         fieldname: 'party',
         component(cellValue) {
-          return partyWithAvatar(cellValue);
+          return getPartyWithAvatar(cellValue);
         },
       },
     ];
diff --git a/src/App.vue b/src/App.vue
index 84986313..b324f3b0 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,16 +30,16 @@
 </template>
 
 <script>
-import WindowsTitleBar from '@/components/WindowsTitleBar';
-import config from '@/config';
+import { ipcRenderer } from 'electron';
+import fs from 'fs/promises';
+import frappe from 'fyo';
+import WindowsTitleBar from 'src/components/WindowsTitleBar';
+import config from 'src/config';
 import {
 connectToLocalDatabase,
 postSetup,
 purgeCache
-} from '@/initialization';
-import { ipcRenderer } from 'electron';
-import fs from 'fs/promises';
-import frappe from 'fyo';
+} from 'src/initialization';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import TelemetryModal from './components/once/TelemetryModal.vue';
 import { showErrorDialog } from './errorHandling';
diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index 19098f5a..a34c7da2 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -32,9 +32,9 @@
 </template>
 
 <script>
+import Dropdown from 'src/components/Dropdown';
+import { fuzzyMatch } from 'src/utils';
 import Base from './Base';
-import Dropdown from '@/components/Dropdown';
-import { fuzzyMatch } from '@/utils';
 
 export default {
   name: 'AutoComplete',
diff --git a/src/components/Controls/Color.vue b/src/components/Controls/Color.vue
index 8686a27f..cf3b535c 100644
--- a/src/components/Controls/Color.vue
+++ b/src/components/Controls/Color.vue
@@ -55,9 +55,9 @@
 </template>
 
 <script>
+import Popover from 'src/components/Popover';
+import Row from 'src/components/Row';
 import Base from './Base';
-import Row from '@/components/Row';
-import Popover from '@/components/Popover';
 
 export default {
   name: 'Color',
diff --git a/src/components/Controls/LanguageSelector.vue b/src/components/Controls/LanguageSelector.vue
index 25490ec1..0f12a3a6 100644
--- a/src/components/Controls/LanguageSelector.vue
+++ b/src/components/Controls/LanguageSelector.vue
@@ -7,10 +7,10 @@
   />
 </template>
 <script>
-import config from '@/config';
-import { languageCodeMap } from '@/languageCodeMap';
-import { setLanguageMap } from '@/utils';
 import { DEFAULT_LANGUAGE } from 'frappe/utils/consts';
+import config from 'src/config';
+import { languageCodeMap } from 'src/languageCodeMap';
+import { setLanguageMap } from 'src/utils';
 import FormControl from './FormControl';
 
 export default {
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index c757d8e9..79135399 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -1,12 +1,12 @@
-import Badge from '@/components/Badge';
-import { openQuickEdit } from '@/utils';
+import Badge from 'src/components/Badge';
+import { openQuickEdit } from 'src/utils';
 import frappe, { t } from 'frappe';
 import { markRaw } from 'vue';
 import AutoComplete from './AutoComplete';
 <script>
-import Badge from '@/components/Badge';
-import { openQuickEdit } from '@/utils';
 import frappe, { t } from 'frappe';
+import Badge from 'src/components/Badge';
+import { openQuickEdit } from 'src/utils';
 import { markRaw } from 'vue';
 import AutoComplete from './AutoComplete';
 
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index 7425534a..23cf587a 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -62,7 +62,7 @@
 
 <script>
 import frappe from 'frappe';
-import Row from '@/components/Row';
+import Row from 'src/components/Row';
 import Base from './Base';
 import TableRow from './TableRow';
 
diff --git a/src/components/Controls/TableRow.vue b/src/components/Controls/TableRow.vue
index 9460db09..983f71af 100644
--- a/src/components/Controls/TableRow.vue
+++ b/src/components/Controls/TableRow.vue
@@ -32,9 +32,9 @@
   </Row>
 </template>
 <script>
-import FormControl from './FormControl';
-import Row from '@/components/Row';
+import Row from 'src/components/Row';
 import { getErrorMessage } from '../../errorHandling';
+import FormControl from './FormControl';
 
 export default {
   name: 'TableRow',
diff --git a/src/components/DropdownWithActions.vue b/src/components/DropdownWithActions.vue
index 2858370b..18097d02 100644
--- a/src/components/DropdownWithActions.vue
+++ b/src/components/DropdownWithActions.vue
@@ -21,8 +21,8 @@
 </template>
 
 <script>
-import Dropdown from '@/components/Dropdown';
-import Button from '@/components/Button';
+import Button from 'src/components/Button';
+import Dropdown from 'src/components/Dropdown';
 
 export default {
   name: 'DropdownWithActions',
diff --git a/src/components/SalesInvoice/SalesInvoicePrint.vue b/src/components/SalesInvoice/SalesInvoicePrint.vue
index d6d35f6c..8420f4bc 100644
--- a/src/components/SalesInvoice/SalesInvoicePrint.vue
+++ b/src/components/SalesInvoice/SalesInvoicePrint.vue
@@ -47,10 +47,10 @@
   </div>
 </template>
 <script>
-import InvoiceTemplate1 from '@/../models/doctype/SalesInvoice/Templates/InvoiceTemplate1';
-import InvoiceTemplate2 from '@/../models/doctype/SalesInvoice/Templates/InvoiceTemplate2';
-import InvoiceTemplate3 from '@/../models/doctype/SalesInvoice/Templates/InvoiceTemplate3';
-import InvoiceCustomizer from '@/components/InvoiceCustomizer';
+import InvoiceTemplate1 from 'src/../models/doctype/SalesInvoice/Templates/InvoiceTemplate1';
+import InvoiceTemplate2 from 'src/../models/doctype/SalesInvoice/Templates/InvoiceTemplate2';
+import InvoiceTemplate3 from 'src/../models/doctype/SalesInvoice/Templates/InvoiceTemplate3';
+import InvoiceCustomizer from 'src/components/InvoiceCustomizer';
 
 const invoiceTemplates = {
   'Basic I': InvoiceTemplate1,
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 516a32d8..5b38e16c 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -41,9 +41,9 @@
   </div>
 </template>
 <script>
-import Dropdown from '@/components/Dropdown';
-import { routeTo } from '@/utils';
 import frappe, { t } from 'frappe';
+import Dropdown from 'src/components/Dropdown';
+import { routeTo } from 'src/utils';
 import reports from '../../reports/view';
 
 export default {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 3b089b9e..86e70888 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -96,10 +96,10 @@
   </div>
 </template>
 <script>
-import Button from '@/components/Button';
-import { reportIssue } from '@/errorHandling';
-import { routeTo } from '@/utils';
 import path from 'path';
+import Button from 'src/components/Button';
+import { reportIssue } from 'src/errorHandling';
+import { routeTo } from 'src/utils';
 import router from '../router';
 import sidebarConfig from '../sidebarConfig';
 import Icon from './Icon.vue';
diff --git a/src/components/StatusBadge.vue b/src/components/StatusBadge.vue
index 2ab5bd0b..992145e1 100644
--- a/src/components/StatusBadge.vue
+++ b/src/components/StatusBadge.vue
@@ -4,8 +4,8 @@
   }}</Badge>
 </template>
 <script>
+import Badge from 'src/components/Badge';
 import { statusColor } from '../colors';
-import Badge from '@/components/Badge';
 
 export default {
   name: 'StatusBadge',
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index a437f6e5..edfc3c31 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -1,5 +1,5 @@
-import Button from '@/components/Button';
-import FormControl from '@/components/Controls/FormControl';
+import Button from 'src/components/Button';
+import FormControl from 'src/components/Controls/FormControl';
 import frappe from 'frappe';
 import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
 <template>
@@ -90,9 +90,9 @@ import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
   </div>
 </template>
 <script>
-import Button from '@/components/Button';
-import FormControl from '@/components/Controls/FormControl';
 import frappe from 'frappe';
+import Button from 'src/components/Button';
+import FormControl from 'src/components/Controls/FormControl';
 import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
 
 let TwoColumnForm = {
diff --git a/src/components/Widgets/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
index 25b226eb..2d08c0cb 100644
--- a/src/components/Widgets/PartyWidget.vue
+++ b/src/components/Widgets/PartyWidget.vue
@@ -49,8 +49,8 @@
 </template>
 
 <script>
-import { routeTo } from '@/utils';
 import frappe from 'frappe';
+import { routeTo } from 'src/utils';
 import { getStatusColumn } from '../Transaction/Transaction';
 
 export default {
diff --git a/src/components/WindowControls.vue b/src/components/WindowControls.vue
index 5d3fcbc8..41c6a014 100644
--- a/src/components/WindowControls.vue
+++ b/src/components/WindowControls.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { runWindowAction } from '@/utils';
+import { runWindowAction } from 'src/utils';
 
 export default {
   name: 'WindowControls',
diff --git a/src/components/WindowsTitleBar.vue b/src/components/WindowsTitleBar.vue
index 0a0c1c10..c22f98de 100644
--- a/src/components/WindowsTitleBar.vue
+++ b/src/components/WindowsTitleBar.vue
@@ -31,7 +31,7 @@
 
 <script>
 import { ipcRenderer } from 'electron';
-import { runWindowAction } from '@/utils';
+import { runWindowAction } from 'src/utils';
 import { IPC_MESSAGES } from 'utils/messages';
 
 export default {
diff --git a/src/components/once/TelemetryModal.vue b/src/components/once/TelemetryModal.vue
index 069c3ba9..35ffe721 100644
--- a/src/components/once/TelemetryModal.vue
+++ b/src/components/once/TelemetryModal.vue
@@ -49,10 +49,10 @@
 </template>
 
 <script>
-import config, { ConfigKeys, TelemetrySetting } from '@/config';
-import { getTelemetryOptions } from '@/telemetry/helpers';
-import telemetry from '@/telemetry/telemetry';
-import { NounEnum, Verb } from '@/telemetry/types';
+import config, { ConfigKeys, TelemetrySetting } from 'src/config';
+import { getTelemetryOptions } from 'src/telemetry/helpers';
+import telemetry from 'src/telemetry/telemetry';
+import { NounEnum, Verb } from 'src/telemetry/types';
 import Button from '../Button.vue';
 import FormControl from '../Controls/FormControl';
 import FeatherIcon from '../FeatherIcon.vue';
diff --git a/src/dataImport.ts b/src/dataImport.ts
index 99400962..7725630f 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -1,11 +1,11 @@
-import frappe from 'fyo';
+import { t } from 'fyo';
 import { DocValueMap } from 'fyo/core/types';
 import Doc from 'fyo/model/doc';
 import { isNameAutoSet } from 'fyo/model/naming';
+import { Noun, Verb } from 'fyo/telemetry/types';
 import { FieldType, FieldTypeEnum } from 'schemas/types';
-import telemetry from '../frappe/telemetry/telemetry';
-import { Noun, Verb } from '../frappe/telemetry/types';
 import { parseCSV } from '../utils/csvParser';
+import { fyo } from './initFyo';
 
 export const importable = [
   'SalesInvoice',
@@ -364,7 +364,7 @@ export class Importer {
 
   async importData(setLoadingStatus: LoadingStatusCallback): Promise<Status> {
     const status: Status = { success: false, names: [], message: '' };
-    const shouldDeleteName = isNameAutoSet(this.doctype);
+    const shouldDeleteName = isNameAutoSet(this.doctype, fyo);
     const docObjs = this.getDocs();
 
     let entriesMade = 0;
@@ -383,7 +383,7 @@ export class Importer {
         delete docObj[key];
       }
 
-      const doc: Doc = frappe.doc.getEmptyDoc(this.doctype, false);
+      const doc: Doc = fyo.doc.getEmptyDoc(this.doctype, false);
       try {
         await this.makeEntry(doc, docObj);
         entriesMade += 1;
@@ -391,7 +391,7 @@ export class Importer {
       } catch (err) {
         setLoadingStatus(false, entriesMade, docObjs.length);
 
-        telemetry.log(Verb.Imported, this.doctype as Noun, {
+        fyo.telemetry.log(Verb.Imported, this.doctype as Noun, {
           success: false,
           count: entriesMade,
         });
@@ -405,7 +405,7 @@ export class Importer {
     setLoadingStatus(false, entriesMade, docObjs.length);
     status.success = true;
 
-    telemetry.log(Verb.Imported, this.doctype as Noun, {
+    fyo.telemetry.log(Verb.Imported, this.doctype as Noun, {
       success: true,
       count: entriesMade,
     });
@@ -426,18 +426,18 @@ export class Importer {
   }
 
   handleError(doc: Doc, err: Error, status: Status): Status {
-    const messages = [frappe.t`Could not import ${this.doctype} ${doc.name!}.`];
+    const messages = [t`Could not import ${this.doctype} ${doc.name!}.`];
 
     const message = err.message;
     if (message?.includes('UNIQUE constraint failed')) {
-      messages.push(frappe.t`${doc.name!} already exists.`);
+      messages.push(t`${doc.name!} already exists.`);
     } else if (message) {
       messages.push(message);
     }
 
     if (status.names.length) {
       messages.push(
-        frappe.t`The following ${
+        t`The following ${
           status.names.length
         } entries were created: ${status.names.join(', ')}`
       );
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index dbfda00c..6c5e93ac 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -1,6 +1,8 @@
 import { ipcRenderer } from 'electron';
-import frappe, { t } from 'fyo';
+import { t } from 'fyo';
+import { ConfigKeys } from 'fyo/core/types';
 import Doc from 'fyo/model/doc';
+import { TelemetrySetting } from 'fyo/telemetry/types';
 import {
   DuplicateEntryError,
   LinkValidationError,
@@ -9,12 +11,12 @@ import {
 } from 'fyo/utils/errors';
 import { ErrorLog } from 'fyo/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
-import telemetry from '../frappe/telemetry/telemetry';
-import config, { ConfigKeys, TelemetrySetting } from '../utils/config';
-import { showMessageDialog, showToast } from './utils.js';
+import { fyo } from './initFyo';
+import { ToastOptions } from './utils/types';
+import { showMessageDialog, showToast } from './utils/ui';
 
 function getCanLog(): boolean {
-  const telemetrySetting = config.get(ConfigKeys.Telemetry);
+  const telemetrySetting = fyo.config.get(ConfigKeys.Telemetry);
   return telemetrySetting !== TelemetrySetting.dontLogAnything;
 }
 
@@ -36,7 +38,7 @@ async function reportError(errorLogObj: ErrorLog, cb?: Function) {
     more: JSON.stringify(errorLogObj.more ?? {}),
   };
 
-  if (frappe.store.isDevelopment) {
+  if (fyo.store.isDevelopment) {
     console.log('errorHandling');
     console.log(body);
   }
@@ -46,7 +48,7 @@ async function reportError(errorLogObj: ErrorLog, cb?: Function) {
 }
 
 function getToastProps(errorLogObj: ErrorLog, canLog: boolean, cb?: Function) {
-  const props = {
+  const props: ToastOptions = {
     message: t`Error: ` + errorLogObj.name,
     type: 'error',
   };
@@ -73,7 +75,7 @@ export function getErrorLogObject(
   const errorLogObj = { name, stack, message, more };
 
   // @ts-ignore
-  frappe.errorLog.push(errorLogObj);
+  fyo.errorLog.push(errorLogObj);
 
   return errorLogObj;
 }
@@ -84,7 +86,7 @@ export function handleError(
   more?: Record<string, unknown>,
   cb?: Function
 ) {
-  telemetry.error(error.name);
+  fyo.telemetry.error(error.name);
   if (shouldLog) {
     console.error(error);
   }
@@ -124,7 +126,7 @@ export function handleErrorWithDialog(error: Error, doc?: Doc) {
   const errorMessage = getErrorMessage(error, doc);
   handleError(false, error, { errorMessage, doc });
 
-  showMessageDialog({ message: error.name, description: errorMessage });
+  showMessageDialog({ message: error.name, detail: errorMessage });
   throw error;
 }
 
diff --git a/src/languageCodeMap.js b/src/languageCodeMap.js
deleted file mode 100644
index 2fa19615..00000000
--- a/src/languageCodeMap.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Language: Language Code in books/translations
-export const languageCodeMap = {
-  English: 'en',
-  French: 'fr',
-  German: 'de',
-  Portuguese: 'pt',
-  Arabic: 'ar',
-  Catalan: 'ca-ES',
-};
diff --git a/src/main.js b/src/main.js
index ed9b3688..a73661be 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,10 +1,10 @@
 import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
 import { createApp } from 'vue';
 import App from './App';
 import FeatherIcon from './components/FeatherIcon';
 import config, { ConfigKeys } from './config';
 import { getErrorHandled, handleError } from './errorHandling';
+import { fyo } from './initFyo';
 import { IPC_ACTIONS } from './messages';
 import { incrementOpenCount } from './renderer/helpers';
 import registerIpcRendererListeners from './renderer/registerIpcRendererListeners';
@@ -13,7 +13,7 @@ import { outsideClickDirective } from './ui';
 import { setLanguageMap, stringifyCircular } from './utils';
 
 (async () => {
-  const language = config.get(ConfigKeys.Language);
+  const language = fyo.config.get(ConfigKeys.Language);
   if (language) {
     await setLanguageMap(language);
   }
@@ -22,15 +22,15 @@ import { setLanguageMap, stringifyCircular } from './utils';
     window.config = config;
   }
 
-  frappe.isElectron = true;
+  fyo.isElectron = true;
 
   const models = (await import('../models')).default;
-  await frappe.initializeAndRegister(models);
+  await fyo.initializeAndRegister(models);
 
   ipcRenderer.send = getErrorHandled(ipcRenderer.send);
   ipcRenderer.invoke = getErrorHandled(ipcRenderer.invoke);
 
-  window.frappe = frappe;
+  window.frappe = fyo;
 
   window.onerror = (message, source, lineno, colno, error) => {
     error = error ?? new Error('triggered in window.onerror');
@@ -50,7 +50,7 @@ import { setLanguageMap, stringifyCircular } from './utils';
   app.mixin({
     computed: {
       frappe() {
-        return frappe;
+        return fyo;
       },
       platform() {
         switch (process.platform) {
@@ -66,8 +66,8 @@ import { setLanguageMap, stringifyCircular } from './utils';
       },
     },
     methods: {
-      t: frappe.t,
-      T: frappe.T,
+      t: fyo.t,
+      T: fyo.T,
     },
   });
 
@@ -88,7 +88,7 @@ import { setLanguageMap, stringifyCircular } from './utils';
     console.error(err, vm, info);
   };
 
-  frappe.store.appVersion = await ipcRenderer.invoke(IPC_ACTIONS.GET_VERSION);
+  fyo.store.appVersion = await ipcRenderer.invoke(IPC_ACTIONS.GET_VERSION);
   incrementOpenCount();
   app.mount('body');
 
@@ -100,4 +100,3 @@ import { setLanguageMap, stringifyCircular } from './utils';
     handleError(true, error, {}, () => process.exit(1));
   });
 })();
-
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 86b0a69d..5ad8a8a3 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,6 +1,6 @@
-import PageHeader from '@/components/PageHeader';
-import SearchBar from '@/components/SearchBar';
-import { openQuickEdit } from '@/utils';
+import PageHeader from 'src/components/PageHeader';
+import SearchBar from 'src/components/SearchBar';
+import { openQuickEdit } from 'src/utils';
 import frappe from 'frappe';
 import { nextTick } from 'vue';
 import { handleErrorWithDialog } from '../errorHandling';
@@ -135,10 +135,10 @@ import { handleErrorWithDialog } from '../errorHandling';
   </div>
 </template>
 <script>
-import PageHeader from '@/components/PageHeader';
-import SearchBar from '@/components/SearchBar';
-import { openQuickEdit } from '@/utils';
 import frappe from 'frappe';
+import PageHeader from 'src/components/PageHeader';
+import SearchBar from 'src/components/SearchBar';
+import { openQuickEdit } from 'src/utils';
 import { nextTick } from 'vue';
 import { handleErrorWithDialog } from '../errorHandling';
 
diff --git a/src/pages/Dashboard/Cashflow.vue b/src/pages/Dashboard/Cashflow.vue
index c28d57e8..696ef538 100644
--- a/src/pages/Dashboard/Cashflow.vue
+++ b/src/pages/Dashboard/Cashflow.vue
@@ -101,12 +101,12 @@
 </template>
 <script>
 import frappe from 'frappe';
-import PeriodSelector from './PeriodSelector';
+import { getYMax } from 'src/components/Charts/chartUtils';
+import LineChart from 'src/components/Charts/LineChart.vue';
+import { formatXLabels } from 'src/utils';
 import Cashflow from '../../../reports/Cashflow/Cashflow';
 import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
-import LineChart from '@/components/Charts/LineChart.vue';
-import { getYMax } from '@/components/Charts/chartUtils';
-import { formatXLabels } from '@/utils';
+import PeriodSelector from './PeriodSelector';
 
 export default {
   name: 'Cashflow',
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index 90bd970a..4433cf81 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -23,12 +23,12 @@
 </template>
 
 <script>
-import PageHeader from '@/components/PageHeader';
-import SearchBar from '@/components/SearchBar';
+import PageHeader from 'src/components/PageHeader';
+import SearchBar from 'src/components/SearchBar';
 import Cashflow from './Cashflow';
-import UnpaidInvoices from './UnpaidInvoices';
-import ProfitAndLoss from './ProfitAndLoss';
 import Expenses from './Expenses';
+import ProfitAndLoss from './ProfitAndLoss';
+import UnpaidInvoices from './UnpaidInvoices';
 
 export default {
   name: 'Dashboard',
diff --git a/src/pages/Dashboard/Expenses.vue b/src/pages/Dashboard/Expenses.vue
index a71533ab..0ade50ae 100644
--- a/src/pages/Dashboard/Expenses.vue
+++ b/src/pages/Dashboard/Expenses.vue
@@ -50,8 +50,8 @@
 </template>
 
 <script>
-import theme from '@/theme';
 import frappe from 'frappe';
+import theme from 'src/theme';
 import DonutChart from '../../components/Charts/DonutChart.vue';
 import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
diff --git a/src/pages/Dashboard/PeriodSelector.vue b/src/pages/Dashboard/PeriodSelector.vue
index d2a136f9..7dad0d49 100644
--- a/src/pages/Dashboard/PeriodSelector.vue
+++ b/src/pages/Dashboard/PeriodSelector.vue
@@ -36,8 +36,8 @@
 </template>
 
 <script>
-import Dropdown from '@/components/Dropdown';
 import { t } from 'frappe';
+import Dropdown from 'src/components/Dropdown';
 
 export default {
   name: 'PeriodSelector',
diff --git a/src/pages/Dashboard/ProfitAndLoss.vue b/src/pages/Dashboard/ProfitAndLoss.vue
index a8adbc42..e30de9e1 100644
--- a/src/pages/Dashboard/ProfitAndLoss.vue
+++ b/src/pages/Dashboard/ProfitAndLoss.vue
@@ -29,13 +29,13 @@
 </template>
 <script>
 import frappe from 'frappe';
-import PeriodSelector from './PeriodSelector';
-import SectionHeader from './SectionHeader';
+import BarChart from 'src/components/Charts/BarChart.vue';
+import { getYMax, getYMin } from 'src/components/Charts/chartUtils';
+import { formatXLabels } from 'src/utils';
 import ProfitAndLoss from '../../../reports/ProfitAndLoss/ProfitAndLoss';
 import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
-import BarChart from '@/components/Charts/BarChart.vue';
-import { getYMax, getYMin } from '@/components/Charts/chartUtils';
-import { formatXLabels } from '@/utils';
+import PeriodSelector from './PeriodSelector';
+import SectionHeader from './SectionHeader';
 
 export default {
   name: 'ProfitAndLoss',
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index e2475de7..adc3e43b 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -68,9 +68,9 @@
   </div>
 </template>
 <script>
-import Button from '@/components/Button';
-import { routeTo } from '@/utils';
 import frappe, { t } from 'frappe';
+import Button from 'src/components/Button';
+import { routeTo } from 'src/utils';
 import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index 393548a4..d9294cf1 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -336,17 +336,17 @@
   </div>
 </template>
 <script>
-import Button from '@/components/Button.vue';
-import FormControl from '@/components/Controls/FormControl';
-import DropdownWithActions from '@/components/DropdownWithActions.vue';
-import FeatherIcon from '@/components/FeatherIcon.vue';
-import HowTo from '@/components/HowTo.vue';
-import PageHeader from '@/components/PageHeader.vue';
-import { importable, Importer } from '@/dataImport';
-import { IPC_ACTIONS } from 'utils/messages';
-import { getSavePath, saveData, showMessageDialog } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe from 'frappe';
+import Button from 'src/components/Button.vue';
+import FormControl from 'src/components/Controls/FormControl';
+import DropdownWithActions from 'src/components/DropdownWithActions.vue';
+import FeatherIcon from 'src/components/FeatherIcon.vue';
+import HowTo from 'src/components/HowTo.vue';
+import PageHeader from 'src/components/PageHeader.vue';
+import { importable, Importer } from 'src/dataImport';
+import { getSavePath, saveData, showMessageDialog } from 'src/utils';
+import { IPC_ACTIONS } from 'utils/messages';
 import Loading from '../components/Loading.vue';
 export default {
   components: {
@@ -550,7 +550,7 @@ export default {
       if (this.isRequiredUnassigned) {
         showMessageDialog({
           message: this.t`Required Fields not Assigned`,
-          description: this
+          detail: this
             .t`Please assign the following fields ${this.requiredUnassigned.join(
             ', '
           )}`,
@@ -561,7 +561,7 @@ export default {
       if (this.importer.assignedMatrix.length === 0) {
         showMessageDialog({
           message: this.t`No Data to Import`,
-          description: this.t`Please select a file with data to import.`,
+          detail: this.t`Please select a file with data to import.`,
         });
         return;
       }
@@ -572,7 +572,7 @@ export default {
       if (!success) {
         showMessageDialog({
           message: this.t`Import Failed`,
-          description: message,
+          detail: message,
         });
         return;
       }
@@ -617,7 +617,7 @@ export default {
       if (!isValid) {
         showMessageDialog({
           message: this.t`Bad import data.`,
-          description: this.t`Could not select file.`,
+          detail: this.t`Could not select file.`,
         });
         return;
       }
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 058f0abc..e5b68648 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -158,14 +158,14 @@
   </div>
 </template>
 <script>
-import LanguageSelector from '@/components/Controls/LanguageSelector.vue';
-import config from '@/config';
-import { connectToLocalDatabase, createNewDatabase } from '@/initialization';
 import { ipcRenderer } from 'electron';
 import fs from 'fs';
 import { DateTime } from 'luxon';
-import { showErrorDialog } from '../errorHandling';
+import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
+import config from 'src/config';
+import { connectToLocalDatabase, createNewDatabase } from 'src/initialization';
 import { DB_CONN_FAILURE, IPC_ACTIONS } from '../../utils/messages';
+import { showErrorDialog } from '../errorHandling';
 
 export default {
   name: 'DatabaseSelector',
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index d0dff313..8207cca1 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -84,12 +84,12 @@
 </template>
 
 <script>
-import Button from '@/components/Button';
-import Icon from '@/components/Icon';
-import PageHeader from '@/components/PageHeader';
-import { openSettings, routeTo } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'frappe';
+import Button from 'src/components/Button';
+import Icon from 'src/components/Icon';
+import PageHeader from 'src/components/PageHeader';
+import { openSettings, routeTo } from 'src/utils';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h } from 'vue';
 
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 1dc936a1..4bec9d81 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -198,20 +198,20 @@
   </div>
 </template>
 <script>
-import BackLink from '@/components/BackLink';
-import Button from '@/components/Button';
-import FormControl from '@/components/Controls/FormControl';
-import DropdownWithActions from '@/components/DropdownWithActions';
-import PageHeader from '@/components/PageHeader';
-import StatusBadge from '@/components/StatusBadge';
+import frappe from 'frappe';
+import { getInvoiceStatus } from 'models/helpers';
+import BackLink from 'src/components/BackLink';
+import Button from 'src/components/Button';
+import FormControl from 'src/components/Controls/FormControl';
+import DropdownWithActions from 'src/components/DropdownWithActions';
+import PageHeader from 'src/components/PageHeader';
+import StatusBadge from 'src/components/StatusBadge';
 import {
 getActionsForDocument,
-getInvoiceStatus,
 openSettings,
 routeTo,
 showMessageDialog
-} from '@/utils';
-import frappe from 'frappe';
+} from 'src/utils';
 import { handleErrorWithDialog } from '../errorHandling';
 
 export default {
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 13e37dd9..9c5d2b3f 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -128,14 +128,14 @@
   </div>
 </template>
 <script>
-import BackLink from '@/components/BackLink';
-import Button from '@/components/Button';
-import FormControl from '@/components/Controls/FormControl';
-import DropdownWithActions from '@/components/DropdownWithActions';
-import PageHeader from '@/components/PageHeader';
-import StatusBadge from '@/components/StatusBadge';
-import { getActionsForDocument, routeTo, showMessageDialog } from '@/utils';
 import frappe from 'frappe';
+import BackLink from 'src/components/BackLink';
+import Button from 'src/components/Button';
+import FormControl from 'src/components/Controls/FormControl';
+import DropdownWithActions from 'src/components/DropdownWithActions';
+import PageHeader from 'src/components/PageHeader';
+import StatusBadge from 'src/components/StatusBadge';
+import { getActionsForDocument, routeTo, showMessageDialog } from 'src/utils';
 import { handleErrorWithDialog } from '../errorHandling';
 
 export default {
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index eb119066..0593e9b3 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -56,11 +56,11 @@
   </div>
 </template>
 <script>
-import Avatar from '@/components/Avatar';
-import Button from '@/components/Button';
-import Row from '@/components/Row';
-import { openQuickEdit, routeTo } from '@/utils';
 import frappe from 'frappe';
+import Avatar from 'src/components/Avatar';
+import Button from 'src/components/Button';
+import Row from 'src/components/Row';
+import { openQuickEdit, routeTo } from 'src/utils';
 import ListCell from './ListCell';
 
 export default {
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 6622ca4e..c7a76353 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -30,12 +30,12 @@
   </div>
 </template>
 <script>
-import Button from '@/components/Button';
-import FilterDropdown from '@/components/FilterDropdown';
-import PageHeader from '@/components/PageHeader';
-import SearchBar from '@/components/SearchBar';
-import { routeTo } from '@/utils';
 import frappe from 'fyo';
+import Button from 'src/components/Button';
+import FilterDropdown from 'src/components/FilterDropdown';
+import PageHeader from 'src/components/PageHeader';
+import SearchBar from 'src/components/SearchBar';
+import { routeTo } from 'src/utils';
 import List from './List';
 
 export default {
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 9cd5ec24..9d914250 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -51,16 +51,16 @@
   </div>
 </template>
 <script>
-import BackLink from '@/components/BackLink';
-import Button from '@/components/Button';
-import PageHeader from '@/components/PageHeader';
-import SearchBar from '@/components/SearchBar';
-import TwoColumnForm from '@/components/TwoColumnForm';
-import telemetry from '@/telemetry/telemetry';
-import { Verb } from '@/telemetry/types';
-import { makePDF } from '@/utils';
 import { ipcRenderer } from 'electron';
 import frappe from 'fyo';
+import BackLink from 'src/components/BackLink';
+import Button from 'src/components/Button';
+import PageHeader from 'src/components/PageHeader';
+import SearchBar from 'src/components/SearchBar';
+import TwoColumnForm from 'src/components/TwoColumnForm';
+import telemetry from 'src/telemetry/telemetry';
+import { Verb } from 'src/telemetry/types';
+import { makePDF } from 'src/utils';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index c3e14a76..67081eb3 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -77,13 +77,13 @@
 </template>
 
 <script>
-import Button from '@/components/Button';
-import FormControl from '@/components/Controls/FormControl';
-import DropdownWithActions from '@/components/DropdownWithActions';
-import StatusBadge from '@/components/StatusBadge';
-import TwoColumnForm from '@/components/TwoColumnForm';
-import { getActionsForDocument, openQuickEdit } from '@/utils';
 import frappe, { t } from 'frappe';
+import Button from 'src/components/Button';
+import FormControl from 'src/components/Controls/FormControl';
+import DropdownWithActions from 'src/components/DropdownWithActions';
+import StatusBadge from 'src/components/StatusBadge';
+import TwoColumnForm from 'src/components/TwoColumnForm';
+import { getActionsForDocument, openQuickEdit } from 'src/utils';
 
 export default {
   name: 'QuickEditForm',
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 5a556650..871d3694 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -136,15 +136,15 @@
   </div>
 </template>
 <script>
-import reportViewConfig from '@/../reports/view';
-import Button from '@/components/Button';
-import FormControl from '@/components/Controls/FormControl';
-import FeatherIcon from '@/components/FeatherIcon.vue';
-import PageHeader from '@/components/PageHeader';
-import Row from '@/components/Row';
-import SearchBar from '@/components/SearchBar';
-import WithScroll from '@/components/WithScroll';
 import frappe from 'frappe';
+import reportViewConfig from 'src/../reports/view';
+import Button from 'src/components/Button';
+import FormControl from 'src/components/Controls/FormControl';
+import FeatherIcon from 'src/components/FeatherIcon.vue';
+import PageHeader from 'src/components/PageHeader';
+import Row from 'src/components/Row';
+import SearchBar from 'src/components/SearchBar';
+import WithScroll from 'src/components/WithScroll';
 import { h, markRaw } from 'vue';
 import { getReportData } from '../../reports/index';
 import DropdownWithActions from '../components/DropdownWithActions.vue';
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index d9541897..7aef6672 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -51,14 +51,14 @@
   </div>
 </template>
 <script>
-import Button from '@/components/Button';
-import Icon from '@/components/Icon';
-import PageHeader from '@/components/PageHeader';
-import Row from '@/components/Row';
-import StatusBadge from '@/components/StatusBadge';
-import WindowControls from '@/components/WindowControls';
 import { ipcRenderer } from 'electron';
 import frappe, { t } from 'fyo';
+import Button from 'src/components/Button';
+import Icon from 'src/components/Icon';
+import PageHeader from 'src/components/PageHeader';
+import Row from 'src/components/Row';
+import StatusBadge from 'src/components/StatusBadge';
+import WindowControls from 'src/components/WindowControls';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h, markRaw } from 'vue';
 import { callInitializeMoneyMaker, showToast } from '../../utils';
diff --git a/src/pages/Settings/TabGeneral.vue b/src/pages/Settings/TabGeneral.vue
index c45d754d..0469400c 100644
--- a/src/pages/Settings/TabGeneral.vue
+++ b/src/pages/Settings/TabGeneral.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-import TwoColumnForm from '@/components/TwoColumnForm';
 import frappe from 'fyo';
+import TwoColumnForm from 'src/components/TwoColumnForm';
 
 export default {
   name: 'TabGeneral',
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index 3c325496..fb39ab4c 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -46,10 +46,10 @@
   </div>
 </template>
 <script>
-import FormControl from '@/components/Controls/FormControl';
-import TwoColumnForm from '@/components/TwoColumnForm';
 import { ipcRenderer } from 'electron';
 import frappe from 'fyo';
+import FormControl from 'src/components/Controls/FormControl';
+import TwoColumnForm from 'src/components/TwoColumnForm';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index 77143621..367fc68f 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -38,17 +38,17 @@
 </template>
 
 <script>
-import FormControl from '@/components/Controls/FormControl';
-import LanguageSelector from '@/components/Controls/LanguageSelector.vue';
-import TwoColumnForm from '@/components/TwoColumnForm';
+import frappe from 'fyo';
+import FormControl from 'src/components/Controls/FormControl';
+import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
+import TwoColumnForm from 'src/components/TwoColumnForm';
 import config, {
 ConfigKeys,
 TelemetrySetting
-} from '@/config';
-import { getTelemetryOptions } from '@/telemetry/helpers';
-import telemetry from '@/telemetry/telemetry';
-import { checkForUpdates } from '@/utils';
-import frappe from 'fyo';
+} from 'src/config';
+import { getTelemetryOptions } from 'src/telemetry/helpers';
+import telemetry from 'src/telemetry/telemetry';
+import { checkForUpdates } from 'src/utils';
 
 export default {
   name: 'TabSystem',
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 6dc189e8..faccf726 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -89,17 +89,17 @@
 </template>
 
 <script>
-import FormControl from '@/components/Controls/FormControl';
-import LanguageSelector from '@/components/Controls/LanguageSelector.vue';
-import Popover from '@/components/Popover';
-import TwoColumnForm from '@/components/TwoColumnForm';
-import config from '@/config';
-import { connectToLocalDatabase, purgeCache } from '@/initialization';
-import { setLanguageMap, showMessageDialog } from '@/utils';
 import { ipcRenderer } from 'electron';
 import fs from 'fs';
 import frappe from 'fyo';
 import path from 'path';
+import FormControl from 'src/components/Controls/FormControl';
+import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
+import Popover from 'src/components/Popover';
+import TwoColumnForm from 'src/components/TwoColumnForm';
+import config from 'src/config';
+import { connectToLocalDatabase, purgeCache } from 'src/initialization';
+import { setLanguageMap, showMessageDialog } from 'src/utils';
 import { IPC_MESSAGES } from 'utils/messages';
 import {
 getErrorMessage,
diff --git a/src/pages/SetupWizard/Slide.vue b/src/pages/SetupWizard/Slide.vue
index c0fe9c12..65ca1616 100644
--- a/src/pages/SetupWizard/Slide.vue
+++ b/src/pages/SetupWizard/Slide.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import Button from '@/components/Button.vue';
+import Button from 'src/components/Button.vue';
 
 export default {
   emits: ['primary-clicked', 'secondary-clicked'],
diff --git a/src/pages/SetupWizard/setupCompany.js b/src/pages/SetupWizard/setupCompany.js
index a8725ace..af7e13a5 100644
--- a/src/pages/SetupWizard/setupCompany.js
+++ b/src/pages/SetupWizard/setupCompany.js
@@ -1,7 +1,7 @@
-import config from '@/config';
+import countryList from 'fixtures/countryInfo.json';
 import frappe from 'fyo';
 import { DEFAULT_LOCALE } from 'fyo/utils/consts';
-import countryList from '~/fixtures/countryInfo.json';
+import config from 'src/config';
 import importCharts from '../../../accounting/importCOA';
 import generateTaxes from '../../../models/doctype/Tax/RegionalEntries';
 import regionalModelUpdates from '../../../models/regionalModelUpdates';
diff --git a/src/postStart.ts b/src/postStart.ts
index 03a67eaa..3ff163bb 100644
--- a/src/postStart.ts
+++ b/src/postStart.ts
@@ -1,5 +1,5 @@
-import { createNumberSeries } from 'frappe/model/naming';
-import { DEFAULT_SERIES_START } from 'frappe/utils/consts';
+import { createNumberSeries } from 'fyo/model/naming';
+import { DEFAULT_SERIES_START } from 'fyo/utils/consts';
 import { getValueMapFromList } from 'utils';
 import { fyo } from './initFyo';
 
diff --git a/src/regional/in.ts b/src/regional/in.ts
index 0d10c4fe..30d04145 100644
--- a/src/regional/in.ts
+++ b/src/regional/in.ts
@@ -1,4 +1,4 @@
-import { fyo } from '@/initFyo';
+import { fyo } from 'src/initFyo';
 
 export type TaxType = 'GST' | 'IGST' | 'Exempt-GST' | 'Exempt-IGST';
 
diff --git a/src/renderer/helpers.ts b/src/renderer/helpers.ts
index d2968f16..ba995ee4 100644
--- a/src/renderer/helpers.ts
+++ b/src/renderer/helpers.ts
@@ -1,5 +1,5 @@
-import { fyo } from '@/initFyo';
 import { ConfigKeys } from 'fyo/core/types';
+import { fyo } from 'src/initFyo';
 
 export function incrementOpenCount() {
   let openCount = fyo.config.get(ConfigKeys.OpenCount);
diff --git a/src/renderer/registerIpcRendererListeners.ts b/src/renderer/registerIpcRendererListeners.ts
index 0590f1f0..1c5c5ed7 100644
--- a/src/renderer/registerIpcRendererListeners.ts
+++ b/src/renderer/registerIpcRendererListeners.ts
@@ -1,7 +1,7 @@
-import { handleError } from '@/errorHandling';
-import { fyo } from '@/initFyo';
-import { showToast } from '@/utils';
 import { ipcRenderer } from 'electron';
+import { handleError } from 'src/errorHandling';
+import { fyo } from 'src/initFyo';
+import { showToast } from 'src/utils/ui';
 import { IPC_CHANNELS, IPC_MESSAGES } from 'utils/messages';
 
 export default function registerIpcRendererListeners() {
diff --git a/src/router.js b/src/router.ts
similarity index 74%
rename from src/router.js
rename to src/router.ts
index d757958a..9fe0f5b4 100644
--- a/src/router.js
+++ b/src/router.ts
@@ -1,17 +1,17 @@
-import ChartOfAccounts from '@/pages/ChartOfAccounts.vue';
-import Dashboard from '@/pages/Dashboard/Dashboard.vue';
-import DataImport from '@/pages/DataImport.vue';
-import GetStarted from '@/pages/GetStarted.vue';
-import InvoiceForm from '@/pages/InvoiceForm.vue';
-import JournalEntryForm from '@/pages/JournalEntryForm.vue';
-import ListView from '@/pages/ListView/ListView.vue';
-import PrintView from '@/pages/PrintView/PrintView.vue';
-import QuickEditForm from '@/pages/QuickEditForm.vue';
-import Report from '@/pages/Report.vue';
-import Settings from '@/pages/Settings/Settings.vue';
+import { NounEnum, Verb } from 'fyo/telemetry/types';
+import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
+import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
+import DataImport from 'src/pages/DataImport.vue';
+import GetStarted from 'src/pages/GetStarted.vue';
+import InvoiceForm from 'src/pages/InvoiceForm.vue';
+import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
+import ListView from 'src/pages/ListView/ListView.vue';
+import PrintView from 'src/pages/PrintView/PrintView.vue';
+import QuickEditForm from 'src/pages/QuickEditForm.vue';
+import Report from 'src/pages/Report.vue';
+import Settings from 'src/pages/Settings/Settings.vue';
 import { createRouter, createWebHistory } from 'vue-router';
-import telemetry from '../frappe/telemetry/telemetry';
-import { NounEnum, Verb } from '../frappe/telemetry/types';
+import { fyo } from './initFyo';
 
 const routes = [
   {
@@ -112,7 +112,7 @@ const routes = [
   },
 ];
 
-let router = createRouter({ routes, history: createWebHistory() });
+const router = createRouter({ routes, history: createWebHistory() });
 
 function removeDetails(path) {
   if (!path) {
@@ -133,7 +133,7 @@ router.afterEach((to, from) => {
     to: removeDetails(to.fullPath),
   };
 
-  telemetry.log(Verb.Navigated, NounEnum.Route, more);
+  fyo.telemetry.log(Verb.Navigated, NounEnum.Route, more);
 });
 
 if (process.env.NODE_ENV === 'development') {
diff --git a/src/utils.js b/src/utils.js
deleted file mode 100644
index 04186b63..00000000
--- a/src/utils.js
+++ /dev/null
@@ -1,603 +0,0 @@
-import Avatar from '@/components/Avatar.vue';
-import Toast from '@/components/Toast.vue';
-import router from '@/router';
-import { ipcRenderer } from 'electron';
-import frappe, { t } from 'frappe';
-import { isPesa } from 'frappe/utils';
-import { DEFAULT_LANGUAGE } from 'frappe/utils/consts';
-import { setLanguageMapOnTranslationString } from 'frappe/utils/translation';
-import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
-import { createApp, h } from 'vue';
-import config from './config';
-import { handleErrorWithDialog } from './errorHandling';
-import { languageCodeMap } from './languageCodeMap';
-
-export async function showMessageDialog({
-  message,
-  description,
-  buttons = [],
-}) {
-  const options = {
-    message,
-    detail: description,
-    buttons: buttons.map((a) => a.label),
-  };
-
-  const { response } = await ipcRenderer.invoke(
-    IPC_ACTIONS.GET_DIALOG_RESPONSE,
-    options
-  );
-
-  let button = buttons[response];
-  if (button && button.action) {
-    button.action();
-  }
-}
-
-export function deleteDocWithPrompt(doc) {
-  return new Promise((resolve) => {
-    showMessageDialog({
-      message: t`Are you sure you want to delete ${doc.doctype} ${doc.name}?`,
-      description: t`This action is permanent`,
-      buttons: [
-        {
-          label: t`Delete`,
-          action: () => {
-            doc
-              .delete()
-              .then(() => resolve(true))
-              .catch((e) => {
-                handleErrorWithDialog(e, doc);
-              });
-          },
-        },
-        {
-          label: t`Cancel`,
-          action() {
-            resolve(false);
-          },
-        },
-      ],
-    });
-  });
-}
-
-export async function cancelDocWithPrompt(doc) {
-  let description = t`This action is permanent`;
-  if (['SalesInvoice', 'PurchaseInvoice'].includes(doc.doctype)) {
-    const payments = (
-      await frappe.db.getAll('Payment', {
-        fields: ['name'],
-        filters: { cancelled: false },
-      })
-    ).map(({ name }) => name);
-
-    const query = (
-      await frappe.db.getAll('PaymentFor', {
-        fields: ['parent'],
-        filters: {
-          referenceName: doc.name,
-        },
-      })
-    ).filter(({ parent }) => payments.includes(parent));
-
-    const paymentList = [...new Set(query.map(({ parent }) => parent))];
-
-    if (paymentList.length === 1) {
-      description = t`This action is permanent and will cancel the following payment: ${paymentList[0]}`;
-    } else if (paymentList.length > 1) {
-      description = t`This action is permanent and will cancel the following payments: ${paymentList.join(
-        ', '
-      )}`;
-    }
-  }
-
-  return new Promise((resolve) => {
-    showMessageDialog({
-      message: t`Are you sure you want to cancel ${doc.doctype} ${doc.name}?`,
-      description,
-      buttons: [
-        {
-          label: t`Yes`,
-          async action() {
-            const entryDoc = await frappe.doc.getDoc(doc.doctype, doc.name);
-            entryDoc.cancelled = 1;
-            await entryDoc.update();
-            entryDoc
-              .revert()
-              .then(() => resolve(true))
-              .catch((e) => {
-                handleErrorWithDialog(e, doc);
-              });
-          },
-        },
-        {
-          label: t`No`,
-          action() {
-            resolve(false);
-          },
-        },
-      ],
-    });
-  });
-}
-
-export function partyWithAvatar(party) {
-  return {
-    data() {
-      return {
-        imageURL: null,
-        label: null,
-      };
-    },
-    components: {
-      Avatar,
-    },
-    async mounted() {
-      const p = await frappe.db.get('Party', party);
-      this.imageURL = p.image;
-      this.label = party;
-    },
-    template: `
-      <div class="flex items-center" v-if="label">
-        <Avatar class="flex-shrink-0" :imageURL="imageURL" :label="label" size="sm" />
-        <span class="ml-2 truncate">{{ label }}</span>
-      </div>
-    `,
-  };
-}
-
-function getShowFields(doctype) {
-  if (doctype === 'Party') {
-    return ['customer'];
-  }
-  return [];
-}
-
-export function openQuickEdit({
-  doctype,
-  name,
-  hideFields,
-  showFields,
-  defaults = {},
-}) {
-  let currentRoute = router.currentRoute.value;
-  let query = currentRoute.query;
-  let method = 'push';
-  if (query.edit && query.doctype === doctype) {
-    // replace the current route if we are
-    // editing another document of the same doctype
-    method = 'replace';
-  }
-  if (query.name === name) return;
-
-  if (defaults?.for?.[0] === 'not in') {
-    const purpose = defaults.for?.[1]?.[0];
-    defaults = Object.assign({
-      for:
-        purpose === 'sales'
-          ? 'purchases'
-          : purpose === 'purchases'
-          ? 'sales'
-          : 'both',
-    });
-  }
-
-  if (defaults?.for?.[0] === 'not in' && defaults?.for?.[1] === 'sales') {
-    defaults = Object.assign({ for: 'purchases' });
-  }
-
-  router[method]({
-    query: {
-      edit: 1,
-      doctype,
-      name,
-      showFields: showFields ?? getShowFields(doctype),
-      hideFields,
-      valueJSON: stringifyCircular(defaults),
-      lastRoute: currentRoute,
-    },
-  });
-}
-
-export async function makePDF(html, savePath) {
-  await ipcRenderer.invoke(IPC_ACTIONS.SAVE_HTML_AS_PDF, html, savePath);
-  showExportInFolder(frappe.t`Save as PDF Successful`, savePath);
-}
-
-export function showExportInFolder(message, filePath) {
-  showToast({
-    message,
-    actionText: frappe.t`Open Folder`,
-    type: 'success',
-    action: async () => {
-      await showItemInFolder(filePath);
-    },
-  });
-}
-
-export async function saveData(data, savePath) {
-  await ipcRenderer.invoke(IPC_ACTIONS.SAVE_DATA, data, savePath);
-}
-
-export async function showItemInFolder(filePath) {
-  await ipcRenderer.send(IPC_MESSAGES.SHOW_ITEM_IN_FOLDER, filePath);
-}
-
-export function getActionsForDocument(doc) {
-  if (!doc) return [];
-
-  let deleteAction = {
-    component: {
-      template: '<span class="text-red-700">{{ t`Delete` }}</span>',
-    },
-    condition: (doc) =>
-      !doc.isNew() && !doc.submitted && !doc.meta.isSingle && !doc.cancelled,
-    action: () =>
-      deleteDocWithPrompt(doc).then((res) => {
-        if (res) {
-          routeTo(`/list/${doc.doctype}`);
-        }
-      }),
-  };
-
-  let cancelAction = {
-    component: {
-      template: '<span class="text-red-700">{{ t`Cancel` }}</span>',
-    },
-    condition: (doc) => doc.submitted && !doc.cancelled,
-    action: () => {
-      cancelDocWithPrompt(doc).then((res) => {
-        if (res) {
-          router.push(`/list/${doc.doctype}`);
-        }
-      });
-    },
-  };
-
-  const isSubmittable = !!doc.meta.isSubmittable;
-  const duplicateAction = {
-    label: frappe.t`Duplicate`,
-    condition: (doc) =>
-      ((isSubmittable && doc && doc.submitted) || !isSubmittable) &&
-      !doc._notInserted &&
-      !(doc.cancelled || false),
-    action: () => {
-      showMessageDialog({
-        message: t`Duplicate ${doc.doctype} ${doc.name}?`,
-        buttons: [
-          {
-            label: t`Yes`,
-            async action() {
-              doc.duplicate();
-            },
-          },
-          {
-            label: t`No`,
-            action() {
-              resolve(false);
-            },
-          },
-        ],
-      });
-    },
-  };
-
-  let actions = [
-    ...(doc.meta.actions || []),
-    duplicateAction,
-    deleteAction,
-    cancelAction,
-  ]
-    .filter((d) => (d.condition ? d.condition(doc) : true))
-    .map((d) => {
-      return {
-        label: d.label,
-        component: d.component,
-        action: d.action.bind(this, doc, router),
-      };
-    });
-
-  return actions;
-}
-
-export async function runWindowAction(name) {
-  switch (name) {
-    case 'close':
-      ipcRenderer.send(IPC_MESSAGES.CLOSE_CURRENT_WINDOW);
-      break;
-    case 'minimize':
-      ipcRenderer.send(IPC_MESSAGES.MINIMIZE_CURRENT_WINDOW);
-      break;
-    case 'maximize':
-      const maximizing = await ipcRenderer.invoke(
-        IPC_ACTIONS.TOGGLE_MAXIMIZE_CURRENT_WINDOW
-      );
-      name = maximizing ? name : 'unmaximize';
-      break;
-  }
-  return name;
-}
-
-export function getInvoiceStatus(doc) {
-  let status = `Unpaid`;
-  if (!doc.submitted) {
-    status = 'Draft';
-  }
-  if (doc.submitted === 1 && doc.outstandingAmount.isZero()) {
-    status = 'Paid';
-  }
-  if (doc.cancelled === 1) {
-    status = 'Cancelled';
-  }
-  return status;
-}
-
-export function routeTo(route) {
-  let routeOptions = route;
-  if (
-    typeof route === 'string' &&
-    route === router.currentRoute.value.fullPath
-  ) {
-    return;
-  }
-
-  if (typeof route === 'string') {
-    routeOptions = { path: route };
-  }
-
-  router.push(routeOptions);
-}
-
-export function fuzzyMatch(keyword, candidate) {
-  const keywordLetters = [...keyword];
-  const candidateLetters = [...candidate];
-
-  let keywordLetter = keywordLetters.shift();
-  let candidateLetter = candidateLetters.shift();
-
-  let isMatch = true;
-  let distance = 0;
-
-  while (keywordLetter && candidateLetter) {
-    if (keywordLetter.toLowerCase() === candidateLetter.toLowerCase()) {
-      keywordLetter = keywordLetters.shift();
-    } else {
-      distance += 1;
-    }
-
-    candidateLetter = candidateLetters.shift();
-  }
-
-  if (keywordLetter !== undefined) {
-    distance = -1;
-    isMatch = false;
-  } else {
-    distance += candidateLetters.length;
-  }
-
-  return { isMatch, distance };
-}
-
-export function openSettings(tab) {
-  routeTo({ path: '/settings', query: { tab } });
-}
-
-export async function getSavePath(name, extention) {
-  let { canceled, filePath } = await ipcRenderer.invoke(
-    IPC_ACTIONS.GET_SAVE_FILEPATH,
-    {
-      title: t`Select Folder`,
-      defaultPath: `${name}.${extention}`,
-    }
-  );
-
-  if (filePath && !filePath.endsWith(extention)) {
-    filePath = filePath + extention;
-  }
-
-  return { canceled, filePath };
-}
-
-function replaceAndAppendMount(app, replaceId) {
-  const fragment = document.createDocumentFragment();
-  const target = document.getElementById(replaceId);
-  if (target === null) {
-    return;
-  }
-
-  const parent = target.parentElement;
-  const clone = target.cloneNode();
-
-  app.mount(fragment);
-  target.replaceWith(fragment);
-  parent.append(clone);
-}
-
-export function showToast(props) {
-  const toast = createApp({
-    render() {
-      return h(Toast, { ...props });
-    },
-  });
-  replaceAndAppendMount(toast, 'toast-target');
-}
-
-export async function getIsSetupComplete() {
-  try {
-    const { setupComplete } = await frappe.getSingle('AccountingSettings');
-    return !!setupComplete;
-  } catch {
-    return false;
-  }
-}
-
-export async function getCurrency() {
-  let currency = frappe?.AccountingSettings?.currency ?? undefined;
-
-  if (!currency) {
-    try {
-      currency = (
-        await frappe.db.getSingleValues({
-          fieldname: 'currency',
-          parent: 'AccountingSettings',
-        })
-      )[0].value;
-    } catch (err) {
-      currency = undefined;
-    }
-  }
-
-  return currency;
-}
-
-export async function callInitializeMoneyMaker(currency, force = false) {
-  currency ??= await getCurrency();
-  if (!force && !currency && frappe.pesa) {
-    return;
-  }
-
-  if (!force && currency && frappe.pesa().options.currency === currency) {
-    return;
-  }
-  await frappe.initializeMoneyMaker(currency);
-}
-
-export function convertPesaValuesToFloat(obj) {
-  Object.keys(obj).forEach((key) => {
-    if (!isPesa(obj[key])) return;
-
-    obj[key] = obj[key].float;
-  });
-}
-
-export function formatXLabels(label) {
-  // Format: Mmm YYYY -> Mm YY
-  let [month, year] = label.split(' ');
-  year = year.slice(2);
-
-  return `${month} ${year}`;
-}
-
-export function stringifyCircular(
-  obj,
-  ignoreCircular = false,
-  convertDocument = false
-) {
-  const cacheKey = [];
-  const cacheValue = [];
-
-  return JSON.stringify(obj, (key, value) => {
-    if (typeof value !== 'object' || value === null) {
-      cacheKey.push(key);
-      cacheValue.push(value);
-      return value;
-    }
-
-    if (cacheValue.includes(value)) {
-      const circularKey = cacheKey[cacheValue.indexOf(value)] || '{self}';
-      return ignoreCircular ? undefined : `[Circular:${circularKey}]`;
-    }
-
-    cacheKey.push(key);
-    cacheValue.push(value);
-
-    if (convertDocument && value instanceof frappe.Document) {
-      return value.getValidDict();
-    }
-
-    return value;
-  });
-}
-
-export async function checkForUpdates(force = false) {
-  ipcRenderer.invoke(IPC_ACTIONS.CHECK_FOR_UPDATES, force);
-  await setLanguageMap();
-}
-
-async function fetchAndSetLanguageMap(code) {
-  const { success, message, languageMap } = await ipcRenderer.invoke(
-    IPC_ACTIONS.GET_LANGUAGE_MAP,
-    code
-  );
-
-  if (!success) {
-    showToast({ type: 'error', message });
-  } else {
-    setLanguageMapOnTranslationString(languageMap);
-  }
-
-  return success;
-}
-
-export async function setLanguageMap(initLanguage, dontReload = false) {
-  const oldLanguage = config.get('language');
-  initLanguage ??= oldLanguage;
-  const [code, language, usingDefault] = getLanguageCode(
-    initLanguage,
-    oldLanguage
-  );
-
-  let success = true;
-  if (code === 'en') {
-    setLanguageMapOnTranslationString(undefined);
-  } else {
-    success = await fetchAndSetLanguageMap(code);
-  }
-
-  if (success && !usingDefault) {
-    config.set('language', language);
-  }
-
-  if (!dontReload && success && initLanguage !== oldLanguage) {
-    await ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
-  }
-  return success;
-}
-
-function getLanguageCode(initLanguage, oldLanguage) {
-  let language = initLanguage ?? oldLanguage;
-  let usingDefault = false;
-
-  if (!language) {
-    language = DEFAULT_LANGUAGE;
-    usingDefault = true;
-  }
-  const code = languageCodeMap[language] ?? 'en';
-  return [code, language, usingDefault];
-}
-
-export function getCOAList() {
-  if (!frappe.temp.coaList) {
-    const coaList = [
-      { name: t`Standard Chart of Accounts`, countryCode: '' },
-
-      { countryCode: 'ae', name: 'U.A.E - Chart of Accounts' },
-      {
-        countryCode: 'ca',
-        name: 'Canada - Plan comptable pour les provinces francophones',
-      },
-      { countryCode: 'gt', name: 'Guatemala - Cuentas' },
-      { countryCode: 'hu', name: 'Hungary - Chart of Accounts' },
-      { countryCode: 'id', name: 'Indonesia - Chart of Accounts' },
-      { countryCode: 'in', name: 'India - Chart of Accounts' },
-      { countryCode: 'mx', name: 'Mexico - Plan de Cuentas' },
-      { countryCode: 'ni', name: 'Nicaragua - Catalogo de Cuentas' },
-      { countryCode: 'nl', name: 'Netherlands - Grootboekschema' },
-      { countryCode: 'sg', name: 'Singapore - Chart of Accounts' },
-    ];
-    frappe.temp.coaList = coaList;
-  }
-  return frappe.temp.coaList;
-}
-
-export function invertMap(map) {
-  const keys = Object.keys(map);
-  const inverted = {};
-  for (const key of keys) {
-    const val = map[key];
-    inverted[val] = key;
-  }
-
-  return inverted;
-}
diff --git a/src/utils.ts b/src/utils.ts
deleted file mode 100644
index 7b2f1863..00000000
--- a/src/utils.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import Doc from 'fyo/model/doc';
-
-export interface QuickEditOptions {
-  schemaName: string;
-  name: string;
-  hideFields?: string[];
-  showFields?: string[];
-  defaults?: Record<string, unknown>;
-}
-
-export async function openQuickEdit({
-  schemaName,
-  name,
-  hideFields,
-  showFields,
-  defaults = {},
-}: QuickEditOptions) {
-  const router = (await import('./router')).default;
-
-  const currentRoute = router.currentRoute.value;
-  const query = currentRoute.query;
-  let method: 'push' | 'replace' = 'push';
-
-  if (query.edit && query.doctype === schemaName) {
-    // replace the current route if we are
-    // editing another document of the same doctype
-    method = 'replace';
-  }
-  if (query.name === name) return;
-
-  const forWhat = (defaults?.for ?? []) as string[];
-  if (forWhat[0] === 'not in') {
-    const purpose = forWhat[1]?.[0];
-
-    defaults = Object.assign({
-      for:
-        purpose === 'sales'
-          ? 'purchases'
-          : purpose === 'purchases'
-          ? 'sales'
-          : 'both',
-    });
-  }
-
-  if (forWhat[0] === 'not in' && forWhat[1] === 'sales') {
-    defaults = Object.assign({ for: 'purchases' });
-  }
-
-  router[method]({
-    query: {
-      edit: 1,
-      doctype: schemaName,
-      name,
-      showFields: showFields ?? getShowFields(schemaName),
-      hideFields,
-      valueJSON: stringifyCircular(defaults),
-      // @ts-ignore
-      lastRoute: currentRoute,
-    },
-  });
-}
-
-function getShowFields(schemaName: string) {
-  if (schemaName === 'Party') {
-    return ['customer'];
-  }
-  return [];
-}
-
-export function stringifyCircular(
-  obj: Record<string, unknown>,
-  ignoreCircular = false,
-  convertDocument = false
-) {
-  const cacheKey: string[] = [];
-  const cacheValue: unknown[] = [];
-
-  return JSON.stringify(obj, (key, value) => {
-    if (typeof value !== 'object' || value === null) {
-      cacheKey.push(key);
-      cacheValue.push(value);
-      return value;
-    }
-
-    if (cacheValue.includes(value)) {
-      const circularKey = cacheKey[cacheValue.indexOf(value)] || '{self}';
-      return ignoreCircular ? undefined : `[Circular:${circularKey}]`;
-    }
-
-    cacheKey.push(key);
-    cacheValue.push(value);
-
-    if (convertDocument && value instanceof Doc) {
-      return value.getValidDict();
-    }
-
-    return value;
-  });
-}
diff --git a/src/colors.js b/src/utils/colors.ts
similarity index 71%
rename from src/colors.js
rename to src/utils/colors.ts
index 6b374deb..938eca70 100644
--- a/src/colors.js
+++ b/src/utils/colors.ts
@@ -17,26 +17,26 @@ export const statusColor = {
   Cancelled: 'red',
 };
 
-const getValidColor = (color) => {
+const getValidColor = (color: string) => {
   const isValid = ['gray', 'orange', 'green', 'red', 'yellow', 'blue'].includes(
     color
   );
   return isValid ? color : 'gray';
 };
 
-export function getBgColorClass(color) {
+export function getBgColorClass(color: string) {
   return `bg-${getValidColor(color)}-100`;
 }
 
-export function getColorClass(color, type, value = 300) {
+export function getColorClass(color: string, type: 'bg' | 'text', value = 300) {
   return `${type}-${getValidColor(color)}-${value}`;
 }
 
-export function getTextColorClass(color) {
+export function getTextColorClass(color: string) {
   return `text-${getValidColor(color)}-600`;
 }
 
-export function getBgTextColorClass(color) {
+export function getBgTextColorClass(color: string) {
   const bg = getBgColorClass(color);
   const text = getTextColorClass(color);
   return [bg, text].join(' ');
diff --git a/src/utils/index.ts b/src/utils/index.ts
new file mode 100644
index 00000000..a83f37e9
--- /dev/null
+++ b/src/utils/index.ts
@@ -0,0 +1,97 @@
+/**
+ * General purpose utils used by the frontend.
+ */
+import Doc from 'fyo/model/doc';
+import { isPesa } from 'fyo/utils';
+import Money from 'pesa/dist/types/src/money';
+import { fyo } from 'src/initFyo';
+
+export function stringifyCircular(
+  obj: unknown,
+  ignoreCircular: boolean = false,
+  convertDocument: boolean = false
+) {
+  const cacheKey: string[] = [];
+  const cacheValue: unknown[] = [];
+
+  return JSON.stringify(obj, (key, value) => {
+    if (typeof value !== 'object' || value === null) {
+      cacheKey.push(key);
+      cacheValue.push(value);
+      return value;
+    }
+
+    if (cacheValue.includes(value)) {
+      const circularKey = cacheKey[cacheValue.indexOf(value)] || '{self}';
+      return ignoreCircular ? undefined : `[Circular:${circularKey}]`;
+    }
+
+    cacheKey.push(key);
+    cacheValue.push(value);
+
+    if (convertDocument && value instanceof Doc) {
+      return value.getValidDict();
+    }
+
+    return value;
+  });
+}
+
+export function fuzzyMatch(keyword: string, candidate: string) {
+  const keywordLetters = [...keyword];
+  const candidateLetters = [...candidate];
+
+  let keywordLetter = keywordLetters.shift();
+  let candidateLetter = candidateLetters.shift();
+
+  let isMatch = true;
+  let distance = 0;
+
+  while (keywordLetter && candidateLetter) {
+    if (keywordLetter.toLowerCase() === candidateLetter.toLowerCase()) {
+      keywordLetter = keywordLetters.shift();
+    } else {
+      distance += 1;
+    }
+
+    candidateLetter = candidateLetters.shift();
+  }
+
+  if (keywordLetter !== undefined) {
+    distance = -1;
+    isMatch = false;
+  } else {
+    distance += candidateLetters.length;
+  }
+
+  return { isMatch, distance };
+}
+
+export function formatXLabels(label: string) {
+  // Format: Mmm YYYY -> Mm YY
+  const splits = label.split(' ');
+  const month = splits[0];
+  const year = splits[1].slice(2);
+
+  return `${month} ${year}`;
+}
+
+export function convertPesaValuesToFloat(obj: Record<string, unknown>) {
+  Object.keys(obj).forEach((key) => {
+    const value = obj[key];
+    if (!isPesa(value)) {
+      return;
+    }
+
+    obj[key] = (value as Money).float;
+  });
+}
+
+export async function getIsSetupComplete() {
+  try {
+    const { setupComplete } = await fyo.doc.getSingle('AccountingSettings');
+    return !!setupComplete;
+  } catch {
+    return false;
+  }
+}
diff --git a/src/utils/ipcCalls.ts b/src/utils/ipcCalls.ts
new file mode 100644
index 00000000..7d809366
--- /dev/null
+++ b/src/utils/ipcCalls.ts
@@ -0,0 +1,72 @@
+/**
+ * Utils that make ipcRenderer calls.
+ */
+import { ipcRenderer } from 'electron';
+import { t } from 'fyo';
+import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
+import { setLanguageMap } from './language';
+import { WindowAction } from './types';
+import { showToast } from './ui';
+
+export async function checkForUpdates(force = false) {
+  ipcRenderer.invoke(IPC_ACTIONS.CHECK_FOR_UPDATES, force);
+  await setLanguageMap();
+}
+
+export async function saveData(data: string, savePath: string) {
+  await ipcRenderer.invoke(IPC_ACTIONS.SAVE_DATA, data, savePath);
+}
+
+export async function showItemInFolder(filePath: string) {
+  await ipcRenderer.send(IPC_MESSAGES.SHOW_ITEM_IN_FOLDER, filePath);
+}
+
+export async function makePDF(html: string, savePath: string) {
+  await ipcRenderer.invoke(IPC_ACTIONS.SAVE_HTML_AS_PDF, html, savePath);
+  showExportInFolder(t`Save as PDF Successful`, savePath);
+}
+
+export async function runWindowAction(name: WindowAction) {
+  switch (name) {
+    case 'close':
+      ipcRenderer.send(IPC_MESSAGES.CLOSE_CURRENT_WINDOW);
+      break;
+    case 'minimize':
+      ipcRenderer.send(IPC_MESSAGES.MINIMIZE_CURRENT_WINDOW);
+      break;
+    case 'maximize':
+      const maximizing = await ipcRenderer.invoke(
+        IPC_ACTIONS.TOGGLE_MAXIMIZE_CURRENT_WINDOW
+      );
+      name = maximizing ? name : 'unmaximize';
+      break;
+  }
+  return name;
+}
+
+export function showExportInFolder(message: string, filePath: string) {
+  showToast({
+    message,
+    actionText: t`Open Folder`,
+    type: 'success',
+    action: async () => {
+      await showItemInFolder(filePath);
+    },
+  });
+}
+
+export async function getSavePath(name: string, extention: string) {
+  const response = (await ipcRenderer.invoke(IPC_ACTIONS.GET_SAVE_FILEPATH, {
+    title: t`Select Folder`,
+    defaultPath: `${name}.${extention}`,
+  })) as { canceled: boolean; filePath?: string };
+
+  const canceled = response.canceled;
+  let filePath = response.filePath;
+
+  if (filePath && !filePath.endsWith(extention)) {
+    filePath = filePath + extention;
+  }
+
+  return { canceled, filePath };
+}
diff --git a/src/utils/language.ts b/src/utils/language.ts
new file mode 100644
index 00000000..5d67ae95
--- /dev/null
+++ b/src/utils/language.ts
@@ -0,0 +1,71 @@
+import { ipcRenderer } from 'electron';
+import { DEFAULT_LANGUAGE } from 'fyo/utils/consts';
+import { setLanguageMapOnTranslationString } from 'fyo/utils/translation';
+import { fyo } from 'src/initFyo';
+import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
+import { showToast } from './ui';
+
+// Language: Language Code in books/translations
+export const languageCodeMap: Record<string, string> = {
+  English: 'en',
+  French: 'fr',
+  German: 'de',
+  Portuguese: 'pt',
+  Arabic: 'ar',
+  Catalan: 'ca-ES',
+};
+
+export async function setLanguageMap(
+  initLanguage?: string,
+  dontReload: boolean = false
+) {
+  const oldLanguage = fyo.config.get('language') as string;
+  initLanguage ??= oldLanguage;
+  const { code, language, usingDefault } = getLanguageCode(
+    initLanguage,
+    oldLanguage
+  );
+
+  let success = true;
+  if (code === 'en') {
+    setLanguageMapOnTranslationString(undefined);
+  } else {
+    success = await fetchAndSetLanguageMap(code);
+  }
+
+  if (success && !usingDefault) {
+    fyo.config.set('language', language);
+  }
+
+  if (!dontReload && success && initLanguage !== oldLanguage) {
+    await ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
+  }
+  return success;
+}
+
+function getLanguageCode(initLanguage: string, oldLanguage: string) {
+  let language = initLanguage ?? oldLanguage;
+  let usingDefault = false;
+
+  if (!language) {
+    language = DEFAULT_LANGUAGE;
+    usingDefault = true;
+  }
+  const code = languageCodeMap[language] ?? 'en';
+  return { code, language, usingDefault };
+}
+
+async function fetchAndSetLanguageMap(code: string) {
+  const { success, message, languageMap } = await ipcRenderer.invoke(
+    IPC_ACTIONS.GET_LANGUAGE_MAP,
+    code
+  );
+
+  if (!success) {
+    showToast({ type: 'error', message });
+  } else {
+    setLanguageMapOnTranslationString(languageMap);
+  }
+
+  return success;
+}
diff --git a/src/utils/types.ts b/src/utils/types.ts
new file mode 100644
index 00000000..84eb9f1d
--- /dev/null
+++ b/src/utils/types.ts
@@ -0,0 +1,29 @@
+export interface MessageDialogButton {
+  label: string;
+  action: () => void;
+}
+
+export interface MessageDialogOptions {
+  message: string;
+  detail?: string;
+  buttons?: MessageDialogButton[];
+}
+
+export interface ToastOptions {
+  message: string;
+  type?: 'info' | 'warning' | 'error' | 'success';
+  duration?: number;
+  action?: () => void;
+  actionText?: string;
+}
+
+export type WindowAction = 'close' | 'minimize' | 'maximize' | 'unmaximize';
+export type SettingsTab = 'Invoice' | 'General' | 'System';
+
+export interface QuickEditOptions {
+  schemaName: string;
+  name: string;
+  hideFields?: string[];
+  showFields?: string[];
+  defaults?: Record<string, unknown>;
+}
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
new file mode 100644
index 00000000..684aa31e
--- /dev/null
+++ b/src/utils/ui.ts
@@ -0,0 +1,329 @@
+/**
+ * Utils to do UI stuff such as opening dialogs, toasts, etc.
+ * Basically anything that may directly or indirectly import a Vue file.
+ */
+import { ipcRenderer } from 'electron';
+import { t } from 'fyo';
+import Doc from 'fyo/model/doc';
+import { Action } from 'fyo/model/types';
+import { getActions } from 'fyo/utils';
+import { handleErrorWithDialog } from 'src/errorHandling';
+import { fyo } from 'src/initFyo';
+import router from 'src/router';
+import { IPC_ACTIONS } from 'utils/messages';
+import { App, createApp, h } from 'vue';
+import { RouteLocationRaw } from 'vue-router';
+import { stringifyCircular } from './';
+import {
+  MessageDialogOptions,
+  QuickEditOptions,
+  SettingsTab,
+  ToastOptions,
+} from './types';
+
+export async function openQuickEdit({
+  schemaName,
+  name,
+  hideFields,
+  showFields,
+  defaults = {},
+}: QuickEditOptions) {
+  const router = (await import('src/router')).default;
+
+  const currentRoute = router.currentRoute.value;
+  const query = currentRoute.query;
+  let method: 'push' | 'replace' = 'push';
+
+  if (query.edit && query.doctype === schemaName) {
+    // replace the current route if we are
+    // editing another document of the same doctype
+    method = 'replace';
+  }
+  if (query.name === name) return;
+
+  const forWhat = (defaults?.for ?? []) as string[];
+  if (forWhat[0] === 'not in') {
+    const purpose = forWhat[1]?.[0];
+
+    defaults = Object.assign({
+      for:
+        purpose === 'sales'
+          ? 'purchases'
+          : purpose === 'purchases'
+          ? 'sales'
+          : 'both',
+    });
+  }
+
+  if (forWhat[0] === 'not in' && forWhat[1] === 'sales') {
+    defaults = Object.assign({ for: 'purchases' });
+  }
+
+  router[method]({
+    query: {
+      edit: 1,
+      doctype: schemaName,
+      name,
+      showFields: showFields ?? getShowFields(schemaName),
+      hideFields,
+      valueJSON: stringifyCircular(defaults),
+      // @ts-ignore
+      lastRoute: currentRoute,
+    },
+  });
+}
+
+function getShowFields(schemaName: string) {
+  if (schemaName === 'Party') {
+    return ['customer'];
+  }
+  return [];
+}
+
+export async function showMessageDialog({
+  message,
+  detail,
+  buttons = [],
+}: MessageDialogOptions) {
+  const options = {
+    message,
+    detail,
+    buttons: buttons.map((a) => a.label),
+  };
+
+  const { response } = (await ipcRenderer.invoke(
+    IPC_ACTIONS.GET_DIALOG_RESPONSE,
+    options
+  )) as { response: number };
+
+  const button = buttons[response];
+  if (button && button.action) {
+    button.action();
+  }
+}
+
+export async function showToast(options: ToastOptions) {
+  const Toast = (await import('src/components/Toast.vue')).default;
+  const toast = createApp({
+    render() {
+      return h(Toast, { ...options });
+    },
+  });
+  replaceAndAppendMount(toast, 'toast-target');
+}
+
+function replaceAndAppendMount(app: App<Element>, replaceId: string) {
+  const fragment = document.createDocumentFragment();
+  const target = document.getElementById(replaceId);
+  if (target === null) {
+    return;
+  }
+
+  const parent = target.parentElement;
+  const clone = target.cloneNode();
+
+  // @ts-ignore
+  app.mount(fragment);
+  target.replaceWith(fragment);
+  parent!.append(clone);
+}
+
+export function openSettings(tab: SettingsTab) {
+  routeTo({ path: '/settings', query: { tab } });
+}
+
+export function routeTo(route: string | RouteLocationRaw) {
+  let routeOptions = route;
+  if (
+    typeof route === 'string' &&
+    route === router.currentRoute.value.fullPath
+  ) {
+    return;
+  }
+
+  if (typeof route === 'string') {
+    routeOptions = { path: route };
+  }
+
+  router.push(routeOptions);
+}
+
+export function deleteDocWithPrompt(doc: Doc) {
+  return new Promise((resolve) => {
+    showMessageDialog({
+      message: t`Are you sure you want to delete ${
+        doc.schemaName
+      } ${doc.name!}?`,
+      detail: t`This action is permanent`,
+      buttons: [
+        {
+          label: t`Delete`,
+          action: () => {
+            doc
+              .delete()
+              .then(() => resolve(true))
+              .catch((e: Error) => {
+                handleErrorWithDialog(e, doc);
+              });
+          },
+        },
+        {
+          label: t`Cancel`,
+          action() {
+            resolve(false);
+          },
+        },
+      ],
+    });
+  });
+}
+
+export async function cancelDocWithPrompt(doc: Doc) {
+  let detail = t`This action is permanent`;
+  if (['SalesInvoice', 'PurchaseInvoice'].includes(doc.schemaName)) {
+    const payments = (
+      await fyo.db.getAll('Payment', {
+        fields: ['name'],
+        filters: { cancelled: false },
+      })
+    ).map(({ name }) => name);
+
+    const query = (
+      await fyo.db.getAll('PaymentFor', {
+        fields: ['parent'],
+        filters: {
+          referenceName: doc.name!,
+        },
+      })
+    ).filter(({ parent }) => payments.includes(parent));
+
+    const paymentList = [...new Set(query.map(({ parent }) => parent))];
+
+    if (paymentList.length === 1) {
+      detail = t`This action is permanent and will cancel the following payment: ${
+        paymentList[0] as string
+      }`;
+    } else if (paymentList.length > 1) {
+      detail = t`This action is permanent and will cancel the following payments: ${paymentList.join(
+        ', '
+      )}`;
+    }
+  }
+
+  return new Promise((resolve) => {
+    showMessageDialog({
+      message: t`Are you sure you want to cancel ${
+        doc.schemaName
+      } ${doc.name!}?`,
+      detail,
+      buttons: [
+        {
+          label: t`Yes`,
+          async action() {
+            const entryDoc = await fyo.doc.getDoc(doc.schemaName, doc.name!);
+            entryDoc.cancelled = 1;
+            await entryDoc.update();
+            entryDoc
+              .revert()
+              .then(() => resolve(true))
+              .catch((e) => {
+                handleErrorWithDialog(e, doc);
+              });
+          },
+        },
+        {
+          label: t`No`,
+          action() {
+            resolve(false);
+          },
+        },
+      ],
+    });
+  });
+}
+
+export function getActionsForDocument(doc?: Doc): Action[] {
+  if (!doc) return [];
+
+  const actions: Action[] = [
+    ...getActions(doc, fyo),
+    getDuplicateAction(doc),
+    getDeleteAction(doc),
+    getCancelAction(doc),
+  ];
+
+  return actions
+    .filter((d) => d.condition?.(doc) ?? true)
+    .map((d) => {
+      return {
+        label: d.label,
+        component: d.component,
+        action: d.action,
+      };
+    });
+}
+
+function getCancelAction(doc: Doc): Action {
+  return {
+    label: t`Cancel`,
+    component: {
+      template: '<span class="text-red-700">{{ t`Cancel` }}</span>',
+    },
+    condition: (doc: Doc) => !!(doc.submitted && !doc.cancelled),
+    action: () => {
+      cancelDocWithPrompt(doc).then((res) => {
+        if (res) {
+          router.push(`/list/${doc.schemaName}`);
+        }
+      });
+    },
+  };
+}
+
+function getDeleteAction(doc: Doc): Action {
+  return {
+    label: t`Delete`,
+    component: {
+      template: '<span class="text-red-700">{{ t`Delete` }}</span>',
+    },
+    condition: (doc: Doc) =>
+      !doc.isNew && !doc.submitted && !doc.schema.isSingle && !doc.cancelled,
+    action: () =>
+      deleteDocWithPrompt(doc).then((res) => {
+        if (res) {
+          routeTo(`/list/${doc.schemaName}`);
+        }
+      }),
+  };
+}
+function getDuplicateAction(doc: Doc): Action {
+  const isSubmittable = !!doc.schema.isSubmittable;
+  return {
+    label: t`Duplicate`,
+    condition: (doc: Doc) =>
+      !!(
+        ((isSubmittable && doc && doc.submitted) || !isSubmittable) &&
+        !doc._notInserted &&
+        !(doc.cancelled || false)
+      ),
+    action: () => {
+      showMessageDialog({
+        message: t`Duplicate ${doc.schemaName} ${doc.name!}?`,
+        buttons: [
+          {
+            label: t`Yes`,
+            async action() {
+              doc.duplicate();
+            },
+          },
+          {
+            label: t`No`,
+            action() {
+              // no-op
+            },
+          },
+        ],
+      });
+    },
+  };
+}
diff --git a/tsconfig.json b/tsconfig.json
index fb437971..e3d5790b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,10 +15,11 @@
     "baseUrl": ".",
     "types": ["webpack-env"],
     "paths": {
-      "@/*": ["src/*"],
+      "src/*": ["src/*"],
       "schemas/*": ["schemas/*"],
       "backend/*": ["backend/*"],
       "regional/*": ["regional/*"],
+      "fixtures/*": ["fixtures/*"],
       "utils/*": ["utils/*"]
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
@@ -43,7 +44,8 @@
     "accounting/**/*.ts",
 
     "scripts/**/*.ts",
-    "utils/csvParser.ts"
-, "utils/config.ts"  ],
+    "utils/csvParser.ts",
+    "utils/config.ts"
+  ],
   "exclude": ["node_modules"]
 }
diff --git a/utils/index.ts b/utils/index.ts
index 5f46ca0a..b70cced9 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -68,3 +68,14 @@ export function titleCase(phrase: string): string {
     })
     .join(' ');
 }
+
+export function invertMap(map: Record<string, string>): Record<string, string> {
+  const keys = Object.keys(map);
+  const inverted: Record<string, string> = {};
+  for (const key of keys) {
+    const val = map[key];
+    inverted[val] = key;
+  }
+
+  return inverted;
+}
diff --git a/vue.config.js b/vue.config.js
index a79f183a..e4bcd831 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,11 +40,12 @@ module.exports = {
   configureWebpack(config) {
     Object.assign(config.resolve.alias, {
       fyo: path.resolve(__dirname, './fyo'),
-      '~': path.resolve('.'),
+      src: path.resolve(__dirname, './src'),
       schemas: path.resolve(__dirname, './schemas'),
       backend: path.resolve(__dirname, './backend'),
       utils: path.resolve(__dirname, './utils'),
       regional: path.resolve(__dirname, './regional'),
+      fixtures: path.resolve(__dirname, './fixtures'),
     });
 
     config.plugins.push(

From 835deb4ce8647c3ae7a029f509d7347472c7a643 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 20 Apr 2022 16:11:27 +0530
Subject: [PATCH 059/163] incr: type renderer - move setup logic outside
 components, type it

---
 accounting/importCOA.js                       |  78 -------
 fixtures/standardCOA.js                       | 172 --------------
 fixtures/verified/ae.json                     |   2 +-
 fixtures/verified/ca.json                     |   8 +-
 fixtures/verified/gt.json                     |  70 +++---
 fixtures/verified/hu.json                     |  46 ++--
 fixtures/verified/id.json                     |   8 +-
 fixtures/verified/in.json                     |  12 +-
 fixtures/verified/mx.json                     |   2 +-
 fixtures/verified/ni.json                     |  62 ++---
 fixtures/verified/nl.json                     |   4 +-
 fixtures/verified/standardCOA.json            |  16 +-
 fyo/core/dbHandler.ts                         |   3 +
 fyo/core/types.ts                             |   2 +-
 fyo/model/doc.ts                              |   8 +
 fyo/telemetry/helpers.ts                      |   2 +-
 models/baseModels/Account/types.ts            |  16 ++
 reports/commonExporter.js                     | 109 ---------
 src/initFyo.ts                                |  12 +
 src/pages/ChartOfAccounts.vue                 |   6 -
 src/pages/Dashboard/Cashflow.vue              |   3 +-
 src/pages/Dashboard/ProfitAndLoss.vue         |   3 +-
 src/pages/ListView/listConfig.js              |  25 --
 src/pages/SetupWizard/setupCompany.js         | 192 ----------------
 src/{print.js => print.ts}                    |   0
 src/regional/in.ts                            |  50 ----
 src/regional/in/in.ts                         |  52 +++++
 src/regional/index.ts                         |   9 +
 src/{main.js => renderer.ts}                  |  77 ++++---
 src/renderer/helpers.ts                       |  35 +++
 src/router.ts                                 |  19 +-
 src/setup/createCOA.ts                        |  98 ++++++++
 src/setup/setupInstance.ts                    | 217 ++++++++++++++++++
 src/setup/standardCOA.ts                      | 175 ++++++++++++++
 src/setup/types.ts                            |  25 ++
 src/{sidebarConfig.js => sidebarConfig.ts}    |   9 +-
 src/ui.js                                     |  30 ---
 .../Charts/chartUtils.ts => utils/chart.ts}   |   9 +
 src/utils/index.ts                            |  18 --
 .../misc.ts}                                  |  10 +-
 src/utils/types.ts                            |   2 +-
 vue.config.js                                 |   4 +-
 42 files changed, 844 insertions(+), 856 deletions(-)
 delete mode 100644 accounting/importCOA.js
 delete mode 100644 fixtures/standardCOA.js
 delete mode 100644 reports/commonExporter.js
 delete mode 100644 src/pages/ListView/listConfig.js
 delete mode 100644 src/pages/SetupWizard/setupCompany.js
 rename src/{print.js => print.ts} (100%)
 delete mode 100644 src/regional/in.ts
 create mode 100644 src/regional/in/in.ts
 create mode 100644 src/regional/index.ts
 rename src/{main.js => renderer.ts} (68%)
 create mode 100644 src/setup/createCOA.ts
 create mode 100644 src/setup/setupInstance.ts
 create mode 100644 src/setup/standardCOA.ts
 create mode 100644 src/setup/types.ts
 rename src/{sidebarConfig.js => sidebarConfig.ts} (91%)
 delete mode 100644 src/ui.js
 rename src/{components/Charts/chartUtils.ts => utils/chart.ts} (88%)
 rename src/{pages/Dashboard/getDatesAndPeriodicity.js => utils/misc.ts} (70%)

diff --git a/accounting/importCOA.js b/accounting/importCOA.js
deleted file mode 100644
index c4315e42..00000000
--- a/accounting/importCOA.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import frappe from 'fyo';
-import standardCOA from '../fixtures/verified/standardCOA.json';
-import { getCOAList } from '../src/utils';
-const accountFields = ['accountType', 'accountNumber', 'rootType', 'isGroup'];
-
-function getAccountName(accountName, accountNumber) {
-  if (accountNumber) {
-    return `${accountName} - ${accountNumber}`;
-  }
-  return accountName;
-}
-
-async function importAccounts(children, parentAccount, rootType, rootAccount) {
-  for (let rootName in children) {
-    if (accountFields.includes(rootName)) {
-      continue;
-    }
-
-    const child = children[rootName];
-
-    if (rootAccount) {
-      rootType = child.rootType;
-    }
-
-    const { accountType, accountNumber } = child;
-    const accountName = getAccountName(rootName, accountNumber);
-    const isGroup = identifyIsGroup(child);
-    const doc = frappe.doc.getNewDoc('Account', {
-      name: accountName,
-      parentAccount,
-      isGroup,
-      rootType,
-      balance: 0,
-      accountType,
-    });
-
-    await doc.insert();
-    await importAccounts(child, accountName, rootType);
-  }
-}
-
-function identifyIsGroup(child) {
-  if (child.isGroup) {
-    return child.isGroup;
-  }
-
-  const keys = Object.keys(child);
-  const children = keys.filter((key) => !accountFields.includes(key));
-
-  if (children.length) {
-    return 1;
-  }
-
-  return 0;
-}
-
-export async function getCountryCOA(chartOfAccounts) {
-  const coaList = getCOAList();
-  const coa = coaList.find(({ name }) => name === chartOfAccounts);
-  const conCode = coa.countryCode;
-  if (!conCode) {
-    return standardCOA;
-  }
-
-  try {
-    const countryCoa = (
-      await import('../fixtures/verified/' + conCode + '.json')
-    ).default;
-    return countryCoa.tree;
-  } catch (e) {
-    return standardCOA;
-  }
-}
-
-export default async function importCharts(chartOfAccounts) {
-  const chart = await getCountryCOA(chartOfAccounts);
-  await importAccounts(chart, '', '', true);
-}
diff --git a/fixtures/standardCOA.js b/fixtures/standardCOA.js
deleted file mode 100644
index 2a1c481b..00000000
--- a/fixtures/standardCOA.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import { t } from 'fyo';
-
-export default {
-  [t`Application of Funds (Assets)`]: {
-    [t`Current Assets`]: {
-      [t`Accounts Receivable`]: {
-        [t`Debtors`]: {
-          accountType: 'Receivable',
-        },
-      },
-      [t`Bank Accounts`]: {
-        accountType: 'Bank',
-        isGroup: 1,
-      },
-      [t`Cash In Hand`]: {
-        [t`Cash`]: {
-          accountType: 'Cash',
-        },
-        accountType: 'Cash',
-      },
-      [t`Loans and Advances (Assets)`]: {
-        isGroup: 1,
-      },
-      [t`Securities and Deposits`]: {
-        [t`Earnest Money`]: {},
-      },
-      [t`Stock Assets`]: {
-        [t`Stock In Hand`]: {
-          accountType: 'Stock',
-        },
-        accountType: 'Stock',
-      },
-      [t`Tax Assets`]: {
-        isGroup: 1,
-      },
-    },
-    [t`Fixed Assets`]: {
-      [t`Capital Equipments`]: {
-        accountType: 'Fixed Asset',
-      },
-      [t`Electronic Equipments`]: {
-        accountType: 'Fixed Asset',
-      },
-      [t`Furnitures and Fixtures`]: {
-        accountType: 'Fixed Asset',
-      },
-      [t`Office Equipments`]: {
-        accountType: 'Fixed Asset',
-      },
-      [t`Plants and Machineries`]: {
-        accountType: 'Fixed Asset',
-      },
-      [t`Buildings`]: {
-        accountType: 'Fixed Asset',
-      },
-      [t`Softwares`]: {
-        accountType: 'Fixed Asset',
-      },
-      [t`Accumulated Depreciation`]: {
-        accountType: 'Accumulated Depreciation',
-      },
-    },
-    [t`Investments`]: {
-      isGroup: 1,
-    },
-    [t`Temporary Accounts`]: {
-      [t`Temporary Opening`]: {
-        accountType: 'Temporary',
-      },
-    },
-    rootType: 'Asset',
-  },
-  [t`Expenses`]: {
-    [t`Direct Expenses`]: {
-      [t`Stock Expenses`]: {
-        [t`Cost of Goods Sold`]: {
-          accountType: 'Cost of Goods Sold',
-        },
-        [t`Expenses Included In Valuation`]: {
-          accountType: 'Expenses Included In Valuation',
-        },
-        [t`Stock Adjustment`]: {
-          accountType: 'Stock Adjustment',
-        },
-      },
-    },
-    [t`Indirect Expenses`]: {
-      [t`Administrative Expenses`]: {},
-      [t`Commission on Sales`]: {},
-      [t`Depreciation`]: {
-        accountType: 'Depreciation',
-      },
-      [t`Entertainment Expenses`]: {},
-      [t`Freight and Forwarding Charges`]: {
-        accountType: 'Chargeable',
-      },
-      [t`Legal Expenses`]: {},
-      [t`Marketing Expenses`]: {
-        accountType: 'Chargeable',
-      },
-      [t`Miscellaneous Expenses`]: {
-        accountType: 'Chargeable',
-      },
-      [t`Office Maintenance Expenses`]: {},
-      [t`Office Rent`]: {},
-      [t`Postal Expenses`]: {},
-      [t`Print and Stationery`]: {},
-      [t`Round Off`]: {
-        accountType: 'Round Off',
-      },
-      [t`Salary`]: {},
-      [t`Sales Expenses`]: {},
-      [t`Telephone Expenses`]: {},
-      [t`Travel Expenses`]: {},
-      [t`Utility Expenses`]: {},
-      [t`Write Off`]: {},
-      [t`Exchange Gain/Loss`]: {},
-      [t`Gain/Loss on Asset Disposal`]: {},
-    },
-    rootType: 'Expense',
-  },
-  [t`Income`]: {
-    [t`Direct Income`]: {
-      [t`Sales`]: {},
-      [t`Service`]: {},
-    },
-    [t`Indirect Income`]: {
-      isGroup: 1,
-    },
-    rootType: 'Income',
-  },
-  [t`Source of Funds (Liabilities)`]: {
-    [t`Current Liabilities`]: {
-      [t`Accounts Payable`]: {
-        [t`Creditors`]: {
-          accountType: 'Payable',
-        },
-        [t`Payroll Payable`]: {},
-      },
-      [t`Stock Liabilities`]: {
-        [t`Stock Received But Not Billed`]: {
-          accountType: 'Stock Received But Not Billed',
-        },
-      },
-      [t`Duties and Taxes`]: {
-        accountType: 'Tax',
-        isGroup: 1,
-      },
-      [t`Loans (Liabilities)`]: {
-        [t`Secured Loans`]: {},
-        [t`Unsecured Loans`]: {},
-        [t`Bank Overdraft Account`]: {},
-      },
-    },
-    rootType: 'Liability',
-  },
-  [t`Equity`]: {
-    [t`Capital Stock`]: {
-      accountType: 'Equity',
-    },
-    [t`Dividends Paid`]: {
-      accountType: 'Equity',
-    },
-    [t`Opening Balance Equity`]: {
-      accountType: 'Equity',
-    },
-    [t`Retained Earnings`]: {
-      accountType: 'Equity',
-    },
-    rootType: 'Equity',
-  },
-};
diff --git a/fixtures/verified/ae.json b/fixtures/verified/ae.json
index 9141556c..1935a3de 100644
--- a/fixtures/verified/ae.json
+++ b/fixtures/verified/ae.json
@@ -386,7 +386,7 @@
         },
         "Duties and Taxes": {
           "accountType": "Tax",
-          "isGroup": 1
+          "isGroup": true
         },
         "Reservations & Credit Notes": {
           "Credit Notes": {
diff --git a/fixtures/verified/ca.json b/fixtures/verified/ca.json
index bf36c047..b270293d 100644
--- a/fixtures/verified/ca.json
+++ b/fixtures/verified/ca.json
@@ -11,7 +11,7 @@
         },
         "Banque": {
           "accountType": "Bank",
-          "isGroup": 1
+          "isGroup": true
         },
         "Comptes \u00e0 recevoir": {
           "Comptes clients": {
@@ -20,7 +20,7 @@
           "Provision pour cr\u00e9ances douteuses": {}
         },
         "Encaisse": {
-          "isGroup": 1
+          "isGroup": true
         },
         "Frais pay\u00e9s d\u2019avance": {
           "Assurances pay\u00e9s d'avance": {},
@@ -29,7 +29,7 @@
         },
         "Petite caisse": {
           "accountType": "Cash",
-          "isGroup": 1
+          "isGroup": true
         },
         "Stocks": {
           "Mati\u00e8res premi\u00e8res": {},
@@ -175,7 +175,7 @@
           "Loyer - b\u00e2timent": {},
           "Loyer - entrep\u00f4t": {},
           "Op\u00e9rations indirectes de la main-d\u2019\u0153uvre directe": {
-            "isGroup": 1
+            "isGroup": true
           },
           "R\u00e9parations et entretien - b\u00e2timent": {},
           "R\u00e9parations et entretien - machinerie et \u00e9quipement": {},
diff --git a/fixtures/verified/gt.json b/fixtures/verified/gt.json
index 69a6a788..a07b65fd 100644
--- a/fixtures/verified/gt.json
+++ b/fixtures/verified/gt.json
@@ -9,12 +9,12 @@
             "Animales": {
               "accountNumber": "1.5.2.1",
               "accountType": "Stock",
-              "isGroup": 1
+              "isGroup": true
             },
             "Plantas": {
               "accountNumber": "1.5.2.2",
               "accountType": "Stock",
-              "isGroup": 1
+              "isGroup": true
             },
             "accountNumber": "1.5.2",
             "accountType": "Stock"
@@ -22,7 +22,7 @@
           "Activos Biol\u00f3gicos al Costo": {
             "accountNumber": "1.5.1",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1.5",
           "accountType": "Stock"
@@ -32,7 +32,7 @@
             "Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
               "accountNumber": "1.1.2.1",
               "accountType": "Chargeable",
-              "isGroup": 1
+              "isGroup": true
             },
             "accountNumber": "1.1.2",
             "accountType": "Chargeable"
@@ -47,22 +47,22 @@
           "Activos Adicionales y Otros": {
             "accountNumber": "1.6.6",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Cobrables Relacionados con Impuestos": {
             "accountNumber": "1.6.2",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Contratos de Construccion": {
             "accountNumber": "1.6.4",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Costos de Montaje": {
             "accountNumber": "1.6.5",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Pagos Anticipados y Otros Activos Circulantes": {
             "Seguro Pagado Anticipadamente": {
@@ -75,7 +75,7 @@
           "Proveedores de Servicio": {
             "accountNumber": "1.6.3",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1.6",
           "accountType": "Chargeable"
@@ -84,32 +84,32 @@
           "Activos Financieros Clasificados por Designaci\u00f3n": {
             "accountNumber": "1.4.6",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Activos Financieros Derivados": {
             "accountNumber": "1.4.3",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
             "accountNumber": "1.4.1",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
             "accountNumber": "1.4.2",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Otros Activos Financieros": {
             "accountNumber": "1.4.4",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
             "accountNumber": "1.4.5",
             "accountType": "Round Off",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1.4",
           "accountType": "Chargeable"
@@ -117,13 +117,13 @@
         "Activos Intangibles": {
           "accountNumber": "1.3",
           "accountType": "Chargeable",
-          "isGroup": 1
+          "isGroup": true
         },
         "Caja y Equivalentes": {
           "Caja": {
             "accountNumber": "1.9.1",
             "accountType": "Cash",
-            "isGroup": 1
+            "isGroup": true
           },
           "Equivalentes de Efectivo (Bancos)": {
             "Bancos Internacionales": {
@@ -146,7 +146,7 @@
               "Banco Industrial": {
                 "accountNumber": "1.9.2.1.1",
                 "accountType": "Bank",
-                "isGroup": 1
+                "isGroup": true
               },
               "Banco Internacional": {
                 "accountNumber": "1.9.2.1.6",
@@ -189,12 +189,12 @@
           "Inversiones a Corto Plazo": {
             "accountNumber": "1.9.3",
             "accountType": "Bank",
-            "isGroup": 1
+            "isGroup": true
           },
           "Otros Equivalentes de Caja y Bancos": {
             "accountNumber": "1.9.4",
             "accountType": "Cash",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1.9",
           "accountType": "Bank"
@@ -203,12 +203,12 @@
           "Activos bajo Contrato": {
             "accountNumber": "1.8.2",
             "accountType": "Receivable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Ajustes": {
             "accountNumber": "1.8.4",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "Otras Cuentas por Cobrar": {
             "Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
@@ -241,7 +241,7 @@
           "Ventas al Cr\u00e9dito": {
             "accountNumber": "1.8.1",
             "accountType": "Receivable",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1.8",
           "accountType": "Receivable"
@@ -253,38 +253,38 @@
           "Art\u00edculos de Inventario Adicionales": {
             "accountNumber": "1.7.8",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Combustibles": {
             "accountNumber": "1.7.5",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Inventarios Pignorados Como Garant\u00eda de Pasivo": {
             "accountNumber": "1.7.10",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Inventarios a Valor Razonable Menos Costos de Venta": {
             "accountNumber": "1.7.11",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Materia Prima": {
             "accountNumber": "1.7.1",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Mercader\u00eda (Mercanc\u00edas)": {
             "accountNumber": "1.7.2",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Otros Inventarios": {
             "Merma o Ajuste de Inventario": {
               "accountNumber": "1.7.9.1",
               "accountType": "Stock Adjustment",
-              "isGroup": 1
+              "isGroup": true
             },
             "accountNumber": "1.7.9",
             "accountType": "Stock"
@@ -292,13 +292,13 @@
           "Producto Terminado": {
             "accountNumber": "1.7.7",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Repuestos": {
             "Respuestos en Transito": {
               "accountNumber": "1.7.4.0",
               "accountType": "Stock",
-              "isGroup": 1
+              "isGroup": true
             },
             "accountNumber": "1.7.4",
             "accountType": "Stock"
@@ -306,12 +306,12 @@
           "Suministros de Producci\u00f3n y Consumibles": {
             "accountNumber": "1.7.3",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Trabajo en Progeso": {
             "accountNumber": "1.7.6",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1.7",
           "accountType": "Stock"
@@ -324,7 +324,7 @@
           "Inversion Inmobiliaria Construida": {
             "accountNumber": "1.2.2",
             "accountType": "Chargeable",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1.2",
           "accountType": "Chargeable"
diff --git a/fixtures/verified/hu.json b/fixtures/verified/hu.json
index 5434e520..3166eda6 100644
--- a/fixtures/verified/hu.json
+++ b/fixtures/verified/hu.json
@@ -29,16 +29,16 @@
           },
           "123. \u00c9p\u00fcletek, \u00e9p\u00fcletr\u00e9szek, tulajdoni h\u00e1nyadok ": {
             "accountType": "Fixed Asset",
-            "isGroup": 1
+            "isGroup": true
           },
           "124. Egy\u00e9b ingatlanok": {
-            "isGroup": 1
+            "isGroup": true
           },
           "125. \u00dczemk\u00f6r\u00f6n k\u00edv\u00fcli ingatlanok, \u00e9p\u00fcletek ": {
-            "isGroup": 1
+            "isGroup": true
           },
           "126. Ingatlanokhoz kapcsol\u00f3d\u00f3 vagyoni \u00e9rt\u00e9k\u0171 jogok": {
-            "isGroup": 1
+            "isGroup": true
           },
           "127. Ingatlanok \u00e9rt\u00e9khelyesb\u00edt\u00e9se": {},
           "129. Kis \u00e9rt\u00e9k\u0171 ingatlanok": {}
@@ -148,7 +148,7 @@
         "239. Befejezetlen termel\u00e9s \u00e9s f\u00e9lk\u00e9sz term\u00e9kek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
       },
       "24. N\u00d6VEND\u00c9K-, H\u00cdZ\u00d3- \u00c9S EGY\u00c9B \u00c1LLATOK": {
-        "isGroup": 1
+        "isGroup": true
       },
       "25. K\u00c9SZTERM\u00c9KEK": {
         "251-257. K\u00e9szterm\u00e9kek": {},
@@ -158,23 +158,23 @@
       "26-28. \u00c1RUK ": {
         "261. Kereskedelmi \u00e1ruk": {
           "accountType": "Stock",
-          "isGroup": 0
+          "isGroup": false
         },
         "262. Idegen helyen t\u00e1rolt, bizom\u00e1nyba \u00e1tadott \u00e1ruk": {
           "accountType": "Stock",
-          "isGroup": 0
+          "isGroup": false
         },
         "263. T\u00e1rgyi eszk\u00f6z\u00f6k k\u00f6z\u00fcl \u00e1tsorolt \u00e1ruk": {
           "accountType": "Stock",
-          "isGroup": 0
+          "isGroup": false
         },
         "264. Bels\u0151 (egys\u00e9gek, tev\u00e9kenys\u00e9gek k\u00f6z\u00f6tti) \u00e1tad\u00e1s-\u00e1tv\u00e9tel \u00fctk\u00f6z\u0151sz\u00e1mla": {
           "accountType": "Stock",
-          "isGroup": 0
+          "isGroup": false
         },
         "269. Kereskedelmi \u00e1ruk \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {
           "accountType": "Stock",
-          "isGroup": 0
+          "isGroup": false
         },
         "accountType": "Stock"
       },
@@ -183,7 +183,7 @@
         "279. K\u00f6zvet\u00edtett szolg\u00e1ltat\u00e1sok \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
       },
       "28. BET\u00c9TD\u00cdJAS G\u00d6NGY\u00d6LEGEK": {
-        "isGroup": 1
+        "isGroup": true
       },
       "rootType": "Asset"
     },
@@ -205,13 +205,13 @@
         "319. K\u00fclf\u00f6ldi k\u00f6vetel\u00e9sek \u00e9rt\u00e9kveszt\u00e9se \u00e9s annak vissza\u00edr\u00e1sa": {}
       },
       "32. K\u00d6VETEL\u00c9SEK KAPCSOLT V\u00c1LLALKOZ\u00c1SSAL SZEMBEN": {
-        "isGroup": 1
+        "isGroup": true
       },
       "33. K\u00d6VETEL\u00c9SEK EGY\u00c9B R\u00c9SZESED\u00c9SI VISZONYBAN L\u00c9V\u00d5 V\u00c1LLALKOZ\u00c1SSAL SZEMBEN ": {
-        "isGroup": 1
+        "isGroup": true
       },
       "34. V\u00c1LT\u00d3K\u00d6VETEL\u00c9SEK": {
-        "isGroup": 1
+        "isGroup": true
       },
       "35. ADOTT EL\u00d5LEGEK": {
         "351. Immateri\u00e1lis javakra adott el\u0151legek": {},
@@ -227,17 +227,17 @@
           "3613. Egy\u00e9b elsz\u00e1mol\u00e1sok a munkav\u00e1llal\u00f3kkal": {}
         },
         "362. K\u00f6lts\u00e9gvet\u00e9ssel szembeni k\u00f6vetel\u00e9sek": {
-          "isGroup": 1
+          "isGroup": true
         },
         "363. R\u00f6vid lej\u00e1ratra k\u00f6lcs\u00f6nadott p\u00e9nzeszk\u00f6z\u00f6k": {
-          "isGroup": 1
+          "isGroup": true
         },
         "364. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6vetel\u00e9sek": {
           "3641. R\u00f6vid lej\u00e1rat\u00fa k\u00f6lcs\u00f6n\u00f6k": {},
           "3642. Tart\u00f3san adott k\u00f6lcs\u00f6n\u00f6kb\u0151l \u00e1tsorolt k\u00f6vetel\u00e9sek": {}
         },
         "365. V\u00e1s\u00e1rolt \u00e9s kapott k\u00f6vetel\u00e9sek ": {
-          "isGroup": 1
+          "isGroup": true
         },
         "366. R\u00e9szesed\u00e9sekkel, \u00e9rt\u00e9kpap\u00edrokkal kapcsolatos k\u00f6vetel\u00e9sek": {},
         "367. Hat\u00e1rid\u0151s, opci\u00f3s \u00e9s swap \u00fcgyletekkel kapcsolatos k\u00f6vetel\u00e9sek": {},
@@ -285,7 +285,7 @@
         "383. Csekkek": {},
         "384. Elsz\u00e1mol\u00e1si bet\u00e9tsz\u00e1mla ": {
           "accountType": "Bank",
-          "isGroup": 1
+          "isGroup": true
         },
         "385. Elk\u00fcl\u00f6n\u00edtett bet\u00e9tsz\u00e1ml\u00e1k ": {
           "3851. Kamatoz\u00f3 bet\u00e9tsz\u00e1ml\u00e1k": {},
@@ -373,7 +373,7 @@
             "4452. Egy\u00e9b hossz\u00fa lej\u00e1rat\u00fa hitelek deviz\u00e1ban": {}
           },
           "446. Tart\u00f3s k\u00f6telezetts\u00e9gek kapcsolt v\u00e1llalkoz\u00e1ssal szemben ": {
-            "isGroup": 1
+            "isGroup": true
           },
           "447. Tart\u00f3s k\u00f6telezetts\u00e9gek egy\u00e9b r\u00e9szesed\u00e9si viszonyban l\u00e9v\u0151 v\u00e1llalkoz\u00e1ssal szemben": {},
           "448. P\u00e9nz\u00fcgyi l\u00edzing miatti k\u00f6telezetts\u00e9gek ": {},
@@ -449,7 +449,7 @@
               "463-9. C\u00e9gaut\u00f3ad\u00f3 ": {}
             },
             "464. G\u00e9pj\u00e1rm\u0171 ad\u00f3 (c\u00e9gaut\u00f3ad\u00f3) elsz\u00e1mol\u00e1sa": {
-              "isGroup": 1
+              "isGroup": true
             },
             "465. V\u00e1m- \u00e9s p\u00e9nz\u00fcgy\u0151rs\u00e9g elsz\u00e1mol\u00e1si sz\u00e1mla ": {
               "4651. V\u00e1mk\u00f6lts\u00e9gek \u00e9s egy\u00e9b v\u00e1mterhek elsz\u00e1mol\u00e1si sz\u00e1mla": {},
@@ -619,7 +619,7 @@
         "589. Aktiv\u00e1lt saj\u00e1t teljes\u00edtm\u00e9nyek \u00e1tvezet\u00e9si sz\u00e1mla": {}
       },
       "59. K\u00d6LTS\u00c9GNEM \u00c1TVEZET\u00c9SI SZ\u00c1MLA": {
-        "isGroup": 1
+        "isGroup": true
       },
       "rootType": "Expense"
     },
@@ -647,7 +647,7 @@
       "rootType": "Expense"
     },
     "7. SZ\u00c1MLAOSZT\u00c1LY TEV\u00c9KENYS\u00c9GEKK\u00d6LTS\u00c9GEI": {
-      "isGroup": 1,
+      "isGroup": true,
       "rootType": "Expense"
     },
     "8. SZ\u00c1MLAOSZT\u00c1LY \u00c9RT\u00c9KES\u00cdT\u00c9S ELSZ\u00c1MOLT \u00d6NK\u00d6LTS\u00c9GE \u00c9S R\u00c1FORD\u00cdT\u00c1SOK": {
@@ -812,7 +812,7 @@
           "9684. R\u00e9szesed\u00e9sek \u00e9rt\u00e9kveszt\u00e9s\u00e9nek vissza\u00edr\u00e1sa": {}
         },
         "969. K\u00fcl\u00f6nf\u00e9le egy\u00e9b bev\u00e9telek": {
-          "isGroup": 1
+          "isGroup": true
         }
       },
       "97. P\u00c9NZ\u00dcGYI M\u0170VELETEK BEV\u00c9TELEI": {
diff --git a/fixtures/verified/id.json b/fixtures/verified/id.json
index 4ad611a9..543bc6d9 100644
--- a/fixtures/verified/id.json
+++ b/fixtures/verified/id.json
@@ -14,11 +14,11 @@
         "Bank ": {
           "Bank Other Currency": {
             "accountNumber": "1122.000",
-            "isGroup": 1
+            "isGroup": true
           },
           "Bank Rupiah": {
             "accountNumber": "1121.000",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountNumber": "1120.000",
           "accountType": "Bank"
@@ -70,7 +70,7 @@
           "Persediaan Barang": {
             "accountNumber": "1141.000",
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "Uang Muka Pembelian": {
             "Uang Muka Pembelian": {
@@ -122,7 +122,7 @@
           "Investasi": {
             "Deposito": {
               "accountNumber": "1231.003",
-              "isGroup": 1
+              "isGroup": true
             },
             "Investai Saham": {
               "Investasi Saham": {
diff --git a/fixtures/verified/in.json b/fixtures/verified/in.json
index 203684d2..f2afda4d 100644
--- a/fixtures/verified/in.json
+++ b/fixtures/verified/in.json
@@ -6,13 +6,13 @@
       "Current Assets": {
         "Accounts Receivable": {
           "Debtors": {
-            "isGroup": 0,
+            "isGroup": false,
             "accountType": "Receivable"
           }
         },
         "Bank Accounts": {
           "accountType": "Bank",
-          "isGroup": 1
+          "isGroup": true
         },
         "Cash In Hand": {
           "Cash": {
@@ -21,7 +21,7 @@
           "accountType": "Cash"
         },
         "Loans and Advances (Assets)": {
-          "isGroup": 1
+          "isGroup": true
         },
         "Securities and Deposits": {
           "Earnest Money": {}
@@ -33,7 +33,7 @@
           "accountType": "Stock"
         },
         "Tax Assets": {
-          "isGroup": 1
+          "isGroup": true
         }
       },
       "Fixed Assets": {
@@ -60,7 +60,7 @@
         }
       },
       "Investments": {
-        "isGroup": 1
+        "isGroup": true
       },
       "Temporary Accounts": {
         "Temporary Opening": {
@@ -126,7 +126,7 @@
       },
       "Indirect Income": {
         "accountType": "Income Account",
-        "isGroup": 1
+        "isGroup": true
       },
       "rootType": "Income"
     },
diff --git a/fixtures/verified/mx.json b/fixtures/verified/mx.json
index 7aa93777..9c0badbd 100644
--- a/fixtures/verified/mx.json
+++ b/fixtures/verified/mx.json
@@ -110,7 +110,7 @@
         },
         "INVENTARIOS": {
           "accountType": "Stock",
-          "isGroup": 1
+          "isGroup": true
         }
       },
       "ACTIVO LARGO PLAZO": {
diff --git a/fixtures/verified/ni.json b/fixtures/verified/ni.json
index 22333489..7bcf43b9 100644
--- a/fixtures/verified/ni.json
+++ b/fixtures/verified/ni.json
@@ -57,7 +57,7 @@
           },
           "Otros Equivalentes a Efectivo": {
             "accountType": "Cash",
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Impuestos Acreditables": {
@@ -91,41 +91,41 @@
           },
           "Todos los Almacenes": {
             "accountType": "Stock",
-            "isGroup": 1
+            "isGroup": true
           },
           "accountType": "Stock"
         },
         "Otras Cuentas por Cobrar": {
           "accountType": "Receivable",
-          "isGroup": 1
+          "isGroup": true
         }
       },
       "Activo no Corriente": {
         "Activo por Impuestos Diferidos": {
-          "isGroup": 1
+          "isGroup": true
         },
         "Activos Intangibles": {
           "Amortizacion de Activos Intangibles": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Concesiones": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Derechos de Autor": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Deterioro de Valor de Activos Intangibles": {},
           "Gastos de investigacion": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Licencias": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Marcas Registradas": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Patentes": {
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Amortizables": {
@@ -138,7 +138,7 @@
             "accountType": "Expenses Included In Valuation"
           },
           "Mejoras en Bienes Arrendados": {
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Bienes en Arrendamiento Financiero": {
@@ -147,28 +147,28 @@
         },
         "Cuentas por Cobrar a Largo Plazo": {
           "Creditos a Largo Plazo": {
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Inversiones Permanentes": {
           "Inversiones Permanentes 1": {
             "accountType": "Fixed Asset",
-            "isGroup": 1
+            "isGroup": true
           },
           "Negocios Conjuntos": {
             "accountType": "Fixed Asset",
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Inversiones a Largo Plazo": {
           "Depositos Bancarios a Plazo": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Intereses percibidos por adelantado": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Titulos y Acciones": {
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Propiedad Planta y Equipo": {
@@ -203,7 +203,7 @@
         }
       },
       "Donaciones": {
-        "isGroup": 1
+        "isGroup": true
       },
       "Ganancias Acumuladas": {
         "Reservas": {
@@ -319,7 +319,7 @@
     },
     "Pasivo": {
       "Obligaciones por Arrendamiento Financiero a Largo Plazo": {
-        "isGroup": 1
+        "isGroup": true
       },
       "Pasivo Corriente": {
         "Anticipos de Clientes": {},
@@ -345,11 +345,11 @@
         },
         "Gastos por Pagar": {
           "Prestaciones Sociales": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Salarios por Pagar": {},
           "Servicios Basicos 1": {
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Impuestos por Pagar": {
@@ -372,17 +372,17 @@
           }
         },
         "Otras Cuentas por Pagar": {
-          "isGroup": 1
+          "isGroup": true
         },
         "Pasivos Financieros a Corto Plazo": {
           "Otras Deudas Bancarias": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Prestamos por Pagar a Corto Plazo": {
-            "isGroup": 1
+            "isGroup": true
           },
           "Sobregiros Bancarios": {
-            "isGroup": 1
+            "isGroup": true
           }
         },
         "Provisiones por Pagar": {
@@ -473,20 +473,20 @@
       },
       "Pasivo No Corriente": {
         "Cuentas por Pagar a Largo Plaso": {
-          "isGroup": 1
+          "isGroup": true
         },
         "Otras Cuentas por Pagar a Largo Plazo": {
-          "isGroup": 1
+          "isGroup": true
         },
         "Otros Pasivos Financieros a Largo Plaso": {
-          "isGroup": 1
+          "isGroup": true
         },
         "Prestamos a Largo Plazo": {
-          "isGroup": 1
+          "isGroup": true
         }
       },
       "Pasivo por Impuestos Diferidos": {
-        "isGroup": 1
+        "isGroup": true
       },
       "rootType": "Liability"
     }
diff --git a/fixtures/verified/nl.json b/fixtures/verified/nl.json
index 7e5607d1..5c7584ce 100644
--- a/fixtures/verified/nl.json
+++ b/fixtures/verified/nl.json
@@ -3,7 +3,7 @@
   "name": "Netherlands - Grootboekschema",
   "tree": {
     "FABRIKAGEREKENINGEN": {
-      "isGroup": 1,
+      "isGroup": true,
       "rootType": "Expense"
     },
     "FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
@@ -106,7 +106,7 @@
       "rootType": "Asset"
     },
     "INDIRECTE KOSTEN": {
-      "isGroup": 1,
+      "isGroup": true,
       "rootType": "Expense"
     },
     "KOSTENREKENINGEN": {
diff --git a/fixtures/verified/standardCOA.json b/fixtures/verified/standardCOA.json
index 8d0877f1..e57e2dbb 100644
--- a/fixtures/verified/standardCOA.json
+++ b/fixtures/verified/standardCOA.json
@@ -7,8 +7,8 @@
               }
           },
           "Bank Accounts": {
-              "accountType": "Bank",
-              "isGroup": 1
+            "accountType": "Bank",
+            "isGroup": true
           },
           "Cash In Hand": {
               "Cash": {
@@ -17,7 +17,7 @@
               "accountType": "Cash"
           },
           "Loans and Advances (Assets)": {
-              "isGroup": 1
+            "isGroup": true
           },
           "Securities and Deposits": {
               "Earnest Money": {}
@@ -29,7 +29,7 @@
               "accountType": "Stock"
           },
           "Tax Assets": {
-              "isGroup": 1
+            "isGroup": true
           }
       },
       "Fixed Assets": {
@@ -59,7 +59,7 @@
           }
       },
       "Investments": {
-          "isGroup": 1
+        "isGroup": true
       },
       "Temporary Accounts": {
           "Temporary Opening": {
@@ -123,7 +123,7 @@
           "Service": {}
       },
       "Indirect Income": {
-          "isGroup": 1
+        "isGroup": true
       },
       "rootType": "Income"
   },
@@ -141,8 +141,8 @@
               }
           },
           "Duties and Taxes": {
-              "accountType": "Tax",
-              "isGroup": 1
+            "accountType": "Tax",
+            "isGroup": true
           },
           "Loans (Liabilities)": {
               "Secured Loans": {},
diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index d1c0cd2b..a2f8f1e2 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -21,6 +21,7 @@ export class DatabaseHandler extends DatabaseBase {
   #fyo: Fyo;
   converter: Converter;
   #demux: DatabaseDemuxBase;
+  dbPath?: string;
   schemaMap: Readonly<SchemaMap> = {};
   fieldValueMap: Record<string, Record<string, Field>> = {};
 
@@ -39,12 +40,14 @@ export class DatabaseHandler extends DatabaseBase {
   async createNewDatabase(dbPath: string, countryCode: string) {
     countryCode = await this.#demux.createNewDatabase(dbPath, countryCode);
     await this.init();
+    this.dbPath = dbPath;
     return countryCode;
   }
 
   async connectToDatabase(dbPath: string, countryCode?: string) {
     countryCode = await this.#demux.connectToDatabase(dbPath, countryCode);
     await this.init();
+    this.dbPath = dbPath;
     return countryCode;
   }
 
diff --git a/fyo/core/types.ts b/fyo/core/types.ts
index 4f22790d..7dd4cac6 100644
--- a/fyo/core/types.ts
+++ b/fyo/core/types.ts
@@ -34,7 +34,7 @@ export enum ConfigKeys {
 export interface ConfigFile {
   id: string;
   companyName: string;
-  filePath: string;
+  dbPath: string;
 }
 
 export interface FyoConfig {
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 4e2f4f21..4e7535ca 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -676,6 +676,14 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return this.fyo.doc.getCachedValue(schemaName, name, fieldname);
   }
 
+  async setAndUpdate(
+    fieldname: string | DocValueMap,
+    value?: DocValue | Doc[]
+  ) {
+    await this.set(fieldname, value);
+    return await this.update();
+  }
+
   async duplicate(shouldInsert: boolean = true): Promise<Doc> {
     const updateMap: DocValueMap = {};
     const docValueMap = this.getValidDict();
diff --git a/fyo/telemetry/helpers.ts b/fyo/telemetry/helpers.ts
index 93a8ef96..5320ee4a 100644
--- a/fyo/telemetry/helpers.ts
+++ b/fyo/telemetry/helpers.ts
@@ -79,7 +79,7 @@ function addNewFile(
 ): UniqueId {
   const newFile: ConfigFile = {
     companyName,
-    filePath: fyo.config.get(ConfigKeys.LastSelectedFilePath, '') as string,
+    dbPath: fyo.config.get(ConfigKeys.LastSelectedFilePath, '') as string,
     id: getId(),
   };
 
diff --git a/models/baseModels/Account/types.ts b/models/baseModels/Account/types.ts
index 8b9c4b33..9d8b5d49 100644
--- a/models/baseModels/Account/types.ts
+++ b/models/baseModels/Account/types.ts
@@ -25,3 +25,19 @@ export type AccountRootType =
   | 'Equity'
   | 'Income'
   | 'Expense';
+
+export interface COARootAccount {
+  rootType: AccountRootType;
+  [key: string]: COAChildAccount | AccountRootType;
+}
+
+export interface COAChildAccount {
+  accountType?: AccountType;
+  accountNumber?: string;
+  isGroup?: boolean;
+  [key: string]: COAChildAccount | boolean | AccountType | string | undefined;
+}
+
+export interface COATree {
+  [key: string]: COARootAccount;
+}
diff --git a/reports/commonExporter.js b/reports/commonExporter.js
deleted file mode 100644
index 5c19a827..00000000
--- a/reports/commonExporter.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import frappe from 'fyo';
-import telemetry from '../src/telemetry/telemetry';
-import { Verb } from '../src/telemetry/types';
-import { getSavePath, saveData, showExportInFolder } from '../src/utils';
-
-function templateToInnerText(innerHTML) {
-  const temp = document.createElement('template');
-  temp.innerHTML = innerHTML.trim();
-  return temp.content.firstChild.innerText;
-}
-
-function deObjectify(value) {
-  if (typeof value !== 'object') return value;
-  if (value === null) return '';
-
-  const innerHTML = value.template;
-  if (!innerHTML) return '';
-  return templateToInnerText(innerHTML);
-}
-
-function csvFormat(value) {
-  if (typeof value === 'string') {
-    return `"${value}"`;
-  } else if (value === null) {
-    return '';
-  } else if (typeof value === 'object') {
-    const innerHTML = value.template;
-    if (!innerHTML) return '';
-    return csvFormat(deObjectify(value));
-  }
-  return value;
-}
-
-export async function exportCsv(rows, columns, filePath) {
-  const fieldnames = columns.map(({ fieldname }) => fieldname);
-  const labels = columns.map(({ label }) => csvFormat(label));
-  const csvRows = [
-    labels.join(','),
-    ...rows.map((row) => fieldnames.map((f) => csvFormat(row[f])).join(',')),
-  ];
-
-  saveExportData(csvRows.join('\n'), filePath);
-}
-
-async function exportJson(rows, columns, filePath, filters, reportName) {
-  const exportObject = {};
-  const fieldnames = columns.map(({ fieldname }) => fieldname);
-
-  exportObject.columns = columns.map(({ fieldname, label }) => ({
-    fieldname,
-    label,
-  }));
-
-  exportObject.rows = rows.map((row) =>
-    fieldnames.reduce((acc, f) => {
-      acc[f] = deObjectify(row[f]);
-      return acc;
-    }, {})
-  );
-
-  exportObject.filters = Object.keys(filters)
-    .filter((name) => filters[name] !== null && filters[name] !== undefined)
-    .reduce((acc, name) => {
-      acc[name] = filters[name];
-      return acc;
-    }, {});
-
-  exportObject.timestamp = new Date().toISOString();
-  exportObject.reportName = reportName;
-  exportObject.softwareName = 'Frappe Books';
-  exportObject.softwareVersion = frappe.store.appVersion;
-
-  await saveExportData(JSON.stringify(exportObject), filePath);
-}
-
-async function exportReport(extention, reportName, getReportData) {
-  const { rows, columns, filters } = getReportData();
-
-  const { filePath, canceled } = await getSavePath(reportName, extention);
-  if (canceled || !filePath) return;
-
-  switch (extention) {
-    case 'csv':
-      await exportCsv(rows, columns, filePath);
-      break;
-    case 'json':
-      await exportJson(rows, columns, filePath, filters, reportName);
-      break;
-    default:
-      return;
-  }
-
-  telemetry.log(Verb.Exported, reportName, { extention });
-}
-
-export default function getCommonExportActions(reportName) {
-  return ['csv', 'json'].map((ext) => ({
-    group: frappe.t`Export`,
-    label: ext.toUpperCase(),
-    type: 'primary',
-    action: async (getReportData) =>
-      await exportReport(ext, reportName, getReportData),
-  }));
-}
-
-export async function saveExportData(data, filePath) {
-  await saveData(data, filePath);
-  showExportInFolder(frappe.t`Export Successful`, filePath);
-}
diff --git a/src/initFyo.ts b/src/initFyo.ts
index a7d7f126..14a68fb1 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -1,3 +1,15 @@
 import { Fyo } from 'fyo';
+import models, { getRegionalModels } from 'models';
 
 export const fyo = new Fyo({ isTest: false, isElectron: true });
+
+export async function initializeModels(dbPath: string, countryCode?: string) {
+  if (countryCode) {
+    countryCode = await fyo.db.createNewDatabase(dbPath, countryCode);
+  } else {
+    countryCode = await fyo.db.connectToDatabase(dbPath);
+  }
+
+  const regionalModels = await getRegionalModels(countryCode);
+  await fyo.initializeAndRegister(models, regionalModels);
+}
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 5ad8a8a3..6f62efd5 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,9 +1,3 @@
-import PageHeader from 'src/components/PageHeader';
-import SearchBar from 'src/components/SearchBar';
-import { openQuickEdit } from 'src/utils';
-import frappe from 'frappe';
-import { nextTick } from 'vue';
-import { handleErrorWithDialog } from '../errorHandling';
 <template>
   <div class="flex flex-col overflow-y-hidden">
     <PageHeader>
diff --git a/src/pages/Dashboard/Cashflow.vue b/src/pages/Dashboard/Cashflow.vue
index 696ef538..a4e85a5f 100644
--- a/src/pages/Dashboard/Cashflow.vue
+++ b/src/pages/Dashboard/Cashflow.vue
@@ -101,9 +101,8 @@
 </template>
 <script>
 import frappe from 'frappe';
-import { getYMax } from 'src/components/Charts/chartUtils';
 import LineChart from 'src/components/Charts/LineChart.vue';
-import { formatXLabels } from 'src/utils';
+import { formatXLabels, getYMax } from 'src/utils/chart';
 import Cashflow from '../../../reports/Cashflow/Cashflow';
 import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
diff --git a/src/pages/Dashboard/ProfitAndLoss.vue b/src/pages/Dashboard/ProfitAndLoss.vue
index e30de9e1..fd51ad5d 100644
--- a/src/pages/Dashboard/ProfitAndLoss.vue
+++ b/src/pages/Dashboard/ProfitAndLoss.vue
@@ -30,8 +30,7 @@
 <script>
 import frappe from 'frappe';
 import BarChart from 'src/components/Charts/BarChart.vue';
-import { getYMax, getYMin } from 'src/components/Charts/chartUtils';
-import { formatXLabels } from 'src/utils';
+import { formatXLabels, getYMax, getYMin } from 'src/utils/chart';
 import ProfitAndLoss from '../../../reports/ProfitAndLoss/ProfitAndLoss';
 import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
diff --git a/src/pages/ListView/listConfig.js b/src/pages/ListView/listConfig.js
deleted file mode 100644
index 97eba638..00000000
--- a/src/pages/ListView/listConfig.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Account from '../../../models/doctype/Account/AccountList';
-import AccountingLedgerEntry from '../../../models/doctype/AccountingLedgerEntry/AccountingLedgerEntryList';
-import Item from '../../../models/doctype/Item/ItemList';
-import JournalEntry from '../../../models/doctype/JournalEntry/JournalEntryList';
-import Customer from '../../../models/doctype/Party/CustomerList';
-import Party from '../../../models/doctype/Party/PartyList';
-import Supplier from '../../../models/doctype/Party/SupplierList';
-import Payment from '../../../models/doctype/Payment/PaymentList';
-import PurchaseInvoice from '../../../models/doctype/PurchaseInvoice/PurchaseInvoiceList';
-import SalesInvoice from '../../../models/doctype/SalesInvoice/SalesInvoiceList';
-import Tax from '../../../models/doctype/Tax/TaxList';
-
-export default {
-  SalesInvoice,
-  PurchaseInvoice,
-  Customer,
-  Supplier,
-  Party,
-  Item,
-  Payment,
-  Tax,
-  JournalEntry,
-  Account,
-  AccountingLedgerEntry,
-};
diff --git a/src/pages/SetupWizard/setupCompany.js b/src/pages/SetupWizard/setupCompany.js
deleted file mode 100644
index af7e13a5..00000000
--- a/src/pages/SetupWizard/setupCompany.js
+++ /dev/null
@@ -1,192 +0,0 @@
-import countryList from 'fixtures/countryInfo.json';
-import frappe from 'fyo';
-import { DEFAULT_LOCALE } from 'fyo/utils/consts';
-import config from 'src/config';
-import importCharts from '../../../accounting/importCOA';
-import generateTaxes from '../../../models/doctype/Tax/RegionalEntries';
-import regionalModelUpdates from '../../../models/regionalModelUpdates';
-import { getId } from '../../telemetry/helpers';
-import { callInitializeMoneyMaker } from '../../utils';
-
-export default async function setupCompany(setupWizardValues) {
-  const {
-    companyLogo,
-    companyName,
-    country,
-    name,
-    email,
-    bankName,
-    currency: companyCurrency,
-    fiscalYearStart,
-    fiscalYearEnd,
-    chartOfAccounts,
-  } = setupWizardValues;
-
-  const accountingSettings = frappe.AccountingSettings;
-  const currency = companyCurrency || countryList[country]['currency'];
-  const locale = countryList[country]['locale'] ?? DEFAULT_LOCALE;
-  await callInitializeMoneyMaker(currency);
-
-  const accountingSettingsUpdateMap = {
-    companyName,
-    country,
-    fullname: name,
-    email,
-    bankName,
-    fiscalYearStart,
-    fiscalYearEnd,
-    currency,
-  };
-
-  await accountingSettings.setMultiple(accountingSettingsUpdateMap);
-  await accountingSettings.update();
-
-  const printSettings = await frappe.getSingle('PrintSettings');
-  const printSettingsUpdateMap = {
-    logo: companyLogo,
-    companyName,
-    email,
-    displayLogo: companyLogo ? true : false,
-  };
-
-  await printSettings.setMultiple(printSettingsUpdateMap);
-  await printSettings.update();
-
-  await setupGlobalCurrencies(countryList);
-  await setupChartOfAccounts(bankName, country, chartOfAccounts);
-  await setupRegionalChanges(country);
-  updateInitializationConfig();
-
-  await accountingSettings.setMultiple({ setupComplete: true });
-  await accountingSettings.update();
-  frappe.AccountingSettings = accountingSettings;
-
-  const systemSettings = await frappe.getSingle('SystemSettings');
-  systemSettings.setMultiple({ locale });
-  systemSettings.update();
-}
-
-async function setupGlobalCurrencies(countries) {
-  const promises = [];
-  const queue = [];
-  for (let country of Object.values(countries)) {
-    const {
-      currency,
-      currency_fraction: fraction,
-      currency_fraction_units: fractionUnits,
-      smallest_currency_fraction_value: smallestValue,
-      currency_symbol: symbol,
-    } = country;
-
-    if (!currency || queue.includes(currency)) {
-      continue;
-    }
-
-    const docObject = {
-      doctype: 'Currency',
-      name: currency,
-      fraction,
-      fractionUnits,
-      smallestValue,
-      symbol,
-    };
-
-    const doc = checkAndCreateDoc(docObject);
-    if (doc) {
-      promises.push(doc);
-      queue.push(currency);
-    }
-  }
-  return Promise.all(promises);
-}
-
-async function setupChartOfAccounts(bankName, country, chartOfAccounts) {
-  await importCharts(chartOfAccounts);
-  const parentAccount = await getBankAccountParentName(country);
-  const docObject = {
-    doctype: 'Account',
-    name: bankName,
-    rootType: 'Asset',
-    parentAccount,
-    accountType: 'Bank',
-    isGroup: 0,
-  };
-  await checkAndCreateDoc(docObject);
-}
-
-async function setupRegionalChanges(country) {
-  await generateTaxes(country);
-  await regionalModelUpdates({ country });
-  await frappe.db.migrate();
-}
-
-function updateInitializationConfig(language) {
-  let filePath = frappe.db.dbPath;
-  let files = config.get('files', []);
-  files.forEach((file) => {
-    if (file.filePath === filePath) {
-      file.companyName = frappe.AccountingSettings.companyName;
-      file.id = getId();
-    }
-  });
-  config.set('files', files);
-}
-
-export async function checkIfExactRecordAbsent(docObject) {
-  const { doctype, name } = docObject;
-  const newDocObject = Object.assign({}, docObject);
-  delete newDocObject.doctype;
-  const rows = await frappe.db.getAllRaw(doctype, {
-    fields: ['*'],
-    filters: { name },
-  });
-
-  if (rows.length === 0) {
-    return true;
-  }
-
-  const storedDocObject = rows[0];
-  const matchList = Object.keys(newDocObject).map((key) => {
-    const newValue = newDocObject[key];
-    const storedValue = storedDocObject[key];
-    return newValue == storedValue; // Should not be type sensitive.
-  });
-
-  if (!matchList.every(Boolean)) {
-    await frappe.db.delete(doctype, name);
-    return true;
-  }
-
-  return false;
-}
-
-async function checkAndCreateDoc(docObject) {
-  const canCreate = await checkIfExactRecordAbsent(docObject);
-  if (!canCreate) {
-    return;
-  }
-
-  const doc = await frappe.doc.getNewDoc(docObject.doctype, docObject);
-  return doc.insert();
-}
-
-async function getBankAccountParentName(country) {
-  const parentBankAccount = await frappe.db.getAllRaw('Account', {
-    fields: ['*'],
-    filters: { isGroup: true, accountType: 'Bank' },
-  });
-
-  if (parentBankAccount.length === 0) {
-    // This should not happen if the fixtures are correct.
-    return 'Bank Accounts';
-  } else if (parentBankAccount.length > 1) {
-    switch (country) {
-      case 'Indonesia':
-        return 'Bank Rupiah - 1121.000';
-      default:
-        break;
-    }
-  }
-
-  return parentBankAccount[0].name;
-}
diff --git a/src/print.js b/src/print.ts
similarity index 100%
rename from src/print.js
rename to src/print.ts
diff --git a/src/regional/in.ts b/src/regional/in.ts
deleted file mode 100644
index 30d04145..00000000
--- a/src/regional/in.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { fyo } from 'src/initFyo';
-
-export type TaxType = 'GST' | 'IGST' | 'Exempt-GST' | 'Exempt-IGST';
-
-export default async function generateTaxes(country: string) {
-  if (country === 'India') {
-    const GSTs = {
-      GST: [28, 18, 12, 6, 5, 3, 0.25, 0],
-      IGST: [28, 18, 12, 6, 5, 3, 0.25, 0],
-      'Exempt-GST': [0],
-      'Exempt-IGST': [0],
-    };
-    const newTax = await fyo.doc.getEmptyDoc('Tax');
-
-    for (const type of Object.keys(GSTs)) {
-      for (const percent of GSTs[type as TaxType]) {
-        const name = `${type}-${percent}`;
-
-        // Not cross checking cause hardcoded values.
-        await fyo.db.delete('Tax', name);
-
-        const details = getTaxDetails(type as TaxType, percent);
-        await newTax.set({ name, details });
-        await newTax.insert();
-      }
-    }
-  }
-}
-
-function getTaxDetails(type: TaxType, percent: number) {
-  if (type === 'GST') {
-    return [
-      {
-        account: 'CGST',
-        rate: percent / 2,
-      },
-      {
-        account: 'SGST',
-        rate: percent / 2,
-      },
-    ];
-  } else {
-    return [
-      {
-        account: type.toString().split('-')[0],
-        rate: percent,
-      },
-    ];
-  }
-}
diff --git a/src/regional/in/in.ts b/src/regional/in/in.ts
new file mode 100644
index 00000000..566860a9
--- /dev/null
+++ b/src/regional/in/in.ts
@@ -0,0 +1,52 @@
+import { fyo } from 'src/initFyo';
+
+export type TaxType = 'GST' | 'IGST' | 'Exempt-GST' | 'Exempt-IGST';
+
+export async function createIndianRecords() {
+  await generateTaxes();
+}
+
+async function generateTaxes() {
+  const GSTs = {
+    GST: [28, 18, 12, 6, 5, 3, 0.25, 0],
+    IGST: [28, 18, 12, 6, 5, 3, 0.25, 0],
+    'Exempt-GST': [0],
+    'Exempt-IGST': [0],
+  };
+  const newTax = await fyo.doc.getEmptyDoc('Tax');
+
+  for (const type of Object.keys(GSTs)) {
+    for (const percent of GSTs[type as TaxType]) {
+      const name = `${type}-${percent}`;
+
+      // Not cross checking cause hardcoded values.
+      await fyo.db.delete('Tax', name);
+
+      const details = getTaxDetails(type as TaxType, percent);
+      await newTax.set({ name, details });
+      await newTax.insert();
+    }
+  }
+}
+
+function getTaxDetails(type: TaxType, percent: number) {
+  if (type === 'GST') {
+    return [
+      {
+        account: 'CGST',
+        rate: percent / 2,
+      },
+      {
+        account: 'SGST',
+        rate: percent / 2,
+      },
+    ];
+  } else {
+    return [
+      {
+        account: type.toString().split('-')[0],
+        rate: percent,
+      },
+    ];
+  }
+}
diff --git a/src/regional/index.ts b/src/regional/index.ts
new file mode 100644
index 00000000..02a7e07c
--- /dev/null
+++ b/src/regional/index.ts
@@ -0,0 +1,9 @@
+import { createIndianRecords } from './in/in';
+
+export async function createRegionalRecords(country: string) {
+  if (country === 'India') {
+    await createIndianRecords();
+  }
+
+  return;
+}
diff --git a/src/main.js b/src/renderer.ts
similarity index 68%
rename from src/main.js
rename to src/renderer.ts
index a73661be..1e50bfbf 100644
--- a/src/main.js
+++ b/src/renderer.ts
@@ -1,55 +1,45 @@
 import { ipcRenderer } from 'electron';
-import { createApp } from 'vue';
-import App from './App';
-import FeatherIcon from './components/FeatherIcon';
-import config, { ConfigKeys } from './config';
+import { ConfigKeys } from 'fyo/core/types';
+import { IPC_ACTIONS } from 'utils/messages';
+import { App as VueApp, createApp } from 'vue';
+import App from './App.vue';
+import Badge from './components/Badge.vue';
+import FeatherIcon from './components/FeatherIcon.vue';
 import { getErrorHandled, handleError } from './errorHandling';
 import { fyo } from './initFyo';
-import { IPC_ACTIONS } from './messages';
-import { incrementOpenCount } from './renderer/helpers';
+import { incrementOpenCount, outsideClickDirective } from './renderer/helpers';
 import registerIpcRendererListeners from './renderer/registerIpcRendererListeners';
 import router from './router';
-import { outsideClickDirective } from './ui';
-import { setLanguageMap, stringifyCircular } from './utils';
+import { stringifyCircular } from './utils';
+import { setLanguageMap } from './utils/language';
 
 (async () => {
-  const language = fyo.config.get(ConfigKeys.Language);
+  const language = fyo.config.get(ConfigKeys.Language) as string;
   if (language) {
     await setLanguageMap(language);
   }
 
-  if (process.env.NODE_ENV === 'development') {
-    window.config = config;
-  }
-
-  fyo.isElectron = true;
-
-  const models = (await import('../models')).default;
-  await fyo.initializeAndRegister(models);
+  setOnWindow();
 
   ipcRenderer.send = getErrorHandled(ipcRenderer.send);
   ipcRenderer.invoke = getErrorHandled(ipcRenderer.invoke);
 
-  window.frappe = fyo;
-
-  window.onerror = (message, source, lineno, colno, error) => {
-    error = error ?? new Error('triggered in window.onerror');
-    handleError(true, error, { message, source, lineno, colno });
-  };
-
   registerIpcRendererListeners();
 
   const app = createApp({
-    template: '<App/>',
+    template: '<h1>Hellow, World</h1>',
   });
+  setErrorHandlers(app);
 
   app.use(router);
   app.component('App', App);
   app.component('feather-icon', FeatherIcon);
+  app.component('Badge', Badge);
+
   app.directive('on-outside-click', outsideClickDirective);
   app.mixin({
     computed: {
-      frappe() {
+      fyo() {
         return fyo;
       },
       platform() {
@@ -71,8 +61,20 @@ import { setLanguageMap, stringifyCircular } from './utils';
     },
   });
 
+  fyo.store.appVersion = await ipcRenderer.invoke(IPC_ACTIONS.GET_VERSION);
+
+  incrementOpenCount();
+  app.mount('body');
+})();
+
+function setErrorHandlers(app: VueApp) {
+  window.onerror = (message, source, lineno, colno, error) => {
+    error = error ?? new Error('triggered in window.onerror');
+    handleError(true, error, { message, source, lineno, colno });
+  };
+
   app.config.errorHandler = (err, vm, info) => {
-    const more = {
+    const more: Record<string, unknown> = {
       info,
     };
 
@@ -84,19 +86,26 @@ import { setLanguageMap, stringifyCircular } from './utils';
       more.props = stringifyCircular(vm.$props ?? {}, true, true);
     }
 
-    handleError(false, err, more);
+    handleError(false, err as Error, more);
     console.error(err, vm, info);
   };
 
-  fyo.store.appVersion = await ipcRenderer.invoke(IPC_ACTIONS.GET_VERSION);
-  incrementOpenCount();
-  app.mount('body');
-
   process.on('unhandledRejection', (error) => {
-    handleError(true, error);
+    handleError(true, error as Error);
   });
 
   process.on('uncaughtException', (error) => {
     handleError(true, error, {}, () => process.exit(1));
   });
-})();
+}
+
+function setOnWindow() {
+  if (process.env.NODE_ENV === 'development') {
+    // @ts-ignore
+    window.config = config;
+    // @ts-ignore
+    window.router = router;
+    // @ts-ignore
+    window.fyo = fyo;
+  }
+}
diff --git a/src/renderer/helpers.ts b/src/renderer/helpers.ts
index ba995ee4..148966cf 100644
--- a/src/renderer/helpers.ts
+++ b/src/renderer/helpers.ts
@@ -1,5 +1,40 @@
 import { ConfigKeys } from 'fyo/core/types';
 import { fyo } from 'src/initFyo';
+import { Directive } from 'vue';
+
+const instances: OutsideClickCallback[] = [];
+type OutsideClickCallback = (e: Event) => void;
+
+export const outsideClickDirective: Directive<
+  HTMLElement,
+  OutsideClickCallback
+> = {
+  beforeMount(el, binding) {
+    el.dataset.outsideClickIndex = String(instances.length);
+
+    const fn = binding.value;
+    const click = function (e: Event) {
+      onDocumentClick(e, el, fn);
+    };
+
+    document.addEventListener('click', click);
+    instances.push(click);
+  },
+  unmounted(el) {
+    const index = parseInt(el.dataset.outsideClickIndex ?? '0');
+    const handler = instances[index];
+    document.addEventListener('click', handler);
+    instances.splice(index, 1);
+  },
+};
+
+function onDocumentClick(e: Event, el: HTMLElement, fn: OutsideClickCallback) {
+  const target = e.target;
+
+  if (el !== target && !el.contains(target as Node)) {
+    fn(e);
+  }
+}
 
 export function incrementOpenCount() {
   let openCount = fyo.config.get(ConfigKeys.OpenCount);
diff --git a/src/router.ts b/src/router.ts
index 9fe0f5b4..4e5057e1 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -10,10 +10,10 @@ import PrintView from 'src/pages/PrintView/PrintView.vue';
 import QuickEditForm from 'src/pages/QuickEditForm.vue';
 import Report from 'src/pages/Report.vue';
 import Settings from 'src/pages/Settings/Settings.vue';
-import { createRouter, createWebHistory } from 'vue-router';
+import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
 import { fyo } from './initFyo';
 
-const routes = [
+const routes: RouteRecordRaw[] = [
   {
     path: '/',
     component: Dashboard,
@@ -62,9 +62,12 @@ const routes = [
     },
     props: {
       default: (route) => {
-        let { doctype, filters, fieldname, value } = route.params;
+        const { doctype, fieldname, value } = route.params;
+        let { filters } = route.params;
+
         if (filters === undefined && fieldname && value) {
-          filters = { [fieldname]: value };
+          // @ts-ignore
+          filters = { [fieldname as string]: value };
         }
 
         return {
@@ -114,7 +117,7 @@ const routes = [
 
 const router = createRouter({ routes, history: createWebHistory() });
 
-function removeDetails(path) {
+function removeDetails(path: string) {
   if (!path) {
     return path;
   }
@@ -124,7 +127,7 @@ function removeDetails(path) {
     return path;
   }
 
-  return path.slice(0, match.index + 4);
+  return path.slice(0, match.index! + 4);
 }
 
 router.afterEach((to, from) => {
@@ -136,8 +139,4 @@ router.afterEach((to, from) => {
   fyo.telemetry.log(Verb.Navigated, NounEnum.Route, more);
 });
 
-if (process.env.NODE_ENV === 'development') {
-  window.router = router;
-}
-
 export default router;
diff --git a/src/setup/createCOA.ts b/src/setup/createCOA.ts
new file mode 100644
index 00000000..14f8647c
--- /dev/null
+++ b/src/setup/createCOA.ts
@@ -0,0 +1,98 @@
+import {
+  AccountRootType,
+  COAChildAccount,
+  COARootAccount,
+  COATree,
+} from 'models/baseModels/Account/types';
+import { getCOAList } from 'models/baseModels/SetupWizard/SetupWizard';
+import { fyo } from 'src/initFyo';
+import { getStandardCOA } from './standardCOA';
+
+const accountFields = ['accountType', 'accountNumber', 'rootType', 'isGroup'];
+
+function getAccountName(accountName: string, accountNumber?: string) {
+  if (accountNumber) {
+    return `${accountName} - ${accountNumber}`;
+  }
+
+  return accountName;
+}
+
+async function createCOAAccounts(
+  children: COATree | COARootAccount | COAChildAccount,
+  parentAccount: string,
+  rootType: AccountRootType | '',
+  rootAccount: boolean
+) {
+  for (const rootName in children) {
+    if (accountFields.includes(rootName)) {
+      continue;
+    }
+
+    const child = children[rootName];
+
+    if (rootAccount) {
+      rootType = (child as COARootAccount).rootType as AccountRootType;
+    }
+
+    const accountType = (child as COAChildAccount).accountType ?? '';
+    const accountNumber = (child as COAChildAccount).accountNumber;
+    const accountName = getAccountName(rootName, accountNumber);
+
+    const isGroup = identifyIsGroup(child as COAChildAccount | COARootAccount);
+    const doc = fyo.doc.getNewDoc('Account', {
+      name: accountName,
+      parentAccount,
+      isGroup,
+      rootType,
+      balance: 0,
+      accountType,
+    });
+
+    await doc.insert();
+    await createCOAAccounts(
+      child as COAChildAccount,
+      accountName,
+      rootType,
+      false
+    );
+  }
+}
+
+function identifyIsGroup(child: COARootAccount | COAChildAccount): boolean {
+  if (child.isGroup !== undefined) {
+    return child.isGroup as boolean;
+  }
+
+  const keys = Object.keys(child);
+  const children = keys.filter((key) => !accountFields.includes(key));
+
+  if (children.length) {
+    return true;
+  }
+
+  return false;
+}
+
+async function getCOA(chartOfAccounts: string) {
+  const coaList = getCOAList();
+  const coa = coaList.find(({ name }) => name === chartOfAccounts);
+
+  const conCode = coa?.countryCode;
+  if (!conCode) {
+    return getStandardCOA();
+  }
+
+  try {
+    const countryCoa = (await import('fixtures/verified/' + conCode + '.json'))
+      .default;
+    return countryCoa.tree;
+  } catch (e) {
+    return getStandardCOA();
+  }
+}
+
+export async function createCOA(chartOfAccounts: string) {
+  const chart = await getCOA(chartOfAccounts);
+  await createCOAAccounts(chart, '', '', true);
+}
diff --git a/src/setup/setupInstance.ts b/src/setup/setupInstance.ts
new file mode 100644
index 00000000..d6ed5f95
--- /dev/null
+++ b/src/setup/setupInstance.ts
@@ -0,0 +1,217 @@
+import countryInfo from 'fixtures/countryInfo.json';
+import { ConfigFile, DocValueMap } from 'fyo/core/types';
+import Doc from 'fyo/model/doc';
+import { getId } from 'fyo/telemetry/helpers';
+import { DEFAULT_CURRENCY, DEFAULT_LOCALE } from 'fyo/utils/consts';
+import { AccountingSettings } from 'models/baseModels/AccountingSettings/AccountingSettings';
+import { fyo } from 'src/initFyo';
+import { createRegionalRecords } from 'src/regional';
+import { createCOA } from './createCOA';
+import { CountrySettings, SetupWizardOptions } from './types';
+
+export default async function setupInstance(
+  setupWizardOptions: SetupWizardOptions
+) {
+  const { companyName, country, bankName, chartOfAccounts } =
+    setupWizardOptions;
+  await updateSystemSettings(setupWizardOptions);
+  await updateAccountingSettings(setupWizardOptions);
+  await updatePrintSettings(setupWizardOptions);
+
+  await createCurrencyRecords();
+  await createAccountRecords(bankName, country, chartOfAccounts);
+  await createRegionalRecords(country);
+
+  await completeSetup(companyName);
+}
+
+async function updateAccountingSettings({
+  companyName,
+  country,
+  name,
+  email,
+  bankName,
+  fiscalYearStart,
+  fiscalYearEnd,
+}: SetupWizardOptions) {
+  const accountingSettings = (await fyo.doc.getSingle(
+    'AccountingSettings'
+  )) as AccountingSettings;
+  await accountingSettings.setAndUpdate({
+    companyName,
+    country,
+    fullname: name,
+    email,
+    bankName,
+    fiscalYearStart,
+    fiscalYearEnd,
+  });
+  return accountingSettings;
+}
+
+async function updatePrintSettings({
+  companyLogo,
+  companyName,
+  email,
+}: SetupWizardOptions) {
+  const printSettings = await fyo.doc.getSingle('PrintSettings');
+  await printSettings.setAndUpdate({
+    logo: companyLogo,
+    companyName,
+    email,
+    displayLogo: companyLogo ? true : false,
+  });
+}
+
+async function updateSystemSettings({
+  country,
+  currency: companyCurrency,
+}: SetupWizardOptions) {
+  // @ts-ignore
+  const countryOptions = countryInfo[country] as CountrySettings;
+  const currency =
+    companyCurrency ?? countryOptions.currency ?? DEFAULT_CURRENCY;
+  const locale = countryOptions.locale ?? DEFAULT_LOCALE;
+  const systemSettings = await fyo.doc.getSingle('SystemSettings');
+  systemSettings.setAndUpdate({
+    locale,
+    currency,
+  });
+}
+
+async function createCurrencyRecords() {
+  const promises: Promise<Doc | undefined>[] = [];
+  const queue: string[] = [];
+  const countrySettings: CountrySettings[] = Object.values(
+    // @ts-ignore
+    countryInfo as Record<string, CountrySettings>
+  );
+
+  for (const country of countrySettings) {
+    const {
+      currency,
+      currency_fraction,
+      currency_fraction_units,
+      smallest_currency_fraction_value,
+      currency_symbol,
+    } = country;
+
+    if (!currency || queue.includes(currency)) {
+      continue;
+    }
+
+    const docObject = {
+      name: currency,
+      fraction: currency_fraction ?? '',
+      fractionUnits: currency_fraction_units ?? 100,
+      smallestValue: smallest_currency_fraction_value ?? 0.01,
+      symbol: currency_symbol ?? '',
+    };
+
+    const doc = checkAndCreateDoc('Currency', docObject);
+    if (doc) {
+      promises.push(doc);
+      queue.push(currency);
+    }
+  }
+  return Promise.all(promises);
+}
+
+async function createAccountRecords(
+  bankName: string,
+  country: string,
+  chartOfAccounts: string
+) {
+  await createCOA(chartOfAccounts);
+  const parentAccount = await getBankAccountParentName(country);
+  const docObject = {
+    name: bankName,
+    rootType: 'Asset',
+    parentAccount,
+    accountType: 'Bank',
+    isGroup: false,
+  };
+  await checkAndCreateDoc('Account', docObject);
+}
+
+async function completeSetup(companyName: string) {
+  updateInitializationConfig(companyName);
+  await fyo.singles.AccountingSettings!.set('setupComplete', true);
+  await fyo.singles.AccountingSettings!.update();
+}
+
+function updateInitializationConfig(companyName: string) {
+  const dbPath = fyo.db.dbPath;
+  const files = fyo.config.get('files', []) as ConfigFile[];
+
+  files.forEach((file) => {
+    if (file.dbPath === dbPath) {
+      file.companyName = companyName;
+      file.id = getId();
+    }
+  });
+
+  fyo.config.set('files', files);
+}
+
+async function checkAndCreateDoc(schemaName: string, docObject: DocValueMap) {
+  const canCreate = await checkIfExactRecordAbsent(schemaName, docObject);
+  if (!canCreate) {
+    return;
+  }
+
+  const doc = await fyo.doc.getNewDoc(schemaName, docObject);
+  return doc.insert();
+}
+
+async function checkIfExactRecordAbsent(
+  schemaName: string,
+  docMap: DocValueMap
+) {
+  const name = docMap.name as string;
+  const newDocObject = Object.assign({}, docMap);
+
+  const rows = await fyo.db.getAllRaw(schemaName, {
+    fields: ['*'],
+    filters: { name },
+  });
+
+  if (rows.length === 0) {
+    return true;
+  }
+
+  const storedDocObject = rows[0];
+  const matchList = Object.keys(newDocObject).map((key) => {
+    const newValue = newDocObject[key];
+    const storedValue = storedDocObject[key];
+    return newValue == storedValue; // Should not be type sensitive.
+  });
+
+  if (!matchList.every(Boolean)) {
+    await fyo.db.delete(schemaName, name);
+    return true;
+  }
+
+  return false;
+}
+
+async function getBankAccountParentName(country: string) {
+  const parentBankAccount = await fyo.db.getAllRaw('Account', {
+    fields: ['*'],
+    filters: { isGroup: true, accountType: 'Bank' },
+  });
+
+  if (parentBankAccount.length === 0) {
+    // This should not happen if the fixtures are correct.
+    return 'Bank Accounts';
+  } else if (parentBankAccount.length > 1) {
+    switch (country) {
+      case 'Indonesia':
+        return 'Bank Rupiah - 1121.000';
+      default:
+        break;
+    }
+  }
+
+  return parentBankAccount[0].name;
+}
diff --git a/src/setup/standardCOA.ts b/src/setup/standardCOA.ts
new file mode 100644
index 00000000..adfed3f0
--- /dev/null
+++ b/src/setup/standardCOA.ts
@@ -0,0 +1,175 @@
+import { t } from 'fyo';
+import { COATree } from 'models/baseModels/Account/types';
+
+export function getStandardCOA(): COATree {
+  return {
+    [t`Application of Funds (Assets)`]: {
+      [t`Current Assets`]: {
+        [t`Accounts Receivable`]: {
+          [t`Debtors`]: {
+            accountType: 'Receivable',
+          },
+        },
+        [t`Bank Accounts`]: {
+          accountType: 'Bank',
+          isGroup: true,
+        },
+        [t`Cash In Hand`]: {
+          [t`Cash`]: {
+            accountType: 'Cash',
+          },
+          accountType: 'Cash',
+        },
+        [t`Loans and Advances (Assets)`]: {
+          isGroup: true,
+        },
+        [t`Securities and Deposits`]: {
+          [t`Earnest Money`]: {},
+        },
+        [t`Stock Assets`]: {
+          [t`Stock In Hand`]: {
+            accountType: 'Stock',
+          },
+          accountType: 'Stock',
+        },
+        [t`Tax Assets`]: {
+          isGroup: true,
+        },
+      },
+      [t`Fixed Assets`]: {
+        [t`Capital Equipments`]: {
+          accountType: 'Fixed Asset',
+        },
+        [t`Electronic Equipments`]: {
+          accountType: 'Fixed Asset',
+        },
+        [t`Furnitures and Fixtures`]: {
+          accountType: 'Fixed Asset',
+        },
+        [t`Office Equipments`]: {
+          accountType: 'Fixed Asset',
+        },
+        [t`Plants and Machineries`]: {
+          accountType: 'Fixed Asset',
+        },
+        [t`Buildings`]: {
+          accountType: 'Fixed Asset',
+        },
+        [t`Softwares`]: {
+          accountType: 'Fixed Asset',
+        },
+        [t`Accumulated Depreciation`]: {
+          accountType: 'Accumulated Depreciation',
+        },
+      },
+      [t`Investments`]: {
+        isGroup: true,
+      },
+      [t`Temporary Accounts`]: {
+        [t`Temporary Opening`]: {
+          accountType: 'Temporary',
+        },
+      },
+      rootType: 'Asset',
+    },
+    [t`Expenses`]: {
+      [t`Direct Expenses`]: {
+        [t`Stock Expenses`]: {
+          [t`Cost of Goods Sold`]: {
+            accountType: 'Cost of Goods Sold',
+          },
+          [t`Expenses Included In Valuation`]: {
+            accountType: 'Expenses Included In Valuation',
+          },
+          [t`Stock Adjustment`]: {
+            accountType: 'Stock Adjustment',
+          },
+        },
+      },
+      [t`Indirect Expenses`]: {
+        [t`Administrative Expenses`]: {},
+        [t`Commission on Sales`]: {},
+        [t`Depreciation`]: {
+          accountType: 'Depreciation',
+        },
+        [t`Entertainment Expenses`]: {},
+        [t`Freight and Forwarding Charges`]: {
+          accountType: 'Chargeable',
+        },
+        [t`Legal Expenses`]: {},
+        [t`Marketing Expenses`]: {
+          accountType: 'Chargeable',
+        },
+        [t`Miscellaneous Expenses`]: {
+          accountType: 'Chargeable',
+        },
+        [t`Office Maintenance Expenses`]: {},
+        [t`Office Rent`]: {},
+        [t`Postal Expenses`]: {},
+        [t`Print and Stationery`]: {},
+        [t`Round Off`]: {
+          accountType: 'Round Off',
+        },
+        [t`Salary`]: {},
+        [t`Sales Expenses`]: {},
+        [t`Telephone Expenses`]: {},
+        [t`Travel Expenses`]: {},
+        [t`Utility Expenses`]: {},
+        [t`Write Off`]: {},
+        [t`Exchange Gain/Loss`]: {},
+        [t`Gain/Loss on Asset Disposal`]: {},
+      },
+      rootType: 'Expense',
+    },
+    [t`Income`]: {
+      [t`Direct Income`]: {
+        [t`Sales`]: {},
+        [t`Service`]: {},
+      },
+      [t`Indirect Income`]: {
+        isGroup: true,
+      },
+      rootType: 'Income',
+    },
+    [t`Source of Funds (Liabilities)`]: {
+      [t`Current Liabilities`]: {
+        [t`Accounts Payable`]: {
+          [t`Creditors`]: {
+            accountType: 'Payable',
+          },
+          [t`Payroll Payable`]: {},
+        },
+        [t`Stock Liabilities`]: {
+          [t`Stock Received But Not Billed`]: {
+            accountType: 'Stock Received But Not Billed',
+          },
+        },
+        [t`Duties and Taxes`]: {
+          accountType: 'Tax',
+          isGroup: true,
+        },
+        [t`Loans (Liabilities)`]: {
+          [t`Secured Loans`]: {},
+          [t`Unsecured Loans`]: {},
+          [t`Bank Overdraft Account`]: {},
+        },
+      },
+      rootType: 'Liability',
+    },
+    [t`Equity`]: {
+      [t`Capital Stock`]: {
+        accountType: 'Equity',
+      },
+      [t`Dividends Paid`]: {
+        accountType: 'Equity',
+      },
+      [t`Opening Balance Equity`]: {
+        accountType: 'Equity',
+      },
+      [t`Retained Earnings`]: {
+        accountType: 'Equity',
+      },
+      rootType: 'Equity',
+    },
+  };
+}
diff --git a/src/setup/types.ts b/src/setup/types.ts
new file mode 100644
index 00000000..e2db66f6
--- /dev/null
+++ b/src/setup/types.ts
@@ -0,0 +1,25 @@
+export interface SetupWizardOptions {
+  companyLogo: string;
+  companyName: string;
+  country: string;
+  fullname: string;
+  name: string;
+  email: string;
+  bankName: string;
+  currency: string;
+  fiscalYearStart: string;
+  fiscalYearEnd: string;
+  chartOfAccounts: string;
+}
+
+export interface CountrySettings {
+  code: string;
+  currency: string;
+  fiscal_year_start: string;
+  fiscal_year_end: string;
+  locale: string;
+  currency_fraction?: string;
+  currency_fraction_units?: number;
+  smallest_currency_fraction_value?: number;
+  currency_symbol?: string;
+}
\ No newline at end of file
diff --git a/src/sidebarConfig.js b/src/sidebarConfig.ts
similarity index 91%
rename from src/sidebarConfig.js
rename to src/sidebarConfig.ts
index dcb7e02e..48ea9a83 100644
--- a/src/sidebarConfig.js
+++ b/src/sidebarConfig.ts
@@ -1,8 +1,9 @@
-import frappe, { t } from 'frappe';
+import { t } from 'fyo';
+import { fyo } from './initFyo';
 
 const config = {
   getTitle: async () => {
-    const { companyName } = await frappe.getSingle('AccountingSettings');
+    const { companyName } = await fyo.doc.getSingle('AccountingSettings');
     return companyName;
   },
   getGroups: () => [
@@ -113,12 +114,12 @@ const config = {
         {
           label: t`GSTR1`,
           route: '/report/gstr-1',
-          hidden: () => frappe.AccountingSettings.country !== 'India',
+          hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
         },
         {
           label: t`GSTR2`,
           route: '/report/gstr-2',
-          hidden: () => frappe.AccountingSettings.country !== 'India',
+          hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
         },
       ],
     },
diff --git a/src/ui.js b/src/ui.js
deleted file mode 100644
index c1c6d5d3..00000000
--- a/src/ui.js
+++ /dev/null
@@ -1,30 +0,0 @@
-let instances = [];
-
-function onDocumentClick(e, el, fn) {
-  let target = e.target;
-  if (el !== target && !el.contains(target)) {
-    fn(e);
-  }
-}
-
-export const outsideClickDirective = {
-  beforeMount(el, binding) {
-    el.dataset.outsideClickIndex = instances.length;
-
-    const fn = binding.value;
-    const click = function (e) {
-      onDocumentClick(e, el, fn);
-    };
-
-    document.addEventListener('click', click);
-    instances.push(click);
-  },
-  unmounted(el) {
-    const index = el.dataset.outsideClickIndex;
-    const handler = instances[index];
-    document.addEventListener('click', handler);
-    instances.splice(index, 1);
-  },
-};
-
-// https://github.com/frappe/frappejs/commits/master/ui/plugins/outsideClickDirective.js
diff --git a/src/components/Charts/chartUtils.ts b/src/utils/chart.ts
similarity index 88%
rename from src/components/Charts/chartUtils.ts
rename to src/utils/chart.ts
index dfb1f3fc..19afd27b 100644
--- a/src/components/Charts/chartUtils.ts
+++ b/src/utils/chart.ts
@@ -60,3 +60,12 @@ export function getYMin(points: Array<Array<number>>): number {
 
   return getVal(minVal);
 }
+
+export function formatXLabels(label: string) {
+  // Format: Mmm YYYY -> Mm YY
+  const splits = label.split(' ');
+  const month = splits[0];
+  const year = splits[1].slice(2);
+
+  return `${month} ${year}`;
+}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index a83f37e9..a030ebf1 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -67,15 +67,6 @@ export function fuzzyMatch(keyword: string, candidate: string) {
   return { isMatch, distance };
 }
 
-export function formatXLabels(label: string) {
-  // Format: Mmm YYYY -> Mm YY
-  const splits = label.split(' ');
-  const month = splits[0];
-  const year = splits[1].slice(2);
-
-  return `${month} ${year}`;
-}
-
 export function convertPesaValuesToFloat(obj: Record<string, unknown>) {
   Object.keys(obj).forEach((key) => {
     const value = obj[key];
@@ -86,12 +77,3 @@ export function convertPesaValuesToFloat(obj: Record<string, unknown>) {
     obj[key] = (value as Money).float;
   });
 }
-
-export async function getIsSetupComplete() {
-  try {
-    const { setupComplete } = await fyo.doc.getSingle('AccountingSettings');
-    return !!setupComplete;
-  } catch {
-    return false;
-  }
-}
diff --git a/src/pages/Dashboard/getDatesAndPeriodicity.js b/src/utils/misc.ts
similarity index 70%
rename from src/pages/Dashboard/getDatesAndPeriodicity.js
rename to src/utils/misc.ts
index 36e4302e..e139c881 100644
--- a/src/pages/Dashboard/getDatesAndPeriodicity.js
+++ b/src/utils/misc.ts
@@ -1,10 +1,12 @@
-import frappe from 'frappe';
 import { DateTime } from 'luxon';
+import { fyo } from 'src/initFyo';
 
-export async function getDatesAndPeriodicity(period) {
+export async function getDatesAndPeriodicity(
+  period: 'This Year' | 'This Quarter' | 'This Month'
+) {
   let fromDate, toDate;
-  let periodicity = 'Monthly';
-  let accountingSettings = await frappe.getSingle('AccountingSettings');
+  const periodicity = 'Monthly';
+  const accountingSettings = await fyo.doc.getSingle('AccountingSettings');
 
   if (period === 'This Year') {
     fromDate = accountingSettings.fiscalYearStart;
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 84eb9f1d..07777196 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -26,4 +26,4 @@ export interface QuickEditOptions {
   hideFields?: string[];
   showFields?: string[];
   defaults?: Record<string, unknown>;
-}
+}
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index e4bcd831..e6889c87 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -27,11 +27,11 @@ module.exports = {
   },
   pages: {
     index: {
-      entry: 'src/main.js',
+      entry: 'src/renderer.ts',
       filename: 'index.html',
     },
     print: {
-      entry: 'src/print.js',
+      entry: 'src/print.ts',
       filename: 'print.html',
     },
   },

From 27aed52044479613fd36221a5bbdfbf2e64a2a2d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 21 Apr 2022 18:38:36 +0530
Subject: [PATCH 060/163] incr: type some files, frappe -> fyo - get books to
 serve albiet broken - one step at a time

---
 accounting/gst.js                             |  25 +-
 fyo/core/docHandler.ts                        |   2 +-
 fyo/core/types.ts                             |   9 +-
 fyo/index.ts                                  |   5 +
 fyo/model/doc.ts                              |   4 +-
 fyo/model/naming.ts                           |   2 +-
 fyo/tests/testFyo.spec.ts                     |   2 +-
 fyo/utils/index.ts                            |  19 +-
 main/registerIpcMainActionListeners.ts        |   8 +-
 models/baseModels/Account/types.ts            |   1 +
 models/index.ts                               |   2 +-
 .../AccountsReceivablePayable.js              |   8 +-
 .../{BalanceSheet.js => BalanceSheet.ts}      |  14 +-
 reports/BalanceSheet/viewConfig.js            |   5 +-
 .../BankReconciliation/BankReconciliation.js  |   6 +-
 .../BankReconciliationImport.js               |   8 +-
 reports/Cashflow/Cashflow.js                  |  40 --
 reports/Cashflow/Cashflow.ts                  |  52 +++
 .../FinancialStatements.js                    | 334 --------------
 .../financialStatements.ts                    | 426 ++++++++++++++++++
 reports/GeneralLedger/GeneralLedger.js        |   5 +-
 reports/GoodsAndServiceTax/BaseGSTR.js        |  15 +-
 reports/ProfitAndLoss/ProfitAndLoss.js        |  83 ----
 reports/ProfitAndLoss/ProfitAndLoss.ts        | 107 +++++
 reports/ProfitAndLoss/viewConfig.js           |   7 +-
 reports/PurchaseRegister/PurchaseRegister.js  |   6 +-
 reports/SalesRegister/SalesRegister.js        |   6 +-
 reports/TrialBalance/TrialBalance.js          |   2 +-
 reports/TrialBalance/viewConfig.js            |   7 +-
 reports/commonExporter.ts                     | 161 +++++++
 reports/index.js                              |   5 +
 reports/types.ts                              |  23 +
 reports/view.js                               |  38 +-
 src/App.vue                                   |  56 +--
 src/components/Badge.vue                      |   2 +-
 src/components/Charts/BarChart.vue            |   2 +-
 src/components/Charts/LineChart.vue           |   2 +-
 src/components/Controls/AttachImage.vue       |   8 +-
 src/components/Controls/Currency.vue          |   8 +-
 src/components/Controls/Date.vue              |   4 +-
 src/components/Controls/LanguageSelector.vue  |  11 +-
 src/components/Controls/Link.vue              |  14 +-
 src/components/Controls/Table.vue             |   4 +-
 src/components/FeatherIcon.vue                |   2 -
 src/components/FilterDropdown.vue             |   8 +-
 src/components/InvoiceCustomizer.vue          |  93 ----
 src/components/ReconciliationValidation.vue   |   3 +-
 .../SalesInvoice/SalesInvoicePrint.vue        | 116 -----
 .../SalesInvoice/Templates/Base.vue           |   4 +-
 .../SalesInvoice/Templates/Basic.vue          |  14 +-
 .../SalesInvoice/Templates/Business.vue       |  14 +-
 .../SalesInvoice/Templates/Minimal.vue        |  14 +-
 src/components/SearchBar.vue                  |  10 +-
 src/components/Sidebar.vue                    |   7 +-
 src/components/StatusBadge.vue                |   3 +-
 src/components/Toast.vue                      |   5 +-
 src/components/TwoColumnForm.vue              |  10 +-
 src/components/Widgets/PartyWidget.vue        |  12 +-
 src/components/once/TelemetryModal.vue        |  12 +-
 src/dataImport.ts                             | 128 +++---
 src/getLanguageMap.ts                         |   5 +-
 src/initFyo.ts                                |   2 +-
 src/pages/ChartOfAccounts.vue                 |  10 +-
 src/pages/Dashboard/Cashflow.vue              |   8 +-
 src/pages/Dashboard/Expenses.vue              |  10 +-
 src/pages/Dashboard/PeriodSelector.vue        |   2 +-
 src/pages/Dashboard/ProfitAndLoss.vue         |   8 +-
 src/pages/Dashboard/UnpaidInvoices.vue        |  13 +-
 src/pages/DataImport.vue                      |  12 +-
 src/pages/DatabaseSelector.vue                |  14 +-
 src/pages/GetStarted.vue                      |  43 +-
 src/pages/InvoiceForm.vue                     |  16 +-
 src/pages/JournalEntryForm.vue                |  14 +-
 src/pages/ListView/List.vue                   |  10 +-
 src/pages/ListView/ListCell.vue               |   8 +-
 src/pages/ListView/ListView.vue               |   9 +-
 src/pages/PrintView/PrintView.vue             |  12 +-
 src/pages/QuickEditForm.vue                   |   7 +-
 src/pages/Report.vue                          |  10 +-
 src/pages/Settings/Settings.vue               |  17 +-
 src/pages/Settings/TabGeneral.vue             |  15 +-
 src/pages/Settings/TabInvoice.vue             |  24 +-
 src/pages/Settings/TabSystem.vue              |  25 +-
 src/pages/SetupWizard/SetupWizard.vue         |  19 +-
 src/postStart.ts                              |   2 +-
 src/renderer.ts                               |   2 -
 src/router.ts                                 |  22 +-
 src/saveHtmlAsPdf.js                          |   2 +-
 src/utils/ui.ts                               |   2 +-
 tsconfig.json                                 |  18 +-
 vue.config.js                                 |   4 +
 91 files changed, 1238 insertions(+), 1130 deletions(-)
 rename reports/BalanceSheet/{BalanceSheet.js => BalanceSheet.ts} (66%)
 delete mode 100644 reports/Cashflow/Cashflow.js
 create mode 100644 reports/Cashflow/Cashflow.ts
 delete mode 100644 reports/FinancialStatements/FinancialStatements.js
 create mode 100644 reports/FinancialStatements/financialStatements.ts
 delete mode 100644 reports/ProfitAndLoss/ProfitAndLoss.js
 create mode 100644 reports/ProfitAndLoss/ProfitAndLoss.ts
 create mode 100644 reports/commonExporter.ts
 create mode 100644 reports/types.ts
 delete mode 100644 src/components/InvoiceCustomizer.vue
 delete mode 100644 src/components/SalesInvoice/SalesInvoicePrint.vue

diff --git a/accounting/gst.js b/accounting/gst.js
index e068f44b..65fdb261 100644
--- a/accounting/gst.js
+++ b/accounting/gst.js
@@ -1,5 +1,6 @@
-import frappe, { t } from 'fyo';
+import { t } from 'fyo';
 import { DateTime } from 'luxon';
+import { fyo } from 'src/initFyo';
 import { showMessageDialog } from 'src/utils';
 import { stateCodeMap } from '../regional/in';
 import { exportCsv, saveExportData } from '../reports/commonExporter';
@@ -46,7 +47,7 @@ const IGST = {
 };
 
 export async function generateGstr1Json(getReportData) {
-  const { gstin } = frappe.AccountingSettings;
+  const { gstin } = fyo.AccountingSettings;
   if (!gstin) {
     showMessageDialog({
       message: t`Export Failed`,
@@ -106,7 +107,7 @@ async function generateB2bData(rows) {
       itms: [],
     };
 
-    const items = await frappe.db.getAllRaw('SalesInvoiceItem', {
+    const items = await fyo.db.getAllRaw('SalesInvoiceItem', {
       fields: ['*'],
       filters: { parent: invRecord.inum },
     });
@@ -115,18 +116,18 @@ async function generateB2bData(rows) {
       const itemRecord = {
         num: item.hsnCode,
         itm_det: {
-          txval: frappe.pesa(item.baseAmount).float,
+          txval: fyo.pesa(item.baseAmount).float,
           rt: GST[item.tax],
           csamt: 0,
-          camt: frappe
+          camt: fyo
             .pesa(CSGST[item.tax] || 0)
             .mul(item.baseAmount)
             .div(100).float,
-          samt: frappe
+          samt: fyo
             .pesa(CSGST[item.tax] || 0)
             .mul(item.baseAmount)
             .div(100).float,
-          iamt: frappe
+          iamt: fyo
             .pesa(IGST[item.tax] || 0)
             .mul(item.baseAmount)
             .div(100).float,
@@ -167,7 +168,7 @@ async function generateB2clData(invoices) {
       itms: [],
     };
 
-    const items = await frappe.db.getAllRaw('SalesInvoiceItem', {
+    const items = await fyo.db.getAllRaw('SalesInvoiceItem', {
       fields: ['*'],
       filters: { parent: invRecord.inum },
     });
@@ -176,10 +177,10 @@ async function generateB2clData(invoices) {
       const itemRecord = {
         num: item.hsnCode,
         itm_det: {
-          txval: frappe.pesa(item.baseAmount).float,
+          txval: fyo.pesa(item.baseAmount).float,
           rt: GST[item.tax],
           csamt: 0,
-          iamt: frappe
+          iamt: fyo
             .pesa(invoice.rate || 0)
             .mul(item.baseAmount)
             .div(100).float,
@@ -228,7 +229,7 @@ async function generateB2csData(invoices) {
 }
 
 export async function generateGstr2Csv(getReportData) {
-  const { gstin } = frappe.AccountingSettings;
+  const { gstin } = fyo.AccountingSettings;
   if (!gstin) {
     showMessageDialog({
       message: t`Export Failed`,
@@ -309,7 +310,7 @@ async function generateB2bCsvGstr2(rows, columns) {
 }
 
 export async function generateGstr1Csv(getReportData) {
-  const { gstin } = frappe.AccountingSettings;
+  const { gstin } = fyo.AccountingSettings;
   if (!gstin) {
     showMessageDialog({
       message: t`Export Failed`,
diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index 84b4e395..69dc67e1 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -1,8 +1,8 @@
 import Doc from 'fyo/model/doc';
 import { DocMap, ModelMap, SinglesMap } from 'fyo/model/types';
 import { coreModels } from 'fyo/models';
-import { getRandomString } from 'fyo/utils';
 import Observable from 'fyo/utils/observable';
+import { getRandomString } from 'utils';
 import { Fyo } from '..';
 import { DocValue, DocValueMap } from './types';
 
diff --git a/fyo/core/types.ts b/fyo/core/types.ts
index 7dd4cac6..c4af5d15 100644
--- a/fyo/core/types.ts
+++ b/fyo/core/types.ts
@@ -4,7 +4,14 @@ import { RawValue } from 'schemas/types';
 import { AuthDemuxBase } from 'utils/auth/types';
 import { DatabaseDemuxBase } from 'utils/db/types';
 
-export type DocValue = string | number | boolean | Date | Money | null;
+export type DocValue =
+  | string
+  | number
+  | boolean
+  | Date
+  | Money
+  | null
+  | undefined;
 export type DocValueMap = Record<string, DocValue | Doc[] | DocValueMap[]>;
 export type RawValueMap = Record<string, RawValue | RawValueMap[]>;
 
diff --git a/fyo/index.ts b/fyo/index.ts
index eef20690..cc8286c8 100644
--- a/fyo/index.ts
+++ b/fyo/index.ts
@@ -165,6 +165,11 @@ export class Fyo {
     await this.auth.logout();
   }
 
+  getField(schemaName: string, fieldname: string) {
+    const schema = this.schemaMap[schemaName];
+    return schema?.fields.find((f) => f.fieldname === fieldname);
+  }
+
   store = {
     isDevelopment: false,
     appVersion: '',
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 4e7535ca..39e69698 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -16,8 +16,8 @@ import {
   Schema,
   TargetField,
 } from 'schemas/types';
-import { getIsNullOrUndef, getMapFromList } from 'utils';
-import { getRandomString, isPesa } from '../utils/index';
+import { getIsNullOrUndef, getMapFromList, getRandomString } from 'utils';
+import { isPesa } from '../utils/index';
 import {
   areDocValuesEqual,
   getMissingMandatoryMessage,
diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts
index 75c86279..e8c7a59e 100644
--- a/fyo/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -1,9 +1,9 @@
 import { Fyo } from 'fyo';
 import NumberSeries from 'fyo/models/NumberSeries';
-import { getRandomString } from 'fyo/utils';
 import { DEFAULT_SERIES_START } from 'fyo/utils/consts';
 import { BaseError } from 'fyo/utils/errors';
 import { Field, Schema } from 'schemas/types';
+import { getRandomString } from 'utils';
 import Doc from './doc';
 
 export function getNumberSeries(schema: Schema): Field | undefined {
diff --git a/fyo/tests/testFyo.spec.ts b/fyo/tests/testFyo.spec.ts
index 34e6ce27..ed2c266b 100644
--- a/fyo/tests/testFyo.spec.ts
+++ b/fyo/tests/testFyo.spec.ts
@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 import 'mocha';
-import models, { getRegionalModels } from 'models';
+import { getRegionalModels, models } from 'models';
 import { getSchemas } from 'schemas';
 import { Fyo } from '..';
 import { DatabaseManager } from '../../backend/database/manager';
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index b77ffb25..187e22e8 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -1,4 +1,3 @@
-import { Fyo } from 'fyo';
 import Doc from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { pesa } from 'pesa';
@@ -11,23 +10,13 @@ export function slug(str: string) {
     .replace(/\s+/g, '');
 }
 
-export function getRandomString() {
-  return Math.random().toString(36).substr(3);
-}
-
-export async function sleep(seconds: number) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, seconds * 1000);
-  });
-}
-
 export function range(n: number) {
   return Array(n)
     .fill(null)
     .map((_, i) => i);
 }
 
-export function unique(list: unknown[], key = (it: unknown) => String(it)) {
+export function unique<T>(list: T[], key = (it: T) => String(it)) {
   const seen: Record<string, boolean> = {};
   return list.filter((item) => {
     const k = key(item);
@@ -54,11 +43,11 @@ export function isPesa(value: unknown): boolean {
   return value instanceof pesa().constructor;
 }
 
-export function getActions(doc: Doc, fyo: Fyo): Action[] {
-  const Model = fyo.models[doc.schemaName];
+export function getActions(doc: Doc): Action[] {
+  const Model = doc.fyo.models[doc.schemaName];
   if (Model === undefined) {
     return [];
   }
 
-  return Model.getActions(fyo);
+  return Model.getActions(doc.fyo);
 }
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index e7b54e2a..97da5eb1 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -134,7 +134,7 @@ export default function registerIpcMainActionListeners(main: Main) {
           countryCode
         );
       } catch (error) {
-        response.error = error.toString();
+        response.error = (error as Error).toString();
       }
 
       return response;
@@ -151,7 +151,7 @@ export default function registerIpcMainActionListeners(main: Main) {
           countryCode
         );
       } catch (error) {
-        response.error = error.toString();
+        response.error = (error as Error).toString();
       }
 
       return response;
@@ -165,7 +165,7 @@ export default function registerIpcMainActionListeners(main: Main) {
       try {
         response.data = await databaseManager.call(method, ...args);
       } catch (error) {
-        response.error = error.toString();
+        response.error = (error as Error).toString();
       }
 
       return response;
@@ -179,7 +179,7 @@ export default function registerIpcMainActionListeners(main: Main) {
       try {
         response.data = await databaseManager.callBespoke(method, ...args);
       } catch (error) {
-        response.error = error.toString();
+        response.error = (error as Error).toString();
       }
 
       return response;
diff --git a/models/baseModels/Account/types.ts b/models/baseModels/Account/types.ts
index 9d8b5d49..477d3007 100644
--- a/models/baseModels/Account/types.ts
+++ b/models/baseModels/Account/types.ts
@@ -26,6 +26,7 @@ export type AccountRootType =
   | 'Income'
   | 'Expense';
 
+
 export interface COARootAccount {
   rootType: AccountRootType;
   [key: string]: COAChildAccount | AccountRootType;
diff --git a/models/index.ts b/models/index.ts
index 139ae4a4..09549533 100644
--- a/models/index.ts
+++ b/models/index.ts
@@ -17,7 +17,7 @@ import { SetupWizard } from './baseModels/SetupWizard/SetupWizard';
 import { Tax } from './baseModels/Tax/Tax';
 import { TaxSummary } from './baseModels/TaxSummary/TaxSummary';
 
-export default {
+export const models = {
   Account,
   AccountingLedgerEntry,
   AccountingSettings,
diff --git a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js b/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
index 11658ac0..614c0c84 100644
--- a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
+++ b/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
@@ -1,4 +1,4 @@
-import frappe from 'fyo';
+import fyo from 'fyo';
 
 export default class AccountsReceivablePayable {
   async run(reportType, { date }) {
@@ -65,7 +65,7 @@ async function getReceivablePayable({ reportType = 'Receivable', date }) {
   // helpers
 
   async function getVouchers() {
-    return await frappe.db.getAll({
+    return await fyo.db.getAll({
       doctype: referenceType,
       fields: ['name', 'date'],
       filters: {
@@ -140,7 +140,7 @@ async function getReceivablePayable({ reportType = 'Receivable', date }) {
 
     const partyType = reportType === 'Receivable' ? 'customer' : 'supplier';
     const partyList = (
-      await frappe.db.getAll({
+      await fyo.db.getAll({
         doctype: 'Party',
         filters: {
           [partyType]: 1,
@@ -148,7 +148,7 @@ async function getReceivablePayable({ reportType = 'Receivable', date }) {
       })
     ).map((d) => d.name);
 
-    return await frappe.db.getAll({
+    return await fyo.db.getAll({
       doctype: 'AccountingLedgerEntry',
       fields: [
         'name',
diff --git a/reports/BalanceSheet/BalanceSheet.js b/reports/BalanceSheet/BalanceSheet.ts
similarity index 66%
rename from reports/BalanceSheet/BalanceSheet.js
rename to reports/BalanceSheet/BalanceSheet.ts
index 9daf6430..02431843 100644
--- a/reports/BalanceSheet/BalanceSheet.js
+++ b/reports/BalanceSheet/BalanceSheet.ts
@@ -1,9 +1,13 @@
+import { Fyo } from 'fyo';
 import { unique } from 'fyo/utils';
-import { getData } from '../FinancialStatements/FinancialStatements';
+import { FinancialStatements } from 'reports/FinancialStatements/financialStatements';
+import { FinancialStatementOptions } from 'reports/types';
 
 class BalanceSheet {
-  async run({ fromDate, toDate, periodicity }) {
-    let asset = await getData({
+  async run(options: FinancialStatementOptions, fyo: Fyo) {
+    const { fromDate, toDate, periodicity } = options;
+    const fs = new FinancialStatements(fyo);
+    const asset = await fs.getData({
       rootType: 'Asset',
       balanceMustBe: 'Debit',
       fromDate,
@@ -12,7 +16,7 @@ class BalanceSheet {
       accumulateValues: true,
     });
 
-    let liability = await getData({
+    const liability = await fs.getData({
       rootType: 'Liability',
       balanceMustBe: 'Credit',
       fromDate,
@@ -21,7 +25,7 @@ class BalanceSheet {
       accumulateValues: true,
     });
 
-    let equity = await getData({
+    const equity = await fs.getData({
       rootType: 'Equity',
       balanceMustBe: 'Credit',
       fromDate,
diff --git a/reports/BalanceSheet/viewConfig.js b/reports/BalanceSheet/viewConfig.js
index a0a6b669..3d573002 100644
--- a/reports/BalanceSheet/viewConfig.js
+++ b/reports/BalanceSheet/viewConfig.js
@@ -1,5 +1,6 @@
-import frappe, { t } from 'fyo';
+import { t } from 'fyo';
 import getCommonExportActions from '../commonExporter';
+import { fyo } from 'src/initFyo';
 
 const periodicityMap = {
   Monthly: t`Monthly`,
@@ -19,7 +20,7 @@ export default {
       label: t`To Date`,
       required: 1,
       default: async () => {
-        return (await frappe.getSingle('AccountingSettings')).fiscalYearEnd;
+        return (await fyo.doc.getSingle('AccountingSettings')).fiscalYearEnd;
       },
     },
     {
diff --git a/reports/BankReconciliation/BankReconciliation.js b/reports/BankReconciliation/BankReconciliation.js
index 7e8bf17f..4540f16b 100644
--- a/reports/BankReconciliation/BankReconciliation.js
+++ b/reports/BankReconciliation/BankReconciliation.js
@@ -1,4 +1,4 @@
-import frappe from 'fyo';
+import { fyo } from 'src/initFyo'
 
 class BankReconciliation {
   async run(params) {
@@ -15,7 +15,7 @@ class BankReconciliation {
 
     filters.paymentMethod = ['in', ['Cheque', 'Transfer']];
 
-    let data = await frappe.db.getAll({
+    let data = await fyo.db.getAll({
       doctype: 'Payment',
       fields: [
         'date',
@@ -31,7 +31,7 @@ class BankReconciliation {
     });
 
     for (var i = 0; i < data.length; i++) {
-      let ledger = await frappe.db.getAll({
+      let ledger = await fyo.db.getAll({
         doctype: 'AccountingLedgerEntry',
         fields: ['date', 'referenceType', 'referenceName', 'debit', 'credit'],
         filters: {
diff --git a/reports/BankReconciliation/BankReconciliationImport.js b/reports/BankReconciliation/BankReconciliationImport.js
index 4af6c2b1..b407f713 100644
--- a/reports/BankReconciliation/BankReconciliationImport.js
+++ b/reports/BankReconciliation/BankReconciliationImport.js
@@ -1,5 +1,5 @@
 import csv2json from 'csvjson-csv2json';
-import frappe from 'fyo';
+import { fyo } from 'src/initFyo';
 import ReconciliationValidation from '../../src/components/ReconciliationValidation';
 
 export const fileImportHandler = (file, report) => {
@@ -42,7 +42,7 @@ export const findMatchingReferences = async (json, report) => {
   const references = json.map((row) => {
     return row[referenceField];
   });
-  const payments = await frappe.db.getAll({
+  const payments = await fyo.db.getAll({
     doctype: 'Payment',
     fields: ['*'],
     filters: {
@@ -60,11 +60,11 @@ export const findMatchingReferences = async (json, report) => {
     });
     const normalizedEntries = entries.map((entry) => {
       return {
-        'Posting Date': frappe.format(entry.date, 'Date'),
+        'Posting Date': fyo.format(entry.date, 'Date'),
         'Payment Entry': entry.name,
         'Ref/Cheq. ID': entry[referenceField],
         'Cr/Dr':
-          frappe.parseNumber(entry[debitField]) > 0
+          fyo.parseNumber(entry[debitField]) > 0
             ? entry[debitField] + ' Dr.'
             : entry[creditField] + ' Cr.',
         'Clearance Date': entry[clearanceDateField],
diff --git a/reports/Cashflow/Cashflow.js b/reports/Cashflow/Cashflow.js
deleted file mode 100644
index 0fed2e6d..00000000
--- a/reports/Cashflow/Cashflow.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import frappe from 'fyo';
-import { DateTime } from 'luxon';
-import {
-  getFiscalYear,
-  getPeriodList,
-} from '../FinancialStatements/FinancialStatements';
-
-class Cashflow {
-  async run({ fromDate, toDate, periodicity }) {
-    const res = await frappe.db.getCashflow(fromDate, toDate);
-    let fiscalYear = await getFiscalYear();
-    let periodList = getPeriodList(fromDate, toDate, periodicity, fiscalYear);
-
-    let data = periodList.map((periodKey) => {
-      let monthYear = this.getMonthYear(periodKey, 'MMM yyyy');
-      let cashflowForPeriod = res.find((d) => d['month-year'] === monthYear);
-      if (cashflowForPeriod) {
-        cashflowForPeriod.periodKey = periodKey;
-        return cashflowForPeriod;
-      }
-      return {
-        inflow: 0,
-        outflow: 0,
-        periodKey,
-        'month-year': monthYear,
-      };
-    });
-
-    return {
-      data,
-      periodList,
-    };
-  }
-
-  getMonthYear(periodKey, format) {
-    return DateTime.fromFormat(periodKey, format).toFormat('MM-yyyy');
-  }
-}
-
-export default Cashflow;
diff --git a/reports/Cashflow/Cashflow.ts b/reports/Cashflow/Cashflow.ts
new file mode 100644
index 00000000..568b044a
--- /dev/null
+++ b/reports/Cashflow/Cashflow.ts
@@ -0,0 +1,52 @@
+import { Fyo } from 'fyo';
+import { DateTime } from 'luxon';
+import {
+  getFiscalYear,
+  getPeriodList,
+} from 'reports/FinancialStatements/financialStatements';
+import { FinancialStatementOptions } from 'reports/types';
+
+class Cashflow {
+  fyo: Fyo;
+  constructor(fyo: Fyo) {
+    this.fyo = fyo;
+  }
+  async run(options: FinancialStatementOptions) {
+    const { fromDate, toDate, periodicity } = options;
+    const res = await this.fyo.db.getCashflow(fromDate, toDate);
+    const fiscalYear = await getFiscalYear(this.fyo);
+    const periodList = getPeriodList(
+      fromDate,
+      toDate,
+      periodicity!,
+      fiscalYear
+    );
+
+    const data = periodList.map((periodKey) => {
+      const monthYear = this.getMonthYear(periodKey, 'MMM yyyy');
+      const cashflowForPeriod = res.find((d) => d['month-year'] === monthYear);
+
+      if (cashflowForPeriod) {
+        return { ...cashflowForPeriod, periodKey };
+      }
+
+      return {
+        inflow: 0,
+        outflow: 0,
+        periodKey,
+        'month-year': monthYear,
+      };
+    });
+
+    return {
+      data,
+      periodList,
+    };
+  }
+
+  getMonthYear(periodKey: string, format: string) {
+    return DateTime.fromFormat(periodKey, format).toFormat('MM-yyyy');
+  }
+}
+
+export default Cashflow;
diff --git a/reports/FinancialStatements/FinancialStatements.js b/reports/FinancialStatements/FinancialStatements.js
deleted file mode 100644
index 2e382a63..00000000
--- a/reports/FinancialStatements/FinancialStatements.js
+++ /dev/null
@@ -1,334 +0,0 @@
-import frappe from 'fyo';
-import { DateTime } from 'luxon';
-import { convertPesaValuesToFloat } from '../../src/utils';
-
-export async function getData({
-  rootType,
-  balanceMustBe = 'Debit',
-  fromDate,
-  toDate,
-  periodicity = 'Monthly',
-  accumulateValues = false,
-}) {
-  let accounts = await getAccounts(rootType);
-  let fiscalYear = await getFiscalYear();
-  let ledgerEntries = await getLedgerEntries(fromDate, toDate, accounts);
-  let periodList = getPeriodList(fromDate, toDate, periodicity, fiscalYear);
-
-  for (let account of accounts) {
-    const entries = ledgerEntries.filter(
-      (entry) => entry.account === account.name
-    );
-
-    for (let entry of entries) {
-      let periodKey = getPeriodKey(entry.date, periodicity, fiscalYear);
-
-      if (!account[periodKey]) {
-        account[periodKey] = frappe.pesa(0.0);
-      }
-
-      const multiplier = balanceMustBe === 'Debit' ? 1 : -1;
-      const value = entry.debit.sub(entry.credit).mul(multiplier);
-      account[periodKey] = value.add(account[periodKey]);
-    }
-  }
-
-  if (accumulateValues) {
-    periodList.forEach((periodKey, i) => {
-      if (i === 0) return;
-      const previousPeriodKey = periodList[i - 1];
-
-      for (let account of accounts) {
-        if (!account[periodKey]) {
-          account[periodKey] = frappe.pesa(0.0);
-        }
-
-        account[periodKey] = account[periodKey].add(
-          account[previousPeriodKey] ?? 0
-        );
-      }
-    });
-  }
-
-  // calculate totalRow
-  let totalRow = {
-    account: `Total ${rootType} (${balanceMustBe})`,
-  };
-
-  periodList.forEach((periodKey) => {
-    if (!totalRow[periodKey]) {
-      totalRow[periodKey] = frappe.pesa(0.0);
-    }
-
-    for (let account of accounts) {
-      totalRow[periodKey] = totalRow[periodKey].add(account[periodKey] ?? 0.0);
-    }
-  });
-
-  convertPesaValuesToFloat(totalRow);
-  accounts.forEach(convertPesaValuesToFloat);
-
-  return { accounts, totalRow, periodList };
-}
-
-export async function getTrialBalance({ rootType, fromDate, toDate }) {
-  let accounts = await getAccounts(rootType);
-  let ledgerEntries = await getLedgerEntries(null, toDate, accounts);
-
-  for (let account of accounts) {
-    const accountEntries = ledgerEntries.filter(
-      (entry) => entry.account === account.name
-    );
-    // opening
-    const beforePeriodEntries = accountEntries.filter(
-      (entry) => entry.date < fromDate
-    );
-    account.opening = beforePeriodEntries.reduce(
-      (acc, entry) => acc.add(entry.debit).sub(entry.credit),
-      frappe.pesa(0)
-    );
-
-    if (account.opening.gte(0)) {
-      account.openingDebit = account.opening;
-      account.openingCredit = frappe.pesa(0);
-    } else {
-      account.openingCredit = account.opening.neg();
-      account.openingDebit = frappe.pesa(0);
-    }
-
-    // debit / credit
-    const periodEntries = accountEntries.filter(
-      (entry) => entry.date >= fromDate && entry.date < toDate
-    );
-    account.debit = periodEntries.reduce(
-      (acc, entry) => acc.add(entry.debit),
-      frappe.pesa(0)
-    );
-    account.credit = periodEntries.reduce(
-      (acc, entry) => acc.add(entry.credit),
-      frappe.pesa(0)
-    );
-
-    // closing
-    account.closing = account.opening.add(account.debit).sub(account.credit);
-
-    if (account.closing.gte(0)) {
-      account.closingDebit = account.closing;
-      account.closingCredit = frappe.pesa(0);
-    } else {
-      account.closingCredit = account.closing.neg();
-      account.closingDebit = frappe.pesa(0);
-    }
-
-    if (account.debit.neq(0) || account.credit.neq(0)) {
-      setParentEntry(account, account.parentAccount);
-    }
-  }
-
-  function setParentEntry(leafAccount, parentName) {
-    for (let acc of accounts) {
-      if (acc.name === parentName) {
-        acc.debit = acc.debit.add(leafAccount.debit);
-        acc.credit = acc.credit.add(leafAccount.credit);
-        acc.closing = acc.opening.add(acc.debit).sub(acc.credit);
-        if (acc.closing.gte(0)) {
-          acc.closingDebit = acc.closing;
-        } else {
-          acc.closingCredit = acc.closing.neg();
-        }
-        if (acc.parentAccount) {
-          setParentEntry(leafAccount, acc.parentAccount);
-        } else {
-          return;
-        }
-      }
-    }
-  }
-
-  accounts.forEach(convertPesaValuesToFloat);
-  return accounts;
-}
-
-export function getPeriodList(fromDate, toDate, periodicity, fiscalYear) {
-  if (!fromDate) {
-    fromDate = fiscalYear.start;
-  }
-
-  let monthsToAdd = {
-    Monthly: 1,
-    Quarterly: 3,
-    'Half Yearly': 6,
-    Yearly: 12,
-  }[periodicity];
-
-  let startDate = DateTime.fromISO(fromDate).startOf('month');
-  let endDate = DateTime.fromISO(toDate).endOf('month');
-  let curDate = startDate;
-  let out = [];
-
-  while (curDate <= endDate) {
-    out.push(getPeriodKey(curDate, periodicity, fiscalYear));
-    curDate = curDate.plus({ months: monthsToAdd });
-  }
-
-  return out;
-}
-
-function getPeriodKey(date, periodicity, fiscalYear) {
-  let key;
-  let { start, end, quarters, isSplit } = fiscalYear;
-  let dateObj = DateTime.fromISO(date);
-  let { month, quarter, year } = dateObj;
-  let fisacalStart = DateTime.fromISO(start);
-  let fisacalEnd = DateTime.fromISO(end);
-
-  let getKey = {
-    Monthly: () => `${dateObj.monthShort} ${year}`,
-    Quarterly: () => {
-      const key =
-        month < fisacalStart.month
-          ? `${year - 1} - ${year}`
-          : `${year} - ${year + 1}`;
-      let strYear = isSplit ? key : `${year}`;
-      return {
-        1: `Q1 ${strYear}`,
-        2: `Q2 ${strYear}`,
-        3: `Q3 ${strYear}`,
-        4: `Q4 ${strYear}`,
-      }[quarters[month - 1]];
-    },
-    'Half Yearly': () => {
-      const key =
-        month < fisacalStart.month
-          ? `${year - 1} - ${year}`
-          : `${year} - ${year + 1}`;
-      let strYear = isSplit ? key : `${year}`;
-      return {
-        1: `1st Half ${strYear}`,
-        2: `1st Half ${strYear}`,
-        3: `2nd Half ${strYear}`,
-        4: `2nd Half ${strYear}`,
-      }[quarters[month - 1]];
-    },
-    Yearly: () => {
-      const key =
-        month < fisacalStart.month
-          ? `${year - 1} - ${year}`
-          : `${year} - ${year + 1}`;
-      let strYear = isSplit ? key : `${year}`;
-      return `FY ${strYear}`;
-    },
-  }[periodicity];
-
-  return getKey();
-}
-
-function setIndentLevel(accounts, parentAccount, level) {
-  if (!parentAccount) {
-    // root
-    parentAccount = null;
-    level = 0;
-  }
-
-  accounts.forEach((account) => {
-    if (
-      account.parentAccount === parentAccount &&
-      account.indent === undefined
-    ) {
-      account.indent = level;
-      setIndentLevel(accounts, account.name, level + 1);
-    }
-  });
-
-  return accounts;
-}
-
-function sortAccounts(accounts) {
-  let out = [];
-  let pushed = {};
-
-  pushToOut(null);
-
-  function pushToOut(parentAccount) {
-    accounts.forEach((account) => {
-      if (account.parentAccount === parentAccount && !pushed[account.name]) {
-        out.push(account);
-        pushed[account.name] = 1;
-
-        pushToOut(account.name);
-      }
-    });
-  }
-
-  return out;
-}
-
-async function getLedgerEntries(fromDate, toDate, accounts) {
-  const dateFilter = () => {
-    const before = ['<=', toDate];
-    const after = ['>=', fromDate];
-    if (fromDate) {
-      return [...after, ...before];
-    }
-    return before;
-  };
-
-  const ledgerEntries = await frappe.db.getAll({
-    doctype: 'AccountingLedgerEntry',
-    fields: ['account', 'debit', 'credit', 'date'],
-    filters: {
-      account: ['in', accounts.map((d) => d.name)],
-      date: dateFilter(),
-    },
-  });
-
-  return ledgerEntries;
-}
-
-async function getAccounts(rootType) {
-  let accounts = await frappe.db.getAll({
-    doctype: 'Account',
-    fields: ['name', 'parentAccount', 'isGroup'],
-    filters: {
-      rootType,
-    },
-  });
-
-  accounts = setIndentLevel(accounts);
-  accounts = sortAccounts(accounts);
-
-  accounts.forEach((account) => {
-    account.account = account.name;
-  });
-
-  return accounts;
-}
-
-export async function getFiscalYear() {
-  let { fiscalYearStart, fiscalYearEnd } = await frappe.getSingle(
-    'AccountingSettings'
-  );
-
-  //right now quaters received from luxon lib is fixed to Jan as starting quarter
-  //moving the financial quarters, according to of start of fiscal year month
-  let quarters = [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4];
-  let start = DateTime.fromISO(fiscalYearStart);
-  quarters.unshift(...quarters.splice(13 - start.month, 11));
-
-  //check if fiscal year ends in next year
-  let end = DateTime.fromISO(fiscalYearEnd);
-  let isFiscalSplit = start.year - end.year;
-
-  return {
-    start: fiscalYearStart,
-    end: fiscalYearEnd,
-    quarters: quarters,
-    isSplit: isFiscalSplit,
-  };
-}
-
-export default {
-  getData,
-  getTrialBalance,
-  getPeriodList,
-};
diff --git a/reports/FinancialStatements/financialStatements.ts b/reports/FinancialStatements/financialStatements.ts
new file mode 100644
index 00000000..24185928
--- /dev/null
+++ b/reports/FinancialStatements/financialStatements.ts
@@ -0,0 +1,426 @@
+import { Fyo } from 'fyo';
+import { DocValueMap } from 'fyo/core/types';
+import { DateTime } from 'luxon';
+import { AccountRootType } from 'models/baseModels/Account/types';
+import Money from 'pesa/dist/types/src/money';
+import {
+  BalanceType,
+  FinancialStatementOptions,
+  Periodicity,
+} from 'reports/types';
+import { convertPesaValuesToFloat } from 'src/utils';
+
+interface FiscalYear {
+  start: string;
+  end: string;
+  quarters: number[];
+  isSplit: number;
+}
+
+interface AccountInfo extends DocValueMap {
+  name: string;
+  parentAccount: string;
+  isGroup: boolean;
+  account?: string;
+  indent?: number;
+}
+
+interface LedgerInfo extends DocValueMap {
+  account: string;
+  debit: Money;
+  credit: Money;
+  date: string;
+}
+
+export class FinancialStatements {
+  fyo: Fyo;
+  constructor(fyo: Fyo) {
+    this.fyo = fyo;
+  }
+
+  async getData(options: FinancialStatementOptions) {
+    const rootType = options.rootType;
+    const balanceMustBe = options.balanceMustBe ?? 'Debit';
+    const fromDate = options.fromDate;
+    const toDate = options.toDate;
+    const periodicity = options.periodicity ?? 'Monthly';
+    const accumulateValues = options.accumulateValues ?? false;
+
+    const accounts = await this.getAccounts(rootType);
+    const fiscalYear = await getFiscalYear(this.fyo);
+    const ledgerEntries = await this.getLedgerEntries(
+      fromDate,
+      toDate,
+      accounts
+    );
+    const periodList = getPeriodList(fromDate, toDate, periodicity, fiscalYear);
+    this.setPeriodAmounts(
+      accounts,
+      ledgerEntries,
+      periodicity,
+      fiscalYear,
+      balanceMustBe
+    );
+
+    if (accumulateValues) {
+      this.accumulateValues(accounts, periodList);
+    }
+
+    const totalRow = this.getTotalRow(
+      rootType,
+      balanceMustBe,
+      periodList,
+      accounts
+    );
+    accounts.forEach(convertPesaValuesToFloat);
+
+    return { accounts, totalRow, periodList };
+  }
+
+  setPeriodAmounts(
+    accounts: AccountInfo[],
+    ledgerEntries: LedgerInfo[],
+    periodicity: Periodicity,
+    fiscalYear: FiscalYear,
+    balanceMustBe: BalanceType
+  ) {
+    for (const account of accounts) {
+      const entries = ledgerEntries.filter(
+        (entry) => entry.account === account.name
+      );
+
+      for (const entry of entries) {
+        const periodKey = getPeriodKey(entry.date, periodicity, fiscalYear);
+
+        if (account[periodKey] === undefined) {
+          account[periodKey] = this.fyo.pesa(0.0);
+        }
+
+        const multiplier = balanceMustBe === 'Debit' ? 1 : -1;
+        const value = entry.debit.sub(entry.credit).mul(multiplier);
+        account[periodKey] = value.add(account[periodKey] as Money);
+      }
+    }
+  }
+
+  getTotalRow(
+    rootType: AccountRootType,
+    balanceMustBe: BalanceType,
+    periodList: string[],
+    accounts: AccountInfo[]
+  ) {
+    const totalRow: DocValueMap = {
+      account: `Total ${rootType} (${balanceMustBe})`,
+    };
+
+    periodList.forEach((periodKey) => {
+      if (totalRow[periodKey] === undefined) {
+        totalRow[periodKey] = this.fyo.pesa(0.0);
+      }
+
+      for (const account of accounts) {
+        totalRow[periodKey] = (totalRow[periodKey] as Money).add(
+          (account[periodKey] as Money) ?? 0.0
+        );
+      }
+    });
+
+    convertPesaValuesToFloat(totalRow);
+    return totalRow;
+  }
+
+  async accumulateValues(accounts: AccountInfo[], periodList: string[]) {
+    periodList.forEach((periodKey, i) => {
+      if (i === 0) {
+        return;
+      }
+
+      const previousPeriodKey = periodList[i - 1];
+
+      for (const account of accounts) {
+        if (!account[periodKey]) {
+          account[periodKey] = this.fyo.pesa(0.0);
+        }
+
+        account[periodKey] = (account[periodKey] as Money).add(
+          (account[previousPeriodKey] as Money | undefined) ?? 0
+        );
+      }
+    });
+  }
+
+  async getAccounts(rootType: AccountRootType) {
+    let accounts = (await this.fyo.db.getAll('Account', {
+      fields: ['name', 'parentAccount', 'isGroup'],
+      filters: {
+        rootType,
+      },
+    })) as AccountInfo[];
+
+    accounts = setIndentLevel(accounts);
+    accounts = sortAccounts(accounts);
+
+    accounts.forEach((account) => {
+      account.account = account.name;
+    });
+
+    return accounts;
+  }
+
+  async getLedgerEntries(
+    fromDate: string | null,
+    toDate: string,
+    accounts: AccountInfo[]
+  ) {
+    const accountFilter = ['in', accounts.map((d) => d.name)];
+    let dateFilter: string[] = ['<=', toDate];
+    if (fromDate) {
+      dateFilter = ['>=', fromDate, '<=', toDate];
+    }
+
+    const ledgerEntries = (await this.fyo.db.getAll('AccountingLedgerEntry', {
+      fields: ['account', 'debit', 'credit', 'date'],
+      filters: {
+        account: accountFilter,
+        date: dateFilter,
+      },
+    })) as LedgerInfo[];
+
+    return ledgerEntries;
+  }
+
+  async getTrialBalance(options: FinancialStatementOptions) {
+    const { rootType, fromDate, toDate } = options;
+    const accounts = await this.getAccounts(rootType);
+    const ledgerEntries = await this.getLedgerEntries(null, toDate, accounts);
+
+    for (const account of accounts) {
+      const accountEntries = ledgerEntries.filter(
+        (entry) => entry.account === account.name
+      );
+      // opening
+      const beforePeriodEntries = accountEntries.filter(
+        (entry) => entry.date < fromDate
+      );
+
+      account.opening = beforePeriodEntries.reduce(
+        (acc, entry) => acc.add(entry.debit).sub(entry.credit),
+        this.fyo.pesa(0)
+      );
+
+      if (account.opening.gte(0)) {
+        account.openingDebit = account.opening;
+        account.openingCredit = this.fyo.pesa(0);
+      } else {
+        account.openingCredit = account.opening.neg();
+        account.openingDebit = this.fyo.pesa(0);
+      }
+
+      // debit / credit
+      const periodEntries = accountEntries.filter(
+        (entry) => entry.date >= fromDate && entry.date < toDate
+      );
+      account.debit = periodEntries.reduce(
+        (acc, entry) => acc.add(entry.debit),
+        this.fyo.pesa(0)
+      );
+      account.credit = periodEntries.reduce(
+        (acc, entry) => acc.add(entry.credit),
+        this.fyo.pesa(0)
+      );
+
+      // closing
+      account.closing = account.opening.add(account.debit).sub(account.credit);
+
+      if (account.closing.gte(0)) {
+        account.closingDebit = account.closing;
+        account.closingCredit = this.fyo.pesa(0);
+      } else {
+        account.closingCredit = account.closing.neg();
+        account.closingDebit = this.fyo.pesa(0);
+      }
+
+      if (account.debit.neq(0) || account.credit.neq(0)) {
+        setParentEntry(account, account.parentAccount);
+      }
+    }
+
+    function setParentEntry(leafAccount: AccountInfo, parentName: string) {
+      for (const acc of accounts) {
+        if (acc.name === parentName) {
+          acc.debit = (acc.debit as Money).add(leafAccount.debit as Money);
+          acc.credit = (acc.credit as Money).add(leafAccount.credit as Money);
+          acc.closing = (acc.opening as Money).add(acc.debit).sub(acc.credit);
+
+          if (acc.closing.gte(0)) {
+            acc.closingDebit = acc.closing;
+          } else {
+            acc.closingCredit = acc.closing.neg();
+          }
+
+          if (acc.parentAccount) {
+            setParentEntry(leafAccount, acc.parentAccount);
+          } else {
+            return;
+          }
+        }
+      }
+    }
+
+    accounts.forEach(convertPesaValuesToFloat);
+    return accounts;
+  }
+}
+
+function setIndentLevel(
+  accounts: AccountInfo[],
+  parentAccount?: string | null,
+  level?: number
+): AccountInfo[] {
+  if (parentAccount === undefined) {
+    parentAccount = null;
+    level = 0;
+  }
+
+  accounts.forEach((account) => {
+    if (
+      account.parentAccount === parentAccount &&
+      account.indent === undefined
+    ) {
+      account.indent = level;
+      setIndentLevel(accounts, account.name, (level ?? 0) + 1);
+    }
+  });
+
+  return accounts;
+}
+
+function sortAccounts(accounts: AccountInfo[]) {
+  const out: AccountInfo[] = [];
+  const pushed: Record<string, boolean> = {};
+
+  pushToOut(null);
+
+  function pushToOut(parentAccount: string | null) {
+    accounts.forEach((account) => {
+      if (pushed[account.name] && account.parentAccount !== parentAccount) {
+        return;
+      }
+
+      out.push(account);
+      pushed[account.name] = true;
+
+      pushToOut(account.name);
+    });
+  }
+
+  return out;
+}
+
+export function getPeriodList(
+  fromDate: string,
+  toDate: string,
+  periodicity: Periodicity,
+  fiscalYear: FiscalYear
+) {
+  if (!fromDate) {
+    fromDate = fiscalYear.start;
+  }
+
+  const monthsToAdd = {
+    Monthly: 1,
+    Quarterly: 3,
+    'Half Yearly': 6,
+    Yearly: 12,
+  }[periodicity];
+
+  const startDate = DateTime.fromISO(fromDate).startOf('month');
+  const endDate = DateTime.fromISO(toDate).endOf('month');
+  let curDate = startDate;
+  const periodKeyList: string[] = [];
+
+  while (curDate <= endDate) {
+    const periodKey = getPeriodKey(curDate, periodicity, fiscalYear);
+    periodKeyList.push(periodKey);
+    curDate = curDate.plus({ months: monthsToAdd });
+  }
+
+  return periodKeyList;
+}
+
+function getPeriodKey(
+  dateObj: DateTime | string,
+  periodicity: Periodicity,
+  fiscalYear: FiscalYear
+) {
+  if (typeof dateObj === 'string') {
+    dateObj = DateTime.fromISO(dateObj);
+  }
+
+  const { start, quarters, isSplit } = fiscalYear;
+  const { month, year } = dateObj;
+  const fisacalStart = DateTime.fromISO(start);
+
+  if (periodicity === 'Monthly') {
+    return `${dateObj.monthShort} ${year}`;
+  }
+
+  if (periodicity === 'Quarterly') {
+    const key =
+      month < fisacalStart.month
+        ? `${year - 1} - ${year}`
+        : `${year} - ${year + 1}`;
+    const strYear = isSplit ? key : `${year}`;
+    return {
+      1: `Q1 ${strYear}`,
+      2: `Q2 ${strYear}`,
+      3: `Q3 ${strYear}`,
+      4: `Q4 ${strYear}`,
+    }[quarters[month - 1]] as string;
+  }
+
+  if (periodicity === 'Half Yearly') {
+    const key =
+      month < fisacalStart.month
+        ? `${year - 1} - ${year}`
+        : `${year} - ${year + 1}`;
+    const strYear = isSplit ? key : `${year}`;
+    return {
+      1: `1st Half ${strYear}`,
+      2: `1st Half ${strYear}`,
+      3: `2nd Half ${strYear}`,
+      4: `2nd Half ${strYear}`,
+    }[quarters[month - 1]] as string;
+  }
+
+  const key =
+    month < fisacalStart.month
+      ? `${year - 1} - ${year}`
+      : `${year} - ${year + 1}`;
+  const strYear = isSplit ? key : `${year}`;
+  return `FY ${strYear}`;
+}
+
+export async function getFiscalYear(fyo: Fyo): Promise<FiscalYear> {
+  const accountingSettings = await fyo.doc.getSingle('AccountingSettings');
+
+  const fiscalYearStart = accountingSettings.fiscalYearStart as string;
+  const fiscalYearEnd = accountingSettings.fiscalYearEnd as string;
+
+  //right now quaters received from luxon lib is fixed to Jan as starting quarter
+  //moving the financial quarters, according to of start of fiscal year month
+  const quarters = [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4];
+  const start = DateTime.fromISO(fiscalYearStart);
+  quarters.unshift(...quarters.splice(13 - start.month, 11));
+
+  //check if fiscal year ends in next year
+  const end = DateTime.fromISO(fiscalYearEnd);
+  const isFiscalSplit = start.year - end.year;
+
+  return {
+    start: fiscalYearStart,
+    end: fiscalYearEnd,
+    quarters: quarters,
+    isSplit: isFiscalSplit,
+  };
+}
diff --git a/reports/GeneralLedger/GeneralLedger.js b/reports/GeneralLedger/GeneralLedger.js
index a1cdbbec..35cee083 100644
--- a/reports/GeneralLedger/GeneralLedger.js
+++ b/reports/GeneralLedger/GeneralLedger.js
@@ -1,4 +1,4 @@
-import frappe from 'fyo';
+import { fyo } from 'src/initFyo';
 
 class GeneralLedger {
   async run(params) {
@@ -15,7 +15,7 @@ class GeneralLedger {
     }
 
     let data = (
-      await frappe.db.getAll({
+      await fyo.db.getAll({
         doctype: 'AccountingLedgerEntry',
         fields: [
           'date',
@@ -40,6 +40,7 @@ class GeneralLedger {
 
     return this.appendOpeningEntry(data);
   }
+
   appendOpeningEntry(data) {
     let glEntries = [];
     let balance = 0,
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.js b/reports/GoodsAndServiceTax/BaseGSTR.js
index 0577584e..b0a11072 100644
--- a/reports/GoodsAndServiceTax/BaseGSTR.js
+++ b/reports/GoodsAndServiceTax/BaseGSTR.js
@@ -1,4 +1,4 @@
-import frappe from 'fyo';
+import { fyo } from 'src/initFyo';
 import { stateCodeMap } from '../../accounting/gst';
 import { convertPesaValuesToFloat } from '../../src/utils';
 
@@ -7,7 +7,7 @@ class BaseGSTR {
     if (['GSTR-1', 'GSTR-2'].includes(gstrType)) {
       const place = filters.place;
       delete filters.place;
-      let entries = await frappe.db.getAll({
+      let entries = await fyo.db.getAll({
         doctype: gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice',
         filters,
       });
@@ -39,21 +39,18 @@ class BaseGSTR {
   }
 
   async getRow(ledgerEntry) {
-    ledgerEntry = await frappe.doc.getDoc(
-      ledgerEntry.doctype,
-      ledgerEntry.name
-    );
+    ledgerEntry = await fyo.doc.getDoc(ledgerEntry.doctype, ledgerEntry.name);
 
     const row = {};
-    const { gstin } = frappe.AccountingSettings;
+    const { gstin } = fyo.AccountingSettings;
 
-    let party = await frappe.doc.getDoc(
+    let party = await fyo.doc.getDoc(
       'Party',
       ledgerEntry.customer || ledgerEntry.supplier
     );
 
     if (party.address) {
-      let addressDetails = await frappe.doc.getDoc('Address', party.address);
+      let addressDetails = await fyo.doc.getDoc('Address', party.address);
       row.place = addressDetails.pos || '';
     }
 
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.js b/reports/ProfitAndLoss/ProfitAndLoss.js
deleted file mode 100644
index 06999f4b..00000000
--- a/reports/ProfitAndLoss/ProfitAndLoss.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import { unique } from 'fyo/utils';
-import { getData } from '../FinancialStatements/FinancialStatements';
-
-class ProfitAndLoss {
-  async run({ fromDate, toDate, periodicity }) {
-    let income = await getData({
-      rootType: 'Income',
-      balanceMustBe: 'Credit',
-      fromDate,
-      toDate,
-      periodicity,
-    });
-
-    let expense = await getData({
-      rootType: 'Expense',
-      balanceMustBe: 'Debit',
-      fromDate,
-      toDate,
-      periodicity,
-    });
-
-    let incomeTotalRow = income.totalRow;
-    incomeTotalRow.account = {
-      template: `<span class="font-semibold">${income.totalRow.account}</span>`,
-    };
-
-    let expenseTotalRow = expense.totalRow;
-    expenseTotalRow.account = {
-      template: `<span class="font-semibold">${expense.totalRow.account}</span>`,
-    };
-
-    let rows = [
-      ...income.accounts,
-      incomeTotalRow,
-      {
-        account: {
-          template: '<span>&nbsp;</span>',
-        },
-        isGroup: 1,
-      },
-      ...expense.accounts,
-      expenseTotalRow,
-      {
-        account: {
-          template: '<span>&nbsp;</span>',
-        },
-        isGroup: 1,
-      },
-    ];
-
-    rows = rows.map((row) => {
-      if (row.indent === 0) {
-        row.account = {
-          template: `<span class="font-semibold">${row.account}</span>`,
-        };
-      }
-      return row;
-    });
-
-    const columns = unique([...income.periodList, ...expense.periodList]);
-
-    let profitRow = {
-      account: 'Total Profit',
-    };
-
-    for (let column of columns) {
-      profitRow[column] =
-        (income.totalRow[column] || 0.0) - (expense.totalRow[column] || 0.0);
-
-      rows.forEach((row) => {
-        if (!row.isGroup) {
-          row[column] = row[column] || 0.0;
-        }
-      });
-    }
-
-    rows.push(profitRow);
-
-    return { rows, columns };
-  }
-}
-
-export default ProfitAndLoss;
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
new file mode 100644
index 00000000..c7509276
--- /dev/null
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -0,0 +1,107 @@
+import { Fyo } from 'fyo';
+import { unique } from 'fyo/utils';
+import { FinancialStatements } from 'reports/FinancialStatements/financialStatements';
+import { FinancialStatementOptions } from 'reports/types';
+
+interface Row {
+  indent?: number;
+  account: string | { template: string };
+  isGroup?: boolean;
+  [key: string]: unknown;
+}
+
+export default class ProfitAndLoss {
+  fyo: Fyo;
+  constructor(fyo: Fyo) {
+    this.fyo = fyo;
+  }
+
+  async run(options: FinancialStatementOptions) {
+    const { fromDate, toDate, periodicity } = options;
+    const fs = new FinancialStatements(this.fyo);
+    const income = await fs.getData({
+      rootType: 'Income',
+      balanceMustBe: 'Credit',
+      fromDate,
+      toDate,
+      periodicity,
+    });
+
+    const expense = await fs.getData({
+      rootType: 'Expense',
+      balanceMustBe: 'Debit',
+      fromDate,
+      toDate,
+      periodicity,
+    });
+
+    const incomeAccount = income.totalRow.account as string;
+    const incomeTotalRow = {
+      ...income.totalRow,
+      account: {
+        template: `<span class="font-semibold">${incomeAccount}</span>`,
+      },
+    };
+
+    const expenseAccount = expense.totalRow.account as string;
+    const expenseTotalRow = {
+      ...expense.totalRow,
+      account: {
+        template: `<span class="font-semibold">${expenseAccount}</span>`,
+      },
+    };
+
+    let rows = [
+      ...income.accounts,
+      incomeTotalRow,
+      {
+        account: {
+          template: '<span>&nbsp;</span>',
+        },
+        isGroup: true,
+      },
+      ...expense.accounts,
+      expenseTotalRow,
+      {
+        account: {
+          template: '<span>&nbsp;</span>',
+        },
+        isGroup: true,
+      },
+    ] as Row[];
+
+    rows = rows.map((row) => {
+      if (row.indent === 0) {
+        row.account = {
+          template: `<span class="font-semibold">${row.account}</span>`,
+        };
+      }
+      return row;
+    });
+
+    const columns = unique([...income.periodList, ...expense.periodList]);
+
+    const profitRow: Row = {
+      account: 'Total Profit',
+    };
+
+    for (const column of columns) {
+      const incomeAmount =
+        (income.totalRow[column] as number | undefined) ?? 0.0;
+      const expenseAmount =
+        (expense.totalRow[column] as number | undefined) ?? 0.0;
+
+      profitRow[column] = incomeAmount - expenseAmount;
+
+      rows.forEach((row) => {
+        if (!row.isGroup) {
+          row[column] = row[column] || 0.0;
+        }
+      });
+    }
+
+    rows.push(profitRow);
+
+    return { rows, columns };
+  }
+}
diff --git a/reports/ProfitAndLoss/viewConfig.js b/reports/ProfitAndLoss/viewConfig.js
index 654aeb47..962c33f9 100644
--- a/reports/ProfitAndLoss/viewConfig.js
+++ b/reports/ProfitAndLoss/viewConfig.js
@@ -1,4 +1,5 @@
-import frappe, { t } from 'fyo';
+import { t } from 'fyo';
+import { fyo } from 'src/initFyo';
 import getCommonExportActions from '../commonExporter';
 
 const title = t`Profit and Loss`;
@@ -22,7 +23,7 @@ export default {
       label: t`From Date`,
       required: 1,
       default: async () => {
-        return (await frappe.getSingle('AccountingSettings')).fiscalYearStart;
+        return (await fyo.getSingle('AccountingSettings')).fiscalYearStart;
       },
     },
     {
@@ -33,7 +34,7 @@ export default {
       label: t`To Date`,
       required: 1,
       default: async () => {
-        return (await frappe.getSingle('AccountingSettings')).fiscalYearEnd;
+        return (await fyo.getSingle('AccountingSettings')).fiscalYearEnd;
       },
     },
     {
diff --git a/reports/PurchaseRegister/PurchaseRegister.js b/reports/PurchaseRegister/PurchaseRegister.js
index 8d1c9f1a..8210d8cc 100644
--- a/reports/PurchaseRegister/PurchaseRegister.js
+++ b/reports/PurchaseRegister/PurchaseRegister.js
@@ -1,4 +1,4 @@
-import frappe from 'fyo';
+import { fyo } from 'src/initFyo';
 
 class PurchaseRegister {
   async run({ fromDate, toDate, supplier }) {
@@ -18,7 +18,7 @@ class PurchaseRegister {
     }
     filters.submitted = 1;
 
-    const bills = await frappe.db.getAll({
+    const bills = await fyo.db.getAll({
       doctype: 'PurchaseInvoice',
       fields: ['name', 'date', 'supplier', 'account', 'netTotal', 'grandTotal'],
       filters,
@@ -28,7 +28,7 @@ class PurchaseRegister {
 
     const billNames = bills.map((d) => d.name);
 
-    const taxes = await frappe.db.getAll({
+    const taxes = await fyo.db.getAll({
       doctype: 'TaxSummary',
       fields: ['parent', 'amount'],
       filters: {
diff --git a/reports/SalesRegister/SalesRegister.js b/reports/SalesRegister/SalesRegister.js
index 18b3d203..d0d23bef 100644
--- a/reports/SalesRegister/SalesRegister.js
+++ b/reports/SalesRegister/SalesRegister.js
@@ -1,4 +1,4 @@
-import frappe from 'fyo';
+import { fyo } from 'src/initFyo';
 
 class SalesRegister {
   async run({ fromDate, toDate, customer }) {
@@ -17,7 +17,7 @@ class SalesRegister {
       filters.date = ['<=', toDate];
     }
 
-    const invoices = await frappe.db.getAll({
+    const invoices = await fyo.db.getAll({
       doctype: 'SalesInvoice',
       fields: ['name', 'date', 'customer', 'account', 'netTotal', 'grandTotal'],
       filters: filters,
@@ -27,7 +27,7 @@ class SalesRegister {
 
     const invoiceNames = invoices.map((d) => d.name);
 
-    const taxes = await frappe.db.getAll({
+    const taxes = await fyo.db.getAll({
       doctype: 'TaxSummary',
       fields: ['parent', 'amount'],
       filters: {
diff --git a/reports/TrialBalance/TrialBalance.js b/reports/TrialBalance/TrialBalance.js
index a841a77a..f9f6dce5 100644
--- a/reports/TrialBalance/TrialBalance.js
+++ b/reports/TrialBalance/TrialBalance.js
@@ -1,4 +1,4 @@
-import { getTrialBalance } from '../FinancialStatements/FinancialStatements';
+import { getTrialBalance } from '../helpers/financialStatements';
 
 export default class TrialBalance {
   async run({ fromDate, toDate }) {
diff --git a/reports/TrialBalance/viewConfig.js b/reports/TrialBalance/viewConfig.js
index 3ab25e2e..7502d1bb 100644
--- a/reports/TrialBalance/viewConfig.js
+++ b/reports/TrialBalance/viewConfig.js
@@ -1,4 +1,5 @@
-import frappe, { t } from 'fyo';
+import { t } from 'fyo';
+import { fyo } from 'src/initFyo';
 import getCommonExportActions from '../commonExporter';
 
 const title = t`Trial Balance`;
@@ -16,7 +17,7 @@ export default {
       placeholder: t`From Date`,
       required: 1,
       default: async () => {
-        return (await frappe.getSingle('AccountingSettings')).fiscalYearStart;
+        return (await fyo.getSingle('AccountingSettings')).fiscalYearStart;
       },
     },
     {
@@ -27,7 +28,7 @@ export default {
       label: t`To Date`,
       required: 1,
       default: async () => {
-        return (await frappe.getSingle('AccountingSettings')).fiscalYearEnd;
+        return (await fyo.getSingle('AccountingSettings')).fiscalYearEnd;
       },
     },
   ],
diff --git a/reports/commonExporter.ts b/reports/commonExporter.ts
new file mode 100644
index 00000000..2a29f18f
--- /dev/null
+++ b/reports/commonExporter.ts
@@ -0,0 +1,161 @@
+import { DocValue, DocValueMap } from 'fyo/core/types';
+import { Verb } from 'fyo/telemetry/types';
+import { Field } from 'schemas/types';
+import { fyo } from 'src/initFyo';
+import { getSavePath, saveData, showExportInFolder } from 'src/utils/ipcCalls';
+
+interface JSONExport {
+  columns: { fieldname: string; label: string }[];
+  rows: Record<string, DocValue>[];
+  filters: Record<string, string>;
+  timestamp: string;
+  reportName: string;
+  softwareName: string;
+  softwareVersion: string;
+}
+
+type GetReportData = () => {
+  rows: DocValueMap[];
+  columns: Field[];
+  filters: Record<string, string>;
+};
+
+type TemplateObject = { template: string };
+
+function templateToInnerText(innerHTML: string): string {
+  const temp = document.createElement('template');
+  temp.innerHTML = innerHTML.trim();
+  // @ts-ignore
+  return temp.content.firstChild!.innerText;
+}
+
+function deObjectify(value: TemplateObject | DocValue) {
+  if (typeof value !== 'object') return value;
+  if (value === null) return '';
+
+  const innerHTML = (value as TemplateObject).template;
+  if (!innerHTML) return '';
+  return templateToInnerText(innerHTML);
+}
+
+function csvFormat(value: TemplateObject | DocValue): string {
+  if (typeof value === 'string') {
+    return `"${value}"`;
+  } else if (value === null) {
+    return '';
+  } else if (typeof value === 'object') {
+    const innerHTML = (value as TemplateObject).template;
+
+    if (!innerHTML) return '';
+    return csvFormat(deObjectify(value as TemplateObject));
+  }
+
+  return String(value);
+}
+
+export async function exportCsv(
+  rows: DocValueMap[],
+  columns: Field[],
+  filePath: string
+) {
+  const fieldnames = columns.map(({ fieldname }) => fieldname);
+  const labels = columns.map(({ label }) => csvFormat(label));
+  const csvRows = [
+    labels.join(','),
+    ...rows.map((row) =>
+      fieldnames.map((f) => csvFormat(row[f] as DocValue)).join(',')
+    ),
+  ];
+
+  saveExportData(csvRows.join('\n'), filePath);
+}
+
+async function exportJson(
+  rows: DocValueMap[],
+  columns: Field[],
+  filePath: string,
+  filters: Record<string, string>,
+  reportName: string
+) {
+  const exportObject: JSONExport = {
+    columns: [],
+    rows: [],
+    filters: {},
+    timestamp: '',
+    reportName: '',
+    softwareName: '',
+    softwareVersion: '',
+  };
+  const fieldnames = columns.map(({ fieldname }) => fieldname);
+
+  exportObject.columns = columns.map(({ fieldname, label }) => ({
+    fieldname,
+    label,
+  }));
+
+  exportObject.rows = rows.map((row) =>
+    fieldnames.reduce((acc, f) => {
+      const value = row[f];
+      if (value === undefined) {
+        acc[f] = '';
+      } else {
+        acc[f] = deObjectify(value as DocValue | TemplateObject);
+      }
+
+      return acc;
+    }, {} as Record<string, DocValue>)
+  );
+
+  exportObject.filters = Object.keys(filters)
+    .filter((name) => filters[name] !== null && filters[name] !== undefined)
+    .reduce((acc, name) => {
+      acc[name] = filters[name];
+      return acc;
+    }, {} as Record<string, string>);
+
+  exportObject.timestamp = new Date().toISOString();
+  exportObject.reportName = reportName;
+  exportObject.softwareName = 'Frappe Books';
+  exportObject.softwareVersion = fyo.store.appVersion;
+
+  await saveExportData(JSON.stringify(exportObject), filePath);
+}
+
+async function exportReport(
+  extention: string,
+  reportName: string,
+  getReportData: GetReportData
+) {
+  const { rows, columns, filters } = getReportData();
+
+  const { filePath, canceled } = await getSavePath(reportName, extention);
+  if (canceled || !filePath) return;
+
+  switch (extention) {
+    case 'csv':
+      await exportCsv(rows, columns, filePath);
+      break;
+    case 'json':
+      await exportJson(rows, columns, filePath, filters, reportName);
+      break;
+    default:
+      return;
+  }
+
+  fyo.telemetry.log(Verb.Exported, reportName, { extention });
+}
+
+export default function getCommonExportActions(reportName: string) {
+  return ['csv', 'json'].map((ext) => ({
+    group: fyo.t`Export`,
+    label: ext.toUpperCase(),
+    type: 'primary',
+    action: async (getReportData: GetReportData) =>
+      await exportReport(ext, reportName, getReportData),
+  }));
+}
+
+export async function saveExportData(data: string, filePath: string) {
+  await saveData(data, filePath);
+  showExportInFolder(fyo.t`Export Successful`, filePath);
+}
diff --git a/reports/index.js b/reports/index.js
index 22b16db7..2f6be6fe 100644
--- a/reports/index.js
+++ b/reports/index.js
@@ -1,3 +1,4 @@
+/*
 import AccountsReceivablePayable from './AccountsReceivablePayable/AccountsReceivablePayable';
 import BalanceSheet from './BalanceSheet/BalanceSheet';
 import BankReconciliation from './BankReconciliation/BankReconciliation';
@@ -33,3 +34,7 @@ export function getReportData(method, filters) {
   const ReportClass = reports[method];
   return new ReportClass().run(filters);
 }
+*/
+export function getReportData(method, filters) {
+  return { rows: [], columns: [] };
+}
diff --git a/reports/types.ts b/reports/types.ts
new file mode 100644
index 00000000..830c73ef
--- /dev/null
+++ b/reports/types.ts
@@ -0,0 +1,23 @@
+import { AccountRootType } from 'models/baseModels/Account/types';
+
+export type ExportExtension = 'csv' | 'json';
+
+export interface ReportData {
+  rows: unknown[];
+  columns: unknown[];
+}
+
+export abstract class Report {
+  abstract run(filters: Record<string, unknown>): ReportData;
+}
+
+export type BalanceType = 'Credit' | 'Debit';
+export type Periodicity = 'Monthly' | 'Quarterly' | 'Half Yearly' | 'Yearly';
+export interface FinancialStatementOptions {
+  rootType: AccountRootType;
+  fromDate: string;
+  toDate: string;
+  balanceMustBe?: BalanceType;
+  periodicity?: Periodicity;
+  accumulateValues?: boolean;
+}
diff --git a/reports/view.js b/reports/view.js
index d73df6e1..dc2a1c3a 100644
--- a/reports/view.js
+++ b/reports/view.js
@@ -1,19 +1,21 @@
-import BalanceSheetViewConfig from './BalanceSheet/viewConfig';
-import GeneralLedgerViewConfig from './GeneralLedger/viewConfig';
-import GoodsAndServiceTaxGSTR1View from './GoodsAndServiceTax/GSTR1View';
-import GoodsAndServiceTaxGSTR2View from './GoodsAndServiceTax/GSTR2View';
-import ProfitAndLossViewConfig from './ProfitAndLoss/viewConfig';
-import PurchaseRegisterViewConfig from './PurchaseRegister/viewConfig';
-import SalesRegisterViewConfig from './SalesRegister/viewConfig';
-import TrialBalanceViewConfig from './TrialBalance/viewConfig';
+// import BalanceSheetViewConfig from './BalanceSheet/viewConfig';
+// import GeneralLedgerViewConfig from './GeneralLedger/viewConfig';
+// import GoodsAndServiceTaxGSTR1View from './GoodsAndServiceTax/GSTR1View';
+// import GoodsAndServiceTaxGSTR2View from './GoodsAndServiceTax/GSTR2View';
+// import ProfitAndLossViewConfig from './ProfitAndLoss/viewConfig';
+// import PurchaseRegisterViewConfig from './PurchaseRegister/viewConfig';
+// import SalesRegisterViewConfig from './SalesRegister/viewConfig';
+// import TrialBalanceViewConfig from './TrialBalance/viewConfig';
 
-export default {
-  'general-ledger': GeneralLedgerViewConfig,
-  'sales-register': SalesRegisterViewConfig,
-  'purchase-register': PurchaseRegisterViewConfig,
-  'balance-sheet': BalanceSheetViewConfig,
-  'profit-and-loss': ProfitAndLossViewConfig,
-  'trial-balance': TrialBalanceViewConfig,
-  'gstr-1': GoodsAndServiceTaxGSTR1View,
-  'gstr-2': GoodsAndServiceTaxGSTR2View,
-};
+// export default {
+//   'general-ledger': GeneralLedgerViewConfig,
+//   'sales-register': SalesRegisterViewConfig,
+//   'purchase-register': PurchaseRegisterViewConfig,
+//   'balance-sheet': BalanceSheetViewConfig,
+//   'profit-and-loss': ProfitAndLossViewConfig,
+//   'trial-balance': TrialBalanceViewConfig,
+//   'gstr-1': GoodsAndServiceTaxGSTR1View,
+//   'gstr-2': GoodsAndServiceTaxGSTR2View,
+// };
+
+export default {};
diff --git a/src/App.vue b/src/App.vue
index b324f3b0..424e9198 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,17 +3,17 @@
     id="app"
     class="h-screen flex flex-col font-sans overflow-hidden antialiased"
   >
-    <WindowsTitleBar v-if="platform === 'Windows'" />
+    <!-- <WindowsTitleBar v-if="platform === 'Windows'" />
     <Desk
       class="flex-1"
       v-if="activeScreen === 'Desk'"
       @change-db-file="changeDbFile"
-    />
+    />-->
     <DatabaseSelector
       v-if="activeScreen === 'DatabaseSelector'"
       @database-connect="showSetupWizardOrDesk(true)"
     />
-    <SetupWizard
+    <!--<SetupWizard
       v-if="activeScreen === 'SetupWizard'"
       @setup-complete="setupComplete"
       @setup-canceled="setupCanceled"
@@ -25,29 +25,19 @@
     >
       <div id="toast-target" />
     </div>
-    <TelemetryModal />
+    <TelemetryModal />-->
   </div>
 </template>
 
 <script>
 import { ipcRenderer } from 'electron';
 import fs from 'fs/promises';
-import frappe from 'fyo';
-import WindowsTitleBar from 'src/components/WindowsTitleBar';
-import config from 'src/config';
-import {
-connectToLocalDatabase,
-postSetup,
-purgeCache
-} from 'src/initialization';
-import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
-import TelemetryModal from './components/once/TelemetryModal.vue';
-import { showErrorDialog } from './errorHandling';
+import { IPC_MESSAGES } from 'utils/messages';
+import { fyo } from './initFyo';
 import DatabaseSelector from './pages/DatabaseSelector';
-import Desk from './pages/Desk';
-import SetupWizard from './pages/SetupWizard/SetupWizard';
+// import Desk from './pages/Desk';
+// import SetupWizard from './pages/SetupWizard/SetupWizard';
 import './styles/index.css';
-import telemetry from './telemetry/telemetry';
 import { checkForUpdates, routeTo } from './utils';
 
 export default {
@@ -77,15 +67,16 @@ export default {
     },
   },
   components: {
-    Desk,
-    SetupWizard,
+    // Desk,
+    // SetupWizard,
     DatabaseSelector,
-    WindowsTitleBar,
-    TelemetryModal,
+    // WindowsTitleBar,
+    // TelemetryModal,
   },
   async mounted() {
-    telemetry.platform = this.platform;
-    const lastSelectedFilePath = config.get('lastSelectedFilePath', null);
+    fyo.telemetry.platform = this.platform;
+    /*
+    const lastSelectedFilePath = fyo.config.get('lastSelectedFilePath', null);
     const { connectionSuccess, reason } = await connectToLocalDatabase(
       lastSelectedFilePath
     );
@@ -101,16 +92,18 @@ export default {
 
       await showErrorDialog(title, content);
     }
+    */
 
     this.activeScreen = 'DatabaseSelector';
   },
   methods: {
     async setupComplete() {
-      await postSetup();
+      // TODO: Complete this
+      // await postSetup();
       await this.showSetupWizardOrDesk(true);
     },
     async showSetupWizardOrDesk(resetRoute = false) {
-      const { setupComplete } = frappe.AccountingSettings;
+      const { setupComplete } = fyo.singles.AccountingSettings;
       if (!setupComplete) {
         this.activeScreen = 'SetupWizard';
       } else {
@@ -122,8 +115,8 @@ export default {
         return;
       }
 
-      const { onboardingComplete } = await frappe.getSingle('GetStarted');
-      const { hideGetStarted } = await frappe.getSingle('SystemSettings');
+      const { onboardingComplete } = await fyo.getSingle('GetStarted');
+      const { hideGetStarted } = await fyo.getSingle('SystemSettings');
 
       if (hideGetStarted || onboardingComplete) {
         routeTo('/');
@@ -132,13 +125,14 @@ export default {
       }
     },
     async changeDbFile() {
-      config.set('lastSelectedFilePath', null);
+      fyo.config.set('lastSelectedFilePath', null);
       telemetry.stop();
-      await purgeCache(true);
+      // TODO: purgeCache(true)
+      // await purgeCache(true);
       this.activeScreen = 'DatabaseSelector';
     },
     async setupCanceled() {
-      const filePath = config.get('lastSelectedFilePath');
+      const filePath = fyo.config.get('lastSelectedFilePath');
       await fs.unlink(filePath);
       this.changeDbFile();
     },
diff --git a/src/components/Badge.vue b/src/components/Badge.vue
index cda009bb..70b6a93f 100644
--- a/src/components/Badge.vue
+++ b/src/components/Badge.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { getBgTextColorClass } from '../colors';
+import { getBgTextColorClass } from 'src/utils/colors';
 
 export default {
   name: 'Badge',
diff --git a/src/components/Charts/BarChart.vue b/src/components/Charts/BarChart.vue
index 295d7e6d..25412809 100644
--- a/src/components/Charts/BarChart.vue
+++ b/src/components/Charts/BarChart.vue
@@ -134,7 +134,7 @@
 </template>
 <script>
 import Tooltip from '../Tooltip.vue';
-import { prefixFormat } from './chartUtils';
+import { prefixFormat } from 'src/utils/chart';
 
 export default {
   props: {
diff --git a/src/components/Charts/LineChart.vue b/src/components/Charts/LineChart.vue
index 752b02bb..3c30bb83 100644
--- a/src/components/Charts/LineChart.vue
+++ b/src/components/Charts/LineChart.vue
@@ -131,8 +131,8 @@
   </div>
 </template>
 <script>
+import { euclideanDistance, prefixFormat } from 'src/utils/chart';
 import Tooltip from '../Tooltip.vue';
-import { euclideanDistance, prefixFormat } from './chartUtils';
 
 export default {
   props: {
diff --git a/src/components/Controls/AttachImage.vue b/src/components/Controls/AttachImage.vue
index d3b14237..201d976e 100644
--- a/src/components/Controls/AttachImage.vue
+++ b/src/components/Controls/AttachImage.vue
@@ -56,12 +56,12 @@
 </template>
 
 <script>
-import frappe from 'frappe';
 import { ipcRenderer } from 'electron';
-import Base from './Base';
-import { IPC_ACTIONS } from 'utils/messages';
 import fs from 'fs';
 import path from 'path';
+import { fyo } from 'src/initFyo';
+import { IPC_ACTIONS } from 'utils/messages';
+import Base from './Base';
 
 export default {
   name: 'AttachImage',
@@ -75,7 +75,7 @@ export default {
   methods: {
     async openFileSelector() {
       const options = {
-        title: frappe.t`Select Image`,
+        title: fyo.t`Select Image`,
         properties: ['openFile'],
         filters: [
           { name: 'Image', extensions: ['png', 'jpg', 'jpeg', 'webp'] },
diff --git a/src/components/Controls/Currency.vue b/src/components/Controls/Currency.vue
index 5a5f576d..210d248d 100644
--- a/src/components/Controls/Currency.vue
+++ b/src/components/Controls/Currency.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import frappe from 'frappe';
+import { fyo } from 'src/initFyo';
 import Float from './Float';
 
 export default {
@@ -48,12 +48,12 @@ export default {
       this.$emit('focus', e);
     },
     parse(value) {
-      return frappe.pesa(value);
+      return fyo.pesa(value);
     },
     onBlur(e) {
       let { value } = e.target;
       if (value !== 0 && !value) {
-        value = frappe.pesa(0).round();
+        value = fyo.pesa(0).round();
       }
 
       this.showInput = false;
@@ -68,7 +68,7 @@ export default {
   },
   computed: {
     formattedValue() {
-      return frappe.format(this.value, this.df, this.doc);
+      return fyo.format(this.value, this.df, this.doc);
     },
   },
 };
diff --git a/src/components/Controls/Date.vue b/src/components/Controls/Date.vue
index 20cd6047..dd802025 100644
--- a/src/components/Controls/Date.vue
+++ b/src/components/Controls/Date.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import frappe from 'frappe';
+import { fyo } from 'src/initFyo';
 import Base from './Base';
 import DatePicker from '../DatePicker/DatePicker';
 
@@ -33,7 +33,7 @@ export default {
   },
   methods: {
     formatValue(value) {
-      return frappe.format(value, this.df);
+      return fyo.format(value, this.df);
     }
   }
 };
diff --git a/src/components/Controls/LanguageSelector.vue b/src/components/Controls/LanguageSelector.vue
index 0f12a3a6..373723b9 100644
--- a/src/components/Controls/LanguageSelector.vue
+++ b/src/components/Controls/LanguageSelector.vue
@@ -7,10 +7,10 @@
   />
 </template>
 <script>
-import { DEFAULT_LANGUAGE } from 'frappe/utils/consts';
-import config from 'src/config';
-import { languageCodeMap } from 'src/languageCodeMap';
+import { DEFAULT_LANGUAGE } from 'fyo/utils/consts';
+import { fyo } from 'src/initFyo';
 import { setLanguageMap } from 'src/utils';
+import { languageCodeMap } from 'src/utils/language';
 import FormControl from './FormControl';
 
 export default {
@@ -31,16 +31,15 @@ export default {
   components: { FormControl },
   computed: {
     value() {
-      return config.get('language') ?? DEFAULT_LANGUAGE;
+      return fyo.config.get('language') ?? DEFAULT_LANGUAGE;
     },
     languageDf() {
-      languageCodeMap;
       return {
         fieldname: 'language',
         label: this.t`Language`,
         fieldtype: 'Select',
         options: Object.keys(languageCodeMap),
-        default: config.get('language') ?? DEFAULT_LANGUAGE,
+        default: fyo.config.get('language') ?? DEFAULT_LANGUAGE,
         description: this.t`Set the display language.`,
       };
     },
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 79135399..81f37825 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -1,11 +1,7 @@
-import Badge from 'src/components/Badge';
-import { openQuickEdit } from 'src/utils';
-import frappe, { t } from 'frappe';
-import { markRaw } from 'vue';
-import AutoComplete from './AutoComplete';
 <script>
-import frappe, { t } from 'frappe';
+import { t } from 'fyo';
 import Badge from 'src/components/Badge';
+import { fyo } from 'src/initFyo';
 import { openQuickEdit } from 'src/utils';
 import { markRaw } from 'vue';
 import AutoComplete from './AutoComplete';
@@ -19,7 +15,7 @@ export default {
       let doctype = this.getTarget();
       let meta;
       try {
-        meta = frappe.getMeta(doctype);
+        meta = fyo.getMeta(doctype);
       } catch (err) {
         if (err.message.includes('not a registered doctype')) {
           return [];
@@ -30,7 +26,7 @@ export default {
       if (keyword && !filters.keywords) {
         filters.keywords = ['like', keyword];
       }
-      let results = await frappe.db.getAll({
+      let results = await fyo.db.getAll({
         doctype,
         filters,
         fields: [
@@ -108,7 +104,7 @@ export default {
     },
     async openNewDoc() {
       let doctype = this.df.target;
-      let doc = await frappe.getEmptyDoc(doctype);
+      let doc = await fyo.getEmptyDoc(doctype);
       let filters = await this.getFilters();
       openQuickEdit({
         doctype,
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index 23cf587a..c34b4fd1 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -61,8 +61,8 @@
 </template>
 
 <script>
-import frappe from 'frappe';
 import Row from 'src/components/Row';
+import { fyo } from 'src/initFyo';
 import Base from './Base';
 import TableRow from './TableRow';
 
@@ -122,7 +122,7 @@ export default {
       return [0.3].concat(this.tableFields.map(() => 1));
     },
     tableFields() {
-      let meta = frappe.getMeta(this.df.childtype);
+      let meta = fyo.getMeta(this.df.childtype);
       return meta.tableFields.map((fieldname) => meta.getField(fieldname));
     },
   },
diff --git a/src/components/FeatherIcon.vue b/src/components/FeatherIcon.vue
index 1c042969..93cf1429 100644
--- a/src/components/FeatherIcon.vue
+++ b/src/components/FeatherIcon.vue
@@ -32,6 +32,4 @@ export default {
     return svg;
   },
 };
-
-// https://github.com/frappe/frappejs/commits/master/ui/components/FeatherIcon.vue
 </script>
diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index fb0a7f40..d9a3e9de 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -116,8 +116,8 @@
 </template>
 
 <script>
-import { t } from 'frappe';
-import { getRandomString } from 'frappe/utils';
+import { t } from 'fyo';
+import { getRandomString } from 'utils';
 import Button from './Button';
 import FormControl from './Controls/FormControl';
 import Icon from './Icon';
@@ -153,9 +153,7 @@ export default {
     this.addNewFilter();
   },
   methods: {
-    getRandomString() {
-      return getRandomString();
-    },
+    getRandomString,
     addNewFilter() {
       let df = this.fields[0];
       this.addFilter(df.fieldname, 'like', '');
diff --git a/src/components/InvoiceCustomizer.vue b/src/components/InvoiceCustomizer.vue
deleted file mode 100644
index 68ddba27..00000000
--- a/src/components/InvoiceCustomizer.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <div>
-    <div v-if="doc" class="p-4">
-      <div class="row">
-        <div class="col-6 text-center">
-          <h4>Customize</h4>
-        </div>
-        <div class="col-6 text-right">
-          <f-button secondary @click="saveAndClose">{{
-            t`Save & Close`
-          }}</f-button>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-12 mt-4">
-          <form-layout :doc="doc" :fields="fields" @updateDoc="saveDoc" />
-          <sketch-picker v-model="color" class="shadow-none" />
-          <div class="mt-3">
-            <f-button secondary @click="openCompanySettings">{{
-              t`Company Settings`
-            }}</f-button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import FormLayout from 'frappe/ui/components/Form/FormLayout';
-import { Sketch } from 'vue-color';
-
-export default {
-  name: 'InvoiceCustomizer',
-  emits: [
-    'changeTemplate',
-    'changeFont',
-    'closeInvoiceCustomizer',
-    'updateTemplateView',
-    'changeColor',
-  ],
-  components: {
-    FormLayout,
-    'sketch-picker': Sketch,
-  },
-  data() {
-    return {
-      doc: null,
-      fields: [],
-      color: {},
-    };
-  },
-  async created() {
-    this.doc = await frappe.doc.getDoc('SalesInvoiceSettings');
-    this.color.hex = this.doc.themeColor;
-    const meta = frappe.getMeta('SalesInvoiceSettings');
-    this.fields = meta.fields.filter(
-      (field) => field.fieldname !== 'numberSeries'
-    );
-  },
-  methods: {
-    async saveDoc(updatedValue) {
-      let { fieldname, value } = updatedValue;
-      if (fieldname === 'template') {
-        this.$emit('changeTemplate', value);
-      } else if (fieldname === 'font') {
-        this.$emit('changeFont', value);
-      }
-    },
-    async saveAndClose() {
-      this.doc.themeColor = this.color.hex;
-      await this.doc.update();
-      this.$emit('closeInvoiceCustomizer');
-    },
-    async openCompanySettings() {
-      const settings = await frappe.getSingle('CompanySettings');
-      settings.on('afterSave', async () => {
-        this.$formModal.close();
-        this.$emit('updateTemplateView');
-      });
-      this.$formModal.open(settings);
-    },
-  },
-  watch: {
-    color: async function () {
-      if (this.doc) {
-        if (this.doc.themeColor != this.color.hex) {
-          this.$emit('changeColor', this.color.hex);
-        }
-      }
-    },
-  },
-};
-</script>
diff --git a/src/components/ReconciliationValidation.vue b/src/components/ReconciliationValidation.vue
index a07c31e1..b0b5454c 100644
--- a/src/components/ReconciliationValidation.vue
+++ b/src/components/ReconciliationValidation.vue
@@ -36,6 +36,7 @@
 </template>
 <script>
 import luxon from 'luxon';
+import { fyo } from 'src/initFyo';
 
 export default {
   props: ['entries', 'afterReconcile'],
@@ -66,7 +67,7 @@ export default {
           this.selectedEntries.push(this.entries[i]);
       }
       for (let entry of this.selectedEntries) {
-        const payment = await frappe.doc.getDoc('Payment', entry['Payment Entry']);
+        const payment = await fyo.doc.getDoc('Payment', entry['Payment Entry']);
         const clearanceDate =
           luxon.DateTime.fromFormat(
             entry['Clearance Date'],
diff --git a/src/components/SalesInvoice/SalesInvoicePrint.vue b/src/components/SalesInvoice/SalesInvoicePrint.vue
deleted file mode 100644
index 8420f4bc..00000000
--- a/src/components/SalesInvoice/SalesInvoicePrint.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <div>
-    <div class="row no-gutters">
-      <div v-if="showInvoiceCustomizer" class="col-3 mt-4 mx-auto"></div>
-      <div class="col-8 mx-auto text-right mt-4">
-        <f-button
-          primary
-          @click="$emit('send', $refs.printComponent.innerHTML)"
-          >{{ t`Send` }}</f-button
-        >
-        <f-button secondary @click="toggleCustomizer">{{
-          t`Customize`
-        }}</f-button>
-        <f-button
-          secondary
-          @click="$emit('makePDF', $refs.printComponent.innerHTML)"
-          >{{ t`PDF` }}</f-button
-        >
-      </div>
-    </div>
-    <div class="row no-gutters">
-      <div v-if="showInvoiceCustomizer" class="col-3 mt-4 mx-auto">
-        <invoice-customizer
-          class="border"
-          style="position: fixed"
-          @closeInvoiceCustomizer="toggleCustomizer"
-          @changeColor="changeColor($event)"
-          @changeTemplate="changeTemplate($event)"
-          @changeFont="changeFont($event)"
-          @updateTemplateView="updateTemplateView"
-        />
-      </div>
-      <div
-        class="col-8 bg-white mt-4 mx-auto border shadow"
-        ref="printComponent"
-      >
-        <component
-          :themeColor="themeColor"
-          :font="font"
-          :is="template"
-          v-if="doc"
-          :doc="doc"
-          :key="usedForReRender"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import InvoiceTemplate1 from 'src/../models/doctype/SalesInvoice/Templates/InvoiceTemplate1';
-import InvoiceTemplate2 from 'src/../models/doctype/SalesInvoice/Templates/InvoiceTemplate2';
-import InvoiceTemplate3 from 'src/../models/doctype/SalesInvoice/Templates/InvoiceTemplate3';
-import InvoiceCustomizer from 'src/components/InvoiceCustomizer';
-
-const invoiceTemplates = {
-  'Basic I': InvoiceTemplate1,
-  'Basic II': InvoiceTemplate2,
-  Modern: InvoiceTemplate3,
-};
-
-export default {
-  name: 'InvoicePrint',
-  props: ['doc'],
-  emits: ['send', 'makePDF'],
-  components: {
-    InvoiceCustomizer,
-  },
-  data() {
-    return {
-      showInvoiceCustomizer: false,
-      themeColor: undefined,
-      template: undefined,
-      font: undefined,
-      usedForReRender: 0,
-    };
-  },
-  async created() {
-    await this.loadInvoice();
-  },
-  methods: {
-    async loadInvoice() {
-      await this.getTemplate();
-      await this.getColor();
-      await this.getFont();
-    },
-    async getTemplate() {
-      let invoiceSettings = await frappe.doc.getDoc('SalesInvoiceSettings');
-      this.template = invoiceTemplates[invoiceSettings.template];
-    },
-    async getColor() {
-      let invoiceSettings = await frappe.doc.getDoc('SalesInvoiceSettings');
-      this.themeColor = invoiceSettings.themeColor;
-    },
-    async getFont() {
-      let invoiceSettings = await frappe.doc.getDoc('SalesInvoiceSettings');
-      this.font = invoiceSettings.font;
-    },
-    async toggleCustomizer() {
-      await this.loadInvoice();
-      this.showInvoiceCustomizer = !this.showInvoiceCustomizer;
-    },
-    changeColor(color) {
-      this.themeColor = color;
-    },
-    changeTemplate(template) {
-      this.template = invoiceTemplates[template];
-    },
-    changeFont(font) {
-      this.font = font;
-    },
-    updateTemplateView() {
-      this.usedForReRender += 1;
-    },
-  },
-};
-</script>
diff --git a/src/components/SalesInvoice/Templates/Base.vue b/src/components/SalesInvoice/Templates/Base.vue
index 48d519f4..2558c910 100644
--- a/src/components/SalesInvoice/Templates/Base.vue
+++ b/src/components/SalesInvoice/Templates/Base.vue
@@ -1,5 +1,5 @@
 <script>
-import frappe from 'frappe';
+import { fyo } from 'src/initFyo';
 export default {
   name: 'Base',
   props: ['doc', 'printSettings'],
@@ -7,7 +7,7 @@ export default {
   methods: {
     format(row, fieldname) {
       let value = row.get(fieldname);
-      return frappe.format(value, row.meta.getField(fieldname));
+      return fyo.format(value, row.meta.getField(fieldname));
     }
   },
   async mounted() {
diff --git a/src/components/SalesInvoice/Templates/Basic.vue b/src/components/SalesInvoice/Templates/Basic.vue
index 9312f7db..e8d3e093 100644
--- a/src/components/SalesInvoice/Templates/Basic.vue
+++ b/src/components/SalesInvoice/Templates/Basic.vue
@@ -14,7 +14,7 @@
               />
             </div>
             <div class="text-xl text-gray-700 font-semibold" v-else>
-              {{ frappe.AccountingSettings.companyName }}
+              {{ fyo.singles.AccountingSettings.companyName }}
             </div>
           </div>
           <div class="w-1/3">
@@ -23,8 +23,8 @@
           </div>
           <div class="w-1/3">
             <div v-if="companyAddress">{{ companyAddress.addressDisplay }}</div>
-            <div v-if="frappe.AccountingSettings && frappe.AccountingSettings.gstin">
-              GSTIN: {{ frappe.AccountingSettings.gstin }}
+            <div v-if="fyo.singles.AccountingSettings && fyo.singles.AccountingSettings.gstin">
+              GSTIN: {{ fyo.singles.AccountingSettings.gstin }}
             </div>
           </div>
         </div>
@@ -36,7 +36,7 @@
               {{ doc.name }}
             </h1>
             <div class="py-2 text-base">
-              {{ frappe.format(doc.date, 'Date') }}
+              {{ fyo.format(doc.date, 'Date') }}
             </div>
           </div>
           <div class="w-1/3" v-if="party">
@@ -97,7 +97,7 @@
       <div class="w-1/2">
         <div class="flex pl-2 justify-between py-3 border-b">
           <div>{{ t`Subtotal` }}</div>
-          <div>{{ frappe.format(doc.netTotal, 'Currency') }}</div>
+          <div>{{ fyo.format(doc.netTotal, 'Currency') }}</div>
         </div>
         <div
           class="flex pl-2 justify-between py-3"
@@ -105,13 +105,13 @@
           :key="tax.name"
         >
           <div>{{ tax.account }}</div>
-          <div>{{ frappe.format(tax.amount, 'Currency') }}</div>
+          <div>{{ fyo.format(tax.amount, 'Currency') }}</div>
         </div>
         <div
           class="flex pl-2 justify-between py-3 border-t text-green-600 font-semibold text-base"
         >
           <div>{{ t`Grand Total` }}</div>
-          <div>{{ frappe.format(doc.grandTotal, 'Currency') }}</div>
+          <div>{{ fyo.format(doc.grandTotal, 'Currency') }}</div>
         </div>
       </div>
     </div>
diff --git a/src/components/SalesInvoice/Templates/Business.vue b/src/components/SalesInvoice/Templates/Business.vue
index 4f7daec3..2775094b 100644
--- a/src/components/SalesInvoice/Templates/Business.vue
+++ b/src/components/SalesInvoice/Templates/Business.vue
@@ -18,16 +18,16 @@
             class="font-semibold text-xl"
             :style="{ color: printSettings.color }"
           >
-            {{ frappe.AccountingSettings.companyName }}
+            {{ fyo.singles.AccountingSettings.companyName }}
           </div>
           <div class="text-sm text-gray-800" v-if="companyAddress">
             {{ companyAddress.addressDisplay }}
           </div>
           <div
             class="text-sm text-gray-800"
-            v-if="frappe.AccountingSettings && frappe.AccountingSettings.gstin"
+            v-if="fyo.singles.AccountingSettings && fyo.singles.AccountingSettings.gstin"
           >
-            GSTIN: {{ frappe.AccountingSettings.gstin }}
+            GSTIN: {{ fyo.singles.AccountingSettings.gstin }}
           </div>
         </div>
       </div>
@@ -41,7 +41,7 @@
               {{ doc.name }}
             </div>
             <div>
-              {{ frappe.format(doc.date, 'Date') }}
+              {{ fyo.format(doc.date, 'Date') }}
             </div>
           </div>
         </div>
@@ -84,7 +84,7 @@
             <div class="text-right">
               <div class="text-gray-800">{{ t`Subtotal` }}</div>
               <div class="text-xl mt-2">
-                {{ frappe.format(doc.netTotal, 'Currency') }}
+                {{ fyo.format(doc.netTotal, 'Currency') }}
               </div>
             </div>
             <div
@@ -96,7 +96,7 @@
                 {{ tax.account }} 
               </div>
               <div class="text-xl mt-2">
-                {{ frappe.format(tax.amount, 'Currency') }}
+                {{ fyo.format(tax.amount, 'Currency') }}
               </div>
             </div>
           </div>
@@ -107,7 +107,7 @@
             <div>
               <div>{{ t`Grand Total` }}</div>
               <div class="text-2xl mt-2 font-semibold">
-                {{ frappe.format(doc.grandTotal, 'Currency') }}
+                {{ fyo.format(doc.grandTotal, 'Currency') }}
               </div>
             </div>
           </div>
diff --git a/src/components/SalesInvoice/Templates/Minimal.vue b/src/components/SalesInvoice/Templates/Minimal.vue
index 788e62bc..c8dba4b5 100644
--- a/src/components/SalesInvoice/Templates/Minimal.vue
+++ b/src/components/SalesInvoice/Templates/Minimal.vue
@@ -18,10 +18,10 @@
             class="font-semibold text-xl"
             :style="{ color: printSettings.color }"
           >
-            {{ frappe.AccountingSettings.companyName }}
+            {{ fyo.singles.AccountingSettings.companyName }}
           </div>
           <div>
-            {{ frappe.format(doc.date, 'Date') }}
+            {{ fyo.format(doc.date, 'Date') }}
           </div>
         </div>
       </div>
@@ -73,9 +73,9 @@
         </div>
         <div
           class="mt-4 ml-8 text-black leading-relaxed text-lg"
-          v-if="frappe.AccountingSettings && frappe.AccountingSettings.gstin"
+          v-if="fyo.singles.AccountingSettings && fyo.singles.AccountingSettings.gstin"
         >
-          GSTIN: {{ frappe.AccountingSettings.gstin }}
+          GSTIN: {{ fyo.singles.AccountingSettings.gstin }}
         </div>
       </div>
     </div>
@@ -117,7 +117,7 @@
       <div class="w-1/2 text-lg">
         <div class="flex pl-2 justify-between py-1">
           <div>{{ t`Subtotal` }}</div>
-          <div>{{ frappe.format(doc.netTotal, 'Currency') }}</div>
+          <div>{{ fyo.format(doc.netTotal, 'Currency') }}</div>
         </div>
         <div
           class="flex pl-2 justify-between py-1"
@@ -125,14 +125,14 @@
           :key="tax.name"
         >
           <div>{{ tax.account }}</div>
-          <div>{{ frappe.format(tax.amount, 'Currency') }}</div>
+          <div>{{ fyo.format(tax.amount, 'Currency') }}</div>
         </div>
         <div
           class="flex pl-2 justify-between py-1 font-semibold"
           :style="{ color: printSettings.color }"
         >
           <div>{{ t`Grand Total` }}</div>
-          <div>{{ frappe.format(doc.grandTotal, 'Currency') }}</div>
+          <div>{{ fyo.format(doc.grandTotal, 'Currency') }}</div>
         </div>
       </div>
     </div>
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 5b38e16c..249e2b04 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -41,10 +41,12 @@
   </div>
 </template>
 <script>
-import frappe, { t } from 'frappe';
+import { t } from 'fyo';
+import reports from 'reports/view';
 import Dropdown from 'src/components/Dropdown';
+import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils';
-import reports from '../../reports/view';
+
 
 export default {
   data() {
@@ -91,8 +93,8 @@ export default {
       });
     },
     getDoctypes() {
-      let doctypes = Object.keys(frappe.models).sort();
-      let doctypeMetas = doctypes.map((doctype) => frappe.getMeta(doctype));
+      let doctypes = Object.keys(fyo.models).sort();
+      let doctypeMetas = doctypes.map((doctype) => fyo.getMeta(doctype));
       let searchableDoctypes = doctypeMetas.filter((meta) => {
         return !meta.isSingle && !meta.isChild;
       });
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 86e70888..06f6d96b 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -99,6 +99,7 @@
 import path from 'path';
 import Button from 'src/components/Button';
 import { reportIssue } from 'src/errorHandling';
+import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils';
 import router from '../router';
 import sidebarConfig from '../sidebarConfig';
@@ -117,10 +118,10 @@ export default {
   },
   computed: {
     appVersion() {
-      return frappe.store.appVersion;
+      return fyo.store.appVersion;
     },
     dbPath() {
-      const splits = frappe.db.dbPath.split(path.sep);
+      const splits = fyo.db.dbPath.split(path.sep);
       return path.join(...splits.slice(splits.length - 2));
     },
   },
@@ -134,7 +135,7 @@ export default {
     groups = groups.filter((group) => {
       if (
         group.route === '/get-started' &&
-        frappe.SystemSettings.hideGetStarted
+        fyo.singles.SystemSettings.hideGetStarted
       ) {
         return false;
       }
diff --git a/src/components/StatusBadge.vue b/src/components/StatusBadge.vue
index 992145e1..0cebca29 100644
--- a/src/components/StatusBadge.vue
+++ b/src/components/StatusBadge.vue
@@ -4,8 +4,7 @@
   }}</Badge>
 </template>
 <script>
-import Badge from 'src/components/Badge';
-import { statusColor } from '../colors';
+import { statusColor } from 'src/utils/colors';
 
 export default {
   name: 'StatusBadge',
diff --git a/src/components/Toast.vue b/src/components/Toast.vue
index 2cf9c0bb..2d7ac07c 100644
--- a/src/components/Toast.vue
+++ b/src/components/Toast.vue
@@ -17,7 +17,7 @@
     :style="{ opacity }"
     v-if="show"
   >
-    <FeatherIcon :name="iconName" class="w-6 h-6 mr-3" :class="iconColor" />
+    <feather-icon :name="iconName" class="w-6 h-6 mr-3" :class="iconColor" />
     <div @click="actionClicked" :class="actionText ? 'cursor-pointer' : ''">
       <p class="text-base">{{ message }}</p>
       <button
@@ -35,8 +35,7 @@
   </div>
 </template>
 <script>
-import { getColorClass } from '../colors';
-import FeatherIcon from './FeatherIcon.vue';
+import { getColorClass } from 'src/utils/colors';
 
 export default {
   components: {
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index edfc3c31..506c70c6 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -1,7 +1,3 @@
-import Button from 'src/components/Button';
-import FormControl from 'src/components/Controls/FormControl';
-import frappe from 'frappe';
-import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
 <template>
   <div class="text-sm" :class="{ 'border-t': !noBorder }">
     <template v-for="df in formFields">
@@ -90,9 +86,9 @@ import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
   </div>
 </template>
 <script>
-import frappe from 'frappe';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl';
+import { fyo } from 'src/initFyo';
 import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
 
 let TwoColumnForm = {
@@ -224,7 +220,7 @@ let TwoColumnForm = {
 
       this.inlineEditField = df;
       if (!this.doc[df.fieldname]) {
-        this.inlineEditDoc = await frappe.getEmptyDoc(df.target);
+        this.inlineEditDoc = await fyo.doc.getEmptyDoc(df.target);
         this.inlineEditDoc.once('afterInsert', () => {
           this.onChangeCommon(df, this.inlineEditDoc.name);
         });
@@ -234,7 +230,7 @@ let TwoColumnForm = {
 
       this.inlineEditDisplayField =
         this.doc.meta.inlineEditDisplayField || 'name';
-      this.inlineEditFields = frappe.getMeta(df.target).getQuickEditFields();
+      this.inlineEditFields = fyo.getMeta(df.target).getQuickEditFields();
     },
     async saveInlineEditDoc(df) {
       if (!this.inlineEditDoc) {
diff --git a/src/components/Widgets/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
index 2d08c0cb..65dfa123 100644
--- a/src/components/Widgets/PartyWidget.vue
+++ b/src/components/Widgets/PartyWidget.vue
@@ -20,14 +20,14 @@
         </div>
         <div class="flex justify-between">
           <span>
-            {{ frappe.format(invoice.date, invoiceMeta.getField('date')) }}
+            {{ fyo.format(invoice.date, invoiceMeta.getField('date')) }}
           </span>
           <div>
             <span
               class="font-medium text-gray-900"
             >
               {{
-                frappe.format(
+                fyo.format(
                   amountPaid(invoice),
                   invoiceMeta.getField('baseGrandTotal')
                 )
@@ -35,7 +35,7 @@
             </span>
             <span class="text-gray-600" v-if="!fullyPaid(invoice)">
               ({{
-                frappe.format(
+                fyo.format(
                   invoice.outstandingAmount,
                   invoiceMeta.getField('outstandingAmount')
                 )
@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import frappe from 'frappe';
+import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils';
 import { getStatusColumn } from '../Transaction/Transaction';
 
@@ -67,7 +67,7 @@ export default {
       return isCustomer ? 'SalesInvoice' : 'PurchaseInvoice';
     },
     invoiceMeta() {
-      return frappe.getMeta(this.invoiceDoctype);
+      return fyo.getMeta(this.invoiceDoctype);
     },
   },
   mounted() {
@@ -78,7 +78,7 @@ export default {
       let isCustomer = this.doc.doctype === 'Customer';
       let doctype = this.invoiceDoctype;
       let partyField = isCustomer ? 'customer' : 'supplier';
-      this.pendingInvoices = await frappe.db.getAll({
+      this.pendingInvoices = await fyo.db.getAll({
         doctype,
         fields: [
           'name',
diff --git a/src/components/once/TelemetryModal.vue b/src/components/once/TelemetryModal.vue
index 35ffe721..ef2460b7 100644
--- a/src/components/once/TelemetryModal.vue
+++ b/src/components/once/TelemetryModal.vue
@@ -49,10 +49,10 @@
 </template>
 
 <script>
-import config, { ConfigKeys, TelemetrySetting } from 'src/config';
-import { getTelemetryOptions } from 'src/telemetry/helpers';
-import telemetry from 'src/telemetry/telemetry';
-import { NounEnum, Verb } from 'src/telemetry/types';
+import { ConfigKeys } from 'fyo/core/types';
+import { getTelemetryOptions } from 'fyo/telemetry/helpers';
+import { TelemetrySetting } from 'fyo/telemetry/types';
+import { fyo } from 'src/initFyo';
 import Button from '../Button.vue';
 import FormControl from '../Controls/FormControl';
 import FeatherIcon from '../FeatherIcon.vue';
@@ -119,12 +119,12 @@ export default {
     },
 
     setOpen(telemetry) {
-      const openCount = config.get(ConfigKeys.OpenCount);
+      const openCount = fyo.config.get(ConfigKeys.OpenCount);
       this.shouldOpen = !this.getIsSet(telemetry) && openCount >= 4;
     },
   },
   mounted() {
-    const telemetry = config.get(ConfigKeys.Telemetry);
+    const telemetry = fyo.config.get(ConfigKeys.Telemetry);
     this.setOpen(telemetry);
     this.value = telemetry;
   },
diff --git a/src/dataImport.ts b/src/dataImport.ts
index 7725630f..0f82d5db 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -1,11 +1,17 @@
-import { t } from 'fyo';
+import { Fyo, t } from 'fyo';
 import { DocValueMap } from 'fyo/core/types';
 import Doc from 'fyo/model/doc';
 import { isNameAutoSet } from 'fyo/model/naming';
 import { Noun, Verb } from 'fyo/telemetry/types';
-import { FieldType, FieldTypeEnum } from 'schemas/types';
+import {
+  Field,
+  FieldType,
+  FieldTypeEnum,
+  OptionField,
+  SelectOption,
+  TargetField,
+} from 'schemas/types';
 import { parseCSV } from '../utils/csvParser';
-import { fyo } from './initFyo';
 
 export const importable = [
   'SalesInvoice',
@@ -44,8 +50,8 @@ interface TemplateField {
   label: string;
   fieldname: string;
   required: boolean;
-  doctype: string;
-  options?: string[];
+  schemaName: string;
+  options?: SelectOption[];
   fieldtype: FieldType;
   parentField: string;
 }
@@ -59,7 +65,7 @@ function formatValue(value: string, fieldtype: FieldType): unknown {
       return new Date(value);
     case FieldTypeEnum.Currency:
       // @ts-ignore
-      return frappe.pesa(value || 0);
+      return this.fyo.pesa(value || 0);
     case FieldTypeEnum.Int:
     case FieldTypeEnum.Float: {
       const n = parseFloat(value);
@@ -80,77 +86,75 @@ const exclusion: Exclusion = {
 };
 
 function getFilteredDocFields(
-  df: string | string[]
+  df: string | string[],
+  fyo: Fyo
 ): [TemplateField[], string[][]] {
-  let doctype = df[0];
+  let schemaName = df[0];
   let parentField = df[1] ?? '';
 
   if (typeof df === 'string') {
-    doctype = df;
+    schemaName = df;
     parentField = '';
   }
 
   // @ts-ignore
-  const primaryFields: Field[] = frappe.models[doctype].fields;
+  const primaryFields: Field[] = fyo.schemaMap[schemaName]?.fields ?? [];
   const fields: TemplateField[] = [];
   const tableTypes: string[][] = [];
-  const exclusionFields: string[] = exclusion[doctype] ?? [];
+  const exclusionFields: string[] = exclusion[schemaName] ?? [];
 
-  primaryFields.forEach(
-    ({
-      label,
-      fieldtype,
-      childtype,
-      fieldname,
-      readOnly,
-      required,
-      hidden,
-      options,
-    }) => {
-      if (
-        !(fieldname === 'name' && !parentField) &&
-        (readOnly ||
-          (hidden && typeof hidden === 'number') ||
-          exclusionFields.includes(fieldname))
-      ) {
-        return;
-      }
+  primaryFields.forEach((field) => {
+    const { label, fieldtype, fieldname, readOnly, required, hidden } = field;
 
-      if (fieldtype === FieldTypeEnum.Table && childtype) {
-        tableTypes.push([childtype, fieldname]);
-        return;
-      }
-
-      fields.push({
-        label,
-        fieldname,
-        doctype,
-        options,
-        fieldtype,
-        parentField,
-        required: Boolean(required ?? false),
-      });
+    if (
+      !(fieldname === 'name' && !parentField) &&
+      (readOnly ||
+        (hidden && typeof hidden === 'number') ||
+        exclusionFields.includes(fieldname))
+    ) {
+      return;
     }
-  );
+
+    if (fieldtype === FieldTypeEnum.Table && (field as TargetField).target) {
+      tableTypes.push([(field as TargetField).target, fieldname]);
+      return;
+    }
+
+    let options: SelectOption[] = [];
+    if ((field as OptionField).options !== undefined) {
+      options = (field as OptionField).options;
+    }
+
+    fields.push({
+      label,
+      fieldname,
+      schemaName: schemaName,
+      options,
+      fieldtype,
+      parentField,
+      required: Boolean(required ?? false),
+    });
+  });
 
   return [fields, tableTypes];
 }
 
-function getTemplateFields(doctype: string): TemplateField[] {
+function getTemplateFields(schemaName: string, fyo: Fyo): TemplateField[] {
   const fields: TemplateField[] = [];
-  if (!doctype) {
+  if (!schemaName) {
     return [];
   }
-  const doctypes: string[][] = [[doctype]];
-  while (doctypes.length > 0) {
-    const dt = doctypes.pop();
+
+  const schemaNames: string[][] = [[schemaName]];
+  while (schemaNames.length > 0) {
+    const dt = schemaNames.pop();
     if (!dt) {
       break;
     }
 
-    const [templateFields, tableTypes] = getFilteredDocFields(dt);
+    const [templateFields, tableTypes] = getFilteredDocFields(dt, fyo);
     fields.push(...templateFields);
-    doctypes.push(...tableTypes);
+    schemaNames.push(...tableTypes);
   }
   return fields;
 }
@@ -173,7 +177,7 @@ function getTemplate(templateFields: TemplateField[]): string {
 }
 
 export class Importer {
-  doctype: string;
+  schemaName: string;
   templateFields: TemplateField[];
   map: Map;
   template: string;
@@ -186,10 +190,12 @@ export class Importer {
   shouldSubmit: boolean = false;
   labelIndex: number = -1;
   csv: string[][] = [];
+  fyo: Fyo;
 
-  constructor(doctype: string) {
-    this.doctype = doctype;
-    this.templateFields = getTemplateFields(doctype);
+  constructor(schemaName: string, fyo: Fyo) {
+    this.schemaName = schemaName;
+    this.fyo = fyo;
+    this.templateFields = getTemplateFields(schemaName, this.fyo);
     this.map = getLabelFieldMap(this.templateFields);
     this.template = getTemplate(this.templateFields);
     this.assignedMap = this.assignableLabels.reduce((acc: Map, k) => {
@@ -364,7 +370,7 @@ export class Importer {
 
   async importData(setLoadingStatus: LoadingStatusCallback): Promise<Status> {
     const status: Status = { success: false, names: [], message: '' };
-    const shouldDeleteName = isNameAutoSet(this.doctype, fyo);
+    const shouldDeleteName = isNameAutoSet(this.schemaName, this.fyo);
     const docObjs = this.getDocs();
 
     let entriesMade = 0;
@@ -383,7 +389,7 @@ export class Importer {
         delete docObj[key];
       }
 
-      const doc: Doc = fyo.doc.getEmptyDoc(this.doctype, false);
+      const doc: Doc = this.fyo.doc.getEmptyDoc(this.schemaName, false);
       try {
         await this.makeEntry(doc, docObj);
         entriesMade += 1;
@@ -391,7 +397,7 @@ export class Importer {
       } catch (err) {
         setLoadingStatus(false, entriesMade, docObjs.length);
 
-        fyo.telemetry.log(Verb.Imported, this.doctype as Noun, {
+        this.fyo.telemetry.log(Verb.Imported, this.schemaName as Noun, {
           success: false,
           count: entriesMade,
         });
@@ -405,7 +411,7 @@ export class Importer {
     setLoadingStatus(false, entriesMade, docObjs.length);
     status.success = true;
 
-    fyo.telemetry.log(Verb.Imported, this.doctype as Noun, {
+    this.fyo.telemetry.log(Verb.Imported, this.schemaName as Noun, {
       success: true,
       count: entriesMade,
     });
@@ -426,7 +432,7 @@ export class Importer {
   }
 
   handleError(doc: Doc, err: Error, status: Status): Status {
-    const messages = [t`Could not import ${this.doctype} ${doc.name!}.`];
+    const messages = [t`Could not import ${this.schemaName} ${doc.name!}.`];
 
     const message = err.message;
     if (message?.includes('UNIQUE constraint failed')) {
diff --git a/src/getLanguageMap.ts b/src/getLanguageMap.ts
index d0a846ad..95b623c1 100644
--- a/src/getLanguageMap.ts
+++ b/src/getLanguageMap.ts
@@ -10,8 +10,9 @@
 const fs = require('fs/promises');
 const path = require('path');
 const fetch = require('node-fetch').default;
-const { splitCsvLine } = require('../scripts/helpers');
-import { LanguageMap } from '../utils/types';
+
+import { splitCsvLine } from 'utils/translationHelpers';
+import { LanguageMap } from 'utils/types';
 
 const VALENTINES_DAY = 1644796800000;
 
diff --git a/src/initFyo.ts b/src/initFyo.ts
index 14a68fb1..f099adfb 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import models, { getRegionalModels } from 'models';
+import { getRegionalModels, models } from 'models';
 
 export const fyo = new Fyo({ isTest: false, isElectron: true });
 
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 6f62efd5..4691e639 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -129,9 +129,9 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
 import PageHeader from 'src/components/PageHeader';
 import SearchBar from 'src/components/SearchBar';
+import { fyo } from 'src/initFyo';
 import { openQuickEdit } from 'src/utils';
 import { nextTick } from 'vue';
 import { handleErrorWithDialog } from '../errorHandling';
@@ -158,8 +158,8 @@ export default {
   },
   methods: {
     async fetchAccounts() {
-      this.settings = frappe.getMeta(this.doctype).treeSettings;
-      const { currency } = await frappe.getSingle('AccountingSettings');
+      this.settings = fyo.getMeta(this.doctype).treeSettings;
+      const { currency } = await fyo.getSingle('AccountingSettings');
       this.root = {
         label: await this.settings.getRootLabel(),
         balance: 0,
@@ -191,7 +191,7 @@ export default {
       }
     },
     async getChildren(parent = null) {
-      const children = await frappe.db.getAll({
+      const children = await fyo.db.getAll({
         doctype: this.doctype,
         filters: {
           parentAccount: parent,
@@ -240,7 +240,7 @@ export default {
       this.insertingAccount = true;
 
       accountName = accountName.trim();
-      let account = await frappe.getEmptyDoc('Account');
+      let account = await fyo.getEmptyDoc('Account');
       try {
         let { name, rootType, accountType } = parentAccount;
         await account.set({
diff --git a/src/pages/Dashboard/Cashflow.vue b/src/pages/Dashboard/Cashflow.vue
index a4e85a5f..032e79ab 100644
--- a/src/pages/Dashboard/Cashflow.vue
+++ b/src/pages/Dashboard/Cashflow.vue
@@ -100,11 +100,11 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
 import LineChart from 'src/components/Charts/LineChart.vue';
+import { fyo } from 'src/initFyo';
 import { formatXLabels, getYMax } from 'src/utils/chart';
+import { getDatesAndPeriodicity } from 'src/utils/misc';
 import Cashflow from '../../../reports/Cashflow/Cashflow';
-import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
 
 export default {
@@ -136,7 +136,7 @@ export default {
         this.data.map((d) => d[k])
       );
       const colors = ['#2490EF', '#B7BFC6'];
-      const format = (value) => frappe.format(value ?? 0, 'Currency');
+      const format = (value) => fyo.format(value ?? 0, 'Currency');
       const yMax = getYMax(points);
       return { points, xLabels, colors, format, yMax, formatX: formatXLabels };
     },
@@ -147,7 +147,7 @@ export default {
         this.period
       );
 
-      const { data, periodList } = await new Cashflow().run({
+      const { data, periodList } = await new Cashflow(this.fyo).run({
         fromDate,
         toDate,
         periodicity,
diff --git a/src/pages/Dashboard/Expenses.vue b/src/pages/Dashboard/Expenses.vue
index 0ade50ae..2f74a7e3 100644
--- a/src/pages/Dashboard/Expenses.vue
+++ b/src/pages/Dashboard/Expenses.vue
@@ -22,7 +22,7 @@
             <div class="ml-3">{{ d.account }}</div>
           </div>
           <p class="whitespace-nowrap">
-            {{ frappe.format(d.total, 'Currency') }}
+            {{ fyo.format(d.total, 'Currency') }}
           </p>
         </div>
       </div>
@@ -33,7 +33,7 @@
         :offset-x="3"
         :thickness="11.5"
         :text-offset-x="6.5"
-        :value-formatter="(value) => frappe.format(value, 'Currency')"
+        :value-formatter="(value) => fyo.format(value, 'Currency')"
         :total-label="t`Total Spending`"
         @change="(value) => (active = value)"
       />
@@ -50,10 +50,10 @@
 </template>
 
 <script>
-import frappe from 'frappe';
+import { fyo } from 'src/initFyo';
 import theme from 'src/theme';
+import { getDatesAndPeriodicity } from 'src/utils/misc';
 import DonutChart from '../../components/Charts/DonutChart.vue';
-import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
 
@@ -95,7 +95,7 @@ export default {
   methods: {
     async setData() {
       const { fromDate, toDate } = await getDatesAndPeriodicity(this.period);
-      let topExpenses = await frappe.db.getTopExpenses(fromDate, toDate);
+      let topExpenses = await fyo.db.getTopExpenses(fromDate, toDate);
       const shades = [
         { class: 'bg-gray-800', hex: theme.backgroundColor.gray['800'] },
         { class: 'bg-gray-600', hex: theme.backgroundColor.gray['600'] },
diff --git a/src/pages/Dashboard/PeriodSelector.vue b/src/pages/Dashboard/PeriodSelector.vue
index 7dad0d49..748cd008 100644
--- a/src/pages/Dashboard/PeriodSelector.vue
+++ b/src/pages/Dashboard/PeriodSelector.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { t } from 'frappe';
+import { t } from 'fyo';
 import Dropdown from 'src/components/Dropdown';
 
 export default {
diff --git a/src/pages/Dashboard/ProfitAndLoss.vue b/src/pages/Dashboard/ProfitAndLoss.vue
index fd51ad5d..574ba504 100644
--- a/src/pages/Dashboard/ProfitAndLoss.vue
+++ b/src/pages/Dashboard/ProfitAndLoss.vue
@@ -28,11 +28,11 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
+import { fyo } from 'src/initFyo';
 import BarChart from 'src/components/Charts/BarChart.vue';
 import { formatXLabels, getYMax, getYMin } from 'src/utils/chart';
+import { getDatesAndPeriodicity } from 'src/utils/misc';
 import ProfitAndLoss from '../../../reports/ProfitAndLoss/ProfitAndLoss';
-import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
 
@@ -58,7 +58,7 @@ export default {
     chartData() {
       const points = [this.periodList.map((p) => this.data[p])];
       const colors = [{ positive: '#2490EF', negative: '#B7BFC6' }];
-      const format = (value) => frappe.format(value ?? 0, 'Currency');
+      const format = (value) => fyo.format(value ?? 0, 'Currency');
       const yMax = getYMax(points);
       const yMin = getYMin(points);
       return {
@@ -81,7 +81,7 @@ export default {
         this.period
       );
 
-      let pl = new ProfitAndLoss();
+      let pl = new ProfitAndLoss(this.fyo);
       let res = await pl.run({
         fromDate,
         toDate,
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index adc3e43b..86c48846 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -29,7 +29,7 @@
             class="text-sm bold"
             :class="{ 'bg-gray-200 text-gray-200 rounded': !invoice.hasData }"
           >
-            {{ frappe.format(invoice.paid, 'Currency') }}
+            {{ fyo.format(invoice.paid, 'Currency') }}
             <span :class="{ 'text-gray-900': invoice.hasData }">{{
               t`Paid`
             }}</span>
@@ -38,7 +38,7 @@
             class="text-sm"
             :class="{ 'bg-gray-200 text-gray-200 rounded': !invoice.hasData }"
           >
-            {{ frappe.format(invoice.unpaid, 'Currency') }}
+            {{ fyo.format(invoice.unpaid, 'Currency') }}
             <span :class="{ 'text-gray-900': invoice.hasData }">{{
               t`Unpaid`
             }}</span>
@@ -68,10 +68,11 @@
   </div>
 </template>
 <script>
-import frappe, { t } from 'frappe';
+import { t } from 'fyo';
 import Button from 'src/components/Button';
+import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils';
-import { getDatesAndPeriodicity } from './getDatesAndPeriodicity';
+import { getDatesAndPeriodicity } from 'src/utils/misc';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
 
@@ -124,7 +125,7 @@ export default {
           this.$data[d.periodKey]
         );
 
-        let result = await frappe.db.getTotalOutstanding(
+        let result = await fyo.db.getTotalOutstanding(
           d.doctype,
           fromDate,
           toDate
@@ -142,7 +143,7 @@ export default {
       this.invoices = await Promise.all(promises);
     },
     async newInvoice(invoice) {
-      let doc = await frappe.getEmptyDoc(invoice.doctype);
+      let doc = await fyo.doc.getEmptyDoc(invoice.doctype);
       routeTo(`/edit/${invoice.doctype}/${doc.name}`);
     },
   },
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index d9294cf1..be5cb580 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -70,7 +70,7 @@
               w-40
             "
           >
-            <p>{{ frappe.t`Submit on Import` }}</p>
+            <p>{{ t`Submit on Import` }}</p>
             <FormControl
               size="small"
               input-class="bg-gray-100"
@@ -337,7 +337,6 @@
 </template>
 <script>
 import { ipcRenderer } from 'electron';
-import frappe from 'frappe';
 import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl';
 import DropdownWithActions from 'src/components/DropdownWithActions.vue';
@@ -345,6 +344,7 @@ import FeatherIcon from 'src/components/FeatherIcon.vue';
 import HowTo from 'src/components/HowTo.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import { importable, Importer } from 'src/dataImport';
+import { fyo } from 'src/initFyo';
 import { getSavePath, saveData, showMessageDialog } from 'src/utils';
 import { IPC_ACTIONS } from 'utils/messages';
 import Loading from '../components/Loading.vue';
@@ -440,7 +440,7 @@ export default {
     isSubmittable() {
       const doctype = this.importer?.doctype;
       if (doctype) {
-        return frappe.models[doctype].isSubmittable ?? false;
+        return fyo.models[doctype].isSubmittable ?? false;
       }
       return false;
     },
@@ -450,14 +450,14 @@ export default {
         label: this.t`Import Type`,
         fieldtype: 'AutoComplete',
         placeholder: this.t`Import Type`,
-        getList: () => importable.map((i) => frappe.models[i].label),
+        getList: () => importable.map((i) => fyo.models[i].label),
       };
     },
     labelDoctypeMap() {
       return importable
         .map((i) => ({
           name: i,
-          label: frappe.models[i].label,
+          label: fyo.models[i].label,
         }))
         .reduce((acc, { name, label }) => {
           acc[label] = name;
@@ -585,7 +585,7 @@ export default {
         this.clear();
       }
       this.importType = importType;
-      this.importer = new Importer(this.labelDoctypeMap[this.importType]);
+      this.importer = new Importer(this.labelDoctypeMap[this.importType], fyo);
     },
     setLoadingStatus(isMakingEntries, entriesMade, totalEntries) {
       this.isMakingEntries = isMakingEntries;
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index e5b68648..5e1d22d2 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -162,10 +162,8 @@ import { ipcRenderer } from 'electron';
 import fs from 'fs';
 import { DateTime } from 'luxon';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
-import config from 'src/config';
-import { connectToLocalDatabase, createNewDatabase } from 'src/initialization';
-import { DB_CONN_FAILURE, IPC_ACTIONS } from '../../utils/messages';
-import { showErrorDialog } from '../errorHandling';
+import { fyo } from 'src/initFyo';
+import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
   name: 'DatabaseSelector',
@@ -189,14 +187,17 @@ export default {
   },
   methods: {
     setFiles() {
-      this.files = config
+      this.files = fyo.config
         .get('files', [])
         .filter(({ filePath }) => fs.existsSync(filePath));
     },
     async newDatabase() {
+      /*
+        TODO: Refactor this
       this.fileSelectedFrom = 'New File';
       let filePath = await createNewDatabase();
       this.connectToDatabase(filePath);
+      */
     },
     async existingDatabase() {
       this.fileSelectedFrom = 'Existing File';
@@ -214,6 +215,8 @@ export default {
       await this.connectToDatabase(file.filePath);
     },
     async connectToDatabase(filePath) {
+      /*
+        TODO: Refactor this
       if (!filePath) {
         return;
       }
@@ -235,6 +238,7 @@ export default {
           .t`Can't open database file: ${filePath}. Please create a new file.`;
       }
       await showErrorDialog(title, content);
+      */
     },
     getFileLastModified(filePath) {
       let stats = fs.statSync(filePath);
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index 8207cca1..aac19d11 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -85,10 +85,11 @@
 
 <script>
 import { ipcRenderer } from 'electron';
-import frappe, { t } from 'frappe';
+import { t } from 'fyo';
 import Button from 'src/components/Button';
 import Icon from 'src/components/Icon';
 import PageHeader from 'src/components/PageHeader';
+import { fyo } from 'src/initFyo';
 import { openSettings, routeTo } from 'src/utils';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h } from 'vue';
@@ -252,7 +253,7 @@ export default {
     };
   },
   async activated() {
-    frappe.GetStarted = await frappe.getSingle('GetStarted');
+    fyo.GetStarted = await fyo.getSingle('GetStarted');
     this.checkForCompletedTasks();
   },
   methods: {
@@ -292,12 +293,12 @@ export default {
       }
     },
     async checkIsOnboardingComplete() {
-      if (frappe.GetStarted.onboardingComplete) {
+      if (fyo.GetStarted.onboardingComplete) {
         return true;
       }
 
-      const meta = await frappe.getMeta('GetStarted');
-      const doc = await frappe.getSingle('GetStarted');
+      const meta = await fyo.getMeta('GetStarted');
+      const doc = await fyo.getSingle('GetStarted');
       const onboardingComplete = !!meta.fields
         .filter(({ fieldname }) => fieldname !== 'onboardingComplete')
         .map(({ fieldname }) => doc.get(fieldname))
@@ -305,7 +306,7 @@ export default {
 
       if (onboardingComplete) {
         await this.updateChecks({ onboardingComplete });
-        const systemSettings = await frappe.getSingle('SystemSettings');
+        const systemSettings = await fyo.getSingle('SystemSettings');
         await systemSettings.set({ hideGetStarted: 1 });
         await systemSettings.update();
       }
@@ -318,22 +319,22 @@ export default {
         return;
       }
 
-      if (!frappe.GetStarted.itemCreated) {
-        const count = await frappe.db.count('Item');
+      if (!fyo.GetStarted.itemCreated) {
+        const count = await fyo.db.count('Item');
         if (count > 0) {
           toUpdate.itemCreated = 1;
         }
       }
 
-      if (!frappe.GetStarted.invoiceCreated) {
-        const count = await frappe.db.count('SalesInvoice');
+      if (!fyo.GetStarted.invoiceCreated) {
+        const count = await fyo.db.count('SalesInvoice');
         if (count > 0) {
           toUpdate.invoiceCreated = 1;
         }
       }
 
-      if (!frappe.GetStarted.customerCreated) {
-        const count = frappe.db.count('Party', {
+      if (!fyo.GetStarted.customerCreated) {
+        const count = fyo.db.count('Party', {
           filters: { role: 'Customer' },
         });
         if (count > 0) {
@@ -341,15 +342,15 @@ export default {
         }
       }
 
-      if (!frappe.GetStarted.billCreated) {
-        const count = await frappe.db.count('SalesInvoice');
+      if (!fyo.GetStarted.billCreated) {
+        const count = await fyo.db.count('SalesInvoice');
         if (count > 0) {
           toUpdate.billCreated = 1;
         }
       }
 
-      if (!frappe.GetStarted.supplierCreated) {
-        const count = frappe.db.count('Party', {
+      if (!fyo.GetStarted.supplierCreated) {
+        const count = fyo.db.count('Party', {
           filters: { role: 'Supplier' },
         });
         if (count > 0) {
@@ -359,15 +360,15 @@ export default {
       await this.updateChecks(toUpdate);
     },
     async updateChecks(toUpdate) {
-      await frappe.GetStarted.setMultiple(toUpdate);
-      await frappe.GetStarted.update();
-      frappe.GetStarted = await frappe.getSingle('GetStarted');
+      await fyo.GetStarted.setMultiple(toUpdate);
+      await fyo.GetStarted.update();
+      fyo.GetStarted = await fyo.getSingle('GetStarted');
     },
     isCompleted(item) {
-      return frappe.GetStarted.get(item.fieldname) || 0;
+      return fyo.GetStarted.get(item.fieldname) || 0;
     },
     getIconComponent(item) {
-      let completed = frappe.GetStarted[item.fieldname] || 0;
+      let completed = fyo.GetStarted[item.fieldname] || 0;
       let name = completed ? 'green-check' : item.icon;
       let size = completed ? '24' : '18';
       return {
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 4bec9d81..8208e231 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -153,7 +153,7 @@
               <div>{{ tax.account }}</div>
               <div>
                 {{
-                  frappe.format(tax.amount, {
+                  fyo.format(tax.amount, {
                     fieldtype: 'Currency',
                     currency: doc.currency,
                   })
@@ -198,7 +198,6 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
 import { getInvoiceStatus } from 'models/helpers';
 import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
@@ -206,6 +205,7 @@ import FormControl from 'src/components/Controls/FormControl';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
+import { fyo } from 'src/initFyo';
 import {
 getActionsForDocument,
 openSettings,
@@ -242,7 +242,7 @@ export default {
   },
   computed: {
     meta() {
-      return frappe.getMeta(this.doctype);
+      return fyo.getMeta(this.doctype);
     },
     partyField() {
       let fieldname = {
@@ -263,18 +263,18 @@ export default {
   },
   async mounted() {
     try {
-      this.doc = await frappe.doc.getDoc(this.doctype, this.name);
+      this.doc = await fyo.doc.getDoc(this.doctype, this.name);
       window.d = this.doc;
     } catch (error) {
-      if (error instanceof frappe.errors.NotFoundError) {
+      if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.doctype}`);
         return;
       }
       this.handleError(error);
     }
-    this.printSettings = await frappe.getSingle('PrintSettings');
+    this.printSettings = await fyo.getSingle('PrintSettings');
     this.companyName = (
-      await frappe.getSingle('AccountingSettings')
+      await fyo.getSingle('AccountingSettings')
     ).companyName;
 
     let query = this.$route.query;
@@ -327,7 +327,7 @@ export default {
         doc = this.doc;
       }
       let df = doc.meta.getField(fieldname);
-      return frappe.format(doc[fieldname], df, doc);
+      return fyo.format(doc[fieldname], df, doc);
     },
   },
 };
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 9c5d2b3f..91e00147 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -87,7 +87,7 @@
                   :read-only="!doc._notInserted || doc.submitted"
                   :class="doc.submitted && 'pointer-events-none'"
                 />
-            </div>
+              </div>
             </div>
           </div>
           <div class="mt-2 px-6 text-base">
@@ -128,13 +128,13 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
 import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
+import { fyo } from 'src/initFyo';
 import { getActionsForDocument, routeTo, showMessageDialog } from 'src/utils';
 import { handleErrorWithDialog } from '../errorHandling';
 
@@ -163,7 +163,7 @@ export default {
   },
   computed: {
     meta() {
-      return frappe.getMeta(this.doctype);
+      return fyo.getMeta(this.doctype);
     },
     status() {
       if (this.doc._notInserted || !this.doc.submitted) {
@@ -177,14 +177,14 @@ export default {
       if (this.doc.accounts) {
         value = this.doc.getSum('accounts', 'debit');
       }
-      return frappe.format(value, 'Currency');
+      return fyo.format(value, 'Currency');
     },
     totalCredit() {
       let value = 0;
       if (this.doc.accounts) {
         value = this.doc.getSum('accounts', 'credit');
       }
-      return frappe.format(value, 'Currency');
+      return fyo.format(value, 'Currency');
     },
     actions() {
       return getActionsForDocument(this.doc);
@@ -192,10 +192,10 @@ export default {
   },
   async mounted() {
     try {
-      this.doc = await frappe.doc.getDoc(this.doctype, this.name);
+      this.doc = await fyo.doc.getDoc(this.doctype, this.name);
       window.je = this.doc;
     } catch (error) {
-      if (error instanceof frappe.errors.NotFoundError) {
+      if (error instanceof fyo.errors.NotFoundError) {
         routeTo(`/list/${this.doctype}`);
         return;
       }
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index 0593e9b3..a577938f 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -56,11 +56,11 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
 import Avatar from 'src/components/Avatar';
 import Button from 'src/components/Button';
 import Row from 'src/components/Row';
-import { openQuickEdit, routeTo } from 'src/utils';
+import { fyo } from 'src/initFyo';
+import { openQuickEdit, routeTo } from 'src/utils/ui';
 import ListCell from './ListCell';
 
 export default {
@@ -90,7 +90,7 @@ export default {
       return this.prepareColumns();
     },
     meta() {
-      return frappe.getMeta(this.listConfig.doctype);
+      return fyo.getMeta(this.listConfig.doctype);
     },
     hasImage() {
       return this.meta.hasField('image');
@@ -98,7 +98,7 @@ export default {
   },
   async mounted() {
     await this.setupColumnsAndData();
-    frappe.db.on(`change:${this.listConfig.doctype}`, () => {
+    fyo.db.on(`change:${this.listConfig.doctype}`, () => {
       this.updateData();
     });
   },
@@ -119,7 +119,7 @@ export default {
     },
     async updateData(filters) {
       if (!filters) filters = this.getFilters();
-      this.data = await frappe.db.getAll({
+      this.data = await fyo.db.getAll({
         doctype: this.doctype,
         fields: ['*'],
         filters,
diff --git a/src/pages/ListView/ListCell.vue b/src/pages/ListView/ListCell.vue
index 1070f02f..bc14fa8c 100644
--- a/src/pages/ListView/ListCell.vue
+++ b/src/pages/ListView/ListCell.vue
@@ -5,7 +5,7 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
+import { fyo } from 'src/initFyo';
 
 export default {
   name: 'ListCell',
@@ -14,7 +14,7 @@ export default {
     columnValue() {
       let { column, doc } = this;
       let value = doc[column.fieldname];
-      return frappe.format(value, column, doc);
+      return fyo.format(value, column, doc);
     },
     customRenderer() {
       if (!this.column.render) return;
@@ -24,7 +24,7 @@ export default {
       return ['Int', 'Float', 'Currency'].includes(this.column.fieldtype)
         ? 'justify-end'
         : '';
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index c7a76353..95d9c581 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -30,11 +30,11 @@
   </div>
 </template>
 <script>
-import frappe from 'fyo';
 import Button from 'src/components/Button';
 import FilterDropdown from 'src/components/FilterDropdown';
 import PageHeader from 'src/components/PageHeader';
 import SearchBar from 'src/components/SearchBar';
+import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils';
 import List from './List';
 
@@ -63,7 +63,7 @@ export default {
   methods: {
     async makeNewDoc() {
       const doctype = this.listConfig.doctype;
-      const doc = await frappe.getEmptyDoc(doctype);
+      const doc = await fyo.doc.getEmptyDoc(doctype);
       if (this.listConfig.filters) {
         doc.set(this.listConfig.filters);
       }
@@ -104,9 +104,6 @@ export default {
     },
   },
   computed: {
-    meta() {
-      return frappe.getMeta(this.doctype);
-    },
     listConfig() {
       if (this?.listConfigs?.[this?.doctype]) {
         return this.listConfigs[this.doctype];
@@ -114,7 +111,7 @@ export default {
         return {
           title: this.doctype,
           doctype: this.doctype,
-          columns: this.meta.getKeywordFields(),
+          columns: fyo.schemaMap[this.doctype].keywordFields ?? ['name'],
         };
       }
     },
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 9d914250..e797238e 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -52,14 +52,12 @@
 </template>
 <script>
 import { ipcRenderer } from 'electron';
-import frappe from 'fyo';
+import { Verb } from 'fyo/telemetry/types';
 import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
 import PageHeader from 'src/components/PageHeader';
 import SearchBar from 'src/components/SearchBar';
 import TwoColumnForm from 'src/components/TwoColumnForm';
-import telemetry from 'src/telemetry/telemetry';
-import { Verb } from 'src/telemetry/types';
 import { makePDF } from 'src/utils';
 import { IPC_ACTIONS } from 'utils/messages';
 
@@ -81,12 +79,12 @@ export default {
     };
   },
   async mounted() {
-    this.doc = await frappe.doc.getDoc(this.doctype, this.name);
-    this.printSettings = await frappe.getSingle('PrintSettings');
+    this.doc = await fyo.doc.getDoc(this.doctype, this.name);
+    this.printSettings = await fyo.getSingle('PrintSettings');
   },
   computed: {
     meta() {
-      return frappe.getMeta(this.doctype);
+      return fyo.getMeta(this.doctype);
     },
     printTemplate() {
       return this.meta.printTemplate;
@@ -98,7 +96,7 @@ export default {
       if (!savePath) return;
 
       const html = this.$refs.printContainer.innerHTML;
-      telemetry.log(Verb.Exported, 'SalesInvoice', { extension: 'pdf' });
+      fyo.telemetry.log(Verb.Exported, 'SalesInvoice', { extension: 'pdf' });
       makePDF(html, savePath);
     },
     async getSavePath() {
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 67081eb3..3f961f87 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -77,12 +77,13 @@
 </template>
 
 <script>
-import frappe, { t } from 'frappe';
+import { t } from 'fyo';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import StatusBadge from 'src/components/StatusBadge';
 import TwoColumnForm from 'src/components/TwoColumnForm';
+import { fyo } from 'src/initFyo';
 import { getActionsForDocument, openQuickEdit } from 'src/utils';
 
 export default {
@@ -126,7 +127,7 @@ export default {
   },
   computed: {
     meta() {
-      return frappe.getMeta(this.doctype);
+      return fyo.getMeta(this.doctype);
     },
     status() {
       if (this.doc && this.doc._notInserted) {
@@ -186,7 +187,7 @@ export default {
     },
     async fetchDoc() {
       try {
-        this.doc = await frappe.doc.getDoc(this.doctype, this.name);
+        this.doc = await fyo.doc.getDoc(this.doctype, this.name);
 
         this.doc.once('afterRename', () => {
           openQuickEdit({
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 871d3694..f834d8ba 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -136,18 +136,18 @@
   </div>
 </template>
 <script>
-import frappe from 'frappe';
-import reportViewConfig from 'src/../reports/view';
+import { getReportData } from 'reports/index';
+import reportViewConfig from 'reports/view';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl';
+import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import FeatherIcon from 'src/components/FeatherIcon.vue';
 import PageHeader from 'src/components/PageHeader';
 import Row from 'src/components/Row';
 import SearchBar from 'src/components/SearchBar';
 import WithScroll from 'src/components/WithScroll';
+import { fyo } from 'src/initFyo';
 import { h, markRaw } from 'vue';
-import { getReportData } from '../../reports/index';
-import DropdownWithActions from '../components/DropdownWithActions.vue';
 
 export default {
   name: 'Report',
@@ -296,7 +296,7 @@ export default {
       // default cell component
       let formattedValue =
         cellValue != null && cellValue !== ''
-          ? frappe.format(cellValue, column)
+          ? fyo.format(cellValue, column)
           : '';
       return {
         render() {
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 7aef6672..373177e7 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -1,6 +1,4 @@
 <template>
-  
-  
   <div class="flex flex-col overflow-hidden">
     <PageHeader>
       <template #title>
@@ -52,16 +50,16 @@
 </template>
 <script>
 import { ipcRenderer } from 'electron';
-import frappe, { t } from 'fyo';
+import { t } from 'fyo';
 import Button from 'src/components/Button';
 import Icon from 'src/components/Icon';
 import PageHeader from 'src/components/PageHeader';
 import Row from 'src/components/Row';
 import StatusBadge from 'src/components/StatusBadge';
 import WindowControls from 'src/components/WindowControls';
+import { showToast } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h, markRaw } from 'vue';
-import { callInitializeMoneyMaker, showToast } from '../../utils';
 import TabGeneral from './TabGeneral.vue';
 import TabInvoice from './TabInvoice.vue';
 import TabSystem from './TabSystem.vue';
@@ -113,23 +111,20 @@ export default {
 
     if (
       fieldnames.includes('displayPrecision') ||
-      fieldnames.includes('hideGetStarted')
+      fieldnames.includes('hideGetStarted') ||
+      fieldnames.includes('displayPrecision')
     ) {
       this.showReloadToast();
     }
-
-    if (fieldnames.includes('displayPrecision')) {
-      callInitializeMoneyMaker(undefined, true);
-    }
   },
   methods: {
     showReloadToast() {
       showToast({
         message: t`Settings changes will be visible on reload`,
-        actionText: frappe.t`Reload App`,
+        actionText: t`Reload App`,
         type: 'info',
         action: async () => {
-          ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW)
+          ipcRenderer.send(IPC_MESSAGES.RELOAD_MAIN_WINDOW);
         },
       });
     },
diff --git a/src/pages/Settings/TabGeneral.vue b/src/pages/Settings/TabGeneral.vue
index 0469400c..2ae927b1 100644
--- a/src/pages/Settings/TabGeneral.vue
+++ b/src/pages/Settings/TabGeneral.vue
@@ -12,8 +12,8 @@
 </template>
 
 <script>
-import frappe from 'fyo';
 import TwoColumnForm from 'src/components/TwoColumnForm';
+import { fyo } from 'src/initFyo';
 
 export default {
   name: 'TabGeneral',
@@ -27,13 +27,16 @@ export default {
     };
   },
   async mounted() {
-    this.doc = await frappe.doc.getDoc('AccountingSettings', 'AccountingSettings', {
-      skipDocumentCache: true,
-    });
+    this.doc = await fyo.doc.getDoc(
+      'AccountingSettings',
+      'AccountingSettings',
+      {
+        skipDocumentCache: true,
+      }
+    );
   },
   computed: {
     fields() {
-      let meta = frappe.getMeta('AccountingSettings');
       return [
         'companyName',
         'country',
@@ -44,7 +47,7 @@ export default {
         'fiscalYearStart',
         'fiscalYearEnd',
         'gstin',
-      ].map((fieldname) => meta.getField(fieldname));
+      ].map((fieldname) => fyo.getField('AccountingSettings', fieldname));
     },
   },
   methods: {
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index fb39ab4c..66bd002e 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -2,13 +2,13 @@
   <div v-if="doc">
     <div class="flex items-center">
       <FormControl
-        :df="meta.getField('logo')"
+        :df="getField('logo')"
         :value="doc.logo"
         @change="
           (value) => {
             doc.set('logo', value);
             doc.update();
-            forwardChangeEvent(meta.getField('logo'));
+            forwardChangeEvent(getField('logo'));
           }
         "
       />
@@ -21,14 +21,14 @@
         </span>
         <FormControl
           class="mt-2"
-          :df="meta.getField('displayLogo')"
+          :df="getField('displayLogo')"
           :value="doc.displayLogo"
           :show-label="true"
           @change="
             (value) => {
               doc.set('displayLogo', value);
               doc.update();
-              forwardChangeEvent(meta.getField('displayLogo'));
+              forwardChangeEvent(getField('displayLogo'));
             }
           "
           size="small"
@@ -47,9 +47,9 @@
 </template>
 <script>
 import { ipcRenderer } from 'electron';
-import frappe from 'fyo';
 import FormControl from 'src/components/Controls/FormControl';
 import TwoColumnForm from 'src/components/TwoColumnForm';
+import { fyo } from 'src/initFyo';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
@@ -73,25 +73,25 @@ export default {
     };
   },
   async mounted() {
-    this.doc = await frappe.getSingle('PrintSettings');
+    this.doc = await fyo.doc.getSingle('PrintSettings');
     this.companyName = (
-      await frappe.getSingle('AccountingSettings')
+      await fyo.doc.getSingle('AccountingSettings')
     ).companyName;
   },
   computed: {
-    meta() {
-      return frappe.getMeta('PrintSettings');
-    },
     fields() {
       return ['template', 'color', 'font', 'email', 'phone', 'address'].map(
-        (field) => this.meta.getField(field)
+        (field) => this.getField(field)
       );
     },
   },
   methods: {
+    getField(fieldname) {
+      return fyo.getField('PrintSettings', fieldname);
+    },
     async openFileSelector() {
       const options = {
-        title: frappe.t`Select Logo`,
+        title: t`Select Logo`,
         properties: ['openFile'],
         filters: [{ name: 'Invoice Logo', extensions: ['png', 'jpg', 'svg'] }],
       };
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index 367fc68f..2cb2fd46 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -38,16 +38,13 @@
 </template>
 
 <script>
-import frappe from 'fyo';
+import { ConfigKeys } from 'fyo/core/types';
+import { getTelemetryOptions } from 'fyo/telemetry/helpers';
+import { TelemetrySetting } from 'fyo/telemetry/types';
 import FormControl from 'src/components/Controls/FormControl';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
-import config, {
-ConfigKeys,
-TelemetrySetting
-} from 'src/config';
-import { getTelemetryOptions } from 'src/telemetry/helpers';
-import telemetry from 'src/telemetry/telemetry';
+import { fyo } from 'src/initFyo';
 import { checkForUpdates } from 'src/utils';
 
 export default {
@@ -65,9 +62,9 @@ export default {
     };
   },
   async mounted() {
-    this.doc = frappe.SystemSettings;
-    this.companyName = frappe.AccountingSettings.companyName;
-    this.telemetry = config.get(ConfigKeys.Telemetry);
+    this.doc = fyo.singles.SystemSettings;
+    this.companyName = fyo.singles.AccountingSettings.companyName;
+    this.telemetry = fyo.config.get(ConfigKeys.Telemetry);
   },
   computed: {
     df() {
@@ -84,7 +81,7 @@ export default {
       };
     },
     fields() {
-      let meta = frappe.getMeta('SystemSettings');
+      let meta = fyo.getMeta('SystemSettings');
       return meta.getQuickEditFields();
     },
   },
@@ -93,12 +90,12 @@ export default {
     setValue(value) {
       this.telemetry = value;
       if (value === TelemetrySetting.dontLogAnything) {
-        telemetry.finalLogAndStop();
+        fyo.telemetry.finalLogAndStop();
       } else {
-        telemetry.log(Verb.Started, NounEnum.Telemetry);
+        fyo.telemetry.log(Verb.Started, NounEnum.Telemetry);
       }
 
-      config.set(ConfigKeys.Telemetry, value);
+      fyo.config.set(ConfigKeys.Telemetry, value);
     },
     forwardChangeEvent(...args) {
       this.$emit('change', ...args);
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index faccf726..51c0bae0 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -91,14 +91,14 @@
 <script>
 import { ipcRenderer } from 'electron';
 import fs from 'fs';
-import frappe from 'fyo';
 import path from 'path';
 import FormControl from 'src/components/Controls/FormControl';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import Popover from 'src/components/Popover';
 import TwoColumnForm from 'src/components/TwoColumnForm';
-import config from 'src/config';
+import { fyo } from 'src/initFyo';
 import { connectToLocalDatabase, purgeCache } from 'src/initialization';
+import { setupInstance } from 'src/setup/setupInstance';
 import { setLanguageMap, showMessageDialog } from 'src/utils';
 import { IPC_MESSAGES } from 'utils/messages';
 import {
@@ -106,7 +106,6 @@ getErrorMessage,
 handleErrorWithDialog,
 showErrorDialog
 } from '../../errorHandling';
-import setupCompany from './setupCompany';
 import Slide from './Slide.vue';
 
 export default {
@@ -135,11 +134,11 @@ export default {
     LanguageSelector,
   },
   async mounted() {
-    if (config.get('language') !== undefined) {
+    if (fyo.config.get('language') !== undefined) {
       this.index = 1;
     }
 
-    this.doc = await frappe.doc.getNewDoc('SetupWizard');
+    this.doc = await fyo.doc.getNewDoc('SetupWizard');
     this.doc.on('change', () => {
       this.valuesFilled = this.allValuesFilled();
     });
@@ -192,11 +191,11 @@ export default {
 
       try {
         this.loading = true;
-        await setupCompany(this.doc);
+        await setupInstance(this.doc);
         this.$emit('setup-complete');
       } catch (e) {
         this.loading = false;
-        if (e.type === frappe.errors.DuplicateEntryError) {
+        if (e.type === fyo.errors.DuplicateEntryError) {
           console.log(e);
           console.log('retrying');
           await this.renameDbFileAndRerunSetup();
@@ -206,7 +205,7 @@ export default {
       }
     },
     async renameDbFileAndRerunSetup() {
-      const filePath = config.get('lastSelectedFilePath');
+      const filePath = fyo.config.get('lastSelectedFilePath');
       renameDbFile(filePath);
 
       await purgeCache();
@@ -216,7 +215,7 @@ export default {
       );
 
       if (connectionSuccess) {
-        await setupCompany(this.doc);
+        await setupInstance(this.doc);
         this.$emit('setup-complete');
       } else {
         const title = this.t`DB Connection Error`;
@@ -227,7 +226,7 @@ export default {
   },
   computed: {
     meta() {
-      return frappe.getMeta('SetupWizard');
+      return fyo.getMeta('SetupWizard');
     },
     fields() {
       return this.meta.getQuickEditFields();
diff --git a/src/postStart.ts b/src/postStart.ts
index 3ff163bb..0386f62e 100644
--- a/src/postStart.ts
+++ b/src/postStart.ts
@@ -3,7 +3,7 @@ import { DEFAULT_SERIES_START } from 'fyo/utils/consts';
 import { getValueMapFromList } from 'utils';
 import { fyo } from './initFyo';
 
-export default async function postStart() {
+export async function postStart() {
   await createDefaultNumberSeries();
   await setSingles();
   await setCurrencySymbols();
diff --git a/src/renderer.ts b/src/renderer.ts
index 1e50bfbf..9c0b97bd 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -101,8 +101,6 @@ function setErrorHandlers(app: VueApp) {
 
 function setOnWindow() {
   if (process.env.NODE_ENV === 'development') {
-    // @ts-ignore
-    window.config = config;
     // @ts-ignore
     window.router = router;
     // @ts-ignore
diff --git a/src/router.ts b/src/router.ts
index 4e5057e1..d2e0ee99 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,15 +1,15 @@
 import { NounEnum, Verb } from 'fyo/telemetry/types';
-import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
-import DataImport from 'src/pages/DataImport.vue';
-import GetStarted from 'src/pages/GetStarted.vue';
-import InvoiceForm from 'src/pages/InvoiceForm.vue';
-import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
-import ListView from 'src/pages/ListView/ListView.vue';
-import PrintView from 'src/pages/PrintView/PrintView.vue';
-import QuickEditForm from 'src/pages/QuickEditForm.vue';
-import Report from 'src/pages/Report.vue';
-import Settings from 'src/pages/Settings/Settings.vue';
+// import GetStarted from 'src/pages/GetStarted.vue';
+// import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
+// import DataImport from 'src/pages/DataImport.vue';
+// import InvoiceForm from 'src/pages/InvoiceForm.vue';
+// import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
+// import ListView from 'src/pages/ListView/ListView.vue';
+// import PrintView from 'src/pages/PrintView/PrintView.vue';
+// import QuickEditForm from 'src/pages/QuickEditForm.vue';
+// import Report from 'src/pages/Report.vue';
+// import Settings from 'src/pages/Settings/Settings.vue';
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
 import { fyo } from './initFyo';
 
@@ -18,6 +18,7 @@ const routes: RouteRecordRaw[] = [
     path: '/',
     component: Dashboard,
   },
+  /*
   {
     path: '/get-started',
     component: GetStarted,
@@ -113,6 +114,7 @@ const routes: RouteRecordRaw[] = [
     component: Settings,
     props: true,
   },
+*/
 ];
 
 const router = createRouter({ routes, history: createWebHistory() });
diff --git a/src/saveHtmlAsPdf.js b/src/saveHtmlAsPdf.js
index ec56a134..5ca7817d 100644
--- a/src/saveHtmlAsPdf.js
+++ b/src/saveHtmlAsPdf.js
@@ -1,6 +1,6 @@
 import { BrowserWindow } from 'electron';
-import { sleep } from 'frappe/utils';
 import fs from 'fs/promises';
+import { sleep } from 'utils';
 
 const PRINT_OPTIONS = {
   marginsType: 1, // no margin
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 684aa31e..4b6e88b9 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -246,7 +246,7 @@ export function getActionsForDocument(doc?: Doc): Action[] {
   if (!doc) return [];
 
   const actions: Action[] = [
-    ...getActions(doc, fyo),
+    ...getActions(doc),
     getDuplicateAction(doc),
     getDeleteAction(doc),
     getCancelAction(doc),
diff --git a/tsconfig.json b/tsconfig.json
index e3d5790b..2a02ff0b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,15 +12,18 @@
     "allowSyntheticDefaultImports": true,
     "resolveJsonModule": true,
     "sourceMap": true,
-    "baseUrl": ".",
     "types": ["webpack-env"],
+    "baseUrl": ".",
     "paths": {
       "src/*": ["src/*"],
       "schemas/*": ["schemas/*"],
+      "main/*": ["main/*"],
       "backend/*": ["backend/*"],
       "regional/*": ["regional/*"],
       "fixtures/*": ["fixtures/*"],
-      "utils/*": ["utils/*"]
+      "reports/*": ["reports/*"],
+      "models/*": ["models/*"],
+      "utils/*": ["utils/*"],
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },
@@ -29,23 +32,20 @@
   },
   "include": [
     "src/**/*.ts",
-    "src/**/*.tsx",
     "src/**/*.vue",
-
     "schemas/**/*.ts",
     "backend/**/*.ts",
-
     "fyo/**/*.ts",
     "models/**/*.ts",
     "patches/**/*.ts",
     "patches/**/*.js",
     "reports/**/*.ts",
     "accounting/**/*.ts",
-    "accounting/**/*.ts",
-
     "scripts/**/*.ts",
-    "utils/csvParser.ts",
-    "utils/config.ts"
+    "main/**/*.ts",
+    "regional/**/*.ts",
+    "reports/**/*.ts",
+    "utils/**/*.ts",
   ],
   "exclude": ["node_modules"]
 }
diff --git a/vue.config.js b/vue.config.js
index e6889c87..b435979f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -13,10 +13,12 @@ module.exports = {
       chainWebpackRendererProcess: (config) => {
         config.target('electron-renderer');
         config.resolve.alias.set('fyo', path.resolve(__dirname, './fyo'));
+        config.resolve.alias.set('utils', path.resolve(__dirname, './utils'));
       },
       chainWebpackMainProcess: (config) => {
         config.target('electron-main');
         config.resolve.alias.set('fyo', path.resolve(__dirname, './fyo'));
+        config.resolve.alias.set('utils', path.resolve(__dirname, './utils'));
         config.module
           .rule('js')
           .test(/\.js$/)
@@ -43,8 +45,10 @@ module.exports = {
       src: path.resolve(__dirname, './src'),
       schemas: path.resolve(__dirname, './schemas'),
       backend: path.resolve(__dirname, './backend'),
+      models: path.resolve(__dirname, './models'),
       utils: path.resolve(__dirname, './utils'),
       regional: path.resolve(__dirname, './regional'),
+      reports: path.resolve(__dirname, './reports'),
       fixtures: path.resolve(__dirname, './fixtures'),
     });
 

From b6163b4cac7159a38e47f23216900fdff9109960 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 21 Apr 2022 18:47:06 +0530
Subject: [PATCH 061/163] incr: remove 600x600 windows

---
 main.ts                                 |  9 +++++----
 main/helpers.ts                         | 14 --------------
 main/registerIpcMainActionListeners.ts  |  5 -----
 main/registerIpcMainMessageListeners.ts |  7 -------
 src/App.vue                             | 21 ---------------------
 src/renderer.ts                         |  2 +-
 utils/messages.ts                       |  2 --
 7 files changed, 6 insertions(+), 54 deletions(-)
 delete mode 100644 main/helpers.ts

diff --git a/main.ts b/main.ts
index 39ee7b9a..b6409afb 100644
--- a/main.ts
+++ b/main.ts
@@ -10,7 +10,6 @@ import Store from 'electron-store';
 import { autoUpdater } from 'electron-updater';
 import path from 'path';
 import { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
-import { getMainWindowSize } from './main/helpers';
 import registerAppLifecycleListeners from './main/registerAppLifecycleListeners';
 import registerAutoUpdaterListeners from './main/registerAutoUpdaterListeners';
 import registerIpcMainActionListeners from './main/registerIpcMainActionListeners';
@@ -18,6 +17,9 @@ import registerIpcMainMessageListeners from './main/registerIpcMainMessageListen
 import registerProcessListeners from './main/registerProcessListeners';
 import { IPC_CHANNELS } from './utils/messages';
 
+const WIDTH = 1200;
+const HEIGHT = 907;
+
 export class Main {
   title: string = 'Frappe Books';
   icon: string;
@@ -69,13 +71,12 @@ export class Main {
   }
 
   getOptions(): BrowserWindowConstructorOptions {
-    const { width, height } = getMainWindowSize();
     const options: BrowserWindowConstructorOptions = {
       vibrancy: 'sidebar',
       transparent: this.isMac,
       backgroundColor: '#80FFFFFF',
-      width,
-      height,
+      width: WIDTH,
+      height: HEIGHT,
       title: this.title,
       webPreferences: {
         contextIsolation: false, // TODO: Switch this off
diff --git a/main/helpers.ts b/main/helpers.ts
deleted file mode 100644
index 6bebddd2..00000000
--- a/main/helpers.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import electron, { app } from 'electron';
-
-export function getMainWindowSize() {
-  let height;
-  if (app.isReady()) {
-    const screen = electron.screen;
-    height = screen.getPrimaryDisplay().workAreaSize.height;
-    height = height > 907 ? 907 : height;
-  } else {
-    height = 907;
-  }
-  const width = Math.ceil(1.323 * height);
-  return { height, width };
-}
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 97da5eb1..0f6a46bc 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -10,7 +10,6 @@ import saveHtmlAsPdf from '../src/saveHtmlAsPdf';
 import { DatabaseMethod } from '../utils/db/types';
 import { DatabaseResponse } from '../utils/ipc/types';
 import { IPC_ACTIONS } from '../utils/messages';
-import { getMainWindowSize } from './helpers';
 
 export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(IPC_ACTIONS.TOGGLE_MAXIMIZE_CURRENT_WINDOW, (event) => {
@@ -31,10 +30,6 @@ export default function registerIpcMainActionListeners(main: Main) {
     return await dialog.showSaveDialog(main.mainWindow!, options);
   });
 
-  ipcMain.handle(IPC_ACTIONS.GET_PRIMARY_DISPLAY_SIZE, (event) => {
-    return getMainWindowSize();
-  });
-
   ipcMain.handle(IPC_ACTIONS.GET_DIALOG_RESPONSE, async (event, options) => {
     if (main.isDevelopment || main.isLinux) {
       Object.assign(options, { icon: main.icon });
diff --git a/main/registerIpcMainMessageListeners.ts b/main/registerIpcMainMessageListeners.ts
index aa5da057..30f2f32f 100644
--- a/main/registerIpcMainMessageListeners.ts
+++ b/main/registerIpcMainMessageListeners.ts
@@ -21,13 +21,6 @@ export default function registerIpcMainMessageListeners(main: Main) {
     main.mainWindow!.reload();
   });
 
-  ipcMain.on(IPC_MESSAGES.RESIZE_MAIN_WINDOW, (event, size, resizable) => {
-    const [width, height] = size;
-    if (!width || !height) return;
-    main.mainWindow!.setSize(width, height);
-    main.mainWindow!.setResizable(resizable);
-  });
-
   ipcMain.on(IPC_MESSAGES.CLOSE_CURRENT_WINDOW, (event) => {
     main.mainWindow!.close();
   });
diff --git a/src/App.vue b/src/App.vue
index 424e9198..7c2136cd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,9 +30,7 @@
 </template>
 
 <script>
-import { ipcRenderer } from 'electron';
 import fs from 'fs/promises';
-import { IPC_MESSAGES } from 'utils/messages';
 import { fyo } from './initFyo';
 import DatabaseSelector from './pages/DatabaseSelector';
 // import Desk from './pages/Desk';
@@ -47,25 +45,6 @@ export default {
       activeScreen: null,
     };
   },
-  watch: {
-    async activeScreen(value) {
-      if (!value) return;
-      const { width, height } = await ipcRenderer.invoke(
-        IPC_ACTIONS.GET_PRIMARY_DISPLAY_SIZE
-      );
-
-      let size = {
-        Desk: [width, height],
-        DatabaseSelector: [600, 600],
-        SetupWizard: [600, 600],
-      }[value];
-      let resizable = value === 'Desk';
-
-      if (size.length) {
-        ipcRenderer.send(IPC_MESSAGES.RESIZE_MAIN_WINDOW, size, resizable);
-      }
-    },
-  },
   components: {
     // Desk,
     // SetupWizard,
diff --git a/src/renderer.ts b/src/renderer.ts
index 9c0b97bd..32e07d71 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -27,7 +27,7 @@ import { setLanguageMap } from './utils/language';
   registerIpcRendererListeners();
 
   const app = createApp({
-    template: '<h1>Hellow, World</h1>',
+    template: '<App/>',
   });
   setErrorHandlers(app);
 
diff --git a/utils/messages.ts b/utils/messages.ts
index 8ce2e316..eff418a6 100644
--- a/utils/messages.ts
+++ b/utils/messages.ts
@@ -5,7 +5,6 @@ export enum IPC_MESSAGES {
   OPEN_EXTERNAL = 'open-external',
   SHOW_ITEM_IN_FOLDER = 'show-item-in-folder',
   RELOAD_MAIN_WINDOW = 'reload-main-window',
-  RESIZE_MAIN_WINDOW = 'resize-main-window',
   CLOSE_CURRENT_WINDOW = 'close-current-window',
   MINIMIZE_CURRENT_WINDOW = 'minimize-current-window',
   DOWNLOAD_UPDATE = 'download-update',
@@ -18,7 +17,6 @@ export enum IPC_ACTIONS {
   GET_OPEN_FILEPATH = 'open-dialog',
   GET_SAVE_FILEPATH = 'save-dialog',
   GET_DIALOG_RESPONSE = 'show-message-box',
-  GET_PRIMARY_DISPLAY_SIZE = 'get-primary-display-size',
   SAVE_HTML_AS_PDF = 'save-html-as-pdf',
   SAVE_DATA = 'save-data',
   SHOW_ERROR = 'show-error',

From 6accde0e173defdb1aee4a5da40d85579b727de7 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 22 Apr 2022 16:32:03 +0530
Subject: [PATCH 062/163] incr: update DatabaseSelector

---
 backend/patches/index.ts                      |   2 +-
 fyo/core/authHandler.ts                       |   2 +
 fyo/core/dbHandler.ts                         |  11 +
 fyo/core/docHandler.ts                        |  17 +-
 fyo/index.ts                                  |  25 ++-
 fyo/model/doc.ts                              |  16 +-
 fyo/model/types.ts                            |   4 +-
 fyo/model/validationFunction.ts               |   9 +-
 fyo/utils/index.ts                            |  22 ++
 .../AccountingSettings/AccountingSettings.ts  |   7 +-
 models/baseModels/Party/Party.ts              |  10 +
 models/baseModels/SetupWizard/SetupWizard.ts  |   7 +-
 schemas/index.ts                              |   1 +
 src/App.vue                                   |  68 +++---
 src/README.md                                 |  13 ++
 .../{FormControl.js => FormControl.vue}       |  26 +--
 src/components/Controls/LanguageSelector.vue  |   7 +-
 src/components/FilterDropdown.vue             |   2 +-
 src/components/TwoColumnForm.vue              | 196 +++++++++---------
 src/components/once/TelemetryModal.vue        |   2 +-
 src/initFyo.ts                                |  40 +++-
 src/pages/DataImport.vue                      |   2 +-
 src/pages/DatabaseSelector.vue                |  81 ++++----
 src/pages/InvoiceForm.vue                     |   2 +-
 src/pages/JournalEntryForm.vue                |   2 +-
 src/pages/QuickEditForm.vue                   |   2 +-
 src/pages/Report.vue                          |   2 +-
 src/pages/Settings/TabInvoice.vue             |   2 +-
 src/pages/Settings/TabSystem.vue              |   2 +-
 src/pages/SetupWizard/Slide.vue               |  20 +-
 src/postStart.ts                              |  39 ----
 src/setup/setupInstance.ts                    |  20 +-
 src/styles/index.css                          |   6 +-
 src/utils/doc.ts                              |  28 +++
 src/utils/misc.ts                             |  26 +++
 35 files changed, 457 insertions(+), 264 deletions(-)
 create mode 100644 src/README.md
 rename src/components/Controls/{FormControl.js => FormControl.vue} (98%)
 delete mode 100644 src/postStart.ts
 create mode 100644 src/utils/doc.ts

diff --git a/backend/patches/index.ts b/backend/patches/index.ts
index 779c69a8..3630b598 100644
--- a/backend/patches/index.ts
+++ b/backend/patches/index.ts
@@ -2,5 +2,5 @@ import { Patch } from '../database/types';
 import testPatch from './testPatch';
 
 export default [
-  { name: 'testPatch', version: '0.4.2-beta.0', patch: testPatch },
+  { name: 'testPatch', version: '0.5.0-beta.0', patch: testPatch },
 ] as Patch[];
diff --git a/fyo/core/authHandler.ts b/fyo/core/authHandler.ts
index c0bb4e94..e304e59c 100644
--- a/fyo/core/authHandler.ts
+++ b/fyo/core/authHandler.ts
@@ -97,6 +97,8 @@ export class AuthHandler {
     // TODO: Implement this with auth flow
   }
 
+  purgeCache() {}
+
   #getServerURL() {
     return this.#config.serverURL || '';
   }
diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index a2f8f1e2..6769477e 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -37,6 +37,10 @@ export class DatabaseHandler extends DatabaseBase {
     }
   }
 
+  get isConnected() {
+    return !!this.dbPath;
+  }
+
   async createNewDatabase(dbPath: string, countryCode: string) {
     countryCode = await this.#demux.createNewDatabase(dbPath, countryCode);
     await this.init();
@@ -60,6 +64,12 @@ export class DatabaseHandler extends DatabaseBase {
     }
   }
 
+  purgeCache() {
+    this.dbPath = undefined;
+    this.schemaMap = {};
+    this.fieldValueMap = {};
+  }
+
   async insert(
     schemaName: string,
     docValueMap: DocValueMap
@@ -162,6 +172,7 @@ export class DatabaseHandler extends DatabaseBase {
   // Other
   async close(): Promise<void> {
     await this.#demux.call('close');
+    this.purgeCache();
   }
 
   async exists(schemaName: string, name?: string): Promise<boolean> {
diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index 69dc67e1..a0478558 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -2,6 +2,7 @@ import Doc from 'fyo/model/doc';
 import { DocMap, ModelMap, SinglesMap } from 'fyo/model/types';
 import { coreModels } from 'fyo/models';
 import Observable from 'fyo/utils/observable';
+import { Schema } from 'schemas/types';
 import { getRandomString } from 'utils';
 import { Fyo } from '..';
 import { DocValue, DocValueMap } from './types';
@@ -18,9 +19,14 @@ export class DocHandler {
 
   init() {
     this.models = {};
+    this.singles = {};
     this.docs = new Observable();
   }
 
+  purgeCache() {
+    this.init();
+  }
+
   registerModels(models: ModelMap, regionalModels: ModelMap = {}) {
     for (const schemaName in this.fyo.db.schemaMap) {
       if (coreModels[schemaName] !== undefined) {
@@ -157,9 +163,14 @@ export class DocHandler {
     return doc;
   }
 
-  getNewDoc(schemaName: string, data: DocValueMap = {}): Doc {
-    const Model = this.getModel(schemaName);
-    const schema = this.fyo.schemaMap[schemaName];
+  getNewDoc(
+    schemaName: string,
+    data: DocValueMap = {},
+    schema?: Schema,
+    Model?: typeof Doc
+  ): Doc {
+    Model ??= this.getModel(schemaName);
+    schema ??= this.fyo.schemaMap[schemaName];
     if (schema === undefined) {
       throw new Error(`Schema not found for ${schemaName}`);
     }
diff --git a/fyo/index.ts b/fyo/index.ts
index cc8286c8..f281e246 100644
--- a/fyo/index.ts
+++ b/fyo/index.ts
@@ -34,8 +34,7 @@ export class Fyo {
 
   _initialized: boolean = false;
 
-  errorLog?: ErrorLog[];
-  methods?: Record<string, Function>;
+  errorLog: ErrorLog[] = [];
   temp?: Record<string, unknown>;
 
   currencyFormatter?: Intl.NumberFormat;
@@ -113,9 +112,6 @@ export class Fyo {
   }
 
   async #initializeModules() {
-    this.methods = {};
-    this.errorLog = [];
-
     // temp params while calling routes
     this.temp = {};
 
@@ -170,6 +166,25 @@ export class Fyo {
     return schema?.fields.find((f) => f.fieldname === fieldname);
   }
 
+  purgeCache() {
+    this.pesa = getMoneyMaker({
+      currency: DEFAULT_CURRENCY,
+      precision: DEFAULT_INTERNAL_PRECISION,
+      display: DEFAULT_DISPLAY_PRECISION,
+      wrapper: markRaw,
+    });
+
+    this._initialized = false;
+    this.temp = {};
+    this.currencyFormatter = undefined;
+    this.currencySymbols = {};
+    this.errorLog = [];
+    this.temp = {};
+    this.db.purgeCache();
+    this.auth.purgeCache();
+    this.doc.purgeCache();
+  }
+
   store = {
     isDevelopment: false,
     appVersion: '',
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 39e69698..22a2b47c 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -37,6 +37,7 @@ import {
   HiddenMap,
   ListsMap,
   ListViewSettings,
+  ReadOnlyMap,
   RequiredMap,
   TreeViewSettings,
   ValidationMap,
@@ -96,6 +97,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return this._dirty;
   }
 
+  get quickEditFields() {
+    const fieldnames = this.schema.quickEditFields ?? ['name'];
+    return fieldnames.map((f) => this.fieldMap[f]);
+  }
+
   _setInitialValues(data: DocValueMap) {
     for (const fieldname in data) {
       const value = data[fieldname];
@@ -393,8 +399,13 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     );
   }
 
-  getLink(fieldname: string) {
-    return this._links ? this._links[fieldname] : null;
+  getLink(fieldname: string): Doc | null {
+    const link = this._links?.[fieldname];
+    if (link === undefined) {
+      return null;
+    }
+
+    return link;
   }
 
   syncValues(data: DocValueMap) {
@@ -736,6 +747,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   validations: ValidationMap = {};
   required: RequiredMap = {};
   hidden: HiddenMap = {};
+  readOnly: ReadOnlyMap = {};
   dependsOn: DependsOnMap = {};
   getCurrencies: CurrenciesMap = {};
 
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index 7e462f8e..ca5e4e9f 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -21,9 +21,10 @@ import Doc from './doc';
 export type FormulaReturn = DocValue | DocValueMap[] | undefined | Doc[];
 export type Formula = () => Promise<FormulaReturn> | FormulaReturn;
 export type Default = () => DocValue;
-export type Validation = (value: DocValue) => Promise<void>;
+export type Validation = (value: DocValue) => Promise<void> | void;
 export type Required = () => boolean;
 export type Hidden = () => boolean;
+export type ReadOnly = () => boolean;
 export type GetCurrency = () => string;
 
 export type FormulaMap = Record<string, Formula | undefined>;
@@ -32,6 +33,7 @@ export type ValidationMap = Record<string, Validation | undefined>;
 export type RequiredMap = Record<string, Required | undefined>;
 export type CurrenciesMap = Record<string, GetCurrency>;
 export type HiddenMap = Record<string, Hidden>;
+export type ReadOnlyMap = Record<string, ReadOnly>;
 export type DependsOnMap = Record<string, string[]>;
 
 /**
diff --git a/fyo/model/validationFunction.ts b/fyo/model/validationFunction.ts
index 3676eb25..4536d2d0 100644
--- a/fyo/model/validationFunction.ts
+++ b/fyo/model/validationFunction.ts
@@ -1,16 +1,17 @@
+import { DocValue } from 'fyo/core/types';
 import { ValidationError, ValueError } from 'fyo/utils/errors';
 import { t } from 'fyo/utils/translation';
 import { OptionField } from 'schemas/types';
 
-export function email(value: string) {
-  const isValid = /(.+)@(.+){2,}\.(.+){2,}/.test(value);
+export function validateEmail(value: DocValue) {
+  const isValid = /(.+)@(.+){2,}\.(.+){2,}/.test(value as string);
   if (!isValid) {
     throw new ValidationError(`Invalid email: ${value}`);
   }
 }
 
-export function phone(value: string) {
-  const isValid = /[+]{0,1}[\d ]+/.test(value);
+export function validatePhoneNumber(value: DocValue) {
+  const isValid = /[+]{0,1}[\d ]+/.test(value as string);
   if (!isValid) {
     throw new ValidationError(`Invalid phone: ${value}`);
   }
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index 187e22e8..f07b2962 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -1,3 +1,4 @@
+import { Fyo } from 'fyo';
 import Doc from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { pesa } from 'pesa';
@@ -51,3 +52,24 @@ export function getActions(doc: Doc): Action[] {
 
   return Model.getActions(doc.fyo);
 }
+
+export async function getSingleValue(
+  fieldname: string,
+  parent: string,
+  fyo: Fyo
+) {
+  if (!fyo.db.isConnected) {
+    return undefined;
+  }
+
+  const res = await fyo.db.getSingleValues({ fieldname, parent });
+  const singleValue = res.find(
+    (f) => f.fieldname === fieldname && f.parent === parent
+  );
+
+  if (singleValue === undefined) {
+    return undefined;
+  }
+
+  return singleValue.value;
+}
diff --git a/models/baseModels/AccountingSettings/AccountingSettings.ts b/models/baseModels/AccountingSettings/AccountingSettings.ts
index ea2c4562..9bdf0f6a 100644
--- a/models/baseModels/AccountingSettings/AccountingSettings.ts
+++ b/models/baseModels/AccountingSettings/AccountingSettings.ts
@@ -1,5 +1,6 @@
 import Doc from 'fyo/model/doc';
-import { FiltersMap, ListsMap } from 'fyo/model/types';
+import { FiltersMap, ListsMap, ValidationMap } from 'fyo/model/types';
+import { validateEmail } from 'fyo/model/validationFunction';
 import countryInfo from '../../../fixtures/countryInfo.json';
 
 export class AccountingSettings extends Doc {
@@ -14,6 +15,10 @@ export class AccountingSettings extends Doc {
     }),
   };
 
+  validations: ValidationMap = {
+    email: validateEmail,
+  };
+
   static lists: ListsMap = {
     country: () => Object.keys(countryInfo),
   };
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 3507f4b4..eea0eb26 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -5,7 +5,12 @@ import {
   FiltersMap,
   FormulaMap,
   ListViewSettings,
+  ValidationMap,
 } from 'fyo/model/types';
+import {
+  validateEmail,
+  validatePhoneNumber,
+} from 'fyo/model/validationFunction';
 import { PartyRole } from './types';
 
 export class Party extends Doc {
@@ -71,6 +76,11 @@ export class Party extends Doc {
     },
   };
 
+  validations: ValidationMap = {
+    email: validateEmail,
+    phone: validatePhoneNumber,
+  };
+
   static filters: FiltersMap = {
     defaultAccount: (doc: Doc) => {
       const role = doc.role as PartyRole;
diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts
index 17e7fcbe..0ae066b2 100644
--- a/models/baseModels/SetupWizard/SetupWizard.ts
+++ b/models/baseModels/SetupWizard/SetupWizard.ts
@@ -1,6 +1,7 @@
 import { t } from 'fyo';
 import Doc from 'fyo/model/doc';
-import { FormulaMap, ListsMap } from 'fyo/model/types';
+import { FormulaMap, ListsMap, ValidationMap } from 'fyo/model/types';
+import { validateEmail } from 'fyo/model/validationFunction';
 import { DateTime } from 'luxon';
 import countryInfo from '../../../fixtures/countryInfo.json';
 
@@ -88,6 +89,10 @@ export class SetupWizard extends Doc {
     },
   };
 
+  validations: ValidationMap = {
+    email: validateEmail,
+  };
+
   static lists: ListsMap = {
     country: () => Object.keys(countryInfo),
     chartOfAccounts: () => getCOAList().map(({ name }) => name),
diff --git a/schemas/index.ts b/schemas/index.ts
index b807bd99..2f58a0db 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -40,6 +40,7 @@ function removeFields(schemaMap: SchemaMap): SchemaMap {
       schema.keywordFields = schema.keywordFields?.filter(
         (fn) => fn !== fieldname
       );
+
       if (schema.inlineEditDisplayField === fieldname) {
         delete schema.inlineEditDisplayField;
       }
diff --git a/src/App.vue b/src/App.vue
index 7c2136cd..b713a0b8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,8 @@
     id="app"
     class="h-screen flex flex-col font-sans overflow-hidden antialiased"
   >
-    <!-- <WindowsTitleBar v-if="platform === 'Windows'" />
+    <WindowsTitleBar v-if="platform === 'Windows'" />
+    <!--
     <Desk
       class="flex-1"
       v-if="activeScreen === 'Desk'"
@@ -11,9 +12,9 @@
     />-->
     <DatabaseSelector
       v-if="activeScreen === 'DatabaseSelector'"
-      @database-connect="showSetupWizardOrDesk(true)"
+      @file-selected="fileSelected"
     />
-    <!--<SetupWizard
+    <SetupWizard
       v-if="activeScreen === 'SetupWizard'"
       @setup-complete="setupComplete"
       @setup-canceled="setupCanceled"
@@ -25,18 +26,20 @@
     >
       <div id="toast-target" />
     </div>
+    <!-- TODO: check this and uncomment
     <TelemetryModal />-->
   </div>
 </template>
 
 <script>
 import fs from 'fs/promises';
-import { fyo } from './initFyo';
-import DatabaseSelector from './pages/DatabaseSelector';
-// import Desk from './pages/Desk';
-// import SetupWizard from './pages/SetupWizard/SetupWizard';
+import WindowsTitleBar from './components/WindowsTitleBar.vue';
+import { fyo, initializeInstance } from './initFyo';
+import DatabaseSelector from './pages/DatabaseSelector.vue';
+import SetupWizard from './pages/SetupWizard/SetupWizard.vue';
 import './styles/index.css';
-import { checkForUpdates, routeTo } from './utils';
+import { checkForUpdates } from './utils/ipcCalls';
+import { routeTo } from './utils/ui';
 
 export default {
   name: 'App',
@@ -47,9 +50,9 @@ export default {
   },
   components: {
     // Desk,
-    // SetupWizard,
+    SetupWizard,
     DatabaseSelector,
-    // WindowsTitleBar,
+    WindowsTitleBar,
     // TelemetryModal,
   },
   async mounted() {
@@ -73,29 +76,45 @@ export default {
     }
     */
 
-    this.activeScreen = 'DatabaseSelector';
+    // this.activeScreen = 'DatabaseSelector';
+    this.activeScreen = 'SetupWizard';
   },
   methods: {
     async setupComplete() {
       // TODO: Complete this
       // await postSetup();
-      await this.showSetupWizardOrDesk(true);
+      // await this.showSetupWizardOrDesk(true);
     },
-    async showSetupWizardOrDesk(resetRoute = false) {
-      const { setupComplete } = fyo.singles.AccountingSettings;
-      if (!setupComplete) {
+    async fileSelected(filePath, isNew) {
+      console.log('from App.vue', filePath, isNew);
+      if (isNew) {
         this.activeScreen = 'SetupWizard';
-      } else {
-        this.activeScreen = 'Desk';
-        await checkForUpdates(false);
+        return;
       }
 
+      await this.showSetupWizardOrDesk(filePath);
+    },
+    async showSetupWizardOrDesk(filePath, resetRoute = false) {
+      const countryCode = await fyo.db.connectToDatabase(filePath);
+      const setupComplete = await getSetupComplete();
+
+      if (!setupComplete) {
+        this.activeScreen = 'SetupWizard';
+        return;
+      }
+
+      await initializeInstance(filePath, false, countryCode);
+      this.activeScreen = 'Desk';
+      await checkForUpdates(false);
       if (!resetRoute) {
         return;
       }
 
-      const { onboardingComplete } = await fyo.getSingle('GetStarted');
-      const { hideGetStarted } = await fyo.getSingle('SystemSettings');
+      await this.setDeskRoute();
+    },
+    async setDeskRoute() {
+      const { onboardingComplete } = await fyo.doc.getSingle('GetStarted');
+      const { hideGetStarted } = await fyo.doc.getSingle('SystemSettings');
 
       if (hideGetStarted || onboardingComplete) {
         routeTo('/');
@@ -105,14 +124,15 @@ export default {
     },
     async changeDbFile() {
       fyo.config.set('lastSelectedFilePath', null);
-      telemetry.stop();
-      // TODO: purgeCache(true)
-      // await purgeCache(true);
+      fyo.telemetry.stop();
+      fyo.purgeCache();
       this.activeScreen = 'DatabaseSelector';
     },
     async setupCanceled() {
       const filePath = fyo.config.get('lastSelectedFilePath');
-      await fs.unlink(filePath);
+      if (filePath) {
+        await fs.unlink(filePath);
+      }
       this.changeDbFile();
     },
   },
diff --git a/src/README.md b/src/README.md
new file mode 100644
index 00000000..9fd6cab7
--- /dev/null
+++ b/src/README.md
@@ -0,0 +1,13 @@
+# src
+
+This is where all the frontend code lives
+
+## Initialization
+New Instance
+1. Run _Setup Wizard_ for initialization values (eg: `countryCode`).
+2. 
+
+Existing Instance
+1. Connect to db
+2. Check if _Setup Wizard_ has been completed, if not, jump to **New Instance**
+3. Call `initFyo/initializeInstance` with `dbPath` and `countryCode`
\ No newline at end of file
diff --git a/src/components/Controls/FormControl.js b/src/components/Controls/FormControl.vue
similarity index 98%
rename from src/components/Controls/FormControl.js
rename to src/components/Controls/FormControl.vue
index 39465767..c334fb19 100644
--- a/src/components/Controls/FormControl.js
+++ b/src/components/Controls/FormControl.vue
@@ -1,18 +1,19 @@
-import Data from './Data';
-import Select from './Select';
-import Link from './Link';
-import Date from './Date';
-import Table from './Table';
+<script>
+import { h } from 'vue';
+import AttachImage from './AttachImage';
 import AutoComplete from './AutoComplete';
 import Check from './Check';
-import AttachImage from './AttachImage';
-import DynamicLink from './DynamicLink';
-import Int from './Int';
-import Float from './Float';
-import Currency from './Currency';
-import Text from './Text';
 import Color from './Color';
-import { h } from 'vue';
+import Currency from './Currency';
+import Data from './Data';
+import Date from './Date';
+import DynamicLink from './DynamicLink';
+import Float from './Float';
+import Int from './Int';
+import Link from './Link';
+import Select from './Select';
+import Table from './Table';
+import Text from './Text';
 
 export default {
   name: 'FormControl',
@@ -48,3 +49,4 @@ export default {
     },
   },
 };
+</script>
diff --git a/src/components/Controls/LanguageSelector.vue b/src/components/Controls/LanguageSelector.vue
index 373723b9..bdabf64c 100644
--- a/src/components/Controls/LanguageSelector.vue
+++ b/src/components/Controls/LanguageSelector.vue
@@ -9,9 +9,8 @@
 <script>
 import { DEFAULT_LANGUAGE } from 'fyo/utils/consts';
 import { fyo } from 'src/initFyo';
-import { setLanguageMap } from 'src/utils';
-import { languageCodeMap } from 'src/utils/language';
-import FormControl from './FormControl';
+import { languageCodeMap, setLanguageMap } from 'src/utils/language';
+import FormControl from './FormControl.vue';
 
 export default {
   methods: {
@@ -37,7 +36,7 @@ export default {
       return {
         fieldname: 'language',
         label: this.t`Language`,
-        fieldtype: 'Select',
+        fieldtype: 'AutoComplete',
         options: Object.keys(languageCodeMap),
         default: fyo.config.get('language') ?? DEFAULT_LANGUAGE,
         description: this.t`Set the display language.`,
diff --git a/src/components/FilterDropdown.vue b/src/components/FilterDropdown.vue
index d9a3e9de..320461dd 100644
--- a/src/components/FilterDropdown.vue
+++ b/src/components/FilterDropdown.vue
@@ -119,7 +119,7 @@
 import { t } from 'fyo';
 import { getRandomString } from 'utils';
 import Button from './Button';
-import FormControl from './Controls/FormControl';
+import FormControl from './Controls/FormControl.vue';
 import Icon from './Icon';
 import Popover from './Popover';
 
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 506c70c6..a993ca55 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="text-sm" :class="{ 'border-t': !noBorder }">
     <template v-for="df in formFields">
+      <!-- Table Field Form (Eg: PaymentFor) -->
       <FormControl
-        :key="df.fieldname"
         v-if="df.fieldtype === 'Table'"
+        :key="`${df.fieldname}-table`"
         ref="controls"
         size="small"
         :df="df"
@@ -11,91 +12,93 @@
         :read-only="evaluateReadOnly(df)"
         @change="(value) => onChange(df, value)"
       />
-      <template v-else>
-        <div class="border-b" :key="df.fieldname" v-if="renderInline(df)">
-          <TwoColumnForm
-            ref="inlineEditForm"
-            :doc="inlineEditDoc"
-            :fields="inlineEditFields"
-            :column-ratio="columnRatio"
-            :no-border="true"
-            :focus-first-input="true"
-            :autosave="false"
-            @error="(msg) => $emit('error', msg)"
-          />
-          <div class="flex px-4 pb-2">
-            <Button class="w-1/2 text-gray-900" @click="inlineEditField = null">
-              {{ t`Cancel` }}
-            </Button>
-            <Button
-              type="primary"
-              class="ml-2 w-1/2 text-white"
-              @click="() => saveInlineEditDoc(df)"
-            >
-              {{ df.inlineSaveText || t`Save` }}
-            </Button>
-          </div>
-        </div>
-        <div
-          :key="df.fieldname + '-else'"
-          v-else
-          class="grid"
-          :class="{ 'border-b': !noBorder }"
-          :style="style"
-        >
-          <div class="py-2 pl-4 flex text-gray-600">
-            <div class="py-1">
-              {{ df.label }}
-            </div>
-          </div>
-          <div
-            class="py-2 pr-4"
-            @click="activateInlineEditing(df)"
-            :class="{
-              'pl-2': df.fieldtype === 'AttachImage',
-            }"
+
+      <!-- Inline Field Form (Eg: Address) -->
+      <div
+        v-else-if="renderInline(df)"
+        class="border-b"
+        :key="`${df.fieldname}-inline`"
+      >
+        <TwoColumnForm
+          ref="inlineEditForm"
+          :doc="inlineEditDoc"
+          :fields="inlineEditFields"
+          :column-ratio="columnRatio"
+          :no-border="true"
+          :focus-first-input="true"
+          :autosave="false"
+          @error="(msg) => $emit('error', msg)"
+        />
+        <div class="flex px-4 pb-2">
+          <Button class="w-1/2 text-gray-900" @click="inlineEditField = null">
+            {{ t`Cancel` }}
+          </Button>
+          <Button
+            type="primary"
+            class="ml-2 w-1/2 text-white"
+            @click="() => saveInlineEditDoc(df)"
           >
-            <FormControl
-              ref="controls"
-              size="small"
-              :df="df"
-              :value="
-                df.inline && doc.getLink(df.fieldname)
-                  ? doc.getLink(df.fieldname)[
-                      doc.getLink(df.fieldname).meta.inlineEditDisplayField ||
-                        'name'
-                    ]
-                  : doc[df.fieldname]
-              "
-              :class="{ 'p-2': df.fieldtype === 'Check' }"
-              :read-only="evaluateReadOnly(df)"
-              @change="(value) => onChange(df, value)"
-              @focus="activateInlineEditing(df)"
-              @new-doc="(newdoc) => onChange(df, newdoc.name)"
-            />
-            <div
-              class="text-sm text-red-600 mt-2 pl-2"
-              v-if="errors[df.fieldname]"
-            >
-              {{ errors[df.fieldname] }}
-            </div>
+            {{ df.inlineSaveText || t`Save` }}
+          </Button>
+        </div>
+      </div>
+
+      <!-- Regular Field Form -->
+      <div
+        v-else
+        class="grid"
+        :class="{ 'border-b': !noBorder }"
+        :key="`${df.fieldname}-regular`"
+        :style="style"
+      >
+        <div class="py-2 pl-4 flex text-gray-600">
+          <div class="py-1">
+            {{ df.label }}
           </div>
         </div>
-      </template>
+
+        <div
+          class="py-2 pr-4"
+          @click="activateInlineEditing(df)"
+          :class="{
+            'pl-2': df.fieldtype === 'AttachImage',
+          }"
+        >
+          <FormControl
+            ref="controls"
+            size="small"
+            :df="df"
+            :value="getRegularValue(df)"
+            :class="{ 'p-2': df.fieldtype === 'Check' }"
+            :read-only="evaluateReadOnly(df)"
+            @change="(value) => onChange(df, value)"
+            @focus="activateInlineEditing(df)"
+            @new-doc="(newdoc) => onChange(df, newdoc.name)"
+          />
+          <div
+            class="text-sm text-red-600 mt-2 pl-2"
+            v-if="errors[df.fieldname]"
+          >
+            {{ errors[df.fieldname] }}
+          </div>
+        </div>
+      </div>
     </template>
   </div>
 </template>
 <script>
-import Button from 'src/components/Button';
-import FormControl from 'src/components/Controls/FormControl';
+import Doc from 'fyo/model/doc';
+import Button from 'src/components/Button.vue';
+import FormControl from 'src/components/Controls/FormControl.vue';
+import { getErrorMessage, handleErrorWithDialog } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
-import { getErrorMessage, handleErrorWithDialog } from '../errorHandling';
+import { evaluateHidden, evaluateReadOnly } from 'src/utils/doc';
 
-let TwoColumnForm = {
+export default {
   name: 'TwoColumnForm',
   emits: ['error', 'change'],
   props: {
-    doc: Object,
+    doc: Doc,
     fields: Array,
     autosave: Boolean,
     columnRatio: {
@@ -120,7 +123,7 @@ let TwoColumnForm = {
   },
   provide() {
     return {
-      doctype: this.doc.doctype,
+      schemaName: this.doc.schemaName,
       name: this.doc.name,
       doc: this.doc,
     };
@@ -134,24 +137,27 @@ let TwoColumnForm = {
     if (this.focusFirstInput) {
       this.$refs['controls'][0].focus();
     }
+    window.tcf = this;
   },
   methods: {
+    getRegularValue(df) {
+      if (!df.inline) {
+        return this.doc[df.fieldname];
+      }
+
+      const link = this.doc.getLink(df.fieldname);
+      if (!link) {
+        return this.doc[df.fieldname];
+      }
+
+      const fieldname = link.schema.inlineEditDisplayField ?? 'name';
+      return link[fieldname];
+    },
     renderInline(df) {
       return (
         this.inlineEditField?.fieldname === df?.fieldname && this.inlineEditDoc
       );
     },
-    evaluateBoolean(fieldProp, defaultValue) {
-      const type = typeof fieldProp;
-      switch (type) {
-        case 'undefined':
-          return defaultValue;
-        case 'function':
-          return fieldProp(this.doc);
-        default:
-          return !!fieldProp;
-      }
-    },
     evaluateReadOnly(df) {
       if (df.fieldname === 'numberSeries' && !this.doc._notInserted) {
         return true;
@@ -160,10 +166,8 @@ let TwoColumnForm = {
       if (this.submitted) {
         return true;
       }
-      return this.evaluateBoolean(df.readOnly, false);
-    },
-    evaluateHidden(df) {
-      return this.evaluateBoolean(df.hidden, false);
+
+      return evaluateReadOnly(df, this.doc);
     },
     onChange(df, value) {
       if (value == null || df.inline) {
@@ -229,8 +233,8 @@ let TwoColumnForm = {
       }
 
       this.inlineEditDisplayField =
-        this.doc.meta.inlineEditDisplayField || 'name';
-      this.inlineEditFields = fyo.getMeta(df.target).getQuickEditFields();
+        this.doc.schema.inlineEditDisplayField ?? 'name';
+      this.inlineEditFields = fyo.schemaMap[df.target].quickEditFields ?? [];
     },
     async saveInlineEditDoc(df) {
       if (!this.inlineEditDoc) {
@@ -248,8 +252,8 @@ let TwoColumnForm = {
   },
   computed: {
     formFields() {
-      return (this.fields || this.doc.meta.getQuickEditFields()).filter(
-        (df) => !this.evaluateHidden(df)
+      return (this.fields || this.doc.quickEditFields).filter(
+        (field) => !evaluateHidden(field, this.doc)
       );
     },
     style() {
@@ -261,10 +265,8 @@ let TwoColumnForm = {
       };
     },
     submitted() {
-      return Boolean(this.doc.meta.isSubmittable && this.doc.submitted);
+      return Boolean(this.doc.schema.isSubmittable && this.doc.submitted);
     },
   },
 };
-
-export default TwoColumnForm;
 </script>
diff --git a/src/components/once/TelemetryModal.vue b/src/components/once/TelemetryModal.vue
index ef2460b7..66f612a8 100644
--- a/src/components/once/TelemetryModal.vue
+++ b/src/components/once/TelemetryModal.vue
@@ -54,7 +54,7 @@ import { getTelemetryOptions } from 'fyo/telemetry/helpers';
 import { TelemetrySetting } from 'fyo/telemetry/types';
 import { fyo } from 'src/initFyo';
 import Button from '../Button.vue';
-import FormControl from '../Controls/FormControl';
+import FormControl from '../Controls/FormControl.vue';
 import FeatherIcon from '../FeatherIcon.vue';
 import HowTo from '../HowTo.vue';
 import Modal from '../Modal.vue';
diff --git a/src/initFyo.ts b/src/initFyo.ts
index f099adfb..cc0c0ae7 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -1,15 +1,49 @@
 import { Fyo } from 'fyo';
 import { getRegionalModels, models } from 'models';
+import { getValueMapFromList } from 'utils';
 
 export const fyo = new Fyo({ isTest: false, isElectron: true });
 
-export async function initializeModels(dbPath: string, countryCode?: string) {
-  if (countryCode) {
+async function closeDbIfConnected() {
+  if (!fyo.db.isConnected) {
+    return;
+  }
+
+  await fyo.db.close();
+}
+
+export async function initializeInstance(
+  dbPath: string,
+  isNew: boolean,
+  countryCode: string
+) {
+  if (isNew) {
+    await closeDbIfConnected();
     countryCode = await fyo.db.createNewDatabase(dbPath, countryCode);
-  } else {
+  } else if (!fyo.db.isConnected) {
     countryCode = await fyo.db.connectToDatabase(dbPath);
   }
 
   const regionalModels = await getRegionalModels(countryCode);
   await fyo.initializeAndRegister(models, regionalModels);
+
+  await setSingles();
+  await setCurrencySymbols();
+}
+
+async function setSingles() {
+  await fyo.doc.getSingle('AccountingSettings');
+  await fyo.doc.getSingle('GetStarted');
+}
+
+async function setCurrencySymbols() {
+  const currencies = (await fyo.db.getAll('Currency', {
+    fields: ['name', 'symbol'],
+  })) as { name: string; symbol: string }[];
+
+  fyo.currencySymbols = getValueMapFromList(
+    currencies,
+    'name',
+    'symbol'
+  ) as Record<string, string | undefined>;
 }
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index be5cb580..5bf47e26 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -338,7 +338,7 @@
 <script>
 import { ipcRenderer } from 'electron';
 import Button from 'src/components/Button.vue';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import FeatherIcon from 'src/components/FeatherIcon.vue';
 import HowTo from 'src/components/HowTo.vue';
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 5e1d22d2..9d59c62d 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -1,13 +1,16 @@
 <template>
   <div
-    class="py-10 flex-1 bg-white"
+    class="py-10 flex-1 bg-white flex justify-center items-center"
     :class="{
       'pointer-events-none': loadingDatabase,
       'window-drag': platform !== 'Windows',
     }"
   >
-    <div class="w-full">
-      <div class="px-12">
+    <div
+      class="w-full w-600 shadow rounded-lg border relative"
+      style="height: 700px"
+    >
+      <div class="px-6 py-8">
         <h1 class="text-2xl font-semibold">
           {{ t`Welcome to Frappe Books` }}
         </h1>
@@ -20,7 +23,7 @@
           {{ t`Select a file to load the company transactions` }}
         </p>
       </div>
-      <div class="px-12 mt-10 window-no-drag" v-if="!showFiles">
+      <div class="px-12 mt-6 window-no-drag" v-if="!showFiles">
         <div class="flex">
           <div
             @click="newDatabase"
@@ -135,7 +138,7 @@
               </span>
             </div>
             <div class="text-gray-700">
-              {{ getFileLastModified(file.filePath) }}
+              {{ file.modified }}
             </div>
           </div>
         </div>
@@ -148,26 +151,28 @@
           </a>
         </div>
       </div>
-    </div>
-    <div
-      class="w-full flex justify-end absolute px-8"
-      style="top: 100%; transform: translateY(-175%)"
-    >
-      <LanguageSelector class="w-28" input-class="text-base" />
+      <div
+        class="w-full flex justify-end absolute px-6 py-6"
+        style="top: 100%; transform: translateY(-100%)"
+      >
+        <LanguageSelector class="w-40" />
+      </div>
     </div>
   </div>
 </template>
 <script>
 import { ipcRenderer } from 'electron';
 import fs from 'fs';
+import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import { fyo } from 'src/initFyo';
+import { getSavePath } from 'src/utils/ipcCalls';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
   name: 'DatabaseSelector',
-  emits: ['database-connect'],
+  emits: ['file-selected'],
   data() {
     return {
       loadingDatabase: false,
@@ -187,17 +192,23 @@ export default {
   },
   methods: {
     setFiles() {
-      this.files = fyo.config
-        .get('files', [])
-        .filter(({ filePath }) => fs.existsSync(filePath));
+      this.files = cloneDeep(fyo.config.get('files', [])).filter(
+        ({ filePath }) => fs.existsSync(filePath)
+      );
+
+      for (const file of this.files) {
+        const stats = fs.statSync(file.filePath);
+        file.modified = DateTime.fromJSDate(stats.mtime).toRelative();
+      }
     },
     async newDatabase() {
-      /*
-        TODO: Refactor this
       this.fileSelectedFrom = 'New File';
-      let filePath = await createNewDatabase();
-      this.connectToDatabase(filePath);
-      */
+      const { filePath, canceled } = await getSavePath('books', 'db');
+      if (canceled || !filePath) {
+        return;
+      }
+
+      this.connectToDatabase(filePath, true);
     },
     async existingDatabase() {
       this.fileSelectedFrom = 'Existing File';
@@ -214,35 +225,17 @@ export default {
       this.fileSelectedFrom = file;
       await this.connectToDatabase(file.filePath);
     },
-    async connectToDatabase(filePath) {
-      /*
-        TODO: Refactor this
+    async connectToDatabase(filePath, isNew) {
       if (!filePath) {
         return;
       }
-      this.loadingDatabase = true;
-      const { connectionSuccess, reason } = await connectToLocalDatabase(
-        filePath
-      );
-      this.loadingDatabase = false;
-      if (connectionSuccess) {
-        this.$emit('database-connect');
+
+      if (isNew) {
+        this.$emit('file-selected', filePath, isNew);
         return;
       }
-      const title = this.t`DB Connection Error`;
-      let content =
-        this.t`Please select an existing database or create a new one.` +
-        ` reason: ${reason}, filePath: ${filePath}`;
-      if (reason === DB_CONN_FAILURE.CANT_OPEN) {
-        content = this
-          .t`Can't open database file: ${filePath}. Please create a new file.`;
-      }
-      await showErrorDialog(title, content);
-      */
-    },
-    getFileLastModified(filePath) {
-      let stats = fs.statSync(filePath);
-      return DateTime.fromJSDate(stats.mtime).toRelative();
+
+      this.$emit('file-selected', filePath, !!isNew);
     },
   },
   components: { LanguageSelector },
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 8208e231..18c22354 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -201,7 +201,7 @@
 import { getInvoiceStatus } from 'models/helpers';
 import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 91e00147..10028a98 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -130,7 +130,7 @@
 <script>
 import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 3f961f87..70468bc2 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -79,7 +79,7 @@
 <script>
 import { t } from 'fyo';
 import Button from 'src/components/Button';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import StatusBadge from 'src/components/StatusBadge';
 import TwoColumnForm from 'src/components/TwoColumnForm';
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index f834d8ba..ecf89ecc 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -139,7 +139,7 @@
 import { getReportData } from 'reports/index';
 import reportViewConfig from 'reports/view';
 import Button from 'src/components/Button';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import FeatherIcon from 'src/components/FeatherIcon.vue';
 import PageHeader from 'src/components/PageHeader';
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index 66bd002e..b13b3d9a 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -47,7 +47,7 @@
 </template>
 <script>
 import { ipcRenderer } from 'electron';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
 import { fyo } from 'src/initFyo';
 import { IPC_ACTIONS } from 'utils/messages';
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index 2cb2fd46..b8bbc40d 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -41,7 +41,7 @@
 import { ConfigKeys } from 'fyo/core/types';
 import { getTelemetryOptions } from 'fyo/telemetry/helpers';
 import { TelemetrySetting } from 'fyo/telemetry/types';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
 import { fyo } from 'src/initFyo';
diff --git a/src/pages/SetupWizard/Slide.vue b/src/pages/SetupWizard/Slide.vue
index 65ca1616..59e63987 100644
--- a/src/pages/SetupWizard/Slide.vue
+++ b/src/pages/SetupWizard/Slide.vue
@@ -1,28 +1,24 @@
 <template>
-  <div
-    class="flex-1 py-10 bg-white h-screen"
-    :class="{
-      'window-drag': platform !== 'Windows',
-    }"
-  >
-    <div class="px-12">
+  <div class="w-600 shadow rounded-lg border relative" style="height: 700px">
+    <div class="px-6 py-8">
       <h1 class="text-2xl font-semibold"><slot name="title"></slot></h1>
     </div>
 
-    <div class="px-8 mt-5 window-no-drag">
+    <div class="px-6 window-no-drag">
       <slot name="content"></slot>
     </div>
+
     <div
-      class="flex justify-between px-8 mt-5 window-no-drag absolute w-full"
-      style="top: 100%; transform: translateY(-260%)"
+      class="flex justify-between px-6 pb-6 window-no-drag absolute w-600"
+      style="top: 100%; transform: translateY(-100%)"
     >
-      <Button class="text-sm text-grey-900" @click="$emit('secondary-clicked')">
+      <Button class="text-sm text-grey-900 w-28" @click="$emit('secondary-clicked')">
         <slot name="secondaryButton"></slot>
       </Button>
       <Button
         @click="$emit('primary-clicked')"
         type="primary"
-        class="text-sm text-white"
+        class="text-sm text-white w-28"
         :disabled="primaryDisabled"
       >
         <slot name="primaryButton"></slot>
diff --git a/src/postStart.ts b/src/postStart.ts
deleted file mode 100644
index 0386f62e..00000000
--- a/src/postStart.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { createNumberSeries } from 'fyo/model/naming';
-import { DEFAULT_SERIES_START } from 'fyo/utils/consts';
-import { getValueMapFromList } from 'utils';
-import { fyo } from './initFyo';
-
-export async function postStart() {
-  await createDefaultNumberSeries();
-  await setSingles();
-  await setCurrencySymbols();
-}
-
-async function createDefaultNumberSeries() {
-  await createNumberSeries('SINV-', 'SalesInvoice', DEFAULT_SERIES_START, fyo);
-  await createNumberSeries(
-    'PINV-',
-    'PurchaseInvoice',
-    DEFAULT_SERIES_START,
-    fyo
-  );
-  await createNumberSeries('PAY-', 'Payment', DEFAULT_SERIES_START, fyo);
-  await createNumberSeries('JV-', 'JournalEntry', DEFAULT_SERIES_START, fyo);
-}
-
-async function setSingles() {
-  await fyo.doc.getSingle('AccountingSettings');
-  await fyo.doc.getSingle('GetStarted');
-}
-
-async function setCurrencySymbols() {
-  const currencies = (await fyo.db.getAll('Currency', {
-    fields: ['name', 'symbol'],
-  })) as { name: string; symbol: string }[];
-
-  fyo.currencySymbols = getValueMapFromList(
-    currencies,
-    'name',
-    'symbol'
-  ) as Record<string, string | undefined>;
-}
diff --git a/src/setup/setupInstance.ts b/src/setup/setupInstance.ts
index d6ed5f95..f48ad646 100644
--- a/src/setup/setupInstance.ts
+++ b/src/setup/setupInstance.ts
@@ -1,8 +1,13 @@
 import countryInfo from 'fixtures/countryInfo.json';
 import { ConfigFile, DocValueMap } from 'fyo/core/types';
 import Doc from 'fyo/model/doc';
+import { createNumberSeries } from 'fyo/model/naming';
 import { getId } from 'fyo/telemetry/helpers';
-import { DEFAULT_CURRENCY, DEFAULT_LOCALE } from 'fyo/utils/consts';
+import {
+  DEFAULT_CURRENCY,
+  DEFAULT_LOCALE,
+  DEFAULT_SERIES_START,
+} from 'fyo/utils/consts';
 import { AccountingSettings } from 'models/baseModels/AccountingSettings/AccountingSettings';
 import { fyo } from 'src/initFyo';
 import { createRegionalRecords } from 'src/regional';
@@ -21,6 +26,7 @@ export default async function setupInstance(
   await createCurrencyRecords();
   await createAccountRecords(bankName, country, chartOfAccounts);
   await createRegionalRecords(country);
+  await createDefaultNumberSeries();
 
   await completeSetup(companyName);
 }
@@ -215,3 +221,15 @@ async function getBankAccountParentName(country: string) {
 
   return parentBankAccount[0].name;
 }
+
+async function createDefaultNumberSeries() {
+  await createNumberSeries('SINV-', 'SalesInvoice', DEFAULT_SERIES_START, fyo);
+  await createNumberSeries(
+    'PINV-',
+    'PurchaseInvoice',
+    DEFAULT_SERIES_START,
+    fyo
+  );
+  await createNumberSeries('PAY-', 'Payment', DEFAULT_SERIES_START, fyo);
+  await createNumberSeries('JV-', 'JournalEntry', DEFAULT_SERIES_START, fyo);
+}
diff --git a/src/styles/index.css b/src/styles/index.css
index 7a58ca3a..b08537db 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -51,4 +51,8 @@ html {
 
 .no-scrollbar::-webkit-scrollbar {
   display: none;
-}
\ No newline at end of file
+}
+
+.w-600 {
+  width: 600px;
+}
diff --git a/src/utils/doc.ts b/src/utils/doc.ts
new file mode 100644
index 00000000..7e2e46e3
--- /dev/null
+++ b/src/utils/doc.ts
@@ -0,0 +1,28 @@
+import Doc from 'fyo/model/doc';
+import { Field } from 'schemas/types';
+
+export function evaluateReadOnly(field: Field, doc: Doc) {
+  if (field.readOnly !== undefined) {
+    return field.readOnly;
+  }
+
+  const readOnlyFunc = doc.readOnly[field.fieldname];
+  if (readOnlyFunc !== undefined) {
+    return readOnlyFunc();
+  }
+
+  return false;
+}
+
+export function evaluateHidden(field: Field, doc: Doc) {
+  if (field.hidden !== undefined) {
+    return field.hidden;
+  }
+
+  const hiddenFunction = doc.hidden[field.fieldname];
+  if (hiddenFunction !== undefined) {
+    return hiddenFunction();
+  }
+
+  return false;
+}
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index e139c881..cc32b0e1 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -1,4 +1,9 @@
+import { getSingleValue } from 'fyo/utils';
 import { DateTime } from 'luxon';
+import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
+import { ModelNameEnum } from 'models/types';
+import SetupWizardSchema from 'schemas/app/SetupWizard.json';
+import { Schema } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 
 export async function getDatesAndPeriodicity(
@@ -25,3 +30,24 @@ export async function getDatesAndPeriodicity(
     periodicity,
   };
 }
+
+export async function getSetupWizardDoc() {
+  /**
+   * This is used cause when setup wizard is running
+   * the database isn't yet initialized.
+   */
+  return await fyo.doc.getNewDoc(
+    'SetupWizard',
+    {},
+    SetupWizardSchema as Schema,
+    SetupWizard
+  );
+}
+
+export async function getSetupComplete(): Promise<boolean> {
+  return !!(await getSingleValue(
+    'setupComplete',
+    ModelNameEnum.AccountingSettings,
+    fyo
+  ));
+}

From b3533698c0d8bba4bbc24d7125898f5267a04b75 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 22 Apr 2022 17:31:04 +0530
Subject: [PATCH 063/163] incr: update AutoComplete

---
 fyo/core/docHandler.ts                   | 17 ++++--------
 fyo/model/types.ts                       |  8 +++---
 src/components/Controls/AutoComplete.vue | 24 ++++------------
 src/utils/doc.ts                         | 35 +++++++++++++++++++++++-
 4 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index a0478558..17a6fae9 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -133,15 +133,6 @@ export class DocHandler {
     return doc;
   }
 
-  getModel(schemaName: string): typeof Doc {
-    const Model = this.models[schemaName];
-    if (Model === undefined) {
-      return Doc;
-    }
-
-    return Model;
-  }
-
   async getSingle(schemaName: string) {
     return await this.getDoc(schemaName, schemaName);
   }
@@ -169,13 +160,17 @@ export class DocHandler {
     schema?: Schema,
     Model?: typeof Doc
   ): Doc {
-    Model ??= this.getModel(schemaName);
+    if (!this.models[schemaName] && Model) {
+      this.models[schemaName] = Model;
+    }
+
+    Model ??= this.models[schemaName];
     schema ??= this.fyo.schemaMap[schemaName];
     if (schema === undefined) {
       throw new Error(`Schema not found for ${schemaName}`);
     }
 
-    const doc = new Model(schema, data, this.fyo);
+    const doc = new Model!(schema, data, this.fyo);
     doc.setDefaults();
     return doc;
   }
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index ca5e4e9f..8150f7af 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -31,9 +31,9 @@ export type FormulaMap = Record<string, Formula | undefined>;
 export type DefaultMap = Record<string, Default | undefined>;
 export type ValidationMap = Record<string, Validation | undefined>;
 export type RequiredMap = Record<string, Required | undefined>;
-export type CurrenciesMap = Record<string, GetCurrency>;
-export type HiddenMap = Record<string, Hidden>;
-export type ReadOnlyMap = Record<string, ReadOnly>;
+export type CurrenciesMap = Record<string, GetCurrency | undefined>;
+export type HiddenMap = Record<string, Hidden | undefined>;
+export type ReadOnlyMap = Record<string, ReadOnly | undefined>;
 export type DependsOnMap = Record<string, string[]>;
 
 /**
@@ -57,7 +57,7 @@ export type EmptyMessageFunction = (doc: Doc, fyo: Fyo) => string;
 export type EmptyMessageMap = Record<string, EmptyMessageFunction>;
 
 export type ListFunction = (doc?: Doc) => string[];
-export type ListsMap = Record<string, ListFunction>;
+export type ListsMap = Record<string, ListFunction | undefined>;
 
 export interface Action {
   label: string;
diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index a34c7da2..574ac530 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -32,9 +32,10 @@
 </template>
 
 <script>
-import Dropdown from 'src/components/Dropdown';
+import Dropdown from 'src/components/Dropdown.vue';
 import { fuzzyMatch } from 'src/utils';
-import Base from './Base';
+import { getOptionList } from 'src/utils/doc';
+import Base from './Base.vue';
 
 export default {
   name: 'AutoComplete',
@@ -83,26 +84,13 @@ export default {
     },
     async getSuggestions(keyword = '') {
       keyword = keyword.toLowerCase();
-
-      let list = this.df.getList
-        ? await this.df.getList(this.doc)
-        : this.df.options || [];
-
-      let items = list.map((d) => {
-        if (typeof d === 'string') {
-          return {
-            label: d,
-            value: d,
-          };
-        }
-        return d;
-      });
+      const options = getOptionList(this.df, this.doc);
 
       if (!keyword) {
-        return items;
+        return options;
       }
 
-      return items
+      return options
         .map((item) => ({ ...fuzzyMatch(keyword, item.value), item }))
         .filter(({ isMatch }) => isMatch)
         .sort((a, b) => a.distance - b.distance)
diff --git a/src/utils/doc.ts b/src/utils/doc.ts
index 7e2e46e3..e7025a6c 100644
--- a/src/utils/doc.ts
+++ b/src/utils/doc.ts
@@ -1,5 +1,6 @@
 import Doc from 'fyo/model/doc';
-import { Field } from 'schemas/types';
+import { Field, OptionField, SelectOption } from 'schemas/types';
+import { fyo } from 'src/initFyo';
 
 export function evaluateReadOnly(field: Field, doc: Doc) {
   if (field.readOnly !== undefined) {
@@ -26,3 +27,35 @@ export function evaluateHidden(field: Field, doc: Doc) {
 
   return false;
 }
+
+export function getOptionList(field: Field, doc: Doc): SelectOption[] {
+  const list = _getOptionList(field, doc);
+  return list.map((option) => {
+    if (typeof option === 'string') {
+      return {
+        label: option,
+        value: option,
+      };
+    }
+
+    return option;
+  });
+}
+
+function _getOptionList(field: Field, doc: Doc) {
+  if ((field as OptionField).options) {
+    return (field as OptionField).options;
+  }
+
+  const Model = fyo.models[doc.schemaName];
+  if (Model === undefined) {
+    return [];
+  }
+
+  const getList = Model.lists[field.fieldname];
+  if (getList === undefined) {
+    return [];
+  }
+
+  return getList(doc);
+}

From 76c61a5c29d22fda8e79fd312aa7acdeea800f39 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sat, 23 Apr 2022 14:53:44 +0530
Subject: [PATCH 064/163] incr: get setupwizard to display - make converter
 more explicit

---
 fyo/core/converter.ts                         | 241 +++++++++++++++---
 fyo/core/dbHandler.ts                         |   4 +-
 fyo/model/doc.ts                              | 118 +++++----
 fyo/model/helpers.ts                          |   2 +-
 fyo/model/validationFunction.ts               |   2 +-
 fyo/utils/consts.ts                           |   5 +-
 fyo/utils/format.ts                           |  10 +-
 .../AccountingSettings/AccountingSettings.ts  |   4 +-
 models/baseModels/Address/Address.ts          |   4 +-
 models/baseModels/SetupWizard/SetupWizard.ts  |  32 ++-
 src/App.vue                                   |  81 +++---
 src/README.md                                 |  20 +-
 src/components/Controls/Base.vue              |  22 +-
 src/components/Controls/Date.vue              |  13 +-
 src/components/Controls/FormControl.vue       |  28 +-
 src/components/Controls/Link.vue              |   2 +-
 src/components/DatePicker/DatePicker.vue      |   2 +-
 src/components/Dropdown.vue                   |   2 +-
 src/components/SearchBar.vue                  |   2 +-
 src/components/Toast.vue                      |   1 +
 src/components/TwoColumnForm.vue              |   5 +-
 src/components/WindowsTitleBar.vue            |   2 +-
 src/pages/SetupWizard/SetupWizard.vue         | 143 ++++-------
 src/renderer.ts                               |   6 +-
 src/renderer/helpers.ts                       |  13 -
 src/renderer/registerIpcRendererListeners.ts  |   3 +-
 src/setup/setupInstance.ts                    |  28 +-
 src/setup/types.ts                            |  13 -
 src/utils/misc.ts                             |  29 +++
 utils/misc.ts                                 |  17 ++
 utils/types.ts                                |  14 +
 31 files changed, 529 insertions(+), 339 deletions(-)
 create mode 100644 utils/misc.ts

diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 41135f3b..0fcf96c6 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -1,7 +1,11 @@
 import { Fyo } from 'fyo';
 import Doc from 'fyo/model/doc';
+import { isPesa } from 'fyo/utils';
+import { ValueError } from 'fyo/utils/errors';
+import { DateTime } from 'luxon';
 import Money from 'pesa/dist/types/src/money';
-import { FieldType, FieldTypeEnum, RawValue } from 'schemas/types';
+import { Field, FieldTypeEnum, RawValue } from 'schemas/types';
+import { getIsNullOrUndef } from 'utils';
 import { DatabaseHandler } from './dbHandler';
 import { DocValue, DocValueMap, RawValueMap } from './types';
 
@@ -51,55 +55,41 @@ export class Converter {
     }
   }
 
-  static toDocValue(
-    value: RawValue,
-    fieldtype: FieldType,
-    fyo: Fyo
-  ): DocValue {
-    switch (fieldtype) {
+  static toDocValue(value: RawValue, field: Field, fyo: Fyo): DocValue {
+    switch (field.fieldtype) {
       case FieldTypeEnum.Currency:
-        return fyo.pesa((value ?? 0) as string | number);
+        return toDocCurrency(value, field, fyo);
       case FieldTypeEnum.Date:
-        return new Date(value as string);
+        return toDocDate(value, field);
       case FieldTypeEnum.Datetime:
-        return new Date(value as string);
+        return toDocDate(value, field);
       case FieldTypeEnum.Int:
-        return +(value as string | number);
+        return toDocInt(value, field);
       case FieldTypeEnum.Float:
-        return +(value as string | number);
+        return toDocFloat(value, field);
       case FieldTypeEnum.Check:
-        return Boolean(value as number);
+        return toDocCheck(value, field);
       default:
         return String(value);
     }
   }
 
-  static toRawValue(value: DocValue, fieldtype: FieldType): RawValue {
-    switch (fieldtype) {
+  static toRawValue(value: DocValue, field: Field, fyo: Fyo): RawValue {
+    switch (field.fieldtype) {
       case FieldTypeEnum.Currency:
-        return (value as Money).store;
+        return toRawCurrency(value, fyo, field);
       case FieldTypeEnum.Date:
-        return (value as Date).toISOString().split('T')[0];
+        return toRawDate(value, field);
       case FieldTypeEnum.Datetime:
-        return (value as Date).toISOString();
-      case FieldTypeEnum.Int: {
-        if (typeof value === 'string') {
-          return parseInt(value);
-        }
-
-        return Math.floor(value as number);
-      }
-      case FieldTypeEnum.Float: {
-        if (typeof value === 'string') {
-          return parseFloat(value);
-        }
-
-        return value as number;
-      }
+        return toRawDateTime(value, field);
+      case FieldTypeEnum.Int:
+        return toRawInt(value, field);
+      case FieldTypeEnum.Float:
+        return toRawFloat(value, field);
       case FieldTypeEnum.Check:
-        return Number(value);
+        return toRawCheck(value, field);
       default:
-        return String(value);
+        return toRawString(value, field);
     }
   }
 
@@ -118,7 +108,7 @@ export class Converter {
       } else {
         docValueMap[fieldname] = Converter.toDocValue(
           rawValue,
-          field.fieldtype,
+          field,
           this.fyo
         );
       }
@@ -146,7 +136,8 @@ export class Converter {
       } else {
         rawValueMap[fieldname] = Converter.toRawValue(
           docValue,
-          field.fieldtype
+          field,
+          this.fyo
         );
       }
     }
@@ -154,3 +145,181 @@ export class Converter {
     return rawValueMap;
   }
 }
+
+function toDocDate(value: RawValue, field: Field) {
+  if (typeof value !== 'number' && typeof value !== 'string') {
+    throwError(value, field, 'doc');
+  }
+
+  const date = new Date(value);
+  if (date.toString() === 'Invalid Date') {
+    throwError(value, field, 'doc');
+  }
+
+  return date;
+}
+
+function toDocCurrency(value: RawValue, field: Field, fyo: Fyo) {
+  if (typeof value === 'string') {
+    return fyo.pesa(value);
+  }
+
+  if (typeof value === 'number') {
+    return fyo.pesa(value);
+  }
+
+  if (typeof value === 'boolean') {
+    return fyo.pesa(Number(value));
+  }
+
+  throwError(value, field, 'doc');
+}
+
+function toDocInt(value: RawValue, field: Field): number {
+  if (typeof value === 'string') {
+    value = parseInt(value);
+  }
+
+  return toDocFloat(value, field);
+}
+
+function toDocFloat(value: RawValue, field: Field): number {
+  if (typeof value === 'boolean') {
+    return Number(value);
+  }
+
+  if (typeof value === 'string') {
+    value = parseFloat(value);
+  }
+
+  if (typeof value === 'number' && !Number.isNaN(value)) {
+    return value;
+  }
+
+  throwError(value, field, 'doc');
+}
+
+function toDocCheck(value: RawValue, field: Field): boolean {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+
+  if (typeof value === 'string') {
+    return value === '1';
+  }
+
+  if (typeof value === 'number') {
+    return Boolean(value);
+  }
+
+  throwError(value, field, 'doc');
+}
+
+function toRawCurrency(value: DocValue, fyo: Fyo, field: Field): string {
+  if (isPesa(value)) {
+    return (value as Money).store;
+  }
+
+  if (getIsNullOrUndef(value)) {
+    return fyo.pesa(0).store;
+  }
+
+  if (typeof value === 'number') {
+    return fyo.pesa(value).store;
+  }
+
+  if (typeof value === 'string') {
+    return fyo.pesa(value).store;
+  }
+
+  throwError(value, field, 'raw');
+}
+
+function toRawInt(value: DocValue, field: Field): number {
+  if (typeof value === 'string') {
+    return parseInt(value);
+  }
+
+  if (getIsNullOrUndef(value)) {
+    return 0;
+  }
+
+  if (typeof value === 'number') {
+    return Math.floor(value as number);
+  }
+
+  throwError(value, field, 'raw');
+}
+
+function toRawFloat(value: DocValue, field: Field): number {
+  if (typeof value === 'string') {
+    return parseFloat(value);
+  }
+
+  if (getIsNullOrUndef(value)) {
+    return 0;
+  }
+
+  if (typeof value === 'number') {
+    return value;
+  }
+
+  throwError(value, field, 'raw');
+}
+
+function toRawDate(value: DocValue, field: Field): string {
+  const dateTime = toRawDateTime(value, field);
+  return dateTime.split('T')[0];
+}
+
+function toRawDateTime(value: DocValue, field: Field): string {
+  if (getIsNullOrUndef(value)) {
+    return '';
+  }
+
+  if (typeof value === 'string') {
+    return value;
+  }
+
+  if (value instanceof Date) {
+    return (value as Date).toISOString();
+  }
+
+  if (value instanceof DateTime) {
+    return (value as DateTime).toISO();
+  }
+
+  throwError(value, field, 'raw');
+}
+
+function toRawCheck(value: DocValue, field: Field): number {
+  if (typeof value === 'number') {
+    value = Boolean(value);
+  }
+
+  if (typeof value === 'boolean') {
+    return Number(value);
+  }
+
+  throwError(value, field, 'raw');
+}
+
+function toRawString(value: DocValue, field: Field): string {
+  if (getIsNullOrUndef(value)) {
+    return '';
+  }
+
+  if (typeof value === 'string') {
+    return value;
+  }
+
+  throwError(value, field, 'raw');
+}
+
+function throwError<T>(value: T, field: Field, type: 'raw' | 'doc'): never {
+  throw new ValueError(
+    `invalid ${type} conversion '${value}' of type ${typeof value} found, field: ${JSON.stringify(
+      field
+    )}`
+  );
+}
diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index 6769477e..b5ee7750 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -129,8 +129,8 @@ export class DatabaseHandler extends DatabaseBase {
 
     const docSingleValue: SingleValue<DocValue> = [];
     for (const sv of rawSingleValue) {
-      const fieldtype = this.fieldValueMap[sv.parent][sv.fieldname].fieldtype;
-      const value = Converter.toDocValue(sv.value, fieldtype, this.#fyo);
+      const field = this.fieldValueMap[sv.parent][sv.fieldname];
+      const value = Converter.toDocValue(sv.value, field, this.#fyo);
 
       docSingleValue.push({
         value,
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 22a2b47c..43f259db 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -1,6 +1,7 @@
 import { Fyo } from 'fyo';
 import { DocValue, DocValueMap } from 'fyo/core/types';
 import { Verb } from 'fyo/telemetry/types';
+import { DEFAULT_USER } from 'fyo/utils/consts';
 import {
   Conflict,
   MandatoryError,
@@ -123,7 +124,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
   }
 
-  setDirty(value: boolean) {
+  _setDirty(value: boolean) {
     this._dirty = value;
     if (this.schema.isChild && this.parentdoc) {
       this.parentdoc._dirty = value;
@@ -133,27 +134,15 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   // set value and trigger change
   async set(fieldname: string | DocValueMap, value?: DocValue | Doc[]) {
     if (typeof fieldname === 'object') {
-      this.setMultiple(fieldname as DocValueMap);
+      await this.setMultiple(fieldname as DocValueMap);
       return;
     }
 
-    if (fieldname === 'numberSeries' && !this._notInserted) {
+    if (!this._canSet(fieldname, value)) {
       return;
     }
 
-    if (value === undefined) {
-      return;
-    }
-
-    if (
-      this.fieldMap[fieldname] === undefined ||
-      (this[fieldname] !== undefined &&
-        areDocValuesEqual(this[fieldname] as DocValue, value as DocValue))
-    ) {
-      return;
-    }
-
-    this.setDirty(true);
+    this._setDirty(true);
     if (Array.isArray(value)) {
       this[fieldname] = value.map((row, i) => {
         row.idx = i;
@@ -161,16 +150,16 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       });
     } else {
       const field = this.fieldMap[fieldname];
-      await this.validateField(field, value);
+      await this._validateField(field, value);
       this[fieldname] = value;
     }
 
     // always run applyChange from the parentdoc
     if (this.schema.isChild && this.parentdoc) {
-      await this.applyChange(fieldname);
-      await this.parentdoc.applyChange(this.parentfield as string);
+      await this._applyChange(fieldname);
+      await this.parentdoc._applyChange(this.parentfield as string);
     } else {
-      await this.applyChange(fieldname);
+      await this._applyChange(fieldname);
     }
   }
 
@@ -180,8 +169,29 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
   }
 
-  async applyChange(fieldname: string) {
-    await this.applyFormula(fieldname);
+  _canSet(fieldname: string, value?: DocValue | Doc[]): boolean {
+    if (fieldname === 'numberSeries' && !this._notInserted) {
+      return false;
+    }
+
+    if (value === undefined) {
+      return false;
+    }
+
+    if (this.fieldMap[fieldname] === undefined) {
+      return false;
+    }
+
+    const currentValue = this.get(fieldname);
+    if (currentValue === undefined) {
+      return true;
+    }
+
+    return !areDocValuesEqual(currentValue as DocValue, value as DocValue);
+  }
+
+  async _applyChange(fieldname: string) {
+    await this._applyFormula(fieldname);
     await this.trigger('change', {
       doc: this,
       changed: fieldname,
@@ -218,7 +228,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     // push child row and trigger change
     this.push(fieldname, docValueMap);
     this._dirty = true;
-    this.applyChange(fieldname);
+    this._applyChange(fieldname);
   }
 
   push(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
@@ -256,11 +266,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async validateInsert() {
-    this.validateMandatory();
-    await this.validateFields();
+    this._validateMandatory();
+    await this._validateFields();
   }
 
-  validateMandatory() {
+  _validateMandatory() {
     const checkForMandatory: Doc[] = [this];
     const tableFields = this.schema.fields.filter(
       (f) => f.fieldtype === FieldTypeEnum.Table
@@ -282,7 +292,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
   }
 
-  async validateFields() {
+  async _validateFields() {
     const fields = this.schema.fields;
     for (const field of fields) {
       if (field.fieldtype === FieldTypeEnum.Table) {
@@ -290,11 +300,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       }
 
       const value = this.get(field.fieldname) as DocValue;
-      await this.validateField(field, value);
+      await this._validateField(field, value);
     }
   }
 
-  async validateField(field: Field, value: DocValue) {
+  async _validateField(field: Field, value: DocValue) {
     if (field.fieldtype == 'Select') {
       validateSelect(field as OptionField, value as string);
     }
@@ -329,25 +339,25 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return data;
   }
 
-  setBaseMetaValues() {
+  _setBaseMetaValues() {
     if (this.schema.isSubmittable && typeof this.submitted !== 'boolean') {
       this.submitted = false;
       this.cancelled = false;
     }
 
     if (!this.createdBy) {
-      this.createdBy = this.fyo.auth.session.user;
+      this.createdBy = this.fyo.auth.session.user || DEFAULT_USER;
     }
 
     if (!this.created) {
       this.created = new Date();
     }
 
-    this.updateModified();
+    this._updateModified();
   }
 
-  updateModified() {
-    this.modifiedBy = this.fyo.auth.session.user;
+  _updateModified() {
+    this.modifiedBy = this.fyo.auth.session.user || DEFAULT_USER;
     this.modified = new Date();
   }
 
@@ -474,11 +484,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
   }
 
-  async applyFormula(fieldname?: string) {
-    if (fieldname && this.formulas[fieldname] === undefined) {
-      return false;
-    }
-
+  async _applyFormula(fieldname?: string) {
     const doc = this;
     let changed = false;
 
@@ -492,7 +498,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
         (fn) => this.fieldMap[fn]
       );
 
-      changed ||= await this.applyFormulaForFields(
+      changed ||= await this._applyFormulaForFields(
         formulaFields,
         row,
         fieldname
@@ -503,22 +509,27 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     const formulaFields = Object.keys(this.formulas).map(
       (fn) => this.fieldMap[fn]
     );
-    changed ||= await this.applyFormulaForFields(formulaFields, doc, fieldname);
+    changed ||= await this._applyFormulaForFields(
+      formulaFields,
+      doc,
+      fieldname
+    );
     return changed;
   }
 
-  async applyFormulaForFields(
+  async _applyFormulaForFields(
     formulaFields: Field[],
     doc: Doc,
     fieldname?: string
   ) {
     let changed = false;
     for (const field of formulaFields) {
-      if (!shouldApplyFormula(field, doc, fieldname)) {
+      const shouldApply = shouldApplyFormula(field, doc, fieldname);
+      if (!shouldApply) {
         continue;
       }
 
-      const newVal = await this.getValueFromFormula(field, doc);
+      const newVal = await this._getValueFromFormula(field, doc);
       const previousVal = doc.get(field.fieldname);
       const isSame = areDocValuesEqual(newVal as DocValue, previousVal);
       if (newVal === undefined || isSame) {
@@ -532,15 +543,18 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return changed;
   }
 
-  async getValueFromFormula(field: Field, doc: Doc) {
-    let value: FormulaReturn;
-
-    const formula = doc.formulas[field.fieldtype];
+  async _getValueFromFormula(field: Field, doc: Doc) {
+    const formula = doc.formulas[field.fieldname];
     if (formula === undefined) {
       return;
     }
 
-    value = await formula();
+    let value: FormulaReturn;
+    try {
+      value = await formula();
+    } catch {
+      return;
+    }
     if (Array.isArray(value) && field.fieldtype === FieldTypeEnum.Table) {
       value = value.map((row) => this._initChild(row, field.fieldname));
     }
@@ -551,13 +565,13 @@ export default class Doc extends Observable<DocValue | Doc[]> {
   async commit() {
     // re-run triggers
     this.setChildIdx();
-    await this.applyFormula();
+    await this._applyFormula();
     await this.trigger('validate', null);
   }
 
   async insert() {
     await setName(this, this.fyo);
-    this.setBaseMetaValues();
+    this._setBaseMetaValues();
     await this.commit();
     await this.validateInsert();
     await this.trigger('beforeInsert', null);
@@ -587,7 +601,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     if (this.flags.revertAction) await this.trigger('beforeRevert');
 
     // update modifiedBy and modified
-    this.updateModified();
+    this._updateModified();
 
     const data = this.getValidDict();
     await this.fyo.db.update(this.schemaName, data);
diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts
index ffd4d6c2..9d9a16ed 100644
--- a/fyo/model/helpers.ts
+++ b/fyo/model/helpers.ts
@@ -88,7 +88,7 @@ function getMandatory(doc: Doc): Field[] {
 }
 
 export function shouldApplyFormula(field: Field, doc: Doc, fieldname?: string) {
-  if (!doc.formulas[field.fieldtype]) {
+  if (!doc.formulas[field.fieldname]) {
     return false;
   }
 
diff --git a/fyo/model/validationFunction.ts b/fyo/model/validationFunction.ts
index 4536d2d0..9c51726c 100644
--- a/fyo/model/validationFunction.ts
+++ b/fyo/model/validationFunction.ts
@@ -23,7 +23,7 @@ export function validateSelect(field: OptionField, value: string) {
     return;
   }
 
-  if (!field.required && (value === null || value === undefined)) {
+  if (!field.required && !value) {
     return;
   }
 
diff --git a/fyo/utils/consts.ts b/fyo/utils/consts.ts
index 1f35baf4..d969d9eb 100644
--- a/fyo/utils/consts.ts
+++ b/fyo/utils/consts.ts
@@ -1,8 +1,9 @@
 export const DEFAULT_INTERNAL_PRECISION = 11;
 export const DEFAULT_DISPLAY_PRECISION = 2;
-export const DEFAULT_DATE_FORMAT = 'yyyy-MM-dd';
+export const DEFAULT_DATE_FORMAT = 'MMM d, y';
 export const DEFAULT_LOCALE = 'en-IN';
 export const DEFAULT_COUNTRY_CODE = 'in';
 export const DEFAULT_CURRENCY = 'INR';
 export const DEFAULT_LANGUAGE = 'English';
-export const DEFAULT_SERIES_START = 1001;
\ No newline at end of file
+export const DEFAULT_SERIES_START = 1001;
+export const DEFAULT_USER = 'Admin';
\ No newline at end of file
diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index 9395e737..bc7c2cb1 100644
--- a/fyo/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -129,12 +129,14 @@ function getNumberFormatter(fyo: Fyo) {
 }
 
 function getCurrency(field: Field, doc: Doc | null, fyo: Fyo): string {
-  if (doc && doc.getCurrencies[field.fieldname]) {
-    return doc.getCurrencies[field.fieldname]();
+  let getCurrency = doc?.getCurrencies[field.fieldname];
+  if (getCurrency !== undefined) {
+    return getCurrency();
   }
 
-  if (doc && doc.parentdoc?.getCurrencies[field.fieldname]) {
-    return doc.parentdoc.getCurrencies[field.fieldname]();
+  getCurrency = doc?.parentdoc?.getCurrencies[field.fieldname];
+  if (getCurrency !== undefined) {
+    return getCurrency();
   }
 
   return (fyo.singles.SystemSettings?.currency as string) ?? DEFAULT_CURRENCY;
diff --git a/models/baseModels/AccountingSettings/AccountingSettings.ts b/models/baseModels/AccountingSettings/AccountingSettings.ts
index 9bdf0f6a..ac8cd45c 100644
--- a/models/baseModels/AccountingSettings/AccountingSettings.ts
+++ b/models/baseModels/AccountingSettings/AccountingSettings.ts
@@ -1,7 +1,7 @@
 import Doc from 'fyo/model/doc';
 import { FiltersMap, ListsMap, ValidationMap } from 'fyo/model/types';
 import { validateEmail } from 'fyo/model/validationFunction';
-import countryInfo from '../../../fixtures/countryInfo.json';
+import { getCountryInfo } from 'utils/misc';
 
 export class AccountingSettings extends Doc {
   static filters: FiltersMap = {
@@ -20,6 +20,6 @@ export class AccountingSettings extends Doc {
   };
 
   static lists: ListsMap = {
-    country: () => Object.keys(countryInfo),
+    country: () => Object.keys(getCountryInfo()),
   };
 }
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
index 3829c309..af9abaa6 100644
--- a/models/baseModels/Address/Address.ts
+++ b/models/baseModels/Address/Address.ts
@@ -3,7 +3,7 @@ import Doc from 'fyo/model/doc';
 import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types';
 import { stateCodeMap } from 'regional/in';
 import { titleCase } from 'utils';
-import countryInfo from '../../../fixtures/countryInfo.json';
+import { getCountryInfo } from 'utils/misc';
 
 export class Address extends Doc {
   formulas: FormulaMap = {
@@ -32,7 +32,7 @@ export class Address extends Doc {
       }
     },
     country() {
-      return Object.keys(countryInfo).sort();
+      return Object.keys(getCountryInfo()).sort();
     },
   };
 
diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts
index 0ae066b2..2081e37c 100644
--- a/models/baseModels/SetupWizard/SetupWizard.ts
+++ b/models/baseModels/SetupWizard/SetupWizard.ts
@@ -1,9 +1,14 @@
 import { t } from 'fyo';
 import Doc from 'fyo/model/doc';
-import { FormulaMap, ListsMap, ValidationMap } from 'fyo/model/types';
+import {
+  DependsOnMap,
+  FormulaMap,
+  ListsMap,
+  ValidationMap,
+} from 'fyo/model/types';
 import { validateEmail } from 'fyo/model/validationFunction';
 import { DateTime } from 'luxon';
-import countryInfo from '../../../fixtures/countryInfo.json';
+import { getCountryInfo } from 'utils/misc';
 
 export function getCOAList() {
   return [
@@ -26,14 +31,21 @@ export function getCOAList() {
 }
 
 export class SetupWizard extends Doc {
+  dependsOn: DependsOnMap = {
+    fiscalYearStart: ['country'],
+    fiscalYearEnd: ['country'],
+    currency: ['country'],
+    chartOfAccounts: ['country'],
+  };
+
   formulas: FormulaMap = {
     fiscalYearStart: async () => {
       if (!this.country) return;
 
       const today = DateTime.local();
 
-      // @ts-ignore
-      const fyStart = countryInfo[this.country].fiscal_year_start as
+      const countryInfo = getCountryInfo();
+      const fyStart = countryInfo[this.country as string]?.fiscal_year_start as
         | string
         | undefined;
 
@@ -50,8 +62,8 @@ export class SetupWizard extends Doc {
 
       const today = DateTime.local();
 
-      // @ts-ignore
-      const fyEnd = countryInfo[this.country].fiscal_year_end as
+      const countryInfo = getCountryInfo();
+      const fyEnd = countryInfo[this.country as string]?.fiscal_year_end as
         | string
         | undefined;
       if (fyEnd) {
@@ -64,8 +76,8 @@ export class SetupWizard extends Doc {
       if (!this.country) {
         return;
       }
-      // @ts-ignore
-      return countryInfo[this.country].currency;
+      const countryInfo = getCountryInfo();
+      return countryInfo[this.country as string]?.currency;
     },
     chartOfAccounts: async () => {
       const country = this.get('country') as string | undefined;
@@ -73,7 +85,7 @@ export class SetupWizard extends Doc {
         return;
       }
 
-      // @ts-ignore
+      const countryInfo = getCountryInfo();
       const code = (countryInfo[country] as undefined | { code: string })?.code;
       if (code === undefined) {
         return;
@@ -94,7 +106,7 @@ export class SetupWizard extends Doc {
   };
 
   static lists: ListsMap = {
-    country: () => Object.keys(countryInfo),
+    country: () => Object.keys(getCountryInfo()),
     chartOfAccounts: () => getCOAList().map(({ name }) => name),
   };
 }
diff --git a/src/App.vue b/src/App.vue
index b713a0b8..f991c0aa 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,6 +10,13 @@
       v-if="activeScreen === 'Desk'"
       @change-db-file="changeDbFile"
     />-->
+    <div
+      v-if="activeScreen === 'Desk'"
+      class="h-screen w-screen flex justify-center items-center bg-white"
+    >
+      <h1>Desk</h1>
+    </div>
+
     <DatabaseSelector
       v-if="activeScreen === 'DatabaseSelector'"
       @file-selected="fileSelected"
@@ -17,7 +24,7 @@
     <SetupWizard
       v-if="activeScreen === 'SetupWizard'"
       @setup-complete="setupComplete"
-      @setup-canceled="setupCanceled"
+      @setup-canceled="changeDbFile"
     />
     <div
       id="toast-container"
@@ -26,17 +33,23 @@
     >
       <div id="toast-target" />
     </div>
-    <!-- TODO: check this and uncomment
-    <TelemetryModal />-->
+    <TelemetryModal />
   </div>
 </template>
 
 <script>
-import fs from 'fs/promises';
+import { ConfigKeys } from 'fyo/core/types';
+import {
+getSetupComplete,
+incrementOpenCount,
+startTelemetry
+} from 'src/utils/misc';
+import TelemetryModal from './components/once/TelemetryModal.vue';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
 import { fyo, initializeInstance } from './initFyo';
 import DatabaseSelector from './pages/DatabaseSelector.vue';
 import SetupWizard from './pages/SetupWizard/SetupWizard.vue';
+import setupInstance from './setup/setupInstance';
 import './styles/index.css';
 import { checkForUpdates } from './utils/ipcCalls';
 import { routeTo } from './utils/ui';
@@ -53,48 +66,45 @@ export default {
     SetupWizard,
     DatabaseSelector,
     WindowsTitleBar,
-    // TelemetryModal,
+    TelemetryModal,
   },
   async mounted() {
     fyo.telemetry.platform = this.platform;
-    /*
-    const lastSelectedFilePath = fyo.config.get('lastSelectedFilePath', null);
-    const { connectionSuccess, reason } = await connectToLocalDatabase(
-      lastSelectedFilePath
+
+    const lastSelectedFilePath = fyo.config.get(
+      ConfigKeys.LastSelectedFilePath,
+      null
     );
 
-    if (connectionSuccess) {
-      this.showSetupWizardOrDesk(false);
+    if (lastSelectedFilePath) {
+      await this.fileSelected(lastSelectedFilePath, false);
       return;
     }
 
-    if (lastSelectedFilePath) {
-      const title = this.t`DB Connection Error`;
-      const content = `reason: ${reason}, filePath: ${lastSelectedFilePath}`;
-
-      await showErrorDialog(title, content);
-    }
-    */
-
-    // this.activeScreen = 'DatabaseSelector';
-    this.activeScreen = 'SetupWizard';
+    this.activeScreen = 'DatabaseSelector';
   },
   methods: {
-    async setupComplete() {
-      // TODO: Complete this
-      // await postSetup();
-      // await this.showSetupWizardOrDesk(true);
+    async setDesk() {
+      this.activeScreen = 'Desk';
+      incrementOpenCount();
+      await startTelemetry();
+      await checkForUpdates(false);
+      await this.setDeskRoute();
     },
     async fileSelected(filePath, isNew) {
-      console.log('from App.vue', filePath, isNew);
+      fyo.config.set(ConfigKeys.LastSelectedFilePath, filePath);
       if (isNew) {
         this.activeScreen = 'SetupWizard';
         return;
       }
-
       await this.showSetupWizardOrDesk(filePath);
     },
-    async showSetupWizardOrDesk(filePath, resetRoute = false) {
+    async setupComplete(setupWizardOptions) {
+      const filePath = fyo.config.get(ConfigKeys.LastSelectedFilePath);
+      await setupInstance(filePath, setupWizardOptions);
+      await this.setDesk();
+    },
+    async showSetupWizardOrDesk(filePath) {
       const countryCode = await fyo.db.connectToDatabase(filePath);
       const setupComplete = await getSetupComplete();
 
@@ -104,13 +114,7 @@ export default {
       }
 
       await initializeInstance(filePath, false, countryCode);
-      this.activeScreen = 'Desk';
-      await checkForUpdates(false);
-      if (!resetRoute) {
-        return;
-      }
-
-      await this.setDeskRoute();
+      await this.setDesk();
     },
     async setDeskRoute() {
       const { onboardingComplete } = await fyo.doc.getSingle('GetStarted');
@@ -128,13 +132,6 @@ export default {
       fyo.purgeCache();
       this.activeScreen = 'DatabaseSelector';
     },
-    async setupCanceled() {
-      const filePath = fyo.config.get('lastSelectedFilePath');
-      if (filePath) {
-        await fs.unlink(filePath);
-      }
-      this.changeDbFile();
-    },
   },
 };
 </script>
diff --git a/src/README.md b/src/README.md
index 9fd6cab7..9c399a07 100644
--- a/src/README.md
+++ b/src/README.md
@@ -2,12 +2,18 @@
 
 This is where all the frontend code lives
 
-## Initialization
-New Instance
-1. Run _Setup Wizard_ for initialization values (eg: `countryCode`).
-2. 
+## Fyo Initialization
 
-Existing Instance
-1. Connect to db
+The initialization flows are different when the instance is new or is existing.
+All of them are triggered from `src/App.vue`.
+
+**New Instance**
+
+1. Run _Setup Wizard_ for init values (eg: `country`).
+2. Call `setupInstance.ts/setupInstance` using init values.
+
+**Existing Instance**
+
+1. Connect to db.
 2. Check if _Setup Wizard_ has been completed, if not, jump to **New Instance**
-3. Call `initFyo/initializeInstance` with `dbPath` and `countryCode`
\ No newline at end of file
+3. Call `initFyo/initializeInstance` with `dbPath` and `countryCode`
diff --git a/src/components/Controls/Base.vue b/src/components/Controls/Base.vue
index 9e693e91..705ca30e 100644
--- a/src/components/Controls/Base.vue
+++ b/src/components/Controls/Base.vue
@@ -22,19 +22,19 @@
 <script>
 export default {
   name: 'Base',
-  props: [
-    'df',
-    'value',
-    'inputClass',
-    'placeholder',
-    'size',
-    'showLabel',
-    'readOnly',
-    'autofocus',
-  ],
+  props: {
+    df: Object,
+    value: [String, Number, Boolean, Object],
+    inputClass: [Function, String],
+    placeholder: String,
+    size: String,
+    showLabel: Boolean,
+    readOnly: Boolean,
+    autofocus: Boolean,
+  },
   emits: ['focus', 'input', 'change'],
   inject: {
-    doctype: {
+    schemaName: {
       default: null,
     },
     name: {
diff --git a/src/components/Controls/Date.vue b/src/components/Controls/Date.vue
index dd802025..baeacbc1 100644
--- a/src/components/Controls/Date.vue
+++ b/src/components/Controls/Date.vue
@@ -3,6 +3,7 @@
     <div class="text-gray-600 text-sm mb-1" v-if="showLabel">
       {{ df.label }}
     </div>
+
     <DatePicker
       ref="input"
       :input-class="[inputClasses, 'cursor-text']"
@@ -10,31 +11,31 @@
       :placeholder="inputPlaceholder"
       :readonly="isReadOnly"
       :format-value="formatValue"
-      @change="value => triggerChange(value)"
+      @change="(value) => triggerChange(value)"
     />
   </div>
 </template>
 
 <script>
 import { fyo } from 'src/initFyo';
-import Base from './Base';
 import DatePicker from '../DatePicker/DatePicker';
+import Base from './Base';
 
 export default {
   name: 'Date',
   extends: Base,
   components: {
-    DatePicker
+    DatePicker,
   },
   computed: {
     inputType() {
       return 'date';
-    }
+    },
   },
   methods: {
     formatValue(value) {
       return fyo.format(value, this.df);
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/components/Controls/FormControl.vue b/src/components/Controls/FormControl.vue
index c334fb19..e1268cb6 100644
--- a/src/components/Controls/FormControl.vue
+++ b/src/components/Controls/FormControl.vue
@@ -1,19 +1,19 @@
 <script>
 import { h } from 'vue';
-import AttachImage from './AttachImage';
-import AutoComplete from './AutoComplete';
-import Check from './Check';
-import Color from './Color';
-import Currency from './Currency';
-import Data from './Data';
-import Date from './Date';
-import DynamicLink from './DynamicLink';
-import Float from './Float';
-import Int from './Int';
-import Link from './Link';
-import Select from './Select';
-import Table from './Table';
-import Text from './Text';
+import AttachImage from './AttachImage.vue';
+import AutoComplete from './AutoComplete.vue';
+import Check from './Check.vue';
+import Color from './Color.vue';
+import Currency from './Currency.vue';
+import Data from './Data.vue';
+import Date from './Date.vue';
+import DynamicLink from './DynamicLink.vue';
+import Float from './Float.vue';
+import Int from './Int.vue';
+import Link from './Link.vue';
+import Select from './Select.vue';
+import Table from './Table.vue';
+import Text from './Text.vue';
 
 export default {
   name: 'FormControl',
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 81f37825..94a5d0fd 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -2,7 +2,7 @@
 import { t } from 'fyo';
 import Badge from 'src/components/Badge';
 import { fyo } from 'src/initFyo';
-import { openQuickEdit } from 'src/utils';
+import { openQuickEdit } from 'src/utils/ui';
 import { markRaw } from 'vue';
 import AutoComplete from './AutoComplete';
 
diff --git a/src/components/DatePicker/DatePicker.vue b/src/components/DatePicker/DatePicker.vue
index 00cbaf82..67250ba1 100644
--- a/src/components/DatePicker/DatePicker.vue
+++ b/src/components/DatePicker/DatePicker.vue
@@ -109,7 +109,7 @@
               togglePopover();
             "
           >
-            Clear
+            {{ t`Clear` }}
           </div>
         </div>
       </div>
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 27b192be..b9eb0ad1 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -73,8 +73,8 @@
 </template>
 
 <script>
-import Popover from './Popover';
 import uniq from 'lodash/uniq';
+import Popover from './Popover.vue';
 
 export default {
   name: 'Dropdown',
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 249e2b04..550f1b1c 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -45,7 +45,7 @@ import { t } from 'fyo';
 import reports from 'reports/view';
 import Dropdown from 'src/components/Dropdown';
 import { fyo } from 'src/initFyo';
-import { routeTo } from 'src/utils';
+import { routeTo } from 'src/utils/ui';
 
 
 export default {
diff --git a/src/components/Toast.vue b/src/components/Toast.vue
index 2d7ac07c..83fa6613 100644
--- a/src/components/Toast.vue
+++ b/src/components/Toast.vue
@@ -36,6 +36,7 @@
 </template>
 <script>
 import { getColorClass } from 'src/utils/colors';
+import FeatherIcon from './FeatherIcon.vue';
 
 export default {
   components: {
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index a993ca55..f6fc99f9 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -170,17 +170,16 @@ export default {
       return evaluateReadOnly(df, this.doc);
     },
     onChange(df, value) {
-      if (value == null || df.inline) {
+      if (df.inline) {
         return;
       }
 
       let oldValue = this.doc.get(df.fieldname);
-
-      this.errors[df.fieldname] = null;
       if (oldValue === value) {
         return;
       }
 
+      this.errors[df.fieldname] = null;
       if (this.emitChange) {
         this.$emit('change', df, value, oldValue);
       }
diff --git a/src/components/WindowsTitleBar.vue b/src/components/WindowsTitleBar.vue
index c22f98de..560d00a0 100644
--- a/src/components/WindowsTitleBar.vue
+++ b/src/components/WindowsTitleBar.vue
@@ -31,7 +31,7 @@
 
 <script>
 import { ipcRenderer } from 'electron';
-import { runWindowAction } from 'src/utils';
+import { runWindowAction } from 'src/utils/ipcCalls';
 import { IPC_MESSAGES } from 'utils/messages';
 
 export default {
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 51c0bae0..6164e53d 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -1,5 +1,8 @@
 <template>
-  <div>
+  <div
+    class="py-10 flex-1 bg-white flex justify-center items-center window-drag"
+  >
+    <!-- 0: Language Selection Slide -->
     <Slide
       @primary-clicked="handlePrimary"
       @secondary-clicked="handleSecondary"
@@ -26,6 +29,8 @@
         {{ t`Next` }}
       </template>
     </Slide>
+
+    <!-- 1: Setup Wizard Slide -->
     <Slide
       :primary-disabled="!valuesFilled || loading"
       @primary-clicked="handlePrimary"
@@ -35,51 +40,48 @@
       <template #title>
         {{ t`Setup your organization` }}
       </template>
+
       <template #content>
         <div v-if="doc">
-          <div
-            class="flex items-center px-6 py-5 mb-4 border bg-brand rounded-xl"
-          >
+          <div class="flex items-center px-6 py-5 mb-8 bg-brand rounded-xl">
             <FormControl
-              :df="meta.getField('companyLogo')"
+              :df="getField('companyLogo')"
               :value="doc.companyLogo"
               @change="(value) => setValue('companyLogo', value)"
             />
             <div class="ml-2">
               <FormControl
                 ref="companyField"
-                :df="meta.getField('companyName')"
+                :df="getField('companyName')"
                 :value="doc.companyName"
                 @change="(value) => setValue('companyName', value)"
                 :input-class="
-                  (classes) => [
+                  () => [
                     'bg-transparent font-semibold text-xl text-white placeholder-blue-200 focus:outline-none focus:bg-blue-600 px-3 rounded py-1',
                   ]
                 "
                 :autofocus="true"
               />
-              <Popover placement="auto" :show-popup="Boolean(emailError)">
-                <template #target>
-                  <FormControl
-                    :df="meta.getField('email')"
-                    :value="doc.email"
-                    @change="(value) => setValue('email', value)"
-                    :input-class="
-                      (classes) => [
-                        'text-base bg-transparent text-white placeholder-blue-200 focus:bg-blue-600 focus:outline-none rounded px-3 py-1',
-                      ]
-                    "
-                  />
-                </template>
-                <template #content>
-                  <div class="p-2 text-sm">
-                    {{ emailError }}
-                  </div>
-                </template>
-              </Popover>
+              <FormControl
+                :df="getField('email')"
+                :value="doc.email"
+                @change="(value) => setValue('email', value)"
+                :input-class="
+                  () => [
+                    'text-base bg-transparent text-white placeholder-blue-200 focus:bg-blue-600 focus:outline-none rounded px-3 py-1',
+                  ]
+                "
+              />
             </div>
           </div>
-          <TwoColumnForm :fields="fields" :doc="doc" />
+          <p
+            class="px-3 -mt-6 text-sm absolute text-red-400 w-full"
+            v-if="emailError"
+          >
+            {{ emailError }}
+          </p>
+
+          <TwoColumnForm :doc="doc" />
         </div>
       </template>
       <template #secondaryButton>{{ t`Back` }}</template>
@@ -90,22 +92,14 @@
 
 <script>
 import { ipcRenderer } from 'electron';
-import fs from 'fs';
-import path from 'path';
-import FormControl from 'src/components/Controls/FormControl';
+import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
-import Popover from 'src/components/Popover';
 import TwoColumnForm from 'src/components/TwoColumnForm';
+import { getErrorMessage } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
-import { connectToLocalDatabase, purgeCache } from 'src/initialization';
-import { setupInstance } from 'src/setup/setupInstance';
-import { setLanguageMap, showMessageDialog } from 'src/utils';
+import { getSetupWizardDoc } from 'src/utils/misc';
+import { showMessageDialog } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
-import {
-getErrorMessage,
-handleErrorWithDialog,
-showErrorDialog
-} from '../../errorHandling';
 import Slide from './Slide.vue';
 
 export default {
@@ -122,14 +116,13 @@ export default {
   },
   provide() {
     return {
-      doctype: 'SetupWizard',
+      schemaName: 'SetupWizard',
       name: 'SetupWizard',
     };
   },
   components: {
     TwoColumnForm,
     FormControl,
-    Popover,
     Slide,
     LanguageSelector,
   },
@@ -138,12 +131,15 @@ export default {
       this.index = 1;
     }
 
-    this.doc = await fyo.doc.getNewDoc('SetupWizard');
+    this.doc = await getSetupWizardDoc();
     this.doc.on('change', () => {
       this.valuesFilled = this.allValuesFilled();
     });
   },
   methods: {
+    getField(fieldname) {
+      return this.doc.schema?.fields.find((f) => f.fieldname === fieldname);
+    },
     openContributingTranslations() {
       ipcRenderer.send(
         IPC_MESSAGES.OPEN_EXTERNAL,
@@ -164,10 +160,6 @@ export default {
         this.$emit('setup-canceled');
       }
     },
-    async selectLanguage(value) {
-      const success = await setLanguageMap(value);
-      this.setValue('language', value);
-    },
     setValue(fieldname, value) {
       this.emailError = null;
       this.doc.set(fieldname, value).catch((e) => {
@@ -178,7 +170,7 @@ export default {
       });
     },
     allValuesFilled() {
-      let values = this.meta.quickEditFields.map(
+      const values = this.doc.schema.quickEditFields.map(
         (fieldname) => this.doc[fieldname]
       );
       return values.every(Boolean);
@@ -189,61 +181,18 @@ export default {
         return;
       }
 
-      try {
-        this.loading = true;
-        await setupInstance(this.doc);
-        this.$emit('setup-complete');
-      } catch (e) {
-        this.loading = false;
-        if (e.type === fyo.errors.DuplicateEntryError) {
-          console.log(e);
-          console.log('retrying');
-          await this.renameDbFileAndRerunSetup();
-        } else {
-          handleErrorWithDialog(e, this.doc);
-        }
-      }
-    },
-    async renameDbFileAndRerunSetup() {
-      const filePath = fyo.config.get('lastSelectedFilePath');
-      renameDbFile(filePath);
-
-      await purgeCache();
-
-      const { connectionSuccess, reason } = await connectToLocalDatabase(
-        filePath
-      );
-
-      if (connectionSuccess) {
-        await setupInstance(this.doc);
-        this.$emit('setup-complete');
-      } else {
-        const title = this.t`DB Connection Error`;
-        const content = `reason: ${reason}, filePath: ${filePath}`;
-        await showErrorDialog(title, content);
-      }
+      this.loading = true;
+      this.$emit('setup-complete', this.doc.getValidDict());
     },
   },
   computed: {
-    meta() {
-      return fyo.getMeta('SetupWizard');
-    },
-    fields() {
-      return this.meta.getQuickEditFields();
-    },
     buttonText() {
-      return this.loading ? this.t`Setting Up...` : this.t`Submit`;
+      if (this.loading) {
+        return this.t`Submit`;
+      }
+
+      return this.t`Setting Up...`;
     },
   },
 };
-
-function renameDbFile(filePath) {
-  const dirname = path.dirname(filePath);
-  const basename = path.basename(filePath);
-  const backupPath = path.join(dirname, `_${basename}`);
-  if (fs.existsSync(backupPath)) {
-    fs.unlinkSync(backupPath);
-  }
-  fs.renameSync(filePath, backupPath);
-}
 </script>
diff --git a/src/renderer.ts b/src/renderer.ts
index 32e07d71..8ce8aca2 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -7,7 +7,7 @@ import Badge from './components/Badge.vue';
 import FeatherIcon from './components/FeatherIcon.vue';
 import { getErrorHandled, handleError } from './errorHandling';
 import { fyo } from './initFyo';
-import { incrementOpenCount, outsideClickDirective } from './renderer/helpers';
+import { outsideClickDirective } from './renderer/helpers';
 import registerIpcRendererListeners from './renderer/registerIpcRendererListeners';
 import router from './router';
 import { stringifyCircular } from './utils';
@@ -33,7 +33,7 @@ import { setLanguageMap } from './utils/language';
 
   app.use(router);
   app.component('App', App);
-  app.component('feather-icon', FeatherIcon);
+  app.component('FeatherIcon', FeatherIcon);
   app.component('Badge', Badge);
 
   app.directive('on-outside-click', outsideClickDirective);
@@ -62,8 +62,6 @@ import { setLanguageMap } from './utils/language';
   });
 
   fyo.store.appVersion = await ipcRenderer.invoke(IPC_ACTIONS.GET_VERSION);
-
-  incrementOpenCount();
   app.mount('body');
 })();
 
diff --git a/src/renderer/helpers.ts b/src/renderer/helpers.ts
index 148966cf..71806b39 100644
--- a/src/renderer/helpers.ts
+++ b/src/renderer/helpers.ts
@@ -1,5 +1,3 @@
-import { ConfigKeys } from 'fyo/core/types';
-import { fyo } from 'src/initFyo';
 import { Directive } from 'vue';
 
 const instances: OutsideClickCallback[] = [];
@@ -35,14 +33,3 @@ function onDocumentClick(e: Event, el: HTMLElement, fn: OutsideClickCallback) {
     fn(e);
   }
 }
-
-export function incrementOpenCount() {
-  let openCount = fyo.config.get(ConfigKeys.OpenCount);
-  if (typeof openCount !== 'number') {
-    openCount = 1;
-  } else {
-    openCount += 1;
-  }
-
-  fyo.config.set(ConfigKeys.OpenCount, openCount);
-}
diff --git a/src/renderer/registerIpcRendererListeners.ts b/src/renderer/registerIpcRendererListeners.ts
index 1c5c5ed7..732225f1 100644
--- a/src/renderer/registerIpcRendererListeners.ts
+++ b/src/renderer/registerIpcRendererListeners.ts
@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron';
 import { handleError } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
+import { startTelemetry } from 'src/utils/misc';
 import { showToast } from 'src/utils/ui';
 import { IPC_CHANNELS, IPC_MESSAGES } from 'utils/messages';
 
@@ -56,7 +57,7 @@ export default function registerIpcRendererListeners() {
   document.addEventListener('visibilitychange', function () {
     const { visibilityState } = document;
     if (visibilityState === 'visible' && !fyo.telemetry.started) {
-      fyo.telemetry.start();
+      startTelemetry();
     }
 
     if (visibilityState !== 'hidden') {
diff --git a/src/setup/setupInstance.ts b/src/setup/setupInstance.ts
index f48ad646..1becabe6 100644
--- a/src/setup/setupInstance.ts
+++ b/src/setup/setupInstance.ts
@@ -1,4 +1,3 @@
-import countryInfo from 'fixtures/countryInfo.json';
 import { ConfigFile, DocValueMap } from 'fyo/core/types';
 import Doc from 'fyo/model/doc';
 import { createNumberSeries } from 'fyo/model/naming';
@@ -9,16 +8,21 @@ import {
   DEFAULT_SERIES_START,
 } from 'fyo/utils/consts';
 import { AccountingSettings } from 'models/baseModels/AccountingSettings/AccountingSettings';
-import { fyo } from 'src/initFyo';
+import { fyo, initializeInstance } from 'src/initFyo';
 import { createRegionalRecords } from 'src/regional';
+import { getCountryCodeFromCountry, getCountryInfo } from 'utils/misc';
+import { CountryInfo } from 'utils/types';
 import { createCOA } from './createCOA';
-import { CountrySettings, SetupWizardOptions } from './types';
+import { SetupWizardOptions } from './types';
 
 export default async function setupInstance(
+  dbPath: string,
   setupWizardOptions: SetupWizardOptions
 ) {
   const { companyName, country, bankName, chartOfAccounts } =
     setupWizardOptions;
+
+  await initializeDatabase(dbPath, country);
   await updateSystemSettings(setupWizardOptions);
   await updateAccountingSettings(setupWizardOptions);
   await updatePrintSettings(setupWizardOptions);
@@ -31,10 +35,15 @@ export default async function setupInstance(
   await completeSetup(companyName);
 }
 
+async function initializeDatabase(dbPath: string, country: string) {
+  const countryCode = getCountryCodeFromCountry(country);
+  await initializeInstance(dbPath, true, countryCode);
+}
+
 async function updateAccountingSettings({
   companyName,
   country,
-  name,
+  fullname,
   email,
   bankName,
   fiscalYearStart,
@@ -46,7 +55,7 @@ async function updateAccountingSettings({
   await accountingSettings.setAndUpdate({
     companyName,
     country,
-    fullname: name,
+    fullname,
     email,
     bankName,
     fiscalYearStart,
@@ -73,8 +82,8 @@ async function updateSystemSettings({
   country,
   currency: companyCurrency,
 }: SetupWizardOptions) {
-  // @ts-ignore
-  const countryOptions = countryInfo[country] as CountrySettings;
+  const countryInfo = getCountryInfo();
+  const countryOptions = countryInfo[country] as CountryInfo;
   const currency =
     companyCurrency ?? countryOptions.currency ?? DEFAULT_CURRENCY;
   const locale = countryOptions.locale ?? DEFAULT_LOCALE;
@@ -88,10 +97,7 @@ async function updateSystemSettings({
 async function createCurrencyRecords() {
   const promises: Promise<Doc | undefined>[] = [];
   const queue: string[] = [];
-  const countrySettings: CountrySettings[] = Object.values(
-    // @ts-ignore
-    countryInfo as Record<string, CountrySettings>
-  );
+  const countrySettings = Object.values(getCountryInfo()) as CountryInfo[];
 
   for (const country of countrySettings) {
     const {
diff --git a/src/setup/types.ts b/src/setup/types.ts
index e2db66f6..2abf8adf 100644
--- a/src/setup/types.ts
+++ b/src/setup/types.ts
@@ -3,7 +3,6 @@ export interface SetupWizardOptions {
   companyName: string;
   country: string;
   fullname: string;
-  name: string;
   email: string;
   bankName: string;
   currency: string;
@@ -11,15 +10,3 @@ export interface SetupWizardOptions {
   fiscalYearEnd: string;
   chartOfAccounts: string;
 }
-
-export interface CountrySettings {
-  code: string;
-  currency: string;
-  fiscal_year_start: string;
-  fiscal_year_end: string;
-  locale: string;
-  currency_fraction?: string;
-  currency_fraction_units?: number;
-  smallest_currency_fraction_value?: number;
-  currency_symbol?: string;
-}
\ No newline at end of file
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index cc32b0e1..2a62dec3 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -1,3 +1,4 @@
+import { ConfigKeys } from 'fyo/core/types';
 import { getSingleValue } from 'fyo/utils';
 import { DateTime } from 'luxon';
 import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
@@ -51,3 +52,31 @@ export async function getSetupComplete(): Promise<boolean> {
     fyo
   ));
 }
+
+export function incrementOpenCount() {
+  let openCount = fyo.config.get(ConfigKeys.OpenCount);
+  if (typeof openCount !== 'number') {
+    openCount = 1;
+  } else {
+    openCount += 1;
+  }
+
+  fyo.config.set(ConfigKeys.OpenCount, openCount);
+}
+
+export async function startTelemetry() {
+  fyo.telemetry.interestingDocs = [
+    ModelNameEnum.Payment,
+    ModelNameEnum.PaymentFor,
+    ModelNameEnum.SalesInvoice,
+    ModelNameEnum.SalesInvoiceItem,
+    ModelNameEnum.PurchaseInvoice,
+    ModelNameEnum.PurchaseInvoiceItem,
+    ModelNameEnum.JournalEntry,
+    ModelNameEnum.JournalEntryAccount,
+    ModelNameEnum.Party,
+    ModelNameEnum.Account,
+    ModelNameEnum.Tax,
+  ];
+  await fyo.telemetry.start();
+}
diff --git a/utils/misc.ts b/utils/misc.ts
new file mode 100644
index 00000000..82cff3a4
--- /dev/null
+++ b/utils/misc.ts
@@ -0,0 +1,17 @@
+import countryInfo from 'fixtures/countryInfo.json';
+import { CountryInfoMap } from './types';
+
+export function getCountryInfo(): CountryInfoMap {
+  // @ts-ignore
+  return countryInfo as CountryInfoMap;
+}
+
+export function getCountryCodeFromCountry(countryName: string): string {
+  const countryInfoMap = getCountryInfo();
+  const countryInfo = countryInfoMap[countryName];
+  if (countryInfo === undefined) {
+    return '';
+  }
+
+  return countryInfo.code;
+}
diff --git a/utils/types.ts b/utils/types.ts
index 254518a6..359e26ee 100644
--- a/utils/types.ts
+++ b/utils/types.ts
@@ -1,2 +1,16 @@
 export type Translation = { translation: string; context?: string };
 export type LanguageMap = Record<string, Translation>;
+
+export type CountryInfoMap = Record<string, CountryInfo | undefined>;
+export interface CountryInfo {
+  code: string;
+  currency: string;
+  currency_fraction?: string;
+  currency_fraction_units?: number;
+  smallest_currency_fraction_value?: number;
+  currency_symbol?: string;
+  timezones?: string[];
+  fiscal_year_start: string;
+  fiscal_year_end: string;
+  locale: string;
+}

From 9877bf4fd385f07d73c13cd022698bb873008618 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sun, 24 Apr 2022 12:18:44 +0530
Subject: [PATCH 065/163] incr: simplify doc a bit - allow nulls in converter
 else not not null'll fail

---
 fyo/core/converter.ts                         |  20 +--
 fyo/core/docHandler.ts                        |  25 ++--
 fyo/core/types.ts                             |   2 +-
 fyo/demux/config.ts                           |  14 +--
 fyo/index.ts                                  |   4 +-
 fyo/model/doc.ts                              |  96 +++++++--------
 fyo/model/helpers.ts                          |   2 +-
 fyo/model/naming.ts                           |   4 +-
 fyo/model/types.ts                            |   2 +-
 fyo/models/NumberSeries.ts                    |   4 +-
 fyo/models/SystemSettings.ts                  |   2 +-
 fyo/tests/testFyo.spec.ts                     |   4 +-
 fyo/utils/format.ts                           |   2 +-
 fyo/utils/index.ts                            |   2 +-
 models/baseModels/Account/Account.ts          |   2 +-
 .../AccountingLedgerEntry.ts                  |   2 +-
 .../AccountingSettings/AccountingSettings.ts  |   2 +-
 models/baseModels/Address/Address.ts          |   2 +-
 models/baseModels/Invoice/Invoice.ts          |   2 +-
 models/baseModels/InvoiceItem/InvoiceItem.ts  |   2 +-
 models/baseModels/Item/Item.ts                |  10 +-
 .../baseModels/JournalEntry/JournalEntry.ts   |   2 +-
 .../JournalEntryAccount.ts                    |   2 +-
 models/baseModels/Party/Party.ts              |   8 +-
 models/baseModels/Payment/Payment.ts          |   8 +-
 models/baseModels/PaymentFor/PaymentFor.ts    |   2 +-
 models/baseModels/SetupWizard/SetupWizard.ts  |  31 ++---
 models/baseModels/Tax/Tax.ts                  |   2 +-
 models/baseModels/TaxSummary/TaxSummary.ts    |   2 +-
 models/helpers.ts                             |   4 +-
 models/ledgerPosting/ledgerPosting.ts         |   8 +-
 models/ledgerPosting/types.ts                 |   2 +-
 src/App.vue                                   |   4 +-
 src/README.md                                 |   5 +
 src/components/Controls/Link.vue              |   2 +-
 src/components/ReconciliationValidation.vue   |   2 +-
 src/components/TwoColumnForm.vue              |  15 +--
 src/dataImport.ts                             |   6 +-
 src/errorHandling.ts                          |   2 +-
 src/initFyo.ts                                |  18 +--
 src/pages/ChartOfAccounts.vue                 |   4 +-
 src/pages/Dashboard/PeriodSelector.vue        |   1 -
 src/pages/Dashboard/UnpaidInvoices.vue        |   2 +-
 src/pages/GetStarted.vue                      |   4 +-
 src/pages/InvoiceForm.vue                     |   2 +-
 src/pages/JournalEntryForm.vue                |   2 +-
 src/pages/ListView/ListView.vue               |   2 +-
 src/pages/QuickEditForm.vue                   |   6 +-
 src/pages/Settings/TabInvoice.vue             |   4 +-
 src/regional/in/in.ts                         |  32 +++--
 src/regional/index.ts                         |   5 +-
 src/setup/createCOA.ts                        | 105 +++++++++-------
 src/setup/setupInstance.ts                    | 115 ++++++++++--------
 src/utils/doc.ts                              |   2 +-
 src/utils/index.ts                            |   3 +-
 src/utils/misc.ts                             |   1 +
 src/utils/ui.ts                               |   4 +-
 tests/helpers.ts                              |  17 +++
 tests/testSetupInstance.spec.ts               |  25 ++++
 tsconfig.json                                 |   1 +
 utils/misc.ts                                 |  19 +++
 61 files changed, 371 insertions(+), 315 deletions(-)
 create mode 100644 tests/helpers.ts
 create mode 100644 tests/testSetupInstance.spec.ts

diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 0fcf96c6..b06a8abf 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import { ValueError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
@@ -267,14 +267,18 @@ function toRawFloat(value: DocValue, field: Field): number {
   throwError(value, field, 'raw');
 }
 
-function toRawDate(value: DocValue, field: Field): string {
+function toRawDate(value: DocValue, field: Field): string | null {
   const dateTime = toRawDateTime(value, field);
+  if (dateTime === null) {
+    return null;
+  }
+
   return dateTime.split('T')[0];
 }
 
-function toRawDateTime(value: DocValue, field: Field): string {
-  if (getIsNullOrUndef(value)) {
-    return '';
+function toRawDateTime(value: DocValue, field: Field): string | null {
+  if (value === null) {
+    return null;
   }
 
   if (typeof value === 'string') {
@@ -304,9 +308,9 @@ function toRawCheck(value: DocValue, field: Field): number {
   throwError(value, field, 'raw');
 }
 
-function toRawString(value: DocValue, field: Field): string {
-  if (getIsNullOrUndef(value)) {
-    return '';
+function toRawString(value: DocValue, field: Field): string | null {
+  if (value === null) {
+    return null;
   }
 
   if (typeof value === 'string') {
diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index 17a6fae9..c873af2e 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { DocMap, ModelMap, SinglesMap } from 'fyo/model/types';
 import { coreModels } from 'fyo/models';
 import Observable from 'fyo/utils/observable';
@@ -143,20 +143,10 @@ export class DocHandler {
     return newDoc;
   }
 
-  getEmptyDoc(schemaName: string, cacheDoc: boolean = true): Doc {
-    const doc = this.getNewDoc(schemaName);
-    doc.name = getRandomString();
-
-    if (cacheDoc) {
-      this.addToCache(doc);
-    }
-
-    return doc;
-  }
-
   getNewDoc(
     schemaName: string,
     data: DocValueMap = {},
+    cacheDoc: boolean = true,
     schema?: Schema,
     Model?: typeof Doc
   ): Doc {
@@ -166,12 +156,17 @@ export class DocHandler {
 
     Model ??= this.models[schemaName];
     schema ??= this.fyo.schemaMap[schemaName];
+
     if (schema === undefined) {
       throw new Error(`Schema not found for ${schemaName}`);
     }
 
     const doc = new Model!(schema, data, this.fyo);
-    doc.setDefaults();
+    doc.name ??= getRandomString();
+    if (cacheDoc) {
+      this.addToCache(doc);
+    }
+
     return doc;
   }
 
@@ -184,12 +179,12 @@ export class DocHandler {
     const docExists = await this.fyo.db.exists(schemaName, name);
     if (!docExists) {
       const doc = this.getNewDoc(schemaName, data);
-      await doc.insert;
+      await doc.sync();
       return;
     }
 
     const doc = await this.getDoc(schemaName, name);
     await doc.setMultiple(data);
-    await doc.update();
+    await doc.sync();
   }
 }
diff --git a/fyo/core/types.ts b/fyo/core/types.ts
index c4af5d15..98d11fc6 100644
--- a/fyo/core/types.ts
+++ b/fyo/core/types.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import Money from 'pesa/dist/types/src/money';
 import { RawValue } from 'schemas/types';
 import { AuthDemuxBase } from 'utils/auth/types';
diff --git a/fyo/demux/config.ts b/fyo/demux/config.ts
index 2126c631..252810c1 100644
--- a/fyo/demux/config.ts
+++ b/fyo/demux/config.ts
@@ -1,14 +1,14 @@
 import config from 'utils/config';
 
 export class Config {
-  #isElectron: boolean;
+  #useElectronConfig: boolean;
   fallback: Map<string, unknown> = new Map();
   constructor(isElectron: boolean) {
-    this.#isElectron = isElectron;
+    this.#useElectronConfig = isElectron;
   }
 
   get store(): Record<string, unknown> {
-    if (this.#isElectron) {
+    if (this.#useElectronConfig) {
       return config.store;
     } else {
       const store: Record<string, unknown> = {};
@@ -22,7 +22,7 @@ export class Config {
   }
 
   get(key: string, defaultValue?: unknown): unknown {
-    if (this.#isElectron) {
+    if (this.#useElectronConfig) {
       return config.get(key, defaultValue);
     } else {
       return this.fallback.get(key) ?? defaultValue;
@@ -30,7 +30,7 @@ export class Config {
   }
 
   set(key: string, value: unknown) {
-    if (this.#isElectron) {
+    if (this.#useElectronConfig) {
       config.set(key, value);
     } else {
       this.fallback.set(key, value);
@@ -38,7 +38,7 @@ export class Config {
   }
 
   delete(key: string) {
-    if (this.#isElectron) {
+    if (this.#useElectronConfig) {
       config.delete(key);
     } else {
       this.fallback.delete(key);
@@ -46,7 +46,7 @@ export class Config {
   }
 
   clear() {
-    if (this.#isElectron) {
+    if (this.#useElectronConfig) {
       config.clear();
     } else {
       this.fallback.clear();
diff --git a/fyo/index.ts b/fyo/index.ts
index f281e246..650d11b1 100644
--- a/fyo/index.ts
+++ b/fyo/index.ts
@@ -6,7 +6,7 @@ import { DatabaseHandler } from './core/dbHandler';
 import { DocHandler } from './core/docHandler';
 import { DocValue, FyoConfig } from './core/types';
 import { Config } from './demux/config';
-import Doc from './model/doc';
+import { Doc } from './model/doc';
 import { ModelMap } from './model/types';
 import { TelemetryManager } from './telemetry/telemetry';
 import {
@@ -60,7 +60,7 @@ export class Fyo {
     });
 
     this.telemetry = new TelemetryManager(this);
-    this.config = new Config(this.isElectron);
+    this.config = new Config(this.isElectron && !this.isTest);
   }
 
   get initialized() {
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 43f259db..54fa7500 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -45,7 +45,7 @@ import {
 } from './types';
 import { validateSelect } from './validationFunction';
 
-export default class Doc extends Observable<DocValue | Doc[]> {
+export class Doc extends Observable<DocValue | Doc[]> {
   name?: string;
   schema: Readonly<Schema>;
   fyo: Fyo;
@@ -72,12 +72,14 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     super();
     this.fyo = fyo;
     this.schema = schema;
-    this._setInitialValues(data);
     this.fieldMap = getMapFromList(schema.fields, 'fieldname');
 
     if (this.schema.isSingle) {
       this.name = this.schemaName;
     }
+
+    this._setDefaults();
+    this._setValuesWithoutChecks(data);
   }
 
   get schemaName(): string {
@@ -103,23 +105,17 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return fieldnames.map((f) => this.fieldMap[f]);
   }
 
-  _setInitialValues(data: DocValueMap) {
-    for (const fieldname in data) {
-      const value = data[fieldname];
+  _setValuesWithoutChecks(data: DocValueMap) {
+    for (const field of this.schema.fields) {
+      const fieldname = field.fieldname;
+      const value = data[field.fieldname];
 
       if (Array.isArray(value)) {
         for (const row of value) {
           this.push(fieldname, row);
         }
       } else {
-        this[fieldname] = value;
-      }
-    }
-
-    // set unset fields as null
-    for (const field of this.schema.fields) {
-      if (this[field.fieldname] === undefined) {
-        this[field.fieldname] = null;
+        this[fieldname] = value ?? null;
       }
     }
   }
@@ -198,7 +194,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     });
   }
 
-  setDefaults() {
+  _setDefaults() {
     for (const field of this.schema.fields) {
       if (!getIsNullOrUndef(this[field.fieldname])) {
         continue;
@@ -224,21 +220,21 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
   }
 
-  append(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
+  async append(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
     // push child row and trigger change
     this.push(fieldname, docValueMap);
     this._dirty = true;
-    this._applyChange(fieldname);
+    await this._applyChange(fieldname);
   }
 
   push(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
     // push child row without triggering change
     this[fieldname] ??= [];
-    const childDoc = this._initChild(docValueMap, fieldname);
+    const childDoc = this._getChildDoc(docValueMap, fieldname);
     (this[fieldname] as Doc[]).push(childDoc);
   }
 
-  _initChild(docValueMap: Doc | DocValueMap, fieldname: string): Doc {
+  _getChildDoc(docValueMap: Doc | DocValueMap, fieldname: string): Doc {
     if (docValueMap instanceof Doc) {
       return docValueMap;
     }
@@ -258,14 +254,13 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       data.name = getRandomString();
     }
 
-    const childSchemaName = this.fieldMap[fieldname] as TargetField;
-    const schema = this.fyo.db.schemaMap[childSchemaName.target] as Schema;
+    const targetField = this.fieldMap[fieldname] as TargetField;
+    const schema = this.fyo.db.schemaMap[targetField.target] as Schema;
     const childDoc = new Doc(schema, data as DocValueMap, this.fyo);
-    childDoc.setDefaults();
     return childDoc;
   }
 
-  async validateInsert() {
+  async _validateInsert() {
     this._validateMandatory();
     await this._validateFields();
   }
@@ -373,10 +368,6 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
     if (data && data.name) {
       this.syncValues(data);
-      if (this.schema.isSingle) {
-        this.setDefaults();
-      }
-
       await this.loadLinks();
     } else {
       throw new NotFoundError(`Not Found: ${this.schemaName} ${this.name}`);
@@ -420,7 +411,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
   syncValues(data: DocValueMap) {
     this.clearValues();
-    this._setInitialValues(data);
+    this._setValuesWithoutChecks(data);
     this._dirty = false;
     this.trigger('change', {
       doc: this,
@@ -436,7 +427,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     this._notInserted = true;
   }
 
-  setChildIdx() {
+  _setChildIdx() {
     const childFields = this.schema.fields.filter(
       (f) => f.fieldtype === FieldTypeEnum.Table
     ) as TargetField[];
@@ -450,7 +441,7 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     }
   }
 
-  async compareWithCurrentDoc() {
+  async _compareWithCurrentDoc() {
     if (this.isNew || !this.name) {
       return;
     }
@@ -556,24 +547,24 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
     if (Array.isArray(value) && field.fieldtype === FieldTypeEnum.Table) {
-      value = value.map((row) => this._initChild(row, field.fieldname));
+      value = value.map((row) => this._getChildDoc(row, field.fieldname));
     }
 
     return value;
   }
 
-  async commit() {
+  async _commit() {
     // re-run triggers
-    this.setChildIdx();
+    this._setChildIdx();
     await this._applyFormula();
     await this.trigger('validate', null);
   }
 
-  async insert() {
+  async _insert() {
     await setName(this, this.fyo);
     this._setBaseMetaValues();
-    await this.commit();
-    await this.validateInsert();
+    await this._commit();
+    await this._validateInsert();
     await this.trigger('beforeInsert', null);
 
     const oldName = this.name!;
@@ -591,9 +582,9 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return this;
   }
 
-  async update() {
-    await this.compareWithCurrentDoc();
-    await this.commit();
+  async _update() {
+    await this._compareWithCurrentDoc();
+    await this._commit();
     await this.trigger('beforeUpdate');
 
     // before submit
@@ -617,11 +608,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return this;
   }
 
-  async insertOrUpdate() {
+  async sync() {
     if (this._notInserted) {
-      return await this.insert();
+      return await this._insert();
     } else {
-      return await this.update();
+      return await this._update();
     }
   }
 
@@ -633,11 +624,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     this.fyo.telemetry.log(Verb.Deleted, this.schemaName);
   }
 
-  async submitOrRevert(isSubmit: boolean) {
+  async _submitOrRevert(isSubmit: boolean) {
     const wasSubmitted = this.submitted;
     this.submitted = isSubmit;
     try {
-      await this.update();
+      await this.sync();
     } catch (e) {
       this.submitted = wasSubmitted;
       throw e;
@@ -646,11 +637,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
 
   async submit() {
     this.cancelled = false;
-    await this.submitOrRevert(true);
+    await this._submitOrRevert(true);
   }
 
   async revert() {
-    await this.submitOrRevert(false);
+    await this._submitOrRevert(false);
   }
 
   async rename(newName: string) {
@@ -701,15 +692,12 @@ export default class Doc extends Observable<DocValue | Doc[]> {
     return this.fyo.doc.getCachedValue(schemaName, name, fieldname);
   }
 
-  async setAndUpdate(
-    fieldname: string | DocValueMap,
-    value?: DocValue | Doc[]
-  ) {
+  async setAndSync(fieldname: string | DocValueMap, value?: DocValue | Doc[]) {
     await this.set(fieldname, value);
-    return await this.update();
+    return await this.sync();
   }
 
-  async duplicate(shouldInsert: boolean = true): Promise<Doc> {
+  async duplicate(shouldSync: boolean = true): Promise<Doc> {
     const updateMap: DocValueMap = {};
     const docValueMap = this.getValidDict();
     const fieldnames = this.schema.fields.map((f) => f.fieldname);
@@ -736,11 +724,11 @@ export default class Doc extends Observable<DocValue | Doc[]> {
       updateMap.name = updateMap.name + ' CPY';
     }
 
-    const doc = this.fyo.doc.getEmptyDoc(this.schemaName, false);
+    const doc = this.fyo.doc.getNewDoc(this.schemaName, {}, false);
     await doc.setMultiple(updateMap);
 
-    if (shouldInsert) {
-      await doc.insert();
+    if (shouldSync) {
+      await doc.sync();
     }
 
     return doc;
diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts
index 9d9a16ed..6b0678a9 100644
--- a/fyo/model/helpers.ts
+++ b/fyo/model/helpers.ts
@@ -5,7 +5,7 @@ import { isEqual } from 'lodash';
 import Money from 'pesa/dist/types/src/money';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
-import Doc from './doc';
+import { Doc } from './doc';
 
 export function areDocValuesEqual(
   dvOne: DocValue | Doc[],
diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts
index e8c7a59e..e34b3ab0 100644
--- a/fyo/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -4,7 +4,7 @@ import { DEFAULT_SERIES_START } from 'fyo/utils/consts';
 import { BaseError } from 'fyo/utils/errors';
 import { Field, Schema } from 'schemas/types';
 import { getRandomString } from 'utils';
-import Doc from './doc';
+import { Doc } from './doc';
 
 export function getNumberSeries(schema: Schema): Field | undefined {
   const numberSeries = schema.fields.find(
@@ -119,5 +119,5 @@ export async function createNumberSeries(
     referenceType,
   });
 
-  await series.insert();
+  await series.sync();
 }
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index 8150f7af..4e7b6bc4 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -4,7 +4,7 @@ import SystemSettings from 'fyo/models/SystemSettings';
 import { FieldType } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 import { Router } from 'vue-router';
-import Doc from './doc';
+import { Doc } from './doc';
 
 /**
  * The functions below are used for dynamic evaluation
diff --git a/fyo/models/NumberSeries.ts b/fyo/models/NumberSeries.ts
index 60088c92..f8759f4a 100644
--- a/fyo/models/NumberSeries.ts
+++ b/fyo/models/NumberSeries.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 
 function getPaddedName(prefix: string, next: number, padZeros: number): string {
   return prefix + next.toString().padStart(padZeros ?? 4, '0');
@@ -21,7 +21,7 @@ export default class NumberSeries extends Doc {
     }
 
     this.current = (this.current as number) + 1;
-    await this.update();
+    await this.sync();
     return this.getPaddedName(this.current as number);
   }
 
diff --git a/fyo/models/SystemSettings.ts b/fyo/models/SystemSettings.ts
index 0f7f9dfa..ad4a5b10 100644
--- a/fyo/models/SystemSettings.ts
+++ b/fyo/models/SystemSettings.ts
@@ -1,5 +1,5 @@
 import { DocValue } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { ValidationMap } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
 import { t } from 'fyo/utils/translation';
diff --git a/fyo/tests/testFyo.spec.ts b/fyo/tests/testFyo.spec.ts
index ed2c266b..16134be2 100644
--- a/fyo/tests/testFyo.spec.ts
+++ b/fyo/tests/testFyo.spec.ts
@@ -58,14 +58,14 @@ describe('Fyo Docs', function () {
     await fyo.close();
   });
 
-  specify('getEmptyDoc', async function () {
+  specify('getNewDoc', async function () {
     for (const schemaName in schemaMap) {
       const schema = schemaMap[schemaName];
       if (schema?.isSingle) {
         continue;
       }
 
-      const doc = fyo.doc.getEmptyDoc(schemaName);
+      const doc = fyo.doc.getNewDoc(schemaName);
     }
   });
 });
diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index bc7c2cb1..534c7138 100644
--- a/fyo/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -1,6 +1,6 @@
 import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { DateTime } from 'luxon';
 import Money from 'pesa/dist/types/src/money';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index f07b2962..9ba16f4a 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { pesa } from 'pesa';
 
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index 5a64b6ab..88728328 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import {
   FiltersMap,
   ListViewSettings,
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
index 2bd32b1c..6441b9f3 100644
--- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
+++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { ListViewSettings } from 'fyo/model/types';
 
 export class AccountingLedgerEntry extends Doc {
diff --git a/models/baseModels/AccountingSettings/AccountingSettings.ts b/models/baseModels/AccountingSettings/AccountingSettings.ts
index ac8cd45c..3ea13a82 100644
--- a/models/baseModels/AccountingSettings/AccountingSettings.ts
+++ b/models/baseModels/AccountingSettings/AccountingSettings.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { FiltersMap, ListsMap, ValidationMap } from 'fyo/model/types';
 import { validateEmail } from 'fyo/model/validationFunction';
 import { getCountryInfo } from 'utils/misc';
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
index af9abaa6..a0f04804 100644
--- a/models/baseModels/Address/Address.ts
+++ b/models/baseModels/Address/Address.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types';
 import { stateCodeMap } from 'regional/in';
 import { titleCase } from 'utils';
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 4d0311aa..74095ec2 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -1,5 +1,5 @@
 import { DocValue } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
 import { getExchangeRate } from 'models/helpers';
 import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index 5b6aa581..2147d0e5 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -1,5 +1,5 @@
 import { DocValue } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import {
   DependsOnMap,
   FiltersMap,
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 891d8205..6b984bfa 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -1,6 +1,6 @@
 import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import {
   Action,
   DependsOnMap,
@@ -68,8 +68,8 @@ export class Item extends Doc {
         label: fyo.t`New Invoice`,
         condition: (doc) => !doc.isNew,
         action: async (doc, router) => {
-          const invoice = await fyo.doc.getEmptyDoc('SalesInvoice');
-          invoice.append('items', {
+          const invoice = await fyo.doc.getNewDoc('SalesInvoice');
+          await invoice.append('items', {
             item: doc.name as string,
             rate: doc.rate as Money,
             tax: doc.tax as string,
@@ -81,8 +81,8 @@ export class Item extends Doc {
         label: fyo.t`New Bill`,
         condition: (doc) => !doc.isNew,
         action: async (doc, router) => {
-          const invoice = await fyo.doc.getEmptyDoc('PurchaseInvoice');
-          invoice.append('items', {
+          const invoice = await fyo.doc.getNewDoc('PurchaseInvoice');
+          await invoice.append('items', {
             item: doc.name as string,
             rate: doc.rate as Money,
             tax: doc.tax as string,
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index 2f11b019..64ab48a1 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import {
   Action,
   DefaultMap,
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
index 0768a0ba..3374b744 100644
--- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
+++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index eea0eb26..2509b39c 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import {
   Action,
   FiltersMap,
@@ -47,7 +47,7 @@ export class Party extends Doc {
       .reduce((a, b) => a.add(b), this.fyo.pesa(0));
 
     await this.set('outstandingAmount', totalOutstanding);
-    await this.update();
+    await this.sync();
   }
 
   formulas: FormulaMap = {
@@ -111,7 +111,7 @@ export class Party extends Doc {
         condition: (doc: Doc) =>
           !doc.isNew && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
-          const doc = await fyo.doc.getEmptyDoc('PurchaseInvoice');
+          const doc = await fyo.doc.getNewDoc('PurchaseInvoice');
           router.push({
             path: `/edit/PurchaseInvoice/${doc.name}`,
             query: {
@@ -146,7 +146,7 @@ export class Party extends Doc {
         condition: (doc: Doc) =>
           !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
-          const doc = await fyo.doc.getEmptyDoc('SalesInvoice');
+          const doc = await fyo.doc.getNewDoc('SalesInvoice');
           router.push({
             path: `/edit/SalesInvoice/${doc.name}`,
             query: {
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index ef3788b6..9eb86ec5 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -1,7 +1,6 @@
-import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import {
   Action,
   DefaultMap,
@@ -14,6 +13,7 @@ import {
 } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
 import { getLedgerLinkAction } from 'models/helpers';
+import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import Money from 'pesa/dist/types/src/money';
 import { getIsNullOrUndef } from 'utils';
 import { Party } from '../Party/Party';
@@ -237,7 +237,7 @@ export class Payment extends Doc {
         // update outstanding amounts in invoice and party
         const newOutstanding = outstandingAmount.sub(amount);
         await referenceDoc.set('outstandingAmount', newOutstanding);
-        await referenceDoc.update();
+        await referenceDoc.sync();
         const party = (await this.fyo.doc.getDoc(
           'Party',
           this.party!
@@ -276,7 +276,7 @@ export class Payment extends Doc {
             amount as Money
           ),
         });
-        refDoc.update();
+        refDoc.sync();
       }
     );
   }
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index eb0730ee..ab3b144e 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 
diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts
index 2081e37c..093d27c1 100644
--- a/models/baseModels/SetupWizard/SetupWizard.ts
+++ b/models/baseModels/SetupWizard/SetupWizard.ts
@@ -1,5 +1,5 @@
 import { t } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import {
   DependsOnMap,
   FormulaMap,
@@ -7,8 +7,7 @@ import {
   ValidationMap,
 } from 'fyo/model/types';
 import { validateEmail } from 'fyo/model/validationFunction';
-import { DateTime } from 'luxon';
-import { getCountryInfo } from 'utils/misc';
+import { getCountryInfo, getFiscalYear } from 'utils/misc';
 
 export function getCOAList() {
   return [
@@ -42,35 +41,19 @@ export class SetupWizard extends Doc {
     fiscalYearStart: async () => {
       if (!this.country) return;
 
-      const today = DateTime.local();
-
       const countryInfo = getCountryInfo();
-      const fyStart = countryInfo[this.country as string]?.fiscal_year_start as
-        | string
-        | undefined;
-
-      if (fyStart) {
-        return DateTime.fromFormat(fyStart, 'MM-dd')
-          .plus({ year: [1, 2, 3].includes(today.month) ? -1 : 0 })
-          .toISODate();
-      }
+      const fyStart =
+        countryInfo[this.country as string]?.fiscal_year_start ?? '';
+      return getFiscalYear(fyStart, true);
     },
     fiscalYearEnd: async () => {
       if (!this.country) {
         return;
       }
 
-      const today = DateTime.local();
-
       const countryInfo = getCountryInfo();
-      const fyEnd = countryInfo[this.country as string]?.fiscal_year_end as
-        | string
-        | undefined;
-      if (fyEnd) {
-        return DateTime.fromFormat(fyEnd, 'MM-dd')
-          .plus({ year: [1, 2, 3].includes(today.month) ? 0 : 1 })
-          .toISODate();
-      }
+      const fyEnd = countryInfo[this.country as string]?.fiscal_year_end ?? '';
+      return getFiscalYear(fyEnd, false);
     },
     currency: async () => {
       if (!this.country) {
diff --git a/models/baseModels/Tax/Tax.ts b/models/baseModels/Tax/Tax.ts
index 4f125a2f..2c102124 100644
--- a/models/baseModels/Tax/Tax.ts
+++ b/models/baseModels/Tax/Tax.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { ListViewSettings } from 'fyo/model/types';
 
 export class Tax extends Doc {
diff --git a/models/baseModels/TaxSummary/TaxSummary.ts b/models/baseModels/TaxSummary/TaxSummary.ts
index 86e9dc4a..aa297b1f 100644
--- a/models/baseModels/TaxSummary/TaxSummary.ts
+++ b/models/baseModels/TaxSummary/TaxSummary.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { FormulaMap } from 'fyo/model/types';
 import Money from 'pesa/dist/types/src/money';
 
diff --git a/models/helpers.ts b/models/helpers.ts
index 72fa8a79..b258be73 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { Action, ColumnConfig } from 'fyo/model/types';
 import { NotFoundError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
@@ -34,7 +34,7 @@ export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
       condition: (doc: Doc) =>
         (doc.submitted as boolean) && (doc.outstandingAmount as Money).gt(0),
       action: async function makePayment(doc: Doc) {
-        const payment = await fyo.doc.getEmptyDoc('Payment');
+        const payment = await fyo.doc.getNewDoc('Payment');
         payment.once('afterInsert', async () => {
           await payment.submit();
         });
diff --git a/models/ledgerPosting/ledgerPosting.ts b/models/ledgerPosting/ledgerPosting.ts
index 4e2d6f38..08d64494 100644
--- a/models/ledgerPosting/ledgerPosting.ts
+++ b/models/ledgerPosting/ledgerPosting.ts
@@ -1,5 +1,5 @@
 import { Fyo } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { ValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 import {
@@ -127,7 +127,7 @@ export class LedgerPosting {
         entry.name as string
       );
       entryDoc.reverted = true;
-      await entryDoc.update();
+      await entryDoc.sync();
     }
 
     let temp;
@@ -193,13 +193,13 @@ export class LedgerPosting {
     for (const entry of this.entries) {
       const entryDoc = this.fyo.doc.getNewDoc('AccountingLedgerEntry');
       Object.assign(entryDoc, entry);
-      await entryDoc.insert();
+      await entryDoc.sync();
     }
     for (const entry of this.accountEntries) {
       const entryDoc = await this.fyo.doc.getDoc('Account', entry.name);
       const balance = entryDoc.get('balance') as Money;
       entryDoc.balance = balance.add(entry.balanceChange);
-      await entryDoc.update();
+      await entryDoc.sync();
     }
   }
 
diff --git a/models/ledgerPosting/types.ts b/models/ledgerPosting/types.ts
index 9423ef0a..4461cd86 100644
--- a/models/ledgerPosting/types.ts
+++ b/models/ledgerPosting/types.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import Money from 'pesa/dist/types/src/money';
 
 export interface LedgerPostingOptions {
diff --git a/src/App.vue b/src/App.vue
index f991c0aa..37728e27 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -101,7 +101,7 @@ export default {
     },
     async setupComplete(setupWizardOptions) {
       const filePath = fyo.config.get(ConfigKeys.LastSelectedFilePath);
-      await setupInstance(filePath, setupWizardOptions);
+      await setupInstance(filePath, setupWizardOptions, fyo);
       await this.setDesk();
     },
     async showSetupWizardOrDesk(filePath) {
@@ -113,7 +113,7 @@ export default {
         return;
       }
 
-      await initializeInstance(filePath, false, countryCode);
+      await initializeInstance(filePath, false, countryCode, fyo);
       await this.setDesk();
     },
     async setDeskRoute() {
diff --git a/src/README.md b/src/README.md
index 9c399a07..c81f01dc 100644
--- a/src/README.md
+++ b/src/README.md
@@ -17,3 +17,8 @@ All of them are triggered from `src/App.vue`.
 1. Connect to db.
 2. Check if _Setup Wizard_ has been completed, if not, jump to **New Instance**
 3. Call `initFyo/initializeInstance` with `dbPath` and `countryCode`
+
+## Global Fyo
+
+Global fyo is exported from `initFyo.ts`. Only code that isn't going to be unit
+tested should use this.
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 94a5d0fd..3656a38b 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -104,7 +104,7 @@ export default {
     },
     async openNewDoc() {
       let doctype = this.df.target;
-      let doc = await fyo.getEmptyDoc(doctype);
+      let doc = await fyo.doc.getNewDoc(doctype);
       let filters = await this.getFilters();
       openQuickEdit({
         doctype,
diff --git a/src/components/ReconciliationValidation.vue b/src/components/ReconciliationValidation.vue
index b0b5454c..098573f8 100644
--- a/src/components/ReconciliationValidation.vue
+++ b/src/components/ReconciliationValidation.vue
@@ -78,7 +78,7 @@ export default {
             'dd/MM/yyyy'
           ).toISO();
         payment.set({ clearanceDate });
-        await payment.update();
+        await payment.sync();
       }
       this.close();
       await this.afterReconcile();
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index f6fc99f9..a723005a 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -87,7 +87,7 @@
   </div>
 </template>
 <script>
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import { getErrorMessage, handleErrorWithDialog } from 'src/errorHandling';
@@ -201,14 +201,11 @@ export default {
         if (df.fieldtype === 'Table') {
           return;
         }
-        this.doc.update();
+        this.doc.sync();
       }
     },
-    insertOrUpdate() {
-      return this.doc.insertOrUpdate().catch(this.handleError);
-    },
-    insert() {
-      return this.doc.insert().catch(this.handleError);
+    sync() {
+      return this.doc.sync().catch(this.handleError);
     },
     submit() {
       return this.doc.submit().catch(this.handleError);
@@ -223,7 +220,7 @@ export default {
 
       this.inlineEditField = df;
       if (!this.doc[df.fieldname]) {
-        this.inlineEditDoc = await fyo.doc.getEmptyDoc(df.target);
+        this.inlineEditDoc = await fyo.doc.getNewDoc(df.target);
         this.inlineEditDoc.once('afterInsert', () => {
           this.onChangeCommon(df, this.inlineEditDoc.name);
         });
@@ -239,7 +236,7 @@ export default {
       if (!this.inlineEditDoc) {
         return;
       }
-      await this.$refs.inlineEditForm[0].insertOrUpdate();
+      await this.$refs.inlineEditForm[0].sync();
       await this.doc.loadLinks();
 
       if (this.emitChange && df.inline) {
diff --git a/src/dataImport.ts b/src/dataImport.ts
index 0f82d5db..79eb46da 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -1,6 +1,6 @@
 import { Fyo, t } from 'fyo';
 import { DocValueMap } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { isNameAutoSet } from 'fyo/model/naming';
 import { Noun, Verb } from 'fyo/telemetry/types';
 import {
@@ -389,7 +389,7 @@ export class Importer {
         delete docObj[key];
       }
 
-      const doc: Doc = this.fyo.doc.getEmptyDoc(this.schemaName, false);
+      const doc: Doc = this.fyo.doc.getNewDoc(this.schemaName, {}, false);
       try {
         await this.makeEntry(doc, docObj);
         entriesMade += 1;
@@ -425,7 +425,7 @@ export class Importer {
 
   async makeEntry(doc: Doc, docObj: Map) {
     await doc.setMultiple(docObj as DocValueMap);
-    await doc.insert();
+    await doc.sync();
     if (this.shouldSubmit) {
       await doc.submit();
     }
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 6c5e93ac..847f7003 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron';
 import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { TelemetrySetting } from 'fyo/telemetry/types';
 import {
   DuplicateEntryError,
diff --git a/src/initFyo.ts b/src/initFyo.ts
index cc0c0ae7..73fec946 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -1,5 +1,6 @@
 import { Fyo } from 'fyo';
 import { getRegionalModels, models } from 'models';
+import { ModelNameEnum } from 'models/types';
 import { getValueMapFromList } from 'utils';
 
 export const fyo = new Fyo({ isTest: false, isElectron: true });
@@ -15,7 +16,8 @@ async function closeDbIfConnected() {
 export async function initializeInstance(
   dbPath: string,
   isNew: boolean,
-  countryCode: string
+  countryCode: string,
+  fyo: Fyo
 ) {
   if (isNew) {
     await closeDbIfConnected();
@@ -27,17 +29,17 @@ export async function initializeInstance(
   const regionalModels = await getRegionalModels(countryCode);
   await fyo.initializeAndRegister(models, regionalModels);
 
-  await setSingles();
-  await setCurrencySymbols();
+  await setSingles(fyo);
+  await setCurrencySymbols(fyo);
 }
 
-async function setSingles() {
-  await fyo.doc.getSingle('AccountingSettings');
-  await fyo.doc.getSingle('GetStarted');
+async function setSingles(fyo: Fyo) {
+  await fyo.doc.getSingle(ModelNameEnum.AccountingSettings);
+  await fyo.doc.getSingle(ModelNameEnum.GetStarted);
 }
 
-async function setCurrencySymbols() {
-  const currencies = (await fyo.db.getAll('Currency', {
+async function setCurrencySymbols(fyo: Fyo) {
+  const currencies = (await fyo.db.getAll(ModelNameEnum.Currency, {
     fields: ['name', 'symbol'],
   })) as { name: string; symbol: string }[];
 
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 4691e639..90bbed77 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -240,7 +240,7 @@ export default {
       this.insertingAccount = true;
 
       accountName = accountName.trim();
-      let account = await fyo.getEmptyDoc('Account');
+      let account = await fyo.doc.getNewDoc('Account');
       try {
         let { name, rootType, accountType } = parentAccount;
         await account.set({
@@ -250,7 +250,7 @@ export default {
           accountType,
           isGroup,
         });
-        await account.insert();
+        await account.sync();
 
         // turn off editing
         parentAccount.addingAccount = 0;
diff --git a/src/pages/Dashboard/PeriodSelector.vue b/src/pages/Dashboard/PeriodSelector.vue
index 748cd008..3fbcd931 100644
--- a/src/pages/Dashboard/PeriodSelector.vue
+++ b/src/pages/Dashboard/PeriodSelector.vue
@@ -74,7 +74,6 @@ export default {
   },
   methods: {
     selectOption(value) {
-      console.log(value);
       this.$emit('change', value);
       this.$refs.dropdown.toggleDropdown(false);
     },
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index 86c48846..64d74133 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -143,7 +143,7 @@ export default {
       this.invoices = await Promise.all(promises);
     },
     async newInvoice(invoice) {
-      let doc = await fyo.doc.getEmptyDoc(invoice.doctype);
+      let doc = await fyo.doc.getNewDoc(invoice.doctype);
       routeTo(`/edit/${invoice.doctype}/${doc.name}`);
     },
   },
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index aac19d11..1ae85b2a 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -308,7 +308,7 @@ export default {
         await this.updateChecks({ onboardingComplete });
         const systemSettings = await fyo.getSingle('SystemSettings');
         await systemSettings.set({ hideGetStarted: 1 });
-        await systemSettings.update();
+        await systemSettings.sync();
       }
 
       return onboardingComplete;
@@ -361,7 +361,7 @@ export default {
     },
     async updateChecks(toUpdate) {
       await fyo.GetStarted.setMultiple(toUpdate);
-      await fyo.GetStarted.update();
+      await fyo.GetStarted.sync();
       fyo.GetStarted = await fyo.getSingle('GetStarted');
     },
     isCompleted(item) {
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 18c22354..46510683 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -293,7 +293,7 @@ export default {
         'items',
         this.doc.items.filter((row) => row.item)
       );
-      return this.doc.insertOrUpdate().catch(this.handleError);
+      return this.doc.sync().catch(this.handleError);
     },
     onSubmitClick() {
       let message =
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 10028a98..86a0aaff 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -204,7 +204,7 @@ export default {
   },
   methods: {
     async onSaveClick() {
-      return this.doc.insertOrUpdate().catch(this.handleError);
+      return this.doc.sync().catch(this.handleError);
     },
     async onSubmitClick() {
       showMessageDialog({
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 95d9c581..2b4deb01 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -63,7 +63,7 @@ export default {
   methods: {
     async makeNewDoc() {
       const doctype = this.listConfig.doctype;
-      const doc = await fyo.doc.getEmptyDoc(doctype);
+      const doc = await fyo.doc.getNewDoc(doctype);
       if (this.listConfig.filters) {
         doc.set(this.listConfig.filters);
       }
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 70468bc2..6d79dd87 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -14,7 +14,7 @@
         <StatusBadge :status="status" />
         <Button
           :icon="true"
-          @click="insertDoc"
+          @click="sync"
           type="primary"
           v-if="doc && doc._notInserted"
           class="ml-2 text-white text-xs"
@@ -210,8 +210,8 @@ export default {
     valueChange(df, value) {
       this.$refs.form.onChange(df, value);
     },
-    insertDoc() {
-      this.$refs.form.insert();
+    sync() {
+      this.$refs.form.sync();
     },
     async submitDoc() {
       try {
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index b13b3d9a..034f6ac0 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -7,7 +7,7 @@
         @change="
           (value) => {
             doc.set('logo', value);
-            doc.update();
+            doc.sync();
             forwardChangeEvent(getField('logo'));
           }
         "
@@ -27,7 +27,7 @@
           @change="
             (value) => {
               doc.set('displayLogo', value);
-              doc.update();
+              doc.sync();
               forwardChangeEvent(getField('displayLogo'));
             }
           "
diff --git a/src/regional/in/in.ts b/src/regional/in/in.ts
index 566860a9..561040bc 100644
--- a/src/regional/in/in.ts
+++ b/src/regional/in/in.ts
@@ -1,30 +1,26 @@
-import { fyo } from 'src/initFyo';
+import { Fyo } from 'fyo';
 
 export type TaxType = 'GST' | 'IGST' | 'Exempt-GST' | 'Exempt-IGST';
 
-export async function createIndianRecords() {
-  await generateTaxes();
+export async function createIndianRecords(fyo: Fyo) {
+  await createTaxes(fyo);
 }
 
-async function generateTaxes() {
+async function createTaxes(fyo: Fyo) {
   const GSTs = {
     GST: [28, 18, 12, 6, 5, 3, 0.25, 0],
     IGST: [28, 18, 12, 6, 5, 3, 0.25, 0],
     'Exempt-GST': [0],
     'Exempt-IGST': [0],
   };
-  const newTax = await fyo.doc.getEmptyDoc('Tax');
 
   for (const type of Object.keys(GSTs)) {
     for (const percent of GSTs[type as TaxType]) {
       const name = `${type}-${percent}`;
-
-      // Not cross checking cause hardcoded values.
-      await fyo.db.delete('Tax', name);
-
       const details = getTaxDetails(type as TaxType, percent);
-      await newTax.set({ name, details });
-      await newTax.insert();
+
+      const newTax = fyo.doc.getNewDoc('Tax', { name, details });
+      await newTax.sync();
     }
   }
 }
@@ -41,12 +37,12 @@ function getTaxDetails(type: TaxType, percent: number) {
         rate: percent / 2,
       },
     ];
-  } else {
-    return [
-      {
-        account: type.toString().split('-')[0],
-        rate: percent,
-      },
-    ];
   }
+
+  return [
+    {
+      account: type.toString().split('-')[0],
+      rate: percent,
+    },
+  ];
 }
diff --git a/src/regional/index.ts b/src/regional/index.ts
index 02a7e07c..1c397b18 100644
--- a/src/regional/index.ts
+++ b/src/regional/index.ts
@@ -1,8 +1,9 @@
+import { Fyo } from 'fyo';
 import { createIndianRecords } from './in/in';
 
-export async function createRegionalRecords(country: string) {
+export async function createRegionalRecords(country: string, fyo: Fyo) {
   if (country === 'India') {
-    await createIndianRecords();
+    await createIndianRecords(fyo);
   }
 
   return;
diff --git a/src/setup/createCOA.ts b/src/setup/createCOA.ts
index 14f8647c..534131d3 100644
--- a/src/setup/createCOA.ts
+++ b/src/setup/createCOA.ts
@@ -1,3 +1,4 @@
+import { Fyo } from 'fyo';
 import {
   AccountRootType,
   COAChildAccount,
@@ -5,57 +6,66 @@ import {
   COATree,
 } from 'models/baseModels/Account/types';
 import { getCOAList } from 'models/baseModels/SetupWizard/SetupWizard';
-import { fyo } from 'src/initFyo';
 import { getStandardCOA } from './standardCOA';
 
 const accountFields = ['accountType', 'accountNumber', 'rootType', 'isGroup'];
 
-function getAccountName(accountName: string, accountNumber?: string) {
-  if (accountNumber) {
-    return `${accountName} - ${accountNumber}`;
+export class CreateCOA {
+  fyo: Fyo;
+  chartOfAccounts: string;
+
+  constructor(chartOfAccounts: string, fyo: Fyo) {
+    this.chartOfAccounts = chartOfAccounts;
+    this.fyo = fyo;
   }
 
-  return accountName;
-}
+  async run() {
+    const chart = await getCOA(this.chartOfAccounts);
+    await this.createCOAAccounts(chart, null, '', true);
+  }
 
-async function createCOAAccounts(
-  children: COATree | COARootAccount | COAChildAccount,
-  parentAccount: string,
-  rootType: AccountRootType | '',
-  rootAccount: boolean
-) {
-  for (const rootName in children) {
-    if (accountFields.includes(rootName)) {
-      continue;
+  async createCOAAccounts(
+    children: COATree | COARootAccount | COAChildAccount,
+    parentAccount: string | null,
+    rootType: AccountRootType | '',
+    rootAccount: boolean
+  ) {
+    for (const rootName in children) {
+      if (accountFields.includes(rootName)) {
+        continue;
+      }
+
+      const child = children[rootName];
+
+      if (rootAccount) {
+        rootType = (child as COARootAccount).rootType as AccountRootType;
+      }
+
+      const accountType = (child as COAChildAccount).accountType ?? '';
+      const accountNumber = (child as COAChildAccount).accountNumber;
+      const accountName = getAccountName(rootName, accountNumber);
+
+      const isGroup = identifyIsGroup(
+        child as COAChildAccount | COARootAccount
+      );
+
+      const doc = this.fyo.doc.getNewDoc('Account', {
+        name: accountName,
+        parentAccount,
+        isGroup,
+        rootType,
+        balance: 0,
+        accountType,
+      });
+
+      await doc.sync();
+      await this.createCOAAccounts(
+        child as COAChildAccount,
+        accountName,
+        rootType,
+        false
+      );
     }
-
-    const child = children[rootName];
-
-    if (rootAccount) {
-      rootType = (child as COARootAccount).rootType as AccountRootType;
-    }
-
-    const accountType = (child as COAChildAccount).accountType ?? '';
-    const accountNumber = (child as COAChildAccount).accountNumber;
-    const accountName = getAccountName(rootName, accountNumber);
-
-    const isGroup = identifyIsGroup(child as COAChildAccount | COARootAccount);
-    const doc = fyo.doc.getNewDoc('Account', {
-      name: accountName,
-      parentAccount,
-      isGroup,
-      rootType,
-      balance: 0,
-      accountType,
-    });
-
-    await doc.insert();
-    await createCOAAccounts(
-      child as COAChildAccount,
-      accountName,
-      rootType,
-      false
-    );
   }
 }
 
@@ -92,7 +102,10 @@ async function getCOA(chartOfAccounts: string) {
   }
 }
 
-export async function createCOA(chartOfAccounts: string) {
-  const chart = await getCOA(chartOfAccounts);
-  await createCOAAccounts(chart, '', '', true);
+function getAccountName(accountName: string, accountNumber?: string) {
+  if (accountNumber) {
+    return `${accountName} - ${accountNumber}`;
+  }
+
+  return accountName;
 }
diff --git a/src/setup/setupInstance.ts b/src/setup/setupInstance.ts
index 1becabe6..8b0762c8 100644
--- a/src/setup/setupInstance.ts
+++ b/src/setup/setupInstance.ts
@@ -1,5 +1,6 @@
+import { Fyo } from 'fyo';
 import { ConfigFile, DocValueMap } from 'fyo/core/types';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { createNumberSeries } from 'fyo/model/naming';
 import { getId } from 'fyo/telemetry/helpers';
 import {
@@ -8,51 +9,55 @@ import {
   DEFAULT_SERIES_START,
 } from 'fyo/utils/consts';
 import { AccountingSettings } from 'models/baseModels/AccountingSettings/AccountingSettings';
-import { fyo, initializeInstance } from 'src/initFyo';
+import { initializeInstance } from 'src/initFyo';
 import { createRegionalRecords } from 'src/regional';
 import { getCountryCodeFromCountry, getCountryInfo } from 'utils/misc';
 import { CountryInfo } from 'utils/types';
-import { createCOA } from './createCOA';
+import { CreateCOA } from './createCOA';
 import { SetupWizardOptions } from './types';
 
 export default async function setupInstance(
   dbPath: string,
-  setupWizardOptions: SetupWizardOptions
+  setupWizardOptions: SetupWizardOptions,
+  fyo: Fyo
 ) {
   const { companyName, country, bankName, chartOfAccounts } =
     setupWizardOptions;
 
-  await initializeDatabase(dbPath, country);
-  await updateSystemSettings(setupWizardOptions);
-  await updateAccountingSettings(setupWizardOptions);
-  await updatePrintSettings(setupWizardOptions);
+  await initializeDatabase(dbPath, country, fyo);
+  await updateSystemSettings(setupWizardOptions, fyo);
+  await updateAccountingSettings(setupWizardOptions, fyo);
+  await updatePrintSettings(setupWizardOptions, fyo);
 
-  await createCurrencyRecords();
-  await createAccountRecords(bankName, country, chartOfAccounts);
-  await createRegionalRecords(country);
-  await createDefaultNumberSeries();
+  await createCurrencyRecords(fyo);
+  await createAccountRecords(bankName, country, chartOfAccounts, fyo);
+  await createRegionalRecords(country, fyo);
+  await createDefaultNumberSeries(fyo);
 
-  await completeSetup(companyName);
+  await completeSetup(companyName, fyo);
 }
 
-async function initializeDatabase(dbPath: string, country: string) {
+async function initializeDatabase(dbPath: string, country: string, fyo: Fyo) {
   const countryCode = getCountryCodeFromCountry(country);
-  await initializeInstance(dbPath, true, countryCode);
+  await initializeInstance(dbPath, true, countryCode, fyo);
 }
 
-async function updateAccountingSettings({
-  companyName,
-  country,
-  fullname,
-  email,
-  bankName,
-  fiscalYearStart,
-  fiscalYearEnd,
-}: SetupWizardOptions) {
+async function updateAccountingSettings(
+  {
+    companyName,
+    country,
+    fullname,
+    email,
+    bankName,
+    fiscalYearStart,
+    fiscalYearEnd,
+  }: SetupWizardOptions,
+  fyo: Fyo
+) {
   const accountingSettings = (await fyo.doc.getSingle(
     'AccountingSettings'
   )) as AccountingSettings;
-  await accountingSettings.setAndUpdate({
+  await accountingSettings.setAndSync({
     companyName,
     country,
     fullname,
@@ -64,13 +69,12 @@ async function updateAccountingSettings({
   return accountingSettings;
 }
 
-async function updatePrintSettings({
-  companyLogo,
-  companyName,
-  email,
-}: SetupWizardOptions) {
+async function updatePrintSettings(
+  { companyLogo, companyName, email }: SetupWizardOptions,
+  fyo: Fyo
+) {
   const printSettings = await fyo.doc.getSingle('PrintSettings');
-  await printSettings.setAndUpdate({
+  await printSettings.setAndSync({
     logo: companyLogo,
     companyName,
     email,
@@ -78,23 +82,23 @@ async function updatePrintSettings({
   });
 }
 
-async function updateSystemSettings({
-  country,
-  currency: companyCurrency,
-}: SetupWizardOptions) {
+async function updateSystemSettings(
+  { country, currency: companyCurrency }: SetupWizardOptions,
+  fyo: Fyo
+) {
   const countryInfo = getCountryInfo();
   const countryOptions = countryInfo[country] as CountryInfo;
   const currency =
     companyCurrency ?? countryOptions.currency ?? DEFAULT_CURRENCY;
   const locale = countryOptions.locale ?? DEFAULT_LOCALE;
   const systemSettings = await fyo.doc.getSingle('SystemSettings');
-  systemSettings.setAndUpdate({
+  systemSettings.setAndSync({
     locale,
     currency,
   });
 }
 
-async function createCurrencyRecords() {
+async function createCurrencyRecords(fyo: Fyo) {
   const promises: Promise<Doc | undefined>[] = [];
   const queue: string[] = [];
   const countrySettings = Object.values(getCountryInfo()) as CountryInfo[];
@@ -120,7 +124,7 @@ async function createCurrencyRecords() {
       symbol: currency_symbol ?? '',
     };
 
-    const doc = checkAndCreateDoc('Currency', docObject);
+    const doc = checkAndCreateDoc('Currency', docObject, fyo);
     if (doc) {
       promises.push(doc);
       queue.push(currency);
@@ -132,10 +136,12 @@ async function createCurrencyRecords() {
 async function createAccountRecords(
   bankName: string,
   country: string,
-  chartOfAccounts: string
+  chartOfAccounts: string,
+  fyo: Fyo
 ) {
-  await createCOA(chartOfAccounts);
-  const parentAccount = await getBankAccountParentName(country);
+  const createCOA = new CreateCOA(chartOfAccounts, fyo);
+  await createCOA.run();
+  const parentAccount = await getBankAccountParentName(country, fyo);
   const docObject = {
     name: bankName,
     rootType: 'Asset',
@@ -143,16 +149,16 @@ async function createAccountRecords(
     accountType: 'Bank',
     isGroup: false,
   };
-  await checkAndCreateDoc('Account', docObject);
+  await checkAndCreateDoc('Account', docObject, fyo);
 }
 
-async function completeSetup(companyName: string) {
-  updateInitializationConfig(companyName);
+async function completeSetup(companyName: string, fyo: Fyo) {
+  updateInitializationConfig(companyName, fyo);
   await fyo.singles.AccountingSettings!.set('setupComplete', true);
-  await fyo.singles.AccountingSettings!.update();
+  await fyo.singles.AccountingSettings!.sync();
 }
 
-function updateInitializationConfig(companyName: string) {
+function updateInitializationConfig(companyName: string, fyo: Fyo) {
   const dbPath = fyo.db.dbPath;
   const files = fyo.config.get('files', []) as ConfigFile[];
 
@@ -166,19 +172,24 @@ function updateInitializationConfig(companyName: string) {
   fyo.config.set('files', files);
 }
 
-async function checkAndCreateDoc(schemaName: string, docObject: DocValueMap) {
-  const canCreate = await checkIfExactRecordAbsent(schemaName, docObject);
+async function checkAndCreateDoc(
+  schemaName: string,
+  docObject: DocValueMap,
+  fyo: Fyo
+) {
+  const canCreate = await checkIfExactRecordAbsent(schemaName, docObject, fyo);
   if (!canCreate) {
     return;
   }
 
   const doc = await fyo.doc.getNewDoc(schemaName, docObject);
-  return doc.insert();
+  return doc.sync();
 }
 
 async function checkIfExactRecordAbsent(
   schemaName: string,
-  docMap: DocValueMap
+  docMap: DocValueMap,
+  fyo: Fyo
 ) {
   const name = docMap.name as string;
   const newDocObject = Object.assign({}, docMap);
@@ -207,7 +218,7 @@ async function checkIfExactRecordAbsent(
   return false;
 }
 
-async function getBankAccountParentName(country: string) {
+async function getBankAccountParentName(country: string, fyo: Fyo) {
   const parentBankAccount = await fyo.db.getAllRaw('Account', {
     fields: ['*'],
     filters: { isGroup: true, accountType: 'Bank' },
@@ -228,7 +239,7 @@ async function getBankAccountParentName(country: string) {
   return parentBankAccount[0].name;
 }
 
-async function createDefaultNumberSeries() {
+async function createDefaultNumberSeries(fyo: Fyo) {
   await createNumberSeries('SINV-', 'SalesInvoice', DEFAULT_SERIES_START, fyo);
   await createNumberSeries(
     'PINV-',
diff --git a/src/utils/doc.ts b/src/utils/doc.ts
index e7025a6c..3c2ad65a 100644
--- a/src/utils/doc.ts
+++ b/src/utils/doc.ts
@@ -1,4 +1,4 @@
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { Field, OptionField, SelectOption } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
index a030ebf1..12459364 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,10 +1,9 @@
 /**
  * General purpose utils used by the frontend.
  */
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import Money from 'pesa/dist/types/src/money';
-import { fyo } from 'src/initFyo';
 
 export function stringifyCircular(
   obj: unknown,
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 2a62dec3..28cefb0e 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -40,6 +40,7 @@ export async function getSetupWizardDoc() {
   return await fyo.doc.getNewDoc(
     'SetupWizard',
     {},
+    false,
     SetupWizardSchema as Schema,
     SetupWizard
   );
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 4b6e88b9..ad40983f 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -4,7 +4,7 @@
  */
 import { ipcRenderer } from 'electron';
 import { t } from 'fyo';
-import Doc from 'fyo/model/doc';
+import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { getActions } from 'fyo/utils';
 import { handleErrorWithDialog } from 'src/errorHandling';
@@ -222,7 +222,7 @@ export async function cancelDocWithPrompt(doc: Doc) {
           async action() {
             const entryDoc = await fyo.doc.getDoc(doc.schemaName, doc.name!);
             entryDoc.cancelled = 1;
-            await entryDoc.update();
+            await entryDoc.sync();
             entryDoc
               .revert()
               .then(() => resolve(true))
diff --git a/tests/helpers.ts b/tests/helpers.ts
new file mode 100644
index 00000000..b03f30fc
--- /dev/null
+++ b/tests/helpers.ts
@@ -0,0 +1,17 @@
+import { SetupWizardOptions } from 'src/setup/types';
+import { getFiscalYear } from 'utils/misc';
+
+export function getTestSetupWizardOptions(): SetupWizardOptions {
+  return {
+    companyLogo: '',
+    companyName: 'Test Company',
+    country: 'India',
+    fullname: 'Test Person',
+    email: 'test@testmyfantasy.com',
+    bankName: 'Test Bank of Scriptia',
+    currency: 'INR',
+    fiscalYearStart: getFiscalYear('04-01', true),
+    fiscalYearEnd: getFiscalYear('04-01', false),
+    chartOfAccounts: 'India - Chart of Accounts',
+  };
+}
diff --git a/tests/testSetupInstance.spec.ts b/tests/testSetupInstance.spec.ts
new file mode 100644
index 00000000..0a33d635
--- /dev/null
+++ b/tests/testSetupInstance.spec.ts
@@ -0,0 +1,25 @@
+import { DatabaseManager } from 'backend/database/manager';
+import { assertDoesNotThrow } from 'backend/database/tests/helpers';
+import { Fyo } from 'fyo';
+import { DummyAuthDemux } from 'fyo/tests/helpers';
+import 'mocha';
+import setupInstance from 'src/setup/setupInstance';
+import { getTestSetupWizardOptions } from './helpers';
+
+const DB_PATH = '/Users/alan/Desktop/test.db';
+describe('setupInstance', function () {
+  const fyo = new Fyo({
+    DatabaseDemux: DatabaseManager,
+    AuthDemux: DummyAuthDemux,
+    isTest: true,
+    isElectron: false,
+  });
+
+  const setupOptions = getTestSetupWizardOptions();
+  specify('setupInstance', async function () {
+    await setupInstance(DB_PATH, setupOptions, fyo);
+    await assertDoesNotThrow(async () => {
+      // await setupInstance(':memory:', setupOptions, fyo);
+    }, 'setup instance failed');
+  });
+});
diff --git a/tsconfig.json b/tsconfig.json
index 2a02ff0b..ed1f86b8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -46,6 +46,7 @@
     "regional/**/*.ts",
     "reports/**/*.ts",
     "utils/**/*.ts",
+    "tests/**/*.ts",
   ],
   "exclude": ["node_modules"]
 }
diff --git a/utils/misc.ts b/utils/misc.ts
index 82cff3a4..95c2b549 100644
--- a/utils/misc.ts
+++ b/utils/misc.ts
@@ -1,4 +1,5 @@
 import countryInfo from 'fixtures/countryInfo.json';
+import { DateTime } from 'luxon';
 import { CountryInfoMap } from './types';
 
 export function getCountryInfo(): CountryInfoMap {
@@ -15,3 +16,21 @@ export function getCountryCodeFromCountry(countryName: string): string {
 
   return countryInfo.code;
 }
+
+export function getFiscalYear(date: string, isStart: boolean) {
+  if (!date) {
+    return '';
+  }
+
+  const today = DateTime.local();
+  const dateTime = DateTime.fromFormat(date, 'MM-dd');
+  if (isStart) {
+    return dateTime
+      .plus({ year: [1, 2, 3].includes(today.month) ? -1 : 0 })
+      .toISODate();
+  }
+
+  return dateTime
+    .plus({ year: [1, 2, 3].includes(today.month) ? 0 : 1 })
+    .toISODate();
+}

From 1b85fee5e6e55a3f4811d12b54eadc6c27149fb7 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 25 Apr 2022 12:03:31 +0530
Subject: [PATCH 066/163] fix: make setupInstance code work

---
 backend/database/tests/helpers.ts             |  4 +-
 fyo/core/converter.ts                         | 25 +++++--
 fyo/model/doc.ts                              | 72 ++++++++++---------
 fyo/model/helpers.ts                          | 12 ++--
 fyo/utils/errors.ts                           |  2 +-
 models/baseModels/Account/Account.ts          | 11 +++
 models/baseModels/Invoice/Invoice.ts          |  2 +-
 .../baseModels/JournalEntry/JournalEntry.ts   |  2 +-
 models/baseModels/Payment/Payment.ts          |  2 +-
 package.json                                  |  3 +-
 schemas/app/SetupWizard.json                  |  2 +-
 schemas/core/SystemSettings.json              |  1 +
 schemas/types.ts                              |  1 -
 src/pages/SetupWizard/SetupWizard.vue         |  6 +-
 src/setup/setupInstance.ts                    | 12 ++--
 src/setup/types.ts                            |  2 +-
 tests/helpers.ts                              |  8 ++-
 tests/testSetupInstance.spec.ts               | 69 +++++++++++++++---
 yarn.lock                                     |  5 ++
 19 files changed, 166 insertions(+), 75 deletions(-)

diff --git a/backend/database/tests/helpers.ts b/backend/database/tests/helpers.ts
index 448816e1..c6b48658 100644
--- a/backend/database/tests/helpers.ts
+++ b/backend/database/tests/helpers.ts
@@ -198,9 +198,9 @@ export async function assertDoesNotThrow(
     await func();
   } catch (err) {
     throw new assert.AssertionError({
-      message: `Missing expected exception: ${message} Error: ${
+      message: `Got unwanted exception: ${message}\nError: ${
         (err as Error).message
-      }`,
+      }\n${(err as Error).stack}`,
     });
   }
 }
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index b06a8abf..870f6322 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -4,7 +4,7 @@ import { isPesa } from 'fyo/utils';
 import { ValueError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
 import Money from 'pesa/dist/types/src/money';
-import { Field, FieldTypeEnum, RawValue } from 'schemas/types';
+import { Field, FieldTypeEnum, RawValue, TargetField } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 import { DatabaseHandler } from './dbHandler';
 import { DocValue, DocValueMap, RawValueMap } from './types';
@@ -70,7 +70,7 @@ export class Converter {
       case FieldTypeEnum.Check:
         return toDocCheck(value, field);
       default:
-        return String(value);
+        return toDocString(value, field);
     }
   }
 
@@ -102,8 +102,9 @@ export class Converter {
       const rawValue = rawValueMap[fieldname];
 
       if (Array.isArray(rawValue)) {
+        const parentSchemaName = (field as TargetField).target;
         docValueMap[fieldname] = rawValue.map((rv) =>
-          this.#toDocValueMap(schemaName, rv)
+          this.#toDocValueMap(parentSchemaName, rv)
         );
       } else {
         docValueMap[fieldname] = Converter.toDocValue(
@@ -126,12 +127,14 @@ export class Converter {
       const docValue = docValueMap[fieldname];
 
       if (Array.isArray(docValue)) {
+        const parentSchemaName = (field as TargetField).target;
+
         rawValueMap[fieldname] = docValue.map((value) => {
           if (value instanceof Doc) {
-            return this.#toRawValueMap(schemaName, value.getValidDict());
+            return this.#toRawValueMap(parentSchemaName, value.getValidDict());
           }
 
-          return this.#toRawValueMap(schemaName, value as DocValueMap);
+          return this.#toRawValueMap(parentSchemaName, value as DocValueMap);
         });
       } else {
         rawValueMap[fieldname] = Converter.toRawValue(
@@ -146,6 +149,18 @@ export class Converter {
   }
 }
 
+function toDocString(value: RawValue, field: Field) {
+  if (typeof value === 'string') {
+    return value;
+  }
+
+  if (value === null) {
+    return value;
+  }
+
+  throwError(value, field, 'doc');
+}
+
 function toDocDate(value: RawValue, field: Field) {
   if (typeof value !== 'number' && typeof value !== 'string') {
     throwError(value, field, 'doc');
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 54fa7500..7710aa1e 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -3,7 +3,7 @@ import { DocValue, DocValueMap } from 'fyo/core/types';
 import { Verb } from 'fyo/telemetry/types';
 import { DEFAULT_USER } from 'fyo/utils/consts';
 import {
-  Conflict,
+  ConflictError,
   MandatoryError,
   NotFoundError,
   ValidationError,
@@ -57,7 +57,8 @@ export class Doc extends Observable<DocValue | Doc[]> {
    */
   idx?: number;
   parentdoc?: Doc;
-  parentfield?: string;
+  parentFieldname?: string;
+  parentSchemaName?: string;
 
   _links?: Record<string, Doc>;
   _dirty: boolean = true;
@@ -115,7 +116,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
           this.push(fieldname, row);
         }
       } else {
-        this[fieldname] = value ?? null;
+        this[fieldname] = value ?? this[fieldname] ?? null;
       }
     }
   }
@@ -153,7 +154,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     // always run applyChange from the parentdoc
     if (this.schema.isChild && this.parentdoc) {
       await this._applyChange(fieldname);
-      await this.parentdoc._applyChange(this.parentfield as string);
+      await this.parentdoc._applyChange(this.parentFieldname as string);
     } else {
       await this._applyChange(fieldname);
     }
@@ -196,23 +197,20 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
   _setDefaults() {
     for (const field of this.schema.fields) {
-      if (!getIsNullOrUndef(this[field.fieldname])) {
-        continue;
-      }
-
       let defaultValue: DocValue | Doc[] = getPreDefaultValues(
         field.fieldtype,
         this.fyo
       );
-      const defaultFunction = this.defaults[field.fieldname];
 
+      const defaultFunction =
+        this.fyo.models[this.schemaName]?.defaults?.[field.fieldname];
       if (defaultFunction !== undefined) {
         defaultValue = defaultFunction();
       } else if (field.default !== undefined) {
         defaultValue = field.default;
       }
 
-      if (field.fieldtype === 'Currency' && !isPesa(defaultValue)) {
+      if (field.fieldtype === FieldTypeEnum.Currency && !isPesa(defaultValue)) {
         defaultValue = this.fyo.pesa!(defaultValue as string | number);
       }
 
@@ -242,8 +240,8 @@ export class Doc extends Observable<DocValue | Doc[]> {
     const data: Record<string, unknown> = Object.assign({}, docValueMap);
 
     data.parent = this.name;
-    data.parenttype = this.schemaName;
-    data.parentfield = fieldname;
+    data.parentSchemaName = this.schemaName;
+    data.parentFieldname = fieldname;
     data.parentdoc = this;
 
     if (!data.idx) {
@@ -329,6 +327,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
         value = (value as Money).copy();
       }
 
+      if (value === null && this.schema.isSingle) {
+        continue;
+      }
+
       data[field.fieldname] = value;
     }
     return data;
@@ -348,10 +350,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
       this.created = new Date();
     }
 
-    this._updateModified();
+    this._updateModifiedMetaValues();
   }
 
-  _updateModified() {
+  _updateModifiedMetaValues() {
     this.modifiedBy = this.fyo.auth.session.user || DEFAULT_USER;
     this.modified = new Date();
   }
@@ -442,20 +444,19 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async _compareWithCurrentDoc() {
-    if (this.isNew || !this.name) {
+    if (this.isNew || !this.name || this.schema.isSingle) {
       return;
     }
 
-    const currentDoc = await this.fyo.db.get(this.schemaName, this.name);
+    const dbValues = await this.fyo.db.get(this.schemaName, this.name);
+    const docModified = this.modified as Date;
+    const dbModified = dbValues.modified as Date;
 
-    // check for conflict
-    if (
-      currentDoc &&
-      (this.modified as Date) !== (currentDoc.modified as Date)
-    ) {
-      throw new Conflict(
+    if (dbValues && docModified !== dbModified) {
+      throw new ConflictError(
         this.fyo
-          .t`Document ${this.schemaName} ${this.name} has been modified after loading`
+          .t`Document ${this.schemaName} ${this.name} has been modified after loading` +
+          `${docModified?.toISOString()}, ${dbModified?.toISOString()}`
       );
     }
 
@@ -466,11 +467,11 @@ export class Doc extends Observable<DocValue | Doc[]> {
     }
 
     // set submit action flag
-    if (this.submitted && !currentDoc.submitted) {
+    if (this.submitted && !dbValues.submitted) {
       this.flags.submitAction = true;
     }
 
-    if (currentDoc.submitted && !this.submitted) {
+    if (dbValues.submitted && !this.submitted) {
       this.flags.revertAction = true;
     }
   }
@@ -568,15 +569,16 @@ export class Doc extends Observable<DocValue | Doc[]> {
     await this.trigger('beforeInsert', null);
 
     const oldName = this.name!;
-    const data = await this.fyo.db.insert(this.schemaName, this.getValidDict());
+    const validDict = this.getValidDict();
+    const data = await this.fyo.db.insert(this.schemaName, validDict);
     this.syncValues(data);
+    this._notInserted = false;
 
     if (oldName !== this.name) {
       this.fyo.doc.removeFromCache(this.schemaName, oldName);
     }
 
     await this.trigger('afterInsert', null);
-    await this.trigger('afterSave', null);
 
     this.fyo.telemetry.log(Verb.Created, this.schemaName);
     return this;
@@ -592,14 +594,13 @@ export class Doc extends Observable<DocValue | Doc[]> {
     if (this.flags.revertAction) await this.trigger('beforeRevert');
 
     // update modifiedBy and modified
-    this._updateModified();
+    this._updateModifiedMetaValues();
 
     const data = this.getValidDict();
     await this.fyo.db.update(this.schemaName, data);
     this.syncValues(data);
 
     await this.trigger('afterUpdate');
-    await this.trigger('afterSave');
 
     // after submit
     if (this.flags.submitAction) await this.trigger('afterSubmit');
@@ -609,11 +610,15 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async sync() {
+    await this.trigger('beforeSync');
+    let doc;
     if (this._notInserted) {
-      return await this._insert();
+      doc = await this._insert();
     } else {
-      return await this._update();
+      doc = await this._update();
     }
+    await this.trigger('afterSync');
+    return doc;
   }
 
   async delete() {
@@ -738,14 +743,14 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async afterInsert() {}
   async beforeUpdate() {}
   async afterUpdate() {}
-  async afterSave() {}
+  async beforeSync() {}
+  async afterSync() {}
   async beforeDelete() {}
   async afterDelete() {}
   async beforeRevert() {}
   async afterRevert() {}
 
   formulas: FormulaMap = {};
-  defaults: DefaultMap = {};
   validations: ValidationMap = {};
   required: RequiredMap = {};
   hidden: HiddenMap = {};
@@ -755,6 +760,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
   static lists: ListsMap = {};
   static filters: FiltersMap = {};
+  static defaults: DefaultMap = {};
   static emptyMessages: EmptyMessageMap = {};
 
   static getListViewSettings(fyo: Fyo): ListViewSettings {
diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts
index 6b0678a9..2bd6b6f3 100644
--- a/fyo/model/helpers.ts
+++ b/fyo/model/helpers.ts
@@ -56,11 +56,11 @@ export function getMissingMandatoryMessage(doc: Doc) {
 
       return isNullOrUndef || value === '';
     })
-    .map((f) => f.label)
+    .map((f) => f.label ?? f.fieldname)
     .join(', ');
 
-  if (message && doc.schema.isChild && doc.parentdoc && doc.parentfield) {
-    const parentfield = doc.parentdoc.fieldMap[doc.parentfield];
+  if (message && doc.schema.isChild && doc.parentdoc && doc.parentFieldname) {
+    const parentfield = doc.parentdoc.fieldMap[doc.parentFieldname];
     return `${parentfield.label} Row ${(doc.idx ?? 0) + 1}: ${message}`;
   }
 
@@ -75,11 +75,7 @@ function getMandatory(doc: Doc): Field[] {
     }
 
     const requiredFunction = doc.required[field.fieldname];
-    if (typeof requiredFunction !== 'function') {
-      continue;
-    }
-
-    if (requiredFunction()) {
+    if (requiredFunction?.()) {
       mandatoryFields.push(field);
     }
   }
diff --git a/fyo/utils/errors.ts b/fyo/utils/errors.ts
index 5cf534d1..636f80db 100644
--- a/fyo/utils/errors.ts
+++ b/fyo/utils/errors.ts
@@ -67,5 +67,5 @@ export class CannotCommitError extends DatabaseError {
 }
 
 export class ValueError extends ValidationError {}
-export class Conflict extends ValidationError {}
+export class ConflictError extends ValidationError {}
 export class InvalidFieldError extends ValidationError {}
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index 88728328..30709c12 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -1,6 +1,7 @@
 import { Fyo } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import {
+  DefaultMap,
   FiltersMap,
   ListViewSettings,
   TreeViewSettings,
@@ -13,6 +14,16 @@ export class Account extends Doc {
   accountType?: AccountType;
   parentAccount?: string;
 
+  static defaults: DefaultMap = {
+    /**
+     * NestedSet indices are actually not used
+     * this needs updation as they may be required
+     * later on.
+     */
+    lft: () => 0,
+    rgt: () => 0,
+  };
+
   async beforeInsert() {
     if (this.accountType || !this.parentAccount) {
       return;
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 74095ec2..b3f08c4e 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -188,7 +188,7 @@ export abstract class Invoice extends Doc {
     },
   };
 
-  defaults: DefaultMap = {
+  static defaults: DefaultMap = {
     date: () => new Date().toISOString().slice(0, 10),
   };
 
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index 64ab48a1..a2b9cca9 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -48,7 +48,7 @@ export class JournalEntry extends Doc {
     await this.getPosting().postReverse();
   }
 
-  defaults: DefaultMap = {
+  static defaults: DefaultMap = {
     date: () => DateTime.local().toISODate(),
   };
 
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 9eb86ec5..40808739 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -281,7 +281,7 @@ export class Payment extends Doc {
     );
   }
 
-  defaults: DefaultMap = { date: () => new Date().toISOString() };
+  static defaults: DefaultMap = { date: () => new Date().toISOString() };
 
   formulas: FormulaMap = {
     account: async () => {
diff --git a/package.json b/package.json
index de560894..93c7b865 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "postinstall": "electron-builder install-app-deps",
     "postuninstall": "electron-builder install-app-deps",
     "script:translate": "ts-node -O '{\"module\":\"commonjs\"}' scripts/generateTranslations.ts",
-    "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --reporter nyan --require ts-node/register --require tsconfig-paths/register ./**/tests/**/*.spec.ts"
+    "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --reporter nyan --require ts-node/register --require tsconfig-paths/register ./**/tests/**/*.spec.ts --exit"
   },
   "dependencies": {
     "@popperjs/core": "^2.10.2",
@@ -52,6 +52,7 @@
     "@vue/eslint-config-typescript": "^7.0.0",
     "autoprefixer": "^9",
     "babel-loader": "^8.2.3",
+    "dotenv": "^16.0.0",
     "electron": "^15.3.5",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
diff --git a/schemas/app/SetupWizard.json b/schemas/app/SetupWizard.json
index a7caab4c..b712b4a7 100644
--- a/schemas/app/SetupWizard.json
+++ b/schemas/app/SetupWizard.json
@@ -6,7 +6,7 @@
   "isSubmittable": false,
   "fields": [
     {
-      "fieldname": "companyLogo",
+      "fieldname": "logo",
       "label": "Company Logo",
       "fieldtype": "AttachImage"
     },
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 392681b7..317928de 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -78,6 +78,7 @@
       "fieldname": "countryCode",
       "label": "Country Code",
       "fieldtype": "Data",
+      "default": "in",
       "description": "Country code used to initialize regional settings."
     },
     {
diff --git a/schemas/types.ts b/schemas/types.ts
index c00ac1e3..54f485aa 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -14,7 +14,6 @@ export enum FieldTypeEnum {
   Currency = 'Currency',
   Text = 'Text',
   Color = 'Color',
-  Code = 'Code',
 }
 
 export type FieldType = keyof typeof FieldTypeEnum;
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 6164e53d..300b4fe0 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -45,9 +45,9 @@
         <div v-if="doc">
           <div class="flex items-center px-6 py-5 mb-8 bg-brand rounded-xl">
             <FormControl
-              :df="getField('companyLogo')"
-              :value="doc.companyLogo"
-              @change="(value) => setValue('companyLogo', value)"
+              :df="getField('logo')"
+              :value="doc.logo"
+              @change="(value) => setValue('logo', value)"
             />
             <div class="ml-2">
               <FormControl
diff --git a/src/setup/setupInstance.ts b/src/setup/setupInstance.ts
index 8b0762c8..ba3a3e72 100644
--- a/src/setup/setupInstance.ts
+++ b/src/setup/setupInstance.ts
@@ -70,15 +70,15 @@ async function updateAccountingSettings(
 }
 
 async function updatePrintSettings(
-  { companyLogo, companyName, email }: SetupWizardOptions,
+  { logo, companyName, email }: SetupWizardOptions,
   fyo: Fyo
 ) {
   const printSettings = await fyo.doc.getSingle('PrintSettings');
   await printSettings.setAndSync({
-    logo: companyLogo,
+    logo,
     companyName,
     email,
-    displayLogo: companyLogo ? true : false,
+    displayLogo: logo ? true : false,
   });
 }
 
@@ -91,10 +91,13 @@ async function updateSystemSettings(
   const currency =
     companyCurrency ?? countryOptions.currency ?? DEFAULT_CURRENCY;
   const locale = countryOptions.locale ?? DEFAULT_LOCALE;
+  const countryCode = getCountryCodeFromCountry(country);
   const systemSettings = await fyo.doc.getSingle('SystemSettings');
+
   systemSettings.setAndSync({
     locale,
     currency,
+    countryCode,
   });
 }
 
@@ -154,8 +157,7 @@ async function createAccountRecords(
 
 async function completeSetup(companyName: string, fyo: Fyo) {
   updateInitializationConfig(companyName, fyo);
-  await fyo.singles.AccountingSettings!.set('setupComplete', true);
-  await fyo.singles.AccountingSettings!.sync();
+  await fyo.singles.AccountingSettings!.setAndSync('setupComplete', true);
 }
 
 function updateInitializationConfig(companyName: string, fyo: Fyo) {
diff --git a/src/setup/types.ts b/src/setup/types.ts
index 2abf8adf..a1407146 100644
--- a/src/setup/types.ts
+++ b/src/setup/types.ts
@@ -1,5 +1,5 @@
 export interface SetupWizardOptions {
-  companyLogo: string;
+  logo: string | null;
   companyName: string;
   country: string;
   fullname: string;
diff --git a/tests/helpers.ts b/tests/helpers.ts
index b03f30fc..4dfcd9de 100644
--- a/tests/helpers.ts
+++ b/tests/helpers.ts
@@ -1,9 +1,10 @@
+import { config } from 'dotenv';
 import { SetupWizardOptions } from 'src/setup/types';
 import { getFiscalYear } from 'utils/misc';
 
 export function getTestSetupWizardOptions(): SetupWizardOptions {
   return {
-    companyLogo: '',
+    logo: null,
     companyName: 'Test Company',
     country: 'India',
     fullname: 'Test Person',
@@ -15,3 +16,8 @@ export function getTestSetupWizardOptions(): SetupWizardOptions {
     chartOfAccounts: 'India - Chart of Accounts',
   };
 }
+
+export function getTestDbPath() {
+  config();
+  return process.env.TEST_DB_PATH ?? ':memory:';
+}
diff --git a/tests/testSetupInstance.spec.ts b/tests/testSetupInstance.spec.ts
index 0a33d635..34a5b679 100644
--- a/tests/testSetupInstance.spec.ts
+++ b/tests/testSetupInstance.spec.ts
@@ -1,25 +1,74 @@
+import * as assert from 'assert';
 import { DatabaseManager } from 'backend/database/manager';
 import { assertDoesNotThrow } from 'backend/database/tests/helpers';
 import { Fyo } from 'fyo';
 import { DummyAuthDemux } from 'fyo/tests/helpers';
 import 'mocha';
 import setupInstance from 'src/setup/setupInstance';
-import { getTestSetupWizardOptions } from './helpers';
+import { SetupWizardOptions } from 'src/setup/types';
+import { getValueMapFromList } from 'utils';
+import { getTestDbPath, getTestSetupWizardOptions } from './helpers';
 
-const DB_PATH = '/Users/alan/Desktop/test.db';
 describe('setupInstance', function () {
-  const fyo = new Fyo({
-    DatabaseDemux: DatabaseManager,
-    AuthDemux: DummyAuthDemux,
-    isTest: true,
-    isElectron: false,
+  const dbPath = getTestDbPath();
+  const setupOptions = getTestSetupWizardOptions();
+
+  let fyo: Fyo;
+
+  this.beforeAll(function () {
+    fyo = new Fyo({
+      DatabaseDemux: DatabaseManager,
+      AuthDemux: DummyAuthDemux,
+      isTest: true,
+      isElectron: false,
+    });
+  });
+
+  this.afterAll(async function () {
+    await fyo.close();
   });
 
-  const setupOptions = getTestSetupWizardOptions();
   specify('setupInstance', async function () {
-    await setupInstance(DB_PATH, setupOptions, fyo);
     await assertDoesNotThrow(async () => {
-      // await setupInstance(':memory:', setupOptions, fyo);
+      await setupInstance(dbPath, setupOptions, fyo);
     }, 'setup instance failed');
   });
+
+  specify('check setup Singles', async function () {
+    const setupFields = [
+      'companyName',
+      'country',
+      'fullname',
+      'email',
+      'bankName',
+      'fiscalYearStart',
+      'fiscalYearEnd',
+      'currency',
+    ];
+
+    const setupSingles = await fyo.db.getSingleValues(...setupFields);
+    const singlesMap = getValueMapFromList(setupSingles, 'fieldname', 'value');
+
+    for (const field of setupFields) {
+      let dbValue = singlesMap[field];
+      const optionsValue = setupOptions[field as keyof SetupWizardOptions];
+
+      if (dbValue instanceof Date) {
+        dbValue = dbValue.toISOString().split('T')[0];
+      }
+
+      assert.strictEqual(dbValue as string, optionsValue, `${field} mismatch`);
+    }
+  });
+
+  specify('check null singles', async function () {
+    const nullFields = ['gstin', 'logo', 'phone', 'address'];
+    const nullSingles = await fyo.db.getSingleValues(...nullFields);
+
+    assert.strictEqual(
+      nullSingles.length,
+      0,
+      `null singles found ${JSON.stringify(nullSingles)}`
+    );
+  });
 });
diff --git a/yarn.lock b/yarn.lock
index 9b85286f..92cb8962 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4680,6 +4680,11 @@ dotenv-expand@^5.1.0:
   resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0"
   integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==
 
+dotenv@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.0.tgz#c619001253be89ebb638d027b609c75c26e47411"
+  integrity sha512-qD9WU0MPM4SWLPJy/r2Be+2WgQj8plChsyrCNQzW/0WjvcJQiKQJ9mH3ZgB3fxbUUxgc/11ZJ0Fi5KiimWGz2Q==
+
 dotenv@^8.2.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"

From b383e426a05201a3947b45222174838cb417edcc Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 25 Apr 2022 14:27:05 +0530
Subject: [PATCH 067/163] fix: update setup wizard

---
 fyo/model/doc.ts                      | 11 ++++++++++-
 schemas/app/SetupWizard.json          | 13 +++++++------
 src/components/TwoColumnForm.vue      | 21 +++++++++++++++++----
 src/pages/SetupWizard/SetupWizard.vue | 11 +++++------
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 7710aa1e..2eaddc6f 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -102,7 +102,16 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   get quickEditFields() {
-    const fieldnames = this.schema.quickEditFields ?? ['name'];
+    let fieldnames = this.schema.quickEditFields;
+
+    if (fieldnames === undefined) {
+      fieldnames = [];
+    }
+
+    if (fieldnames.length === 0 && this.fieldMap['name']) {
+      fieldnames = ['name'];
+    }
+
     return fieldnames.map((f) => this.fieldMap[f]);
   }
 
diff --git a/schemas/app/SetupWizard.json b/schemas/app/SetupWizard.json
index b712b4a7..230c5f7d 100644
--- a/schemas/app/SetupWizard.json
+++ b/schemas/app/SetupWizard.json
@@ -66,17 +66,18 @@
       "placeholder": "Currency",
       "required": true
     },
+    {
+      "fieldname": "chartOfAccounts",
+      "label": "Chart of Accounts",
+      "fieldtype": "AutoComplete",
+      "placeholder": "Select CoA",
+      "required": true
+    },
     {
       "fieldname": "completed",
       "label": "Completed",
       "fieldtype": "Check",
       "readOnly": true
-    },
-    {
-      "fieldname": "chartOfAccounts",
-      "label": "Chart of Accounts",
-      "fieldtype": "AutoComplete",
-      "placeholder": "Select CoA"
     }
   ],
   "quickEditFields": [
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index a723005a..6e6e95ec 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -99,7 +99,7 @@ export default {
   emits: ['error', 'change'],
   props: {
     doc: Doc,
-    fields: Array,
+    fields: { type: Array, default: () => [] },
     autosave: Boolean,
     columnRatio: {
       type: Array,
@@ -137,7 +137,10 @@ export default {
     if (this.focusFirstInput) {
       this.$refs['controls'][0].focus();
     }
-    window.tcf = this;
+
+    if (fyo.store.isDevelopment) {
+      window.tcf = this;
+    }
   },
   methods: {
     getRegularValue(df) {
@@ -248,8 +251,18 @@ export default {
   },
   computed: {
     formFields() {
-      return (this.fields || this.doc.quickEditFields).filter(
-        (field) => !evaluateHidden(field, this.doc)
+      let fieldList = this.fields;
+
+      if (fieldList.length === 0) {
+        fieldList = this.doc.quickEditFields;
+      }
+
+      if (fieldList.length === 0) {
+        fieldList = this.doc.schema.fields.filter((f) => f.required);
+      }
+
+      return fieldList.filter(
+        (field) => field && !evaluateHidden(field, this.doc)
       );
     },
     style() {
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 300b4fe0..e9a367a7 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -57,7 +57,7 @@
                 @change="(value) => setValue('companyName', value)"
                 :input-class="
                   () => [
-                    'bg-transparent font-semibold text-xl text-white placeholder-blue-200 focus:outline-none focus:bg-blue-600 px-3 rounded py-1',
+                    'bg-transparent font-semibold text-xl text-white placeholder-blue-400 focus:outline-none focus:bg-blue-600 px-3 rounded py-1',
                   ]
                 "
                 :autofocus="true"
@@ -68,7 +68,7 @@
                 @change="(value) => setValue('email', value)"
                 :input-class="
                   () => [
-                    'text-base bg-transparent text-white placeholder-blue-200 focus:bg-blue-600 focus:outline-none rounded px-3 py-1',
+                    'text-base bg-transparent text-white placeholder-blue-400 focus:bg-blue-600 focus:outline-none rounded px-3 py-1',
                   ]
                 "
               />
@@ -163,16 +163,15 @@ export default {
     setValue(fieldname, value) {
       this.emailError = null;
       this.doc.set(fieldname, value).catch((e) => {
-        // set error
         if (fieldname === 'email') {
           this.emailError = getErrorMessage(e, this.doc);
         }
       });
     },
     allValuesFilled() {
-      const values = this.doc.schema.quickEditFields.map(
-        (fieldname) => this.doc[fieldname]
-      );
+      const values = this.doc.schema.fields
+        .filter((f) => f.required)
+        .map((f) => this.doc[f.fieldname]);
       return values.every(Boolean);
     },
     async submit() {

From 3f3da5001c2161a9fceb0546b043a5e087a9ea46 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 25 Apr 2022 15:56:01 +0530
Subject: [PATCH 068/163] fix: get sidebar to display

---
 src/App.vue                       |  12 +--
 src/components/FeatherIcon.vue    |   1 -
 src/components/Sidebar.vue        | 136 ++++++++++++------------------
 src/components/WindowControls.vue |  11 ++-
 src/{ => utils}/sidebarConfig.ts  |  86 ++++++++++++++-----
 src/utils/types.ts                |  22 ++++-
 6 files changed, 153 insertions(+), 115 deletions(-)
 rename src/{ => utils}/sidebarConfig.ts (62%)

diff --git a/src/App.vue b/src/App.vue
index 37728e27..90d0df0a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,18 +4,11 @@
     class="h-screen flex flex-col font-sans overflow-hidden antialiased"
   >
     <WindowsTitleBar v-if="platform === 'Windows'" />
-    <!--
     <Desk
       class="flex-1"
       v-if="activeScreen === 'Desk'"
       @change-db-file="changeDbFile"
-    />-->
-    <div
-      v-if="activeScreen === 'Desk'"
-      class="h-screen w-screen flex justify-center items-center bg-white"
-    >
-      <h1>Desk</h1>
-    </div>
+    />
 
     <DatabaseSelector
       v-if="activeScreen === 'DatabaseSelector'"
@@ -48,6 +41,7 @@ import TelemetryModal from './components/once/TelemetryModal.vue';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
 import { fyo, initializeInstance } from './initFyo';
 import DatabaseSelector from './pages/DatabaseSelector.vue';
+import Desk from './pages/Desk.vue';
 import SetupWizard from './pages/SetupWizard/SetupWizard.vue';
 import setupInstance from './setup/setupInstance';
 import './styles/index.css';
@@ -62,7 +56,7 @@ export default {
     };
   },
   components: {
-    // Desk,
+    Desk,
     SetupWizard,
     DatabaseSelector,
     WindowsTitleBar,
diff --git a/src/components/FeatherIcon.vue b/src/components/FeatherIcon.vue
index 93cf1429..866b9589 100644
--- a/src/components/FeatherIcon.vue
+++ b/src/components/FeatherIcon.vue
@@ -8,7 +8,6 @@ export default {
   props: {
     name: {
       type: String,
-      // default: 'middle-finger',
       required: true,
       validator: (value) => validIcons.includes(value),
     },
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 06f6d96b..a98f0007 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -7,7 +7,8 @@
   >
     <div class="window-no-drag">
       <WindowControls v-if="platform === 'Mac'" class="px-3 mb-6" />
-      <div class="px-3 flex flex-row items-center">
+      <!-- Company name and DB Switcher -->
+      <div class="px-3 flex flex-row items-center justify-between mb-6">
         <h6
           class="
             text-xl
@@ -15,6 +16,7 @@
             whitespace-nowrap
             overflow-scroll
             no-scrollbar
+            w-32
           "
         >
           {{ companyName }}
@@ -33,57 +35,61 @@
           @click="$emit('change-db-file')"
         />
       </div>
-      <div class="mt-3">
-        <div class="mt-1 first:mt-0" v-for="group in groups" :key="group.title">
+
+      <!-- Sidebar Items -->
+      <div class="mt-1 first:mt-0" v-for="group in groups" :key="group.label">
+        <div
+          class="
+            px-3
+            py-2
+            flex
+            items-center
+            rounded-lg
+            cursor-pointer
+            hover:bg-white
+          "
+          :class="isActiveGroup(group) && !group.items ? 'bg-white' : ''"
+          @click="onGroupClick(group)"
+        >
+          <Icon
+            :name="group.icon"
+            :size="group.iconSize || '18'"
+            :height="group.iconHeight"
+            :active="isActiveGroup(group)"
+          />
           <div
+            class="ml-2 text-lg text-gray-900"
+            :class="isActiveGroup(group) && !group.items && 'text-blue-500'"
+          >
+            {{ group.label }}
+          </div>
+        </div>
+
+        <!-- Expanded Group -->
+        <div v-if="group.items && isActiveGroup(group)">
+          <div
+            v-for="item in group.items"
+            :key="item.label"
             class="
-              px-3
-              py-2
-              flex
-              items-center
-              rounded-lg
+              mt-1
+              first:mt-0
+              text-base text-gray-800
+              py-1
+              pl-10
+              rounded
               cursor-pointer
               hover:bg-white
             "
-            :class="isActiveGroup(group) && !group.items ? 'bg-white' : ''"
-            @click="onGroupClick(group)"
+            :class="itemActiveClass(item)"
+            @click="onItemClick(item)"
           >
-            <Icon
-              :name="group.icon"
-              :size="group.iconSize || '18'"
-              :height="group.iconHeight"
-              :active="isActiveGroup(group)"
-            />
-            <div
-              class="ml-2 text-lg text-gray-900"
-              :class="isActiveGroup(group) && !group.items && 'text-blue-500'"
-            >
-              {{ group.title }}
-            </div>
-          </div>
-          <div v-if="group.items && isActiveGroup(group)">
-            <div
-              v-for="item in group.items"
-              :key="item.label"
-              class="
-                mt-1
-                first:mt-0
-                text-base text-gray-800
-                py-1
-                pl-10
-                rounded
-                cursor-pointer
-                hover:bg-white
-              "
-              :class="itemActiveClass(item)"
-              @click="onItemClick(item)"
-            >
-              {{ item.label }}
-            </div>
+            {{ item.label }}
           </div>
         </div>
       </div>
     </div>
+
+    <!-- Report Issue and App Version -->
     <div class="px-5 window-no-drag">
       <button
         class="pb-1 text-sm text-gray-600 hover:text-gray-800 w-full text-left"
@@ -97,14 +103,14 @@
 </template>
 <script>
 import path from 'path';
-import Button from 'src/components/Button';
+import Button from 'src/components/Button.vue';
 import { reportIssue } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
-import { routeTo } from 'src/utils';
+import { getSidebarConfig } from 'src/utils/sidebarConfig';
+import { routeTo } from 'src/utils/ui';
 import router from '../router';
-import sidebarConfig from '../sidebarConfig';
 import Icon from './Icon.vue';
-import WindowControls from './WindowControls';
+import WindowControls from './WindowControls.vue';
 
 export default {
   components: [Button],
@@ -130,39 +136,9 @@ export default {
     Icon,
   },
   async mounted() {
-    this.companyName = await sidebarConfig.getTitle();
-    let groups = sidebarConfig.getGroups();
-    groups = groups.filter((group) => {
-      if (
-        group.route === '/get-started' &&
-        fyo.singles.SystemSettings.hideGetStarted
-      ) {
-        return false;
-      }
-      return true;
-    });
-
-    // use the hidden property in the routes config to show/hide the elements
-    // filter doens't work with async function so using reduce
-    for (let group of groups) {
-      if (group.items) {
-        group.items = await group.items.reduce(async (acc, item) => {
-          if (item.hidden) {
-            // async methods can also be used in future
-            const hidden = item.hidden();
-            if (hidden) {
-              return acc;
-            } else {
-              return (await acc).concat(item);
-            }
-          }
-
-          return (await acc).concat(item);
-        }, []);
-      }
-    }
-
-    this.groups = groups;
+    const { companyName } = await fyo.doc.getSingle('AccountingSettings');
+    this.companyName = companyName;
+    this.groups = getSidebarConfig();
 
     this.setActiveGroup();
     router.afterEach(() => {
@@ -206,7 +182,7 @@ export default {
       return routeMatch || doctypeMatch ? 'bg-white text-blue-500' : '';
     },
     isActiveGroup(group) {
-      return this.activeGroup && group.title === this.activeGroup.title;
+      return this.activeGroup && group.label === this.activeGroup.label;
     },
     onGroupClick(group) {
       if (group.action) {
diff --git a/src/components/WindowControls.vue b/src/components/WindowControls.vue
index 41c6a014..55e4bc8e 100644
--- a/src/components/WindowControls.vue
+++ b/src/components/WindowControls.vue
@@ -19,7 +19,8 @@
 </template>
 
 <script>
-import { runWindowAction } from 'src/utils';
+import { runWindowAction } from "src/utils/ipcCalls";
+
 
 export default {
   name: 'WindowControls',
@@ -32,10 +33,12 @@ export default {
   },
   methods: {
     async action(name) {
-      if (this.buttons.includes(name)) {
-        const actionRan = await runWindowAction(name);
-        this.$emit(actionRan);
+      if (!this.buttons.includes(name)) {
+        return;
       }
+
+      const actionRan = await runWindowAction(name);
+      this.$emit(actionRan);
     },
     getColorClasses(name) {
       let classes = {
diff --git a/src/sidebarConfig.ts b/src/utils/sidebarConfig.ts
similarity index 62%
rename from src/sidebarConfig.ts
rename to src/utils/sidebarConfig.ts
index 48ea9a83..15743087 100644
--- a/src/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -1,153 +1,199 @@
 import { t } from 'fyo';
-import { fyo } from './initFyo';
+import { fyo } from '../initFyo';
+import { SidebarConfig } from './types';
 
-const config = {
-  getTitle: async () => {
-    const { companyName } = await fyo.doc.getSingle('AccountingSettings');
-    return companyName;
-  },
-  getGroups: () => [
+export function getSidebarConfig(): SidebarConfig {
+  const sideBar = getCompleteSidebar();
+  return getFilteredSidebar(sideBar);
+}
+
+export function getFilteredSidebar(sideBar: SidebarConfig): SidebarConfig {
+  return sideBar.filter((root) => {
+    root.items = root.items?.filter((item) => {
+      if (item.hidden !== undefined) {
+        return !item.hidden();
+      }
+
+      return true;
+    });
+
+    if (root.hidden !== undefined) {
+      return !root.hidden();
+    }
+
+    return true;
+  });
+}
+
+function getCompleteSidebar(): SidebarConfig {
+  return [
     {
-      title: t`Get Started`,
+      label: t`Get Started`,
+      name: 'get-started',
       route: '/get-started',
       icon: 'general',
       iconSize: '24',
       iconHeight: '5',
+      hidden: () => fyo.singles.SystemSettings!.hideGetStarted as boolean,
     },
     {
-      title: t`Dashboard`,
+      label: t`Dashboard`,
+      name: 'dashboard',
       route: '/',
       icon: 'dashboard',
     },
     {
-      title: t`Sales`,
+      label: t`Sales`,
+      name: 'sales',
       icon: 'sales',
       route: '/list/SalesInvoice',
       items: [
         {
-          label: t`Invoices`,
+          label: t`Sales Invoices`,
+          name: 'sales-invoices',
           route: '/list/SalesInvoice',
           doctype: 'SalesInvoice',
         },
         {
           label: t`Payments`,
+          name: 'payments',
           route: '/list/Payment/paymentType/Receive',
           doctype: 'Payment',
         },
         {
           label: t`Customers`,
+          name: 'customers',
           route: '/list/Customer',
           doctype: 'Customer',
         },
         {
           label: t`Sales Items`,
+          name: 'sales-items',
           route: '/list/Item/for/sales',
           doctype: 'Item',
         },
       ],
     },
     {
-      title: t`Purchases`,
+      label: t`Purchases`,
+      name: 'purchases',
       icon: 'purchase',
       route: '/list/PurchaseInvoice',
       items: [
         {
-          label: t`Bills`,
+          label: t`Purchase Invoices`,
+          name: 'purchase-invoices',
           route: '/list/PurchaseInvoice',
           doctype: 'PurchaseInvoice',
         },
         {
           label: t`Payments`,
+          name: 'payments',
           route: '/list/Payment/paymentType/Pay',
           doctype: 'Payment',
         },
         {
           label: t`Suppliers`,
+          name: 'suppliers',
           route: '/list/Supplier',
           doctype: 'Supplier',
         },
         {
           label: t`Purchase Items`,
+          name: 'purchase-items',
           route: '/list/Item/for/purchases',
           doctype: 'Item',
         },
       ],
     },
     {
+      label: t`Common`,
+      name: 'common-entries',
       icon: 'common-entries',
-      title: t`Common`,
       route: '/list/JournalEntry',
       items: [
         {
           label: t`Journal Entry`,
+          name: 'journal-entry',
           route: '/list/JournalEntry',
           doctype: 'JournalEntry',
         },
         {
           label: t`Common Items`,
+          name: 'common-items',
           route: '/list/Item/for/both',
           doctype: 'Item',
         },
       ],
     },
     {
-      title: t`Reports`,
+      label: t`Reports`,
+      name: t`reports`,
       icon: 'reports',
       route: '/report/general-ledger',
       items: [
         {
           label: t`General Ledger`,
+          name: 'general-ledger',
           route: '/report/general-ledger',
         },
         {
           label: t`Profit And Loss`,
+          name: 'profit-and-loss',
           route: '/report/profit-and-loss',
         },
         {
           label: t`Balance Sheet`,
+          name: 'balance-sheet',
           route: '/report/balance-sheet',
         },
         {
           label: t`Trial Balance`,
+          name: 'trial-balance',
           route: '/report/trial-balance',
         },
         {
           label: t`GSTR1`,
+          name: 'gstr1',
           route: '/report/gstr-1',
           hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
         },
         {
           label: t`GSTR2`,
+          name: 'gstr2',
           route: '/report/gstr-2',
           hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
         },
       ],
     },
     {
-      title: t`Setup`,
+      label: t`Setup`,
+      name: t`setup`,
       icon: 'settings',
       route: '/chart-of-accounts',
       items: [
         {
           label: t`Chart of Accounts`,
+          name: 'chart-of-accounts',
           route: '/chart-of-accounts',
         },
         {
           label: t`Taxes`,
+          name: 'taxes',
           route: '/list/Tax',
           doctype: 'Tax',
         },
         {
           label: t`Data Import`,
+          name: 'data-import',
           route: '/data_import',
         },
         {
           label: t`Settings`,
+          name: 'settings',
           route: '/settings',
         },
       ],
     },
-  ],
-};
-
-export default config;
+  ];
+}
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 07777196..ba77da68 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -26,4 +26,24 @@ export interface QuickEditOptions {
   hideFields?: string[];
   showFields?: string[];
   defaults?: Record<string, unknown>;
-}
\ No newline at end of file
+}
+
+export type SidebarConfig = SidebarRoot[];
+export interface SidebarRoot {
+  label: string;
+  name: string;
+  route: string;
+  icon: string;
+  iconSize?: string;
+  iconHeight?: string;
+  hidden?: () => boolean;
+  items?: SidebarItem[];
+}
+
+export interface SidebarItem {
+  label: string;
+  name: string;
+  route: string;
+  doctype?: string;
+  hidden?: () => boolean;
+}

From 9fbf4fa23cfbfc65b9167fbcad948a8786ae1dfc Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 25 Apr 2022 16:07:25 +0530
Subject: [PATCH 069/163] fix: get GetStarted to display

---
 src/pages/GetStarted.vue      | 184 ++++------------------------------
 src/router.ts                 |   4 +-
 src/utils/getStartedConfig.ts | 144 ++++++++++++++++++++++++++
 3 files changed, 166 insertions(+), 166 deletions(-)
 create mode 100644 src/utils/getStartedConfig.ts

diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index 1ae85b2a..b44c8571 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -85,12 +85,11 @@
 
 <script>
 import { ipcRenderer } from 'electron';
-import { t } from 'fyo';
 import Button from 'src/components/Button';
 import Icon from 'src/components/Icon';
 import PageHeader from 'src/components/PageHeader';
 import { fyo } from 'src/initFyo';
-import { openSettings, routeTo } from 'src/utils';
+import { getGetStartedConfig } from 'src/utils/getStartedConfig';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h } from 'vue';
 
@@ -101,159 +100,17 @@ export default {
     Button,
     Icon,
   },
-  computed: {
-    sections() {
-      /* eslint-disable vue/no-side-effects-in-computed-properties */
-      return [
-        {
-          label: t`Organisation`,
-
-          items: [
-            {
-              key: 'Invoice',
-              label: t`Invoice`,
-              icon: 'invoice',
-              description: t`Customize your invoices by adding a logo and address details`,
-              fieldname: 'invoiceSetup',
-              action() {
-                openSettings('Invoice');
-              },
-            },
-            {
-              key: 'General',
-              label: t`General`,
-              icon: 'general',
-              description: t`Setup your company information, email, country and fiscal year`,
-              fieldname: 'companySetup',
-              action() {
-                openSettings('General');
-              },
-            },
-            {
-              key: 'System',
-              label: t`System`,
-              icon: 'system',
-              description: t`Setup system defaults like date format and display precision`,
-              fieldname: 'systemSetup',
-              action() {
-                openSettings('System');
-              },
-            },
-          ],
-        },
-        {
-          label: t`Accounts`,
-
-          items: [
-            {
-              key: 'Review Accounts',
-              label: t`Review Accounts`,
-              icon: 'review-ac',
-              description: t`Review your chart of accounts, add any account or tax heads as needed`,
-              action: () => {
-                routeTo('/chart-of-accounts');
-              },
-              fieldname: 'chartOfAccountsReviewed',
-              documentation:
-                'https://frappebooks.com/docs/setting-up#1-enter-bank-accounts',
-            },
-            {
-              key: 'Opening Balances',
-              label: t`Opening Balances`,
-              icon: 'opening-ac',
-              fieldname: 'openingBalanceChecked',
-              description: t`Setup your opening balances before performing any accounting entries`,
-              documentation:
-                'https://frappebooks.com/docs/setting-up#5-setup-opening-balances',
-            },
-            {
-              key: 'Add Taxes',
-              label: t`Add Taxes`,
-              icon: 'percentage',
-              fieldname: 'taxesAdded',
-              description: t`Setup your tax templates for your sales or purchase transactions`,
-              action: () => routeTo('/list/Tax'),
-              documentation:
-                'https://frappebooks.com/docs/setting-up#2-add-taxes',
-            },
-          ],
-        },
-        {
-          label: t`Sales`,
-
-          items: [
-            {
-              key: 'Add Sales Items',
-              label: t`Add Items`,
-              icon: 'item',
-              description: t`Add products or services that you sell to your customers`,
-              action: () => routeTo('/list/Item'),
-              fieldname: 'itemCreated',
-              documentation:
-                'https://frappebooks.com/docs/setting-up#3-add-items',
-            },
-            {
-              key: 'Add Customers',
-              label: t`Add Customers`,
-              icon: 'customer',
-              description: t`Add a few customers to create your first invoice`,
-              action: () => routeTo('/list/Customer'),
-              fieldname: 'customerCreated',
-              documentation:
-                'https://frappebooks.com/docs/setting-up#4-add-customers',
-            },
-            {
-              key: 'Create Invoice',
-              label: t`Create Invoice`,
-              icon: 'sales-invoice',
-              description: t`Create your first invoice and mail it to your customer`,
-              action: () => routeTo('/list/SalesInvoice'),
-              fieldname: 'invoiceCreated',
-              documentation: 'https://frappebooks.com/docs/invoices',
-            },
-          ],
-        },
-        {
-          label: t`Purchase`,
-
-          items: [
-            {
-              key: 'Add Purchase Items',
-              label: t`Add Items`,
-              icon: 'item',
-              description: t`Add products or services that you buy from your suppliers`,
-              action: () => routeTo('/list/Item'),
-              fieldname: 'itemCreated',
-            },
-            {
-              key: 'Add Suppliers',
-              label: t`Add Suppliers`,
-              icon: 'supplier',
-              description: t`Add a few suppliers to create your first bill`,
-              action: () => routeTo('/list/Supplier'),
-              fieldname: 'supplierCreated',
-            },
-            {
-              key: 'Create Bill',
-              label: t`Create Bill`,
-              icon: 'purchase-invoice',
-              description: t`Create your first bill and mail it to your supplier`,
-              action: () => routeTo('/list/PurchaseInvoice'),
-              fieldname: 'billCreated',
-              documentation: 'https://frappebooks.com/docs/bills',
-            },
-          ],
-        },
-      ];
-    },
-  },
   data() {
     return {
       activeCard: null,
+      sections: [],
     };
   },
+  mounted() {
+    this.sections = getGetStartedConfig();
+  },
   async activated() {
-    fyo.GetStarted = await fyo.getSingle('GetStarted');
+    await fyo.doc.getSingle('GetStarted');
     this.checkForCompletedTasks();
   },
   methods: {
@@ -293,20 +150,19 @@ export default {
       }
     },
     async checkIsOnboardingComplete() {
-      if (fyo.GetStarted.onboardingComplete) {
+      if (fyo.singles.GetStarted.onboardingComplete) {
         return true;
       }
 
-      const meta = await fyo.getMeta('GetStarted');
-      const doc = await fyo.getSingle('GetStarted');
-      const onboardingComplete = !!meta.fields
+      const doc = await fyo.doc.getSingle('GetStarted');
+      const onboardingComplete = fyo.schemaMap.GetStarted.fields
         .filter(({ fieldname }) => fieldname !== 'onboardingComplete')
         .map(({ fieldname }) => doc.get(fieldname))
         .every(Boolean);
 
       if (onboardingComplete) {
         await this.updateChecks({ onboardingComplete });
-        const systemSettings = await fyo.getSingle('SystemSettings');
+        const systemSettings = await fyo.doc.getSingle('SystemSettings');
         await systemSettings.set({ hideGetStarted: 1 });
         await systemSettings.sync();
       }
@@ -319,21 +175,21 @@ export default {
         return;
       }
 
-      if (!fyo.GetStarted.itemCreated) {
+      if (!fyo.singles.GetStarted.itemCreated) {
         const count = await fyo.db.count('Item');
         if (count > 0) {
           toUpdate.itemCreated = 1;
         }
       }
 
-      if (!fyo.GetStarted.invoiceCreated) {
+      if (!fyo.singles.GetStarted.invoiceCreated) {
         const count = await fyo.db.count('SalesInvoice');
         if (count > 0) {
           toUpdate.invoiceCreated = 1;
         }
       }
 
-      if (!fyo.GetStarted.customerCreated) {
+      if (!fyo.singles.GetStarted.customerCreated) {
         const count = fyo.db.count('Party', {
           filters: { role: 'Customer' },
         });
@@ -342,14 +198,14 @@ export default {
         }
       }
 
-      if (!fyo.GetStarted.billCreated) {
+      if (!fyo.singles.GetStarted.billCreated) {
         const count = await fyo.db.count('SalesInvoice');
         if (count > 0) {
           toUpdate.billCreated = 1;
         }
       }
 
-      if (!fyo.GetStarted.supplierCreated) {
+      if (!fyo.singles.GetStarted.supplierCreated) {
         const count = fyo.db.count('Party', {
           filters: { role: 'Supplier' },
         });
@@ -360,15 +216,15 @@ export default {
       await this.updateChecks(toUpdate);
     },
     async updateChecks(toUpdate) {
-      await fyo.GetStarted.setMultiple(toUpdate);
-      await fyo.GetStarted.sync();
-      fyo.GetStarted = await fyo.getSingle('GetStarted');
+      await fyo.singles.GetStarted.setMultiple(toUpdate);
+      await fyo.singles.GetStarted.sync();
+      fyo.singles.GetStarted = await fyo.doc.getSingle('GetStarted');
     },
     isCompleted(item) {
-      return fyo.GetStarted.get(item.fieldname) || 0;
+      return fyo.singles.GetStarted.get(item.fieldname) || 0;
     },
     getIconComponent(item) {
-      let completed = fyo.GetStarted[item.fieldname] || 0;
+      let completed = fyo.singles.GetStarted[item.fieldname] || 0;
       let name = completed ? 'green-check' : item.icon;
       let size = completed ? '24' : '18';
       return {
diff --git a/src/router.ts b/src/router.ts
index d2e0ee99..36668239 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,6 +1,6 @@
 import { NounEnum, Verb } from 'fyo/telemetry/types';
 import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
-// import GetStarted from 'src/pages/GetStarted.vue';
+import GetStarted from 'src/pages/GetStarted.vue';
 // import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 // import DataImport from 'src/pages/DataImport.vue';
 // import InvoiceForm from 'src/pages/InvoiceForm.vue';
@@ -18,11 +18,11 @@ const routes: RouteRecordRaw[] = [
     path: '/',
     component: Dashboard,
   },
-  /*
   {
     path: '/get-started',
     component: GetStarted,
   },
+  /*
   {
     path: '/edit/JournalEntry/:name',
     name: 'JournalEntryForm',
diff --git a/src/utils/getStartedConfig.ts b/src/utils/getStartedConfig.ts
new file mode 100644
index 00000000..6f195c62
--- /dev/null
+++ b/src/utils/getStartedConfig.ts
@@ -0,0 +1,144 @@
+import { t } from 'fyo';
+import { openSettings, routeTo } from './ui';
+
+export function getGetStartedConfig() {
+  return [
+    {
+      label: t`Organisation`,
+
+      items: [
+        {
+          key: 'Invoice',
+          label: t`Invoice`,
+          icon: 'invoice',
+          description: t`Customize your invoices by adding a logo and address details`,
+          fieldname: 'invoiceSetup',
+          action() {
+            openSettings('Invoice');
+          },
+        },
+        {
+          key: 'General',
+          label: t`General`,
+          icon: 'general',
+          description: t`Setup your company information, email, country and fiscal year`,
+          fieldname: 'companySetup',
+          action() {
+            openSettings('General');
+          },
+        },
+        {
+          key: 'System',
+          label: t`System`,
+          icon: 'system',
+          description: t`Setup system defaults like date format and display precision`,
+          fieldname: 'systemSetup',
+          action() {
+            openSettings('System');
+          },
+        },
+      ],
+    },
+    {
+      label: t`Accounts`,
+
+      items: [
+        {
+          key: 'Review Accounts',
+          label: t`Review Accounts`,
+          icon: 'review-ac',
+          description: t`Review your chart of accounts, add any account or tax heads as needed`,
+          action: () => {
+            routeTo('/chart-of-accounts');
+          },
+          fieldname: 'chartOfAccountsReviewed',
+          documentation:
+            'https://frappebooks.com/docs/setting-up#1-enter-bank-accounts',
+        },
+        {
+          key: 'Opening Balances',
+          label: t`Opening Balances`,
+          icon: 'opening-ac',
+          fieldname: 'openingBalanceChecked',
+          description: t`Setup your opening balances before performing any accounting entries`,
+          documentation:
+            'https://frappebooks.com/docs/setting-up#5-setup-opening-balances',
+        },
+        {
+          key: 'Add Taxes',
+          label: t`Add Taxes`,
+          icon: 'percentage',
+          fieldname: 'taxesAdded',
+          description: t`Setup your tax templates for your sales or purchase transactions`,
+          action: () => routeTo('/list/Tax'),
+          documentation: 'https://frappebooks.com/docs/setting-up#2-add-taxes',
+        },
+      ],
+    },
+    {
+      label: t`Sales`,
+
+      items: [
+        {
+          key: 'Add Sales Items',
+          label: t`Add Items`,
+          icon: 'item',
+          description: t`Add products or services that you sell to your customers`,
+          action: () => routeTo('/list/Item'),
+          fieldname: 'itemCreated',
+          documentation: 'https://frappebooks.com/docs/setting-up#3-add-items',
+        },
+        {
+          key: 'Add Customers',
+          label: t`Add Customers`,
+          icon: 'customer',
+          description: t`Add a few customers to create your first invoice`,
+          action: () => routeTo('/list/Customer'),
+          fieldname: 'customerCreated',
+          documentation:
+            'https://frappebooks.com/docs/setting-up#4-add-customers',
+        },
+        {
+          key: 'Create Invoice',
+          label: t`Create Invoice`,
+          icon: 'sales-invoice',
+          description: t`Create your first invoice and mail it to your customer`,
+          action: () => routeTo('/list/SalesInvoice'),
+          fieldname: 'invoiceCreated',
+          documentation: 'https://frappebooks.com/docs/invoices',
+        },
+      ],
+    },
+    {
+      label: t`Purchase`,
+
+      items: [
+        {
+          key: 'Add Purchase Items',
+          label: t`Add Items`,
+          icon: 'item',
+          description: t`Add products or services that you buy from your suppliers`,
+          action: () => routeTo('/list/Item'),
+          fieldname: 'itemCreated',
+        },
+        {
+          key: 'Add Suppliers',
+          label: t`Add Suppliers`,
+          icon: 'supplier',
+          description: t`Add a few suppliers to create your first bill`,
+          action: () => routeTo('/list/Supplier'),
+          fieldname: 'supplierCreated',
+        },
+        {
+          key: 'Create Bill',
+          label: t`Create Bill`,
+          icon: 'purchase-invoice',
+          description: t`Create your first bill and mail it to your supplier`,
+          action: () => routeTo('/list/PurchaseInvoice'),
+          fieldname: 'billCreated',
+          documentation: 'https://frappebooks.com/docs/bills',
+        },
+      ],
+    },
+  ];
+}

From 024687c1b917c0475a587662d944dbd1b6e09e38 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 26 Apr 2022 15:42:33 +0530
Subject: [PATCH 070/163] fix: get Invoice settings to render and work - remove
 "computed" - fix a few formcontrols - simplify doc.ts a bit more

---
 backend/database/core.ts                      |   4 +-
 backend/database/tests/helpers.ts             |   2 -
 fyo/model/doc.ts                              |  46 ++++----
 fyo/model/types.ts                            |   5 +-
 models/baseModels/Account/Account.ts          |   2 +-
 models/baseModels/Address/Address.ts          |  26 ++++-
 models/baseModels/Invoice/Invoice.ts          |   7 +-
 models/baseModels/Item/Item.ts                |   4 +-
 .../baseModels/JournalEntry/JournalEntry.ts   |   6 +-
 models/baseModels/Party/Party.ts              |   8 +-
 models/helpers.ts                             |   2 +-
 models/regionalModels/in/Party.ts             |   2 +-
 schemas/app/PurchaseInvoice.json              |   4 -
 schemas/app/PurchaseInvoiceItem.json          |   3 -
 schemas/app/SalesInvoice.json                 |   5 -
 schemas/app/SalesInvoiceItem.json             |   3 -
 schemas/index.ts                              |  16 +++
 schemas/tests/testSchemaBuilder.spec.ts       |  13 ++-
 schemas/types.ts                              |   3 +-
 src/App.vue                                   |   3 +-
 src/components/Controls/AutoComplete.vue      |   2 +-
 src/components/Controls/Check.vue             |   4 +-
 src/components/Controls/Color.vue             |   4 +-
 src/components/Controls/Currency.vue          |   2 +-
 src/components/Controls/DynamicLink.vue       |   5 +-
 src/components/Controls/Float.vue             |   4 +-
 src/components/Controls/FormControl.vue       |  39 ++++---
 src/components/Controls/Int.vue               |   4 +-
 src/components/Controls/Link.vue              | 106 +++++++++---------
 src/components/Controls/Table.vue             |  10 +-
 src/components/Controls/TableRow.vue          |   7 +-
 src/components/Controls/Text.vue              |   2 +-
 src/components/Dropdown.vue                   |  20 +++-
 src/components/StatusBadge.vue                |   3 -
 src/components/TwoColumnForm.vue              |  62 +++++-----
 src/errorHandling.ts                          |  24 +---
 src/pages/ListView/ListView.vue               |   2 +-
 src/pages/QuickEditForm.vue                   |   6 +-
 src/pages/Settings/Settings.vue               |  17 +--
 src/pages/Settings/TabInvoice.vue             |  10 +-
 src/pages/SetupWizard/SetupWizard.vue         |   2 +-
 src/router.ts                                 |   4 +-
 src/utils/doc.ts                              |   3 +-
 src/utils/index.ts                            |  18 +++
 src/utils/ui.ts                               |   7 +-
 tsconfig.json                                 |   4 +-
 46 files changed, 281 insertions(+), 254 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 9e5f8e94..ae889b39 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -75,7 +75,7 @@ export default class DatabaseCore extends DatabaseBase {
     const db = new DatabaseCore(dbPath);
     db.connect();
 
-    let query: { countryCode: string }[] = [];
+    let query: { value: string }[] = [];
     try {
       query = await db.knex!('SingleValue').where({
         fieldname: 'countryCode',
@@ -86,7 +86,7 @@ export default class DatabaseCore extends DatabaseBase {
     }
 
     if (query.length > 0) {
-      countryCode = query[0].countryCode as string;
+      countryCode = query[0].value as string;
     }
 
     await db.close();
diff --git a/backend/database/tests/helpers.ts b/backend/database/tests/helpers.ts
index c6b48658..cdf4e634 100644
--- a/backend/database/tests/helpers.ts
+++ b/backend/database/tests/helpers.ts
@@ -57,7 +57,6 @@ const SalesInvoiceItem = {
       fieldname: 'amount',
       label: 'Amount',
       fieldtype: 'Float',
-      computed: true,
       readOnly: true,
     },
   ],
@@ -108,7 +107,6 @@ const SalesInvoice = {
       fieldname: 'grandTotal',
       label: 'Grand Total',
       fieldtype: 'Currency',
-      computed: true,
       readOnly: true,
     },
   ],
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 2eaddc6f..aca8f76d 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -18,6 +18,7 @@ import {
   TargetField,
 } from 'schemas/types';
 import { getIsNullOrUndef, getMapFromList, getRandomString } from 'utils';
+import { markRaw } from 'vue';
 import { isPesa } from '../utils/index';
 import {
   areDocValuesEqual,
@@ -71,7 +72,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
   constructor(schema: Schema, data: DocValueMap, fyo: Fyo) {
     super();
-    this.fyo = fyo;
+    this.fyo = markRaw(fyo);
     this.schema = schema;
     this.fieldMap = getMapFromList(schema.fields, 'fieldname');
 
@@ -87,7 +88,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return this.schema.name;
   }
 
-  get isNew(): boolean {
+  get notInserted(): boolean {
     return this._notInserted;
   }
 
@@ -176,7 +177,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   _canSet(fieldname: string, value?: DocValue | Doc[]): boolean {
-    if (fieldname === 'numberSeries' && !this._notInserted) {
+    if (fieldname === 'numberSeries' && !this.notInserted) {
       return false;
     }
 
@@ -378,11 +379,13 @@ export class Doc extends Observable<DocValue | Doc[]> {
     }
 
     if (data && data.name) {
-      this.syncValues(data);
+      this._syncValues(data);
       await this.loadLinks();
     } else {
       throw new NotFoundError(`Not Found: ${this.schemaName} ${this.name}`);
     }
+
+    this._notInserted = false;
   }
 
   async loadLinks() {
@@ -420,8 +423,8 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return link;
   }
 
-  syncValues(data: DocValueMap) {
-    this.clearValues();
+  _syncValues(data: DocValueMap) {
+    this._clearValues();
     this._setValuesWithoutChecks(data);
     this._dirty = false;
     this.trigger('change', {
@@ -429,7 +432,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     });
   }
 
-  clearValues() {
+  _clearValues() {
     for (const { fieldname } of this.schema.fields) {
       this[fieldname] = null;
     }
@@ -453,19 +456,19 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async _compareWithCurrentDoc() {
-    if (this.isNew || !this.name || this.schema.isSingle) {
+    if (this.notInserted || !this.name || this.schema.isSingle) {
       return;
     }
 
     const dbValues = await this.fyo.db.get(this.schemaName, this.name);
-    const docModified = this.modified as Date;
-    const dbModified = dbValues.modified as Date;
+    const docModified = (this.modified as Date)?.toISOString();
+    const dbModified = (dbValues.modified as Date)?.toISOString();
 
     if (dbValues && docModified !== dbModified) {
       throw new ConflictError(
         this.fyo
           .t`Document ${this.schemaName} ${this.name} has been modified after loading` +
-          `${docModified?.toISOString()}, ${dbModified?.toISOString()}`
+          ` ${dbModified}, ${docModified}`
       );
     }
 
@@ -575,20 +578,15 @@ export class Doc extends Observable<DocValue | Doc[]> {
     this._setBaseMetaValues();
     await this._commit();
     await this._validateInsert();
-    await this.trigger('beforeInsert', null);
 
     const oldName = this.name!;
     const validDict = this.getValidDict();
     const data = await this.fyo.db.insert(this.schemaName, validDict);
-    this.syncValues(data);
-    this._notInserted = false;
+    this._syncValues(data);
 
     if (oldName !== this.name) {
       this.fyo.doc.removeFromCache(this.schemaName, oldName);
     }
-
-    await this.trigger('afterInsert', null);
-
     this.fyo.telemetry.log(Verb.Created, this.schemaName);
     return this;
   }
@@ -596,7 +594,6 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async _update() {
     await this._compareWithCurrentDoc();
     await this._commit();
-    await this.trigger('beforeUpdate');
 
     // before submit
     if (this.flags.submitAction) await this.trigger('beforeSubmit');
@@ -607,9 +604,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
     const data = this.getValidDict();
     await this.fyo.db.update(this.schemaName, data);
-    this.syncValues(data);
-
-    await this.trigger('afterUpdate');
+    this._syncValues(data);
 
     // after submit
     if (this.flags.submitAction) await this.trigger('afterSubmit');
@@ -621,11 +616,12 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async sync() {
     await this.trigger('beforeSync');
     let doc;
-    if (this._notInserted) {
+    if (this.notInserted) {
       doc = await this._insert();
     } else {
       doc = await this._update();
     }
+    this._notInserted = false;
     await this.trigger('afterSync');
     return doc;
   }
@@ -748,14 +744,12 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return doc;
   }
 
-  async beforeInsert() {}
-  async afterInsert() {}
-  async beforeUpdate() {}
-  async afterUpdate() {}
   async beforeSync() {}
   async afterSync() {}
   async beforeDelete() {}
   async afterDelete() {}
+  async beforeSubmit() {}
+  async afterSubmit() {}
   async beforeRevert() {}
   async afterRevert() {}
 
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index 4e7b6bc4..89d92f49 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -1,4 +1,3 @@
-import { Fyo } from 'fyo';
 import { DocValue, DocValueMap } from 'fyo/core/types';
 import SystemSettings from 'fyo/models/SystemSettings';
 import { FieldType } from 'schemas/types';
@@ -50,10 +49,10 @@ export interface SinglesMap {
 
 // Static Config properties
 
-export type FilterFunction = (doc: Doc) => QueryFilter;
+export type FilterFunction = (doc: Doc) => QueryFilter | Promise<QueryFilter>;
 export type FiltersMap = Record<string, FilterFunction>;
 
-export type EmptyMessageFunction = (doc: Doc, fyo: Fyo) => string;
+export type EmptyMessageFunction = (doc: Doc) => string;
 export type EmptyMessageMap = Record<string, EmptyMessageFunction>;
 
 export type ListFunction = (doc?: Doc) => string[];
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index 30709c12..74b57680 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -24,7 +24,7 @@ export class Account extends Doc {
     rgt: () => 0,
   };
 
-  async beforeInsert() {
+  async beforeSync() {
     if (this.accountType || !this.parentAccount) {
       return;
     }
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
index a0f04804..3084ca69 100644
--- a/models/baseModels/Address/Address.ts
+++ b/models/baseModels/Address/Address.ts
@@ -1,6 +1,11 @@
-import { Fyo } from 'fyo';
+import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
-import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types';
+import {
+  DependsOnMap,
+  EmptyMessageMap,
+  FormulaMap,
+  ListsMap,
+} from 'fyo/model/types';
 import { stateCodeMap } from 'regional/in';
 import { titleCase } from 'utils';
 import { getCountryInfo } from 'utils/misc';
@@ -21,6 +26,17 @@ export class Address extends Doc {
     },
   };
 
+  dependsOn: DependsOnMap = {
+    addressDisplay: [
+      'addressLine1',
+      'addressLine2',
+      'city',
+      'state',
+      'country',
+      'postalCode',
+    ],
+  };
+
   static lists: ListsMap = {
     state(doc?: Doc) {
       const country = doc?.country as string | undefined;
@@ -37,12 +53,12 @@ export class Address extends Doc {
   };
 
   static emptyMessages: EmptyMessageMap = {
-    state: (doc: Doc, fyo: Fyo) => {
+    state: (doc: Doc) => {
       if (doc.country) {
-        return fyo.t`Enter State`;
+        return t`Enter State`;
       }
 
-      return fyo.t`Enter Country to load States`;
+      return t`Enter Country to load States`;
     },
   };
 }
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index b3f08c4e..2d336c61 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -43,12 +43,7 @@ export abstract class Invoice extends Doc {
     return [];
   }
 
-  async beforeUpdate() {
-    const entries = await this.getPosting();
-    await entries.validateEntries();
-  }
-
-  async beforeInsert() {
+  async beforeSync() {
     const entries = await this.getPosting();
     await entries.validateEntries();
   }
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 6b984bfa..06ae828a 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -66,7 +66,7 @@ export class Item extends Doc {
     return [
       {
         label: fyo.t`New Invoice`,
-        condition: (doc) => !doc.isNew,
+        condition: (doc) => !doc.notInserted,
         action: async (doc, router) => {
           const invoice = await fyo.doc.getNewDoc('SalesInvoice');
           await invoice.append('items', {
@@ -79,7 +79,7 @@ export class Item extends Doc {
       },
       {
         label: fyo.t`New Bill`,
-        condition: (doc) => !doc.isNew,
+        condition: (doc) => !doc.notInserted,
         action: async (doc, router) => {
           const invoice = await fyo.doc.getNewDoc('PurchaseInvoice');
           await invoice.append('items', {
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index a2b9cca9..4e89617f 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -32,11 +32,7 @@ export class JournalEntry extends Doc {
     return entries;
   }
 
-  async beforeUpdate() {
-    this.getPosting().validateEntries();
-  }
-
-  async beforeInsert() {
+  async beforeSync() {
     this.getPosting().validateEntries();
   }
 
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 2509b39c..308eb9a5 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -109,7 +109,7 @@ export class Party extends Doc {
       {
         label: fyo.t`Create Bill`,
         condition: (doc: Doc) =>
-          !doc.isNew && (doc.role as PartyRole) !== 'Customer',
+          !doc.notInserted && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
           const doc = await fyo.doc.getNewDoc('PurchaseInvoice');
           router.push({
@@ -127,7 +127,7 @@ export class Party extends Doc {
       {
         label: fyo.t`View Bills`,
         condition: (doc: Doc) =>
-          !doc.isNew && (doc.role as PartyRole) !== 'Customer',
+          !doc.notInserted && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
           router.push({
             name: 'ListView',
@@ -144,7 +144,7 @@ export class Party extends Doc {
       {
         label: fyo.t`Create Invoice`,
         condition: (doc: Doc) =>
-          !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
+          !doc.notInserted && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
           const doc = await fyo.doc.getNewDoc('SalesInvoice');
           router.push({
@@ -162,7 +162,7 @@ export class Party extends Doc {
       {
         label: fyo.t`View Invoices`,
         condition: (doc: Doc) =>
-          !doc.isNew && (doc.role as PartyRole) !== 'Supplier',
+          !doc.notInserted && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
           router.push({
             name: 'ListView',
diff --git a/models/helpers.ts b/models/helpers.ts
index b258be73..f154803b 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -35,7 +35,7 @@ export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
         (doc.submitted as boolean) && (doc.outstandingAmount as Money).gt(0),
       action: async function makePayment(doc: Doc) {
         const payment = await fyo.doc.getNewDoc('Payment');
-        payment.once('afterInsert', async () => {
+        payment.once('afterSync', async () => {
           await payment.submit();
         });
         const isSales = schemaName === 'SalesInvoice';
diff --git a/models/regionalModels/in/Party.ts b/models/regionalModels/in/Party.ts
index c35d6f0c..58012228 100644
--- a/models/regionalModels/in/Party.ts
+++ b/models/regionalModels/in/Party.ts
@@ -3,7 +3,7 @@ import { Party as BaseParty } from 'models/baseModels/Party/Party';
 import { GSTType } from './types';
 
 export class Party extends BaseParty {
-  async beforeInsert() {
+  async beforeSync() {
     const gstin = this.get('gstin') as string | undefined;
     const gstType = this.get('gstType') as GSTType;
 
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 1c2e4138..72fc530b 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -55,14 +55,12 @@
       "fieldname": "netTotal",
       "label": "Net Total",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseNetTotal",
       "label": "Net Total (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
@@ -76,14 +74,12 @@
       "fieldname": "grandTotal",
       "label": "Grand Total",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseGrandTotal",
       "label": "Grand Total (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
diff --git a/schemas/app/PurchaseInvoiceItem.json b/schemas/app/PurchaseInvoiceItem.json
index c85213da..ff0b6283 100644
--- a/schemas/app/PurchaseInvoiceItem.json
+++ b/schemas/app/PurchaseInvoiceItem.json
@@ -33,7 +33,6 @@
       "fieldname": "baseRate",
       "label": "Rate (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
@@ -54,14 +53,12 @@
       "fieldname": "amount",
       "label": "Amount",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseAmount",
       "label": "Amount (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 521a8e68..da0d778d 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -55,14 +55,12 @@
       "fieldname": "netTotal",
       "label": "Net Total",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseNetTotal",
       "label": "Net Total (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
@@ -76,21 +74,18 @@
       "fieldname": "grandTotal",
       "label": "Grand Total",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseGrandTotal",
       "label": "Grand Total (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "outstandingAmount",
       "label": "Outstanding Amount",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
diff --git a/schemas/app/SalesInvoiceItem.json b/schemas/app/SalesInvoiceItem.json
index 805d25b8..31598e87 100644
--- a/schemas/app/SalesInvoiceItem.json
+++ b/schemas/app/SalesInvoiceItem.json
@@ -33,7 +33,6 @@
       "fieldname": "baseRate",
       "label": "Rate (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
@@ -55,14 +54,12 @@
       "fieldname": "amount",
       "label": "Amount",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
       "fieldname": "baseAmount",
       "label": "Amount (Company Currency)",
       "fieldtype": "Currency",
-      "computed": true,
       "readOnly": true
     },
     {
diff --git a/schemas/index.ts b/schemas/index.ts
index 2f58a0db..4cb50ec2 100644
--- a/schemas/index.ts
+++ b/schemas/index.ts
@@ -19,11 +19,20 @@ export function getSchemas(countryCode: string = '-'): Readonly<SchemaMap> {
   let schemaMap = Object.assign({}, builtAppSchemas, builtCoreSchemas);
   schemaMap = addMetaFields(schemaMap);
   schemaMap = removeFields(schemaMap);
+  schemaMap = setSchemaNameOnFields(schemaMap);
 
   deepFreeze(schemaMap);
   return schemaMap;
 }
 
+export function setSchemaNameOnFields(schemaMap: SchemaMap): SchemaMap {
+  for (const schemaName in schemaMap) {
+    const schema = schemaMap[schemaName]!;
+    schema.fields = schema.fields.map((f) => ({ ...f, schemaName }));
+  }
+  return schemaMap;
+}
+
 function removeFields(schemaMap: SchemaMap): SchemaMap {
   for (const schemaName in schemaMap) {
     const schema = schemaMap[schemaName]!;
@@ -96,9 +105,16 @@ export function addMetaFields(schemaMap: SchemaMap): SchemaMap {
   }
 
   addNameField(schemaMap);
+  addTitleField(schemaMap);
   return schemaMap;
 }
 
+function addTitleField(schemaMap: SchemaMap) {
+  for (const schemaName in schemaMap) {
+    schemaMap[schemaName]!.titleField ??= 'name';
+  }
+}
+
 function addNameField(schemaMap: SchemaMap) {
   for (const name in schemaMap) {
     const schema = schemaMap[name] as Schema;
diff --git a/schemas/tests/testSchemaBuilder.spec.ts b/schemas/tests/testSchemaBuilder.spec.ts
index bb7dc403..31cac186 100644
--- a/schemas/tests/testSchemaBuilder.spec.ts
+++ b/schemas/tests/testSchemaBuilder.spec.ts
@@ -7,6 +7,7 @@ import {
   cleanSchemas,
   getAbstractCombinedSchemas,
   getRegionalCombinedSchemas,
+  setSchemaNameOnFields,
 } from '../index';
 import { metaSchemas } from '../schemas';
 import {
@@ -134,7 +135,9 @@ describe('Schema Builder', function () {
     });
   });
 
-  const finalSchemas = addMetaFields(cloneDeep(abstractCombined));
+  let almostFinalSchemas = cloneDeep(abstractCombined);
+  almostFinalSchemas = addMetaFields(almostFinalSchemas);
+  const finalSchemas = setSchemaNameOnFields(almostFinalSchemas);
   const metaSchemaMap = getMapFromList(metaSchemas, 'name');
   const baseFieldNames = metaSchemaMap.base.fields!.map((f) => f.fieldname);
   const childFieldNames = metaSchemaMap.child.fields!.map((f) => f.fieldname);
@@ -150,6 +153,14 @@ describe('Schema Builder', function () {
   ];
 
   describe('Final Schemas', function () {
+    specify('Schema Name Existsance', function () {
+      for (const schemaName in finalSchemas) {
+        for (const field of finalSchemas[schemaName]?.fields!) {
+          assert.strictEqual(field.schemaName, schemaName);
+        }
+      }
+    });
+
     specify('Schema Field Existance', function () {
       assert.strictEqual(
         everyFieldExists(baseFieldNames, finalSchemas.Customer!),
diff --git a/schemas/types.ts b/schemas/types.ts
index 54f485aa..2d59ccd1 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -23,6 +23,7 @@ export interface BaseField {
   fieldname: string;             // Column name in the db
   fieldtype: FieldType;          // UI Descriptive field types that map to column types
   label: string;                 // Translateable UI facing name
+  schemaName?: string;           // Convenient access to schemaName incase just the field is passed
   required?: boolean;            // Implies Not Null
   hidden?: boolean;              // UI Facing config, whether field is shown in a form
   readOnly?: boolean;            // UI Facing config, whether field is editable
@@ -30,7 +31,6 @@ export interface BaseField {
   default?: RawValue;            // Default value of a field, should match the db type
   placeholder?: string;          // UI Facing config, form field placeholder
   groupBy?: string;              // UI Facing used in dropdowns fields
-  computed?: boolean;            // Indicates whether a value is computed, implies readonly
   meta?: boolean;                // Field is a meta field, i.e. only for the db, not UI
   inline?: boolean;              // UI Facing config, whether to display doc inline.
 }
@@ -84,6 +84,7 @@ export interface Schema {
   quickEditFields?: string[];    // Used to get fields for the quickEditForm
   inlineEditDisplayField?:string;// Display field if inline editable
   naming?: Naming;               // Used for assigning name, default is 'random' else 'numberSeries' if present
+  titleField?: string;           // Main display field
   removeFields?: string[];       // Used by the builder to remove fields.
 }
 
diff --git a/src/App.vue b/src/App.vue
index 90d0df0a..2118a3ae 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -117,7 +117,8 @@ export default {
       if (hideGetStarted || onboardingComplete) {
         routeTo('/');
       } else {
-        routeTo('/get-started');
+        // routeTo('/get-started');
+        routeTo('/settings');
       }
     },
     async changeDbFile() {
diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index 574ac530..13879be4 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -83,9 +83,9 @@ export default {
       this.isLoading = false;
     },
     async getSuggestions(keyword = '') {
-      keyword = keyword.toLowerCase();
       const options = getOptionList(this.df, this.doc);
 
+      keyword = keyword.toLowerCase();
       if (!keyword) {
         return options;
       }
diff --git a/src/components/Controls/Check.vue b/src/components/Controls/Check.vue
index 9d2c5752..e8ea4f57 100644
--- a/src/components/Controls/Check.vue
+++ b/src/components/Controls/Check.vue
@@ -6,7 +6,7 @@
       </div>
       <div style="width: 14px; height: 14px; overflow: hidden; cursor: pointer">
         <svg
-          v-if="checked === 1"
+          v-if="checked"
           width="14"
           height="14"
           viewBox="0 0 14 14"
@@ -57,7 +57,7 @@
           :class="inputClasses"
           :checked="value"
           :readonly="isReadOnly"
-          @change="(e) => triggerChange(+e.target.checked)"
+          @change="(e) => triggerChange(e.target.checked)"
           @focus="(e) => $emit('focus', e)"
         />
       </div>
diff --git a/src/components/Controls/Color.vue b/src/components/Controls/Color.vue
index cf3b535c..f28290a5 100644
--- a/src/components/Controls/Color.vue
+++ b/src/components/Controls/Color.vue
@@ -78,10 +78,10 @@ export default {
   },
   computed: {
     colors() {
-      return this.df.colors;
+      return this.df.options;
     },
     selectedColorLabel() {
-      let color = this.colors.find((c) => this.value === c.value);
+      const color = this.colors.find((c) => this.value === c.value);
       return color ? color.label : this.value;
     },
   },
diff --git a/src/components/Controls/Currency.vue b/src/components/Controls/Currency.vue
index 210d248d..207c6c18 100644
--- a/src/components/Controls/Currency.vue
+++ b/src/components/Controls/Currency.vue
@@ -29,7 +29,7 @@
 
 <script>
 import { fyo } from 'src/initFyo';
-import Float from './Float';
+import Float from './Float.vue';
 
 export default {
   name: 'Currency',
diff --git a/src/components/Controls/DynamicLink.vue b/src/components/Controls/DynamicLink.vue
index 5920d54c..395322ef 100644
--- a/src/components/Controls/DynamicLink.vue
+++ b/src/components/Controls/DynamicLink.vue
@@ -1,11 +1,11 @@
 <script>
-import Link from './Link';
+import Link from './Link.vue';
 export default {
   name: 'DynamicLink',
   props: ['target'],
   extends: Link,
   created() {
-    let watchKey = `doc.${this.df.references}`;
+    const watchKey = `doc.${this.df.references}`;
     this.targetWatcher = this.$watch(watchKey, function(newTarget, oldTarget) {
       if (oldTarget && newTarget !== oldTarget) {
         this.triggerChange('');
@@ -20,6 +20,7 @@ export default {
       if (!this.doc) {
         throw new Error('You must provide `doc` for DynamicLink to work.');
       }
+
       return this.doc[this.df.references];
     }
   }
diff --git a/src/components/Controls/Float.vue b/src/components/Controls/Float.vue
index cd0b0ff9..244f78cd 100644
--- a/src/components/Controls/Float.vue
+++ b/src/components/Controls/Float.vue
@@ -1,5 +1,5 @@
 <script>
-import Int from './Int';
+import Int from './Int.vue';
 
 export default {
   name: 'Float',
@@ -11,7 +11,7 @@ export default {
   },
   methods: {
     parse(value) {
-      let parsedValue = parseFloat(value);
+      const parsedValue = parseFloat(value);
       return isNaN(parsedValue) ? 0 : parsedValue;
     },
   },
diff --git a/src/components/Controls/FormControl.vue b/src/components/Controls/FormControl.vue
index e1268cb6..1e195de8 100644
--- a/src/components/Controls/FormControl.vue
+++ b/src/components/Controls/FormControl.vue
@@ -15,27 +15,30 @@ import Select from './Select.vue';
 import Table from './Table.vue';
 import Text from './Text.vue';
 
+const components = {
+  AttachImage,
+  Data,
+  Check,
+  Color,
+  Select,
+  Link,
+  Date,
+  Table,
+  AutoComplete,
+  DynamicLink,
+  Int,
+  Float,
+  Currency,
+  Text,
+};
+
 export default {
   name: 'FormControl',
   render() {
-    let controls = {
-      Data,
-      Select,
-      Link,
-      Date,
-      Table,
-      AutoComplete,
-      Check,
-      AttachImage,
-      DynamicLink,
-      Int,
-      Float,
-      Currency,
-      Text,
-      Color,
-    };
-    let { df } = this.$attrs;
-    return h(controls[df.fieldtype] || Data, {
+    const fieldtype = this.$attrs.df.fieldtype;
+    const component = components[fieldtype] ?? Data;
+
+    return h(component, {
       ...this.$attrs,
       ref: 'control',
     });
diff --git a/src/components/Controls/Int.vue b/src/components/Controls/Int.vue
index 354ca247..4e2564a3 100644
--- a/src/components/Controls/Int.vue
+++ b/src/components/Controls/Int.vue
@@ -1,5 +1,5 @@
 <script>
-import Data from './Data';
+import Data from "./Data.vue";
 
 export default {
   name: 'Int',
@@ -11,7 +11,7 @@ export default {
   },
   methods: {
     parse(value) {
-      let parsedValue = parseInt(value, 10);
+      const parsedValue = parseInt(value, 10);
       return isNaN(parsedValue) ? 0 : parsedValue;
     },
   },
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 3656a38b..22b9f187 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -1,10 +1,9 @@
 <script>
 import { t } from 'fyo';
-import Badge from 'src/components/Badge';
+import Badge from 'src/components/Badge.vue';
 import { fyo } from 'src/initFyo';
-import { openQuickEdit } from 'src/utils/ui';
 import { markRaw } from 'vue';
-import AutoComplete from './AutoComplete';
+import AutoComplete from './AutoComplete.vue';
 
 export default {
   name: 'Link',
@@ -12,54 +11,51 @@ export default {
   emits: ['new-doc'],
   methods: {
     async getSuggestions(keyword = '') {
-      let doctype = this.getTarget();
-      let meta;
-      try {
-        meta = fyo.getMeta(doctype);
-      } catch (err) {
-        if (err.message.includes('not a registered doctype')) {
-          return [];
-        }
-        throw err;
-      }
-      let filters = await this.getFilters(keyword);
+      const schemaName = this.df.target;
+      const schema = fyo.schemaMap[schemaName];
+      const filters = await this.getFilters(keyword);
+
       if (keyword && !filters.keywords) {
         filters.keywords = ['like', keyword];
       }
-      let results = await fyo.db.getAll({
-        doctype,
+
+      const fields = [
+        ...new Set([
+          'name',
+          schema.titleField,
+          this.df.groupBy,
+          ...schema.keywordFields,
+        ]),
+      ].filter(Boolean);
+
+      const results = await fyo.db.getAll(schemaName, {
         filters,
-        fields: [
-          ...new Set([
-            'name',
-            meta.titleField,
-            this.df.groupBy,
-            ...meta.getKeywordFields(),
-          ]),
-        ].filter(Boolean),
+        fields,
       });
-      let createNewOption = this.getCreateNewOption();
-      let suggestions = results
+
+      const suggestions = results
         .map((r) => {
-          let option = { label: r[meta.titleField], value: r.name };
+          const option = { label: r[schema.titleField], value: r.name };
           if (this.df.groupBy) {
             option.group = r[this.df.groupBy];
           }
           return option;
         })
-        .concat(this.df.disableCreation ? null : createNewOption)
+        .concat(this.getCreateNewOption())
         .filter(Boolean);
 
       if (suggestions.length === 0) {
         return [
           {
-            component: {
-              template: '<span class="text-gray-600">No results found</span>',
-            },
+            component: markRaw({
+              template:
+                '<span class="text-gray-600">{{ t`No results found` }}</span>',
+            }),
             action: () => {},
           },
         ];
       }
+
       return suggestions;
     },
     getCreateNewOption() {
@@ -83,14 +79,35 @@ export default {
         }),
       };
     },
-    async getFilters(keyword) {
-      const { getFilters } = this.df;
-      if (!getFilters) {
+    async openNewDoc() {
+      const schemaName = this.df.target;
+      const doc = await fyo.doc.getNewDoc(schemaName);
+      const filters = await this.getFilters();
+      const { openQuickEdit } = await import('src/utils/ui');
+
+      openQuickEdit({
+        schemaName,
+        name: doc.name,
+        defaults: Object.assign({}, filters, {
+          name: this.linkValue,
+        }),
+      });
+
+      doc.once('afterSync', () => {
+        this.$emit('new-doc', doc);
+        this.$router.back();
+      });
+    },
+    async getFilters() {
+      const { schemaName, fieldname } = this.df;
+      const getFilters = fyo.models[schemaName].filters[fieldname];
+
+      if (getFilters === undefined) {
         return {};
       }
 
       if (this.doc) {
-        return (await getFilters(keyword, this.doc)) ?? {};
+        return (await getFilters(this.doc)) ?? {};
       }
 
       try {
@@ -99,25 +116,6 @@ export default {
         return {};
       }
     },
-    getTarget() {
-      return this.df.target;
-    },
-    async openNewDoc() {
-      let doctype = this.df.target;
-      let doc = await fyo.doc.getNewDoc(doctype);
-      let filters = await this.getFilters();
-      openQuickEdit({
-        doctype,
-        name: doc.name,
-        defaults: Object.assign({}, filters, {
-          name: this.linkValue,
-        }),
-      });
-      doc.once('afterInsert', () => {
-        this.$emit('new-doc', doc);
-        this.$router.back();
-      });
-    },
   },
 };
 </script>
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index c34b4fd1..9e832c7c 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -61,10 +61,10 @@
 </template>
 
 <script>
-import Row from 'src/components/Row';
+import Row from 'src/components/Row.vue';
 import { fyo } from 'src/initFyo';
-import Base from './Base';
-import TableRow from './TableRow';
+import Base from './Base.vue';
+import TableRow from './TableRow.vue';
 
 export default {
   name: 'Table',
@@ -122,8 +122,8 @@ export default {
       return [0.3].concat(this.tableFields.map(() => 1));
     },
     tableFields() {
-      let meta = fyo.getMeta(this.df.childtype);
-      return meta.tableFields.map((fieldname) => meta.getField(fieldname));
+      const fields = fyo.schemaMap[this.df.target].tableFields ?? [];
+      return fields.map((fieldname) => fyo.getField(this.df.target, fieldname));
     },
   },
 };
diff --git a/src/components/Controls/TableRow.vue b/src/components/Controls/TableRow.vue
index 983f71af..4d7f2e5c 100644
--- a/src/components/Controls/TableRow.vue
+++ b/src/components/Controls/TableRow.vue
@@ -32,9 +32,9 @@
   </Row>
 </template>
 <script>
-import Row from 'src/components/Row';
-import { getErrorMessage } from '../../errorHandling';
-import FormControl from './FormControl';
+import Row from 'src/components/Row.vue';
+import { getErrorMessage } from 'src/utils';
+import FormControl from './FormControl.vue';
 
 export default {
   name: 'TableRow',
@@ -42,6 +42,7 @@ export default {
   emits: ['remove'],
   components: {
     Row,
+    FormControl,
   },
   data: () => ({ hovering: false, errors: {} }),
   beforeCreate() {
diff --git a/src/components/Controls/Text.vue b/src/components/Controls/Text.vue
index 4c6737fa..89649b24 100644
--- a/src/components/Controls/Text.vue
+++ b/src/components/Controls/Text.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import Base from './Base';
+import Base from './Base.vue';
 
 export default {
   name: 'Text',
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index b9eb0ad1..68a1101c 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -74,6 +74,7 @@
 
 <script>
 import uniq from 'lodash/uniq';
+import { fyo } from 'src/initFyo';
 import Popover from './Popover.vue';
 
 export default {
@@ -166,13 +167,20 @@ export default {
   },
   methods: {
     getEmptyMessage() {
-      const { emptyMessage } = this.df ?? {};
-      if (typeof emptyMessage === 'function') {
-        return emptyMessage(this.doc);
-      } else if (emptyMessage) {
-        return emptyMessage;
+      if (this.df === null) {
+        return this.t`Empty`;
       }
-      return this.t`Empty`;
+
+      const { schemaName, fieldname } = this.df;
+      const emptyMessage = fyo.models[schemaName]?.emptyMessages[fieldname]?.(
+        this.doc
+      );
+
+      if (emptyMessage === undefined || emptyMessage.length === 0) {
+        return this.t`Empty`;
+      }
+
+      return emptyMessage;
     },
     selectItem(d) {
       if (d.action) {
diff --git a/src/components/StatusBadge.vue b/src/components/StatusBadge.vue
index 0cebca29..533544c7 100644
--- a/src/components/StatusBadge.vue
+++ b/src/components/StatusBadge.vue
@@ -9,9 +9,6 @@ import { statusColor } from 'src/utils/colors';
 export default {
   name: 'StatusBadge',
   props: ['status'],
-  components: {
-    Badge,
-  },
   computed: {
     color() {
       return statusColor[this.status];
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 6e6e95ec..154d0097 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -22,23 +22,23 @@
         <TwoColumnForm
           ref="inlineEditForm"
           :doc="inlineEditDoc"
-          :fields="inlineEditFields"
+          :fields="getInlineEditFields(df)"
           :column-ratio="columnRatio"
           :no-border="true"
           :focus-first-input="true"
           :autosave="false"
           @error="(msg) => $emit('error', msg)"
         />
-        <div class="flex px-4 pb-2">
-          <Button class="w-1/2 text-gray-900" @click="inlineEditField = null">
+        <div class="flex px-4 pb-2 gap-2">
+          <Button class="w-1/2 text-gray-900" @click="stopInlineEditing">
             {{ t`Cancel` }}
           </Button>
           <Button
             type="primary"
-            class="ml-2 w-1/2 text-white"
-            @click="() => saveInlineEditDoc(df)"
+            class="w-1/2 text-white"
+            @click="saveInlineEditDoc"
           >
-            {{ df.inlineSaveText || t`Save` }}
+            {{ t`Save` }}
           </Button>
         </div>
       </div>
@@ -90,8 +90,9 @@
 import { Doc } from 'fyo/model/doc';
 import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
-import { getErrorMessage, handleErrorWithDialog } from 'src/errorHandling';
+import { handleErrorWithDialog } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
+import { getErrorMessage } from 'src/utils';
 import { evaluateHidden, evaluateReadOnly } from 'src/utils/doc';
 
 export default {
@@ -114,10 +115,8 @@ export default {
   },
   data() {
     return {
-      inlineEditField: null,
       inlineEditDoc: null,
-      inlineEditFields: null,
-      inlineEditDisplayField: null,
+      inlineEditField: null,
       errors: {},
     };
   },
@@ -162,7 +161,7 @@ export default {
       );
     },
     evaluateReadOnly(df) {
-      if (df.fieldname === 'numberSeries' && !this.doc._notInserted) {
+      if (df.fieldname === 'numberSeries' && !this.doc.notInserted) {
         return true;
       }
 
@@ -177,7 +176,7 @@ export default {
         return;
       }
 
-      let oldValue = this.doc.get(df.fieldname);
+      const oldValue = this.doc.get(df.fieldname);
       if (oldValue === value) {
         return;
       }
@@ -188,7 +187,7 @@ export default {
       }
 
       // handle rename
-      if (this.autosave && df.fieldname === 'name' && !this.doc.isNew()) {
+      if (this.autosave && df.fieldname === 'name' && !this.doc.notInserted) {
         return this.doc.rename(value);
       }
 
@@ -200,21 +199,19 @@ export default {
         this.errors[df.fieldname] = getErrorMessage(e, this.doc);
       });
 
-      if (this.autosave && this.doc._dirty && !this.doc.isNew()) {
+      if (this.autosave && this.doc.dirty) {
         if (df.fieldtype === 'Table') {
           return;
         }
+
         this.doc.sync();
       }
     },
     sync() {
-      return this.doc.sync().catch(this.handleError);
+      return this.doc.sync().catch((e) => handleErrorWithDialog(e, this.doc));
     },
     submit() {
-      return this.doc.submit().catch(this.handleError);
-    },
-    handleError(e) {
-      handleErrorWithDialog(e, this.doc);
+      return this.doc.submit().catch((e) => handleErrorWithDialog(e, this.doc));
     },
     async activateInlineEditing(df) {
       if (!df.inline) {
@@ -224,28 +221,39 @@ export default {
       this.inlineEditField = df;
       if (!this.doc[df.fieldname]) {
         this.inlineEditDoc = await fyo.doc.getNewDoc(df.target);
-        this.inlineEditDoc.once('afterInsert', () => {
+        this.inlineEditDoc.once('afterSync', () => {
           this.onChangeCommon(df, this.inlineEditDoc.name);
         });
       } else {
         this.inlineEditDoc = this.doc.getLink(df.fieldname);
       }
-
-      this.inlineEditDisplayField =
-        this.doc.schema.inlineEditDisplayField ?? 'name';
-      this.inlineEditFields = fyo.schemaMap[df.target].quickEditFields ?? [];
     },
-    async saveInlineEditDoc(df) {
+    getInlineEditFields(df) {
+      const inlineEditFieldNames =
+        fyo.schemaMap[df.target].quickEditFields ?? [];
+      return inlineEditFieldNames.map((fieldname) =>
+        fyo.getField(df.target, fieldname)
+      );
+    },
+    async saveInlineEditDoc() {
       if (!this.inlineEditDoc) {
         return;
       }
+
       await this.$refs.inlineEditForm[0].sync();
       await this.doc.loadLinks();
 
-      if (this.emitChange && df.inline) {
-        this.$emit('change', df.inlineEditField);
+      if (this.emitChange) {
+        this.$emit('change', this.inlineEditField);
       }
 
+      await this.stopInlineEditing();
+    },
+    async stopInlineEditing() {
+      if (this.inlineEditDoc?.dirty) {
+        await this.inlineEditDoc.load()
+      }
+      this.inlineEditDoc = null;
       this.inlineEditField = null;
     },
   },
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 847f7003..9ecf7e41 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -3,15 +3,11 @@ import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { TelemetrySetting } from 'fyo/telemetry/types';
-import {
-  DuplicateEntryError,
-  LinkValidationError,
-  MandatoryError,
-  ValidationError,
-} from 'fyo/utils/errors';
+import { MandatoryError, ValidationError } from 'fyo/utils/errors';
 import { ErrorLog } from 'fyo/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { fyo } from './initFyo';
+import { getErrorMessage } from './utils';
 import { ToastOptions } from './utils/types';
 import { showMessageDialog, showToast } from './utils/ui';
 
@@ -106,22 +102,6 @@ export function handleError(
   }
 }
 
-export function getErrorMessage(e: Error, doc?: Doc): string {
-  let errorMessage = e.message || t`An error occurred.`;
-
-  const { schemaName, name }: { schemaName?: string; name?: string } =
-    doc ?? {};
-  const canElaborate = !!(schemaName && name);
-
-  if (e instanceof LinkValidationError && canElaborate) {
-    errorMessage = t`${schemaName} ${name} is linked with existing records.`;
-  } else if (e instanceof DuplicateEntryError && canElaborate) {
-    errorMessage = t`${schemaName} ${name} already exists.`;
-  }
-
-  return errorMessage;
-}
-
 export function handleErrorWithDialog(error: Error, doc?: Doc) {
   const errorMessage = getErrorMessage(error, doc);
   handleError(false, error, { errorMessage, doc });
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 2b4deb01..729687a0 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -72,7 +72,7 @@ export default {
       }
       let path = this.getFormPath(doc.name);
       routeTo(path);
-      doc.on('afterInsert', () => {
+      doc.on('afterSync', () => {
         let path = this.getFormPath(doc.name);
         this.$router.replace(path);
       });
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 6d79dd87..a0c6a612 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -166,7 +166,7 @@ export default {
       await this.fetchDoc();
 
       // setup the title field
-      if (this.doc && this.doc.isNew() && this.doc[this.titleField.fieldname]) {
+      if (this.doc && this.doc.notInserted && this.doc[this.titleField.fieldname]) {
         if (!this.titleField.readOnly) {
           this.doc.set(this.titleField.fieldname, '');
           setTimeout(() => {
@@ -195,10 +195,10 @@ export default {
             name: this.doc.name,
           });
         });
-        this.doc.on('beforeUpdate', () => {
+        this.doc.on('beforeSync', () => {
           this.statusText = t`Saving...`;
         });
-        this.doc.on('afterUpdate', () => {
+        this.doc.on('afterSync', () => {
           setTimeout(() => {
             this.statusText = null;
           }, 500);
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 373177e7..07132a3c 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -51,16 +51,15 @@
 <script>
 import { ipcRenderer } from 'electron';
 import { t } from 'fyo';
-import Button from 'src/components/Button';
-import Icon from 'src/components/Icon';
-import PageHeader from 'src/components/PageHeader';
-import Row from 'src/components/Row';
-import StatusBadge from 'src/components/StatusBadge';
-import WindowControls from 'src/components/WindowControls';
+import Button from 'src/components/Button.vue';
+import Icon from 'src/components/Icon.vue';
+import PageHeader from 'src/components/PageHeader.vue';
+import Row from 'src/components/Row.vue';
+import StatusBadge from 'src/components/StatusBadge.vue';
+import WindowControls from 'src/components/WindowControls.vue';
 import { showToast } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h, markRaw } from 'vue';
-import TabGeneral from './TabGeneral.vue';
 import TabInvoice from './TabInvoice.vue';
 import TabSystem from './TabSystem.vue';
 
@@ -89,13 +88,15 @@ export default {
           key: 'General',
           label: t`General`,
           icon: 'general',
-          component: markRaw(TabGeneral),
+          // component: markRaw(TabGeneral),
+          component: {template: `<h1>General</h1>`}
         },
         {
           key: 'System',
           label: t`System`,
           icon: 'system',
           component: markRaw(TabSystem),
+          component: {template: `<h1>System</h1>`}
         },
       ],
     };
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index 034f6ac0..1f8e5044 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -6,8 +6,7 @@
         :value="doc.logo"
         @change="
           (value) => {
-            doc.set('logo', value);
-            doc.sync();
+            doc.setAndSync('logo', value);
             forwardChangeEvent(getField('logo'));
           }
         "
@@ -26,8 +25,7 @@
           :show-label="true"
           @change="
             (value) => {
-              doc.set('displayLogo', value);
-              doc.sync();
+              doc.setAndSync('displayLogo', value);
               forwardChangeEvent(getField('displayLogo'));
             }
           "
@@ -47,10 +45,10 @@
 </template>
 <script>
 import { ipcRenderer } from 'electron';
-import FormControl from 'src/components/Controls/FormControl.vue';
-import TwoColumnForm from 'src/components/TwoColumnForm';
+import TwoColumnForm from 'src/components/TwoColumnForm.vue';
 import { fyo } from 'src/initFyo';
 import { IPC_ACTIONS } from 'utils/messages';
+import FormControl from '../../components/Controls/FormControl.vue';
 
 export default {
   name: 'TabInvoice',
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index e9a367a7..54ab3c19 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -95,8 +95,8 @@ import { ipcRenderer } from 'electron';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
-import { getErrorMessage } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
+import { getErrorMessage } from 'src/utils';
 import { getSetupWizardDoc } from 'src/utils/misc';
 import { showMessageDialog } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
diff --git a/src/router.ts b/src/router.ts
index 36668239..94eeafe4 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -9,7 +9,7 @@ import GetStarted from 'src/pages/GetStarted.vue';
 // import PrintView from 'src/pages/PrintView/PrintView.vue';
 // import QuickEditForm from 'src/pages/QuickEditForm.vue';
 // import Report from 'src/pages/Report.vue';
-// import Settings from 'src/pages/Settings/Settings.vue';
+import Settings from 'src/pages/Settings/Settings.vue';
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
 import { fyo } from './initFyo';
 
@@ -108,13 +108,13 @@ const routes: RouteRecordRaw[] = [
     name: 'Data Import',
     component: DataImport,
   },
+*/
   {
     path: '/settings',
     name: 'Settings',
     component: Settings,
     props: true,
   },
-*/
 ];
 
 const router = createRouter({ routes, history: createWebHistory() });
diff --git a/src/utils/doc.ts b/src/utils/doc.ts
index 3c2ad65a..7033ae28 100644
--- a/src/utils/doc.ts
+++ b/src/utils/doc.ts
@@ -43,7 +43,8 @@ export function getOptionList(field: Field, doc: Doc): SelectOption[] {
 }
 
 function _getOptionList(field: Field, doc: Doc) {
-  if ((field as OptionField).options) {
+  const options = (field as OptionField).options;
+  if (options && options.length > 0) {
     return (field as OptionField).options;
   }
 
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 12459364..710fcdd5 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,8 +1,10 @@
 /**
  * General purpose utils used by the frontend.
  */
+import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
+import { DuplicateEntryError, LinkValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 
 export function stringifyCircular(
@@ -76,3 +78,19 @@ export function convertPesaValuesToFloat(obj: Record<string, unknown>) {
     obj[key] = (value as Money).float;
   });
 }
+
+export function getErrorMessage(e: Error, doc?: Doc): string {
+  let errorMessage = e.message || t`An error occurred.`;
+
+  const { schemaName, name }: { schemaName?: string; name?: string } =
+    doc ?? {};
+  const canElaborate = !!(schemaName && name);
+
+  if (e instanceof LinkValidationError && canElaborate) {
+    errorMessage = t`${schemaName} ${name} is linked with existing records.`;
+  } else if (e instanceof DuplicateEntryError && canElaborate) {
+    errorMessage = t`${schemaName} ${name} already exists.`;
+  }
+
+  return errorMessage;
+}
\ No newline at end of file
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index ad40983f..95b9c704 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -28,8 +28,6 @@ export async function openQuickEdit({
   showFields,
   defaults = {},
 }: QuickEditOptions) {
-  const router = (await import('src/router')).default;
-
   const currentRoute = router.currentRoute.value;
   const query = currentRoute.query;
   let method: 'push' | 'replace' = 'push';
@@ -287,7 +285,10 @@ function getDeleteAction(doc: Doc): Action {
       template: '<span class="text-red-700">{{ t`Delete` }}</span>',
     },
     condition: (doc: Doc) =>
-      !doc.isNew && !doc.submitted && !doc.schema.isSingle && !doc.cancelled,
+      !doc.notInserted &&
+      !doc.submitted &&
+      !doc.schema.isSingle &&
+      !doc.cancelled,
     action: () =>
       deleteDocWithPrompt(doc).then((res) => {
         if (res) {
diff --git a/tsconfig.json b/tsconfig.json
index ed1f86b8..acf610fe 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,7 +23,7 @@
       "fixtures/*": ["fixtures/*"],
       "reports/*": ["reports/*"],
       "models/*": ["models/*"],
-      "utils/*": ["utils/*"],
+      "utils/*": ["utils/*"]
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },
@@ -46,7 +46,7 @@
     "regional/**/*.ts",
     "reports/**/*.ts",
     "utils/**/*.ts",
-    "tests/**/*.ts",
+    "tests/**/*.ts"
   ],
   "exclude": ["node_modules"]
 }

From 371cda82b338603c29ca0525605c5284f105e91b Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 27 Apr 2022 14:07:06 +0530
Subject: [PATCH 071/163] fix: get system settings to function and display -
 improve autocomplete display and func

---
 fyo/model/doc.ts                             |  12 +-
 fyo/model/types.ts                           |   4 +-
 fyo/model/validationFunction.ts              |  32 +++-
 fyo/models/SystemSettings.ts                 |  26 ++-
 fyo/utils/index.ts                           |  41 +++++
 schemas/app/AccountingSettings.json          |   2 +
 schemas/core/SystemSettings.json             |  11 +-
 schemas/types.ts                             |   1 +
 src/components/Controls/AutoComplete.vue     | 161 +++++++++++++------
 src/components/Controls/LanguageSelector.vue |  11 +-
 src/components/Controls/Link.vue             |   5 +
 src/components/TwoColumnForm.vue             |   4 +-
 src/pages/Settings/Settings.vue              |   5 +-
 src/pages/Settings/TabSystem.vue             |  12 +-
 src/utils/doc.ts                             |  36 +----
 15 files changed, 245 insertions(+), 118 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index aca8f76d..a1e4f8e2 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -44,7 +44,7 @@ import {
   TreeViewSettings,
   ValidationMap,
 } from './types';
-import { validateSelect } from './validationFunction';
+import { validateOptions, validateRequired } from './validationFunction';
 
 export class Doc extends Observable<DocValue | Doc[]> {
   name?: string;
@@ -308,11 +308,15 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async _validateField(field: Field, value: DocValue) {
-    if (field.fieldtype == 'Select') {
-      validateSelect(field as OptionField, value as string);
+    if (
+      field.fieldtype === FieldTypeEnum.Select ||
+      field.fieldtype === FieldTypeEnum.AutoComplete
+    ) {
+      validateOptions(field as OptionField, value as string, this);
     }
 
-    if (value === null || value === undefined) {
+    validateRequired(field, value, this);
+    if (getIsNullOrUndef(value)) {
       return;
     }
 
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index 89d92f49..1b2346df 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -1,6 +1,6 @@
 import { DocValue, DocValueMap } from 'fyo/core/types';
 import SystemSettings from 'fyo/models/SystemSettings';
-import { FieldType } from 'schemas/types';
+import { FieldType, SelectOption } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 import { Router } from 'vue-router';
 import { Doc } from './doc';
@@ -55,7 +55,7 @@ export type FiltersMap = Record<string, FilterFunction>;
 export type EmptyMessageFunction = (doc: Doc) => string;
 export type EmptyMessageMap = Record<string, EmptyMessageFunction>;
 
-export type ListFunction = (doc?: Doc) => string[];
+export type ListFunction = (doc?: Doc) => string[] | SelectOption[];
 export type ListsMap = Record<string, ListFunction | undefined>;
 
 export interface Action {
diff --git a/fyo/model/validationFunction.ts b/fyo/model/validationFunction.ts
index 9c51726c..8471dd2b 100644
--- a/fyo/model/validationFunction.ts
+++ b/fyo/model/validationFunction.ts
@@ -1,7 +1,10 @@
 import { DocValue } from 'fyo/core/types';
+import { getOptionList } from 'fyo/utils';
 import { ValidationError, ValueError } from 'fyo/utils/errors';
 import { t } from 'fyo/utils/translation';
-import { OptionField } from 'schemas/types';
+import { Field, OptionField } from 'schemas/types';
+import { getIsNullOrUndef } from 'utils';
+import { Doc } from './doc';
 
 export function validateEmail(value: DocValue) {
   const isValid = /(.+)@(.+){2,}\.(.+){2,}/.test(value as string);
@@ -17,9 +20,9 @@ export function validatePhoneNumber(value: DocValue) {
   }
 }
 
-export function validateSelect(field: OptionField, value: string) {
-  const options = field.options;
-  if (!options) {
+export function validateOptions(field: OptionField, value: string, doc: Doc) {
+  const options = getOptionList(field, doc);
+  if (!options.length) {
     return;
   }
 
@@ -29,12 +32,25 @@ export function validateSelect(field: OptionField, value: string) {
 
   const validValues = options.map((o) => o.value);
 
-  if (validValues.includes(value)) {
+  if (validValues.includes(value) || field.allowCustom) {
     return;
   }
 
   const labels = options.map((o) => o.label).join(', ');
-  throw new ValueError(
-    t`Invalid value ${value} for ${field.label}. Must be one of ${labels}`
-  );
+  throw new ValueError(t`Invalid value ${value} for ${field.label}`);
+}
+
+export function validateRequired(field: Field, value: DocValue, doc: Doc) {
+  if (!getIsNullOrUndef(value)) {
+    return;
+  }
+
+  if (field.required) {
+    throw new ValidationError(`${field.label} is required`);
+  }
+
+  const requiredFunction = doc.required[field.fieldname];
+  if (requiredFunction && requiredFunction()) {
+    throw new ValidationError(`${field.label} is required`);
+  }
 }
diff --git a/fyo/models/SystemSettings.ts b/fyo/models/SystemSettings.ts
index ad4a5b10..7eb5c327 100644
--- a/fyo/models/SystemSettings.ts
+++ b/fyo/models/SystemSettings.ts
@@ -1,8 +1,10 @@
 import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
-import { ValidationMap } from 'fyo/model/types';
+import { ListsMap, ValidationMap } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
 import { t } from 'fyo/utils/translation';
+import { SelectOption } from 'schemas/types';
+import { getCountryInfo } from 'utils/misc';
 
 export default class SystemSettings extends Doc {
   validations: ValidationMap = {
@@ -16,4 +18,26 @@ export default class SystemSettings extends Doc {
       );
     },
   };
+
+  static lists: ListsMap = {
+    locale() {
+      const countryInfo = getCountryInfo();
+      return Object.keys(countryInfo)
+        .filter((c) => !!countryInfo[c]?.locale)
+        .map(
+          (c) =>
+            ({
+              value: countryInfo[c]?.locale,
+              label: `${c} (${countryInfo[c]?.locale})`,
+            } as SelectOption)
+        );
+    },
+    currency() {
+      const countryInfo = getCountryInfo();
+      const currencies = Object.values(countryInfo)
+        .map((ci) => ci?.currency as string)
+        .filter(Boolean);
+      return [...new Set(currencies)];
+    },
+  };
 }
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index 9ba16f4a..f59170df 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -2,6 +2,7 @@ import { Fyo } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { pesa } from 'pesa';
+import { Field, OptionField, SelectOption } from 'schemas/types';
 
 export function slug(str: string) {
   return str
@@ -73,3 +74,43 @@ export async function getSingleValue(
 
   return singleValue.value;
 }
+
+export function getOptionList(
+  field: Field,
+  doc: Doc | undefined
+): SelectOption[] {
+  const list = getRawOptionList(field, doc);
+  return list.map((option) => {
+    if (typeof option === 'string') {
+      return {
+        label: option,
+        value: option,
+      };
+    }
+
+    return option;
+  });
+}
+
+function getRawOptionList(field: Field, doc: Doc | undefined) {
+  const options = (field as OptionField).options;
+  if (options && options.length > 0) {
+    return (field as OptionField).options;
+  }
+
+  if (doc === undefined) {
+    return [];
+  }
+
+  const Model = doc.fyo.models[doc.schemaName];
+  if (Model === undefined) {
+    return [];
+  }
+
+  const getList = Model.lists[field.fieldname];
+  if (getList === undefined) {
+    return [];
+  }
+
+  return getList(doc);
+}
diff --git a/schemas/app/AccountingSettings.json b/schemas/app/AccountingSettings.json
index d215d6b7..a3ce4dce 100644
--- a/schemas/app/AccountingSettings.json
+++ b/schemas/app/AccountingSettings.json
@@ -9,6 +9,7 @@
       "label": "Company Name",
       "fieldname": "companyName",
       "fieldtype": "Data",
+      "readOnly": true,
       "required": true
     },
     {
@@ -49,6 +50,7 @@
       "fieldname": "bankName",
       "label": "Bank Name",
       "fieldtype": "Data",
+      "readOnly": true,
       "required": true
     },
     {
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 317928de..c9683496 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -7,7 +7,7 @@
     {
       "fieldname": "dateFormat",
       "label": "Date Format",
-      "fieldtype": "Select",
+      "fieldtype": "AutoComplete",
       "options": [
         {
           "label": "23/03/2022",
@@ -40,13 +40,15 @@
       ],
       "default": "MMM d, y",
       "required": true,
+      "allowCustom": true,
       "description": "Sets the app-wide date display format."
     },
     {
       "fieldname": "locale",
       "label": "Locale",
-      "fieldtype": "Data",
+      "fieldtype": "AutoComplete",
       "default": "en-IN",
+      "required": true,
       "description": "Set the local code. This is used for number formatting."
     },
     {
@@ -84,9 +86,8 @@
     {
       "fieldname": "currency",
       "label": "Currency",
-      "fieldtype": "Data",
-      "readOnly": true,
-      "required": false
+      "fieldtype": "AutoComplete",
+      "required": true
     }
   ],
   "quickEditFields": [
diff --git a/schemas/types.ts b/schemas/types.ts
index 2d59ccd1..5c0b019a 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -42,6 +42,7 @@ export interface OptionField extends BaseField {
     | FieldTypeEnum.AutoComplete
     | FieldTypeEnum.Color;
   options: SelectOption[];
+  allowCustom?: boolean;
 }
 
 export interface TargetField extends BaseField {
diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index 13879be4..09563b3b 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -11,30 +11,57 @@
       <div class="text-gray-600 text-sm mb-1" v-if="showLabel">
         {{ df.label }}
       </div>
-      <input
-        ref="input"
-        :class="inputClasses"
-        type="text"
-        :value="linkValue"
-        :placeholder="inputPlaceholder"
-        :readonly="isReadOnly"
-        @focus="(e) => onFocus(e, toggleDropdown)"
-        @blur="(e) => onBlur(e.target.value)"
-        @input="onInput"
-        @keydown.up="highlightItemUp"
-        @keydown.down="highlightItemDown"
-        @keydown.enter="selectHighlightedItem"
-        @keydown.tab="toggleDropdown(false)"
-        @keydown.esc="toggleDropdown(false)"
-      />
+      <div
+        class="
+          flex
+          items-center
+          justify-between
+          bg-white
+          focus-within:bg-gray-200
+          pr-2
+          rounded
+        "
+      >
+        <input
+          ref="input"
+          :class="inputClasses"
+          type="text"
+          :value="linkValue"
+          :placeholder="inputPlaceholder"
+          :readonly="isReadOnly"
+          @focus="(e) => onFocus(e, toggleDropdown)"
+          @blur="(e) => onBlur(e.target.value)"
+          @input="onInput"
+          @keydown.up="highlightItemUp"
+          @keydown.down="highlightItemDown"
+          @keydown.enter="selectHighlightedItem"
+          @keydown.tab="toggleDropdown(false)"
+          @keydown.esc="toggleDropdown(false)"
+        />
+        <svg
+          class="w-3 h-3"
+          style="background: inherit; margin-right: -3px"
+          viewBox="0 0 5 10"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            d="M1 2.636L2.636 1l1.637 1.636M1 7.364L2.636 9l1.637-1.636"
+            stroke="#404040"
+            fill="none"
+            fill-rule="evenodd"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+          />
+        </svg>
+      </div>
     </template>
   </Dropdown>
 </template>
 
 <script>
+import { getOptionList } from 'fyo/utils';
 import Dropdown from 'src/components/Dropdown.vue';
 import { fuzzyMatch } from 'src/utils';
-import { getOptionList } from 'src/utils/doc';
 import Base from './Base.vue';
 
 export default {
@@ -57,47 +84,81 @@ export default {
     value: {
       immediate: true,
       handler(newValue) {
-        this.linkValue = newValue;
+        this.linkValue = this.getLabel(newValue);
       },
     },
   },
   inject: {
     doc: { default: null },
   },
-  computed: {},
+  mounted() {
+    this.linkValue = this.getLabel(this.linkValue || this.value);
+  },
+  computed: {
+    options() {
+      if (!this.df) {
+        return [];
+      }
+
+      return getOptionList(this.df, this.doc);
+    },
+  },
   methods: {
-    async updateSuggestions(e) {
-      let keyword;
-      if (e) {
-        keyword = e.target.value;
+    getLabel(value) {
+      const oldValue = this.linkValue;
+      let option = this.options.find((o) => o.value === value);
+      if (option === undefined) {
+        option = this.options.find((o) => o.label === value);
+      }
+
+      return option?.label ?? oldValue;
+    },
+    getValue(label) {
+      let option = this.options.find((o) => o.label === label);
+      if (option === undefined) {
+        option = this.options.find((o) => o.value === label);
+      }
+
+      return option?.value ?? label;
+    },
+    async updateSuggestions(keyword) {
+      if (typeof keyword === 'string') {
         this.linkValue = keyword;
       }
+
       this.isLoading = true;
-      let suggestions = await this.getSuggestions(keyword);
-      this.suggestions = suggestions.map((d) => {
-        if (!d.action) {
-          d.action = () => this.setSuggestion(d);
-        }
-        return d;
-      });
+      const suggestions = await this.getSuggestions(keyword);
+      this.suggestions = this.setSetSuggestionAction(suggestions);
       this.isLoading = false;
     },
-    async getSuggestions(keyword = '') {
-      const options = getOptionList(this.df, this.doc);
 
-      keyword = keyword.toLowerCase();
-      if (!keyword) {
-        return options;
+    setSetSuggestionAction(suggestions) {
+      for (const option of suggestions) {
+        if (option.action) {
+          continue;
+        }
+
+        option.action = () => {
+          this.setSuggestion(option);
+        };
       }
 
-      return options
-        .map((item) => ({ ...fuzzyMatch(keyword, item.value), item }))
+      return suggestions;
+    },
+    async getSuggestions(keyword = '') {
+      keyword = keyword.toLowerCase();
+      if (!keyword) {
+        return this.options;
+      }
+
+      return this.options
+        .map((item) => ({ ...fuzzyMatch(keyword, item.label), item }))
         .filter(({ isMatch }) => isMatch)
         .sort((a, b) => a.distance - b.distance)
         .map(({ item }) => item);
     },
     setSuggestion(suggestion) {
-      this.linkValue = suggestion.value;
+      this.linkValue = suggestion.label;
       this.triggerChange(suggestion.value);
       this.toggleDropdown(false);
     },
@@ -107,34 +168,28 @@ export default {
       this.updateSuggestions();
       this.$emit('focus', e);
     },
-    async onBlur(value) {
-      if (value === '' || value == null) {
+    async onBlur(label) {
+      if (!label) {
         this.triggerChange('');
         return;
       }
 
-      if (value && this.suggestions.length === 0) {
-        this.triggerChange(value);
+      if (label && this.suggestions.length === 0) {
+        this.triggerChange(label);
         return;
       }
 
       if (
-        value &&
-        !this.suggestions.map(({ value }) => value).includes(value)
+        label &&
+        !this.suggestions.map(({ label }) => label).includes(label)
       ) {
-        const suggestion = await this.getSuggestions(value);
-
-        if (suggestion.length < 2) {
-          this.linkValue = '';
-          this.triggerChange('');
-        } else {
-          this.setSuggestion(suggestion[0]);
-        }
+        const suggestions = await this.getSuggestions(label);
+        this.setSuggestion(suggestions[0]);
       }
     },
     onInput(e) {
       this.toggleDropdown(true);
-      this.updateSuggestions(e);
+      this.updateSuggestions(e.target.value);
     },
   },
 };
diff --git a/src/components/Controls/LanguageSelector.vue b/src/components/Controls/LanguageSelector.vue
index bdabf64c..60e16a9a 100644
--- a/src/components/Controls/LanguageSelector.vue
+++ b/src/components/Controls/LanguageSelector.vue
@@ -2,7 +2,7 @@
   <FormControl
     :df="languageDf"
     :value="value"
-    @change="(v) => setLanguageMap(v, dontReload)"
+    @change="onChange"
     :input-class="'focus:outline-none rounded ' + inputClass"
   />
 </template>
@@ -28,6 +28,15 @@ export default {
     },
   },
   components: { FormControl },
+  methods: {
+    onChange(value) {
+      if (languageCodeMap[value] === undefined) {
+        return;
+      }
+
+      setLanguageMap(value, this.dontReload);
+    },
+  },
   computed: {
     value() {
       return fyo.config.get('language') ?? DEFAULT_LANGUAGE;
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 22b9f187..cbae1f38 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -9,6 +9,11 @@ export default {
   name: 'Link',
   extends: AutoComplete,
   emits: ['new-doc'],
+  mounted() {
+    if (this.value) {
+      this.linkValue = this.value;
+    }
+  },
   methods: {
     async getSuggestions(keyword = '') {
       const schemaName = this.df.target;
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 154d0097..0e010fc6 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -177,11 +177,11 @@ export default {
       }
 
       const oldValue = this.doc.get(df.fieldname);
+      this.errors[df.fieldname] = null;
       if (oldValue === value) {
         return;
       }
 
-      this.errors[df.fieldname] = null;
       if (this.emitChange) {
         this.$emit('change', df, value, oldValue);
       }
@@ -251,7 +251,7 @@ export default {
     },
     async stopInlineEditing() {
       if (this.inlineEditDoc?.dirty) {
-        await this.inlineEditDoc.load()
+        await this.inlineEditDoc.load();
       }
       this.inlineEditDoc = null;
       this.inlineEditField = null;
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index 07132a3c..a75dec87 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -60,6 +60,7 @@ import WindowControls from 'src/components/WindowControls.vue';
 import { showToast } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h, markRaw } from 'vue';
+import TabGeneral from './TabGeneral.vue';
 import TabInvoice from './TabInvoice.vue';
 import TabSystem from './TabSystem.vue';
 
@@ -88,15 +89,13 @@ export default {
           key: 'General',
           label: t`General`,
           icon: 'general',
-          // component: markRaw(TabGeneral),
-          component: {template: `<h1>General</h1>`}
+          component: markRaw(TabGeneral),
         },
         {
           key: 'System',
           label: t`System`,
           icon: 'system',
           component: markRaw(TabSystem),
-          component: {template: `<h1>System</h1>`}
         },
       ],
     };
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index b8bbc40d..9e1f3bcb 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -40,12 +40,14 @@
 <script>
 import { ConfigKeys } from 'fyo/core/types';
 import { getTelemetryOptions } from 'fyo/telemetry/helpers';
-import { TelemetrySetting } from 'fyo/telemetry/types';
+import { NounEnum, TelemetrySetting, Verb } from 'fyo/telemetry/types';
+import { ModelNameEnum } from 'models/types';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
 import { fyo } from 'src/initFyo';
-import { checkForUpdates } from 'src/utils';
+import { checkForUpdates } from 'src/utils/ipcCalls';
+import { getCountryInfo } from 'utils/misc';
 
 export default {
   name: 'TabSystem',
@@ -65,6 +67,7 @@ export default {
     this.doc = fyo.singles.SystemSettings;
     this.companyName = fyo.singles.AccountingSettings.companyName;
     this.telemetry = fyo.config.get(ConfigKeys.Telemetry);
+    window.gci = getCountryInfo
   },
   computed: {
     df() {
@@ -81,8 +84,9 @@ export default {
       };
     },
     fields() {
-      let meta = fyo.getMeta('SystemSettings');
-      return meta.getQuickEditFields();
+      return fyo.schemaMap.SystemSettings.quickEditFields.map((f) =>
+        fyo.getField(ModelNameEnum.SystemSettings, f)
+      );
     },
   },
   methods: {
diff --git a/src/utils/doc.ts b/src/utils/doc.ts
index 7033ae28..2dc2b970 100644
--- a/src/utils/doc.ts
+++ b/src/utils/doc.ts
@@ -1,6 +1,5 @@
 import { Doc } from 'fyo/model/doc';
-import { Field, OptionField, SelectOption } from 'schemas/types';
-import { fyo } from 'src/initFyo';
+import { Field } from 'schemas/types';
 
 export function evaluateReadOnly(field: Field, doc: Doc) {
   if (field.readOnly !== undefined) {
@@ -27,36 +26,3 @@ export function evaluateHidden(field: Field, doc: Doc) {
 
   return false;
 }
-
-export function getOptionList(field: Field, doc: Doc): SelectOption[] {
-  const list = _getOptionList(field, doc);
-  return list.map((option) => {
-    if (typeof option === 'string') {
-      return {
-        label: option,
-        value: option,
-      };
-    }
-
-    return option;
-  });
-}
-
-function _getOptionList(field: Field, doc: Doc) {
-  const options = (field as OptionField).options;
-  if (options && options.length > 0) {
-    return (field as OptionField).options;
-  }
-
-  const Model = fyo.models[doc.schemaName];
-  if (Model === undefined) {
-    return [];
-  }
-
-  const getList = Model.lists[field.fieldname];
-  if (getList === undefined) {
-    return [];
-  }
-
-  return getList(doc);
-}

From 22609711bc18dcd049e0153582ffbddc9d4c8f47 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 27 Apr 2022 14:12:18 +0530
Subject: [PATCH 072/163] fix(ui): chevron display and readOnly color

---
 src/components/Controls/AutoComplete.vue | 1 +
 src/components/Controls/Base.vue         | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index 09563b3b..d317d526 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -39,6 +39,7 @@
           @keydown.esc="toggleDropdown(false)"
         />
         <svg
+          v-if="!isReadOnly"
           class="w-3 h-3"
           style="background: inherit; margin-right: -3px"
           viewBox="0 0 5 10"
diff --git a/src/components/Controls/Base.vue b/src/components/Controls/Base.vue
index 705ca30e..4f0ab2fe 100644
--- a/src/components/Controls/Base.vue
+++ b/src/components/Controls/Base.vue
@@ -60,7 +60,8 @@ export default {
           'px-2 py-1': this.size === 'small',
           'pointer-events-none': this.isReadOnly,
         },
-        'focus:outline-none focus:bg-gray-200 rounded w-full text-gray-900 placeholder-gray-400',
+        'focus:outline-none focus:bg-gray-200 rounded w-full placeholder-gray-400',
+        this.isReadOnly ? 'text-gray-800' : 'text-gray-900',
       ];
 
       return this.getInputClassesFromProp(classes);

From fba81e5b22d80bfd70917c1a4040b093e61140ef Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 27 Apr 2022 17:32:43 +0530
Subject: [PATCH 073/163] fix: get listview to render

---
 fyo/model/naming.ts                           |  2 +-
 .../baseModels/JournalEntry/JournalEntry.ts   | 10 +--
 models/baseModels/Payment/Payment.ts          |  4 +-
 src/App.vue                                   |  3 +-
 src/components/Avatar.vue                     | 22 ++++--
 src/components/BackLink.vue                   |  3 +-
 src/components/PageHeader.vue                 | 21 +++++-
 src/components/SearchBar.vue                  | 40 +++++-----
 src/components/Widgets/PartyWidget.vue        |  2 +-
 src/pages/ChartOfAccounts.vue                 | 13 +---
 src/pages/Dashboard/Dashboard.vue             | 12 +--
 src/pages/DataImport.vue                      | 16 +---
 src/pages/GetStarted.vue                      | 15 +---
 src/pages/InvoiceForm.vue                     | 11 +--
 src/pages/JournalEntryForm.vue                |  7 +-
 src/pages/ListView/List.vue                   | 74 +++++++++----------
 src/pages/ListView/ListView.vue               | 66 +++++++----------
 src/pages/PrintView/PrintView.vue             |  7 +-
 src/pages/Report.vue                          | 12 +--
 src/pages/Settings/Settings.vue               |  8 +-
 src/router.ts                                 | 15 ++--
 src/utils/sidebarConfig.ts                    | 32 ++++----
 src/utils/types.ts                            |  2 +-
 translations/ar.csv                           |  2 +-
 translations/ca-ES.csv                        |  2 +-
 translations/de.csv                           |  2 +-
 translations/fr.csv                           |  2 +-
 translations/pt.csv                           |  2 +-
 28 files changed, 175 insertions(+), 232 deletions(-)

diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts
index e34b3ab0..d3e53c6a 100644
--- a/fyo/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -74,7 +74,7 @@ export async function getLastInserted(schemaName: string, fyo: Fyo) {
   const lastInserted = await fyo.db.getAll(schemaName, {
     fields: ['name'],
     limit: 1,
-    orderBy: 'creation',
+    orderBy: 'created',
     order: 'desc',
   });
   return lastInserted && lastInserted.length ? lastInserted[0] : null;
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index 4e89617f..0a9f1cc1 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -1,10 +1,10 @@
-import { Fyo } from 'fyo';
+import { Fyo, t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import {
   Action,
   DefaultMap,
   FiltersMap,
-  ListViewSettings,
+  ListViewSettings
 } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { getLedgerLinkAction } from 'models/helpers';
@@ -56,13 +56,13 @@ export class JournalEntry extends Doc {
     return [getLedgerLinkAction(fyo)];
   }
 
-  static getListViewSettings(fyo: Fyo): ListViewSettings {
+  static getListViewSettings(): ListViewSettings {
     return {
       formRoute: (name) => `/edit/JournalEntry/${name}`,
       columns: [
         'date',
         {
-          label: fyo.t`Status`,
+          label: t`Status`,
           fieldtype: 'Select',
           size: 'small',
           render(doc) {
@@ -84,7 +84,7 @@ export class JournalEntry extends Doc {
           },
         },
         {
-          label: fyo.t`Entry ID`,
+          label: t`Entry ID`,
           fieldtype: 'Data',
           fieldname: 'name',
           getValue(doc) {
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 40808739..a2546625 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -1,4 +1,4 @@
-import { Fyo } from 'fyo';
+import { Fyo, t } from 'fyo';
 import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import {
@@ -374,7 +374,7 @@ export class Payment extends Doc {
       columns: [
         'party',
         {
-          label: fyo.t`Status`,
+          label: t`Status`,
           fieldname: 'status',
           fieldtype: 'Select',
           size: 'small',
diff --git a/src/App.vue b/src/App.vue
index 2118a3ae..90d0df0a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -117,8 +117,7 @@ export default {
       if (hideGetStarted || onboardingComplete) {
         routeTo('/');
       } else {
-        // routeTo('/get-started');
-        routeTo('/settings');
+        routeTo('/get-started');
       }
     },
     async changeDbFile() {
diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue
index ff31babf..3d8fc1b2 100644
--- a/src/components/Avatar.vue
+++ b/src/components/Avatar.vue
@@ -8,7 +8,17 @@
     />
     <div
       v-else
-      class="bg-gray-500 flex h-full items-center justify-center text-white w-full text-base uppercase"
+      class="
+        bg-gray-500
+        flex
+        h-full
+        items-center
+        justify-center
+        text-white
+        w-full
+        text-base
+        uppercase
+      "
     >
       {{ label && label[0] }}
     </div>
@@ -22,17 +32,17 @@ export default {
     imageURL: String,
     label: String,
     size: {
-      default: 'md'
-    }
+      default: 'md',
+    },
   },
   computed: {
     sizeClasses() {
       return {
         sm: 'w-5 h-5',
         md: 'w-7 h-7',
-        lg: 'w-9 h-9'
+        lg: 'w-9 h-9',
       }[this.size];
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/components/BackLink.vue b/src/components/BackLink.vue
index aa305a88..9b896474 100644
--- a/src/components/BackLink.vue
+++ b/src/components/BackLink.vue
@@ -1,4 +1,4 @@
-<template #title>
+<template>
   <a
     class="cursor-pointer font-semibold flex items-center"
     @click="$router.back()"
@@ -7,3 +7,4 @@
     <span class="ml-1">{{ t`Back` }}</span>
   </a>
 </template>
+<script></script>
diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index 64df8e34..2b8f6972 100644
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -1,10 +1,25 @@
 <template>
   <div class="my-4 mx-4 flex justify-between window-drag">
-    <div class="window-no-drag">
-      <slot name="title" />
-    </div>
+    <h1 class="text-2xl font-bold select-none" v-if="title && !backLink">
+      {{ title }}
+    </h1>
+    <BackLink v-if="backLink" />
     <div class="flex items-stretch window-no-drag">
       <slot name="actions" />
+      <SearchBar v-show="!hideSearch" class="ml-2" />
     </div>
   </div>
 </template>
+<script>
+import BackLink from './BackLink.vue';
+import SearchBar from './SearchBar.vue';
+
+export default {
+  props: {
+    title: { type: String, default: '' },
+    backLink: { type: Boolean, default: false },
+    hideSearch: { type: Boolean, default: false },
+  },
+  components: { SearchBar, BackLink },
+};
+</script>
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 550f1b1c..e05145ab 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -13,11 +13,11 @@
           class="rounded-md relative flex items-center overflow-hidden h-full"
         >
           <div class="absolute flex justify-center w-8">
-            <feather-icon name="search" class="w-3 h-3 text-gray-800" />
+            <feather-icon name="search" class="w-3 h-3 text-gray-700" />
           </div>
           <input
             type="search"
-            class="bg-gray-200 text-sm pl-8 focus:outline-none h-full w-56"
+            class="bg-gray-200 text-sm pl-8 focus:outline-none h-full w-56 placeholder-gray-700"
             :placeholder="t`Search...`"
             autocomplete="off"
             spellcheck="false"
@@ -47,7 +47,6 @@ import Dropdown from 'src/components/Dropdown';
 import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils/ui';
 
-
 export default {
   data() {
     return {
@@ -79,11 +78,11 @@ export default {
       this.$emit('change', null);
     },
     async makeSearchList() {
-      const doctypes = this.getDoctypes();
+      const schemas = this.getSearchableSchemas();
       const reports = this.getReports();
       const views = this.getViews();
 
-      let searchList = [...doctypes, ...reports, ...views];
+      let searchList = [...schemas, ...reports, ...views];
       this.searchList = searchList.map((d) => {
         if (d.route) {
           d.action = () => routeTo(d.route);
@@ -92,19 +91,14 @@ export default {
         return d;
       });
     },
-    getDoctypes() {
-      let doctypes = Object.keys(fyo.models).sort();
-      let doctypeMetas = doctypes.map((doctype) => fyo.getMeta(doctype));
-      let searchableDoctypes = doctypeMetas.filter((meta) => {
-        return !meta.isSingle && !meta.isChild;
-      });
-      return searchableDoctypes.map((meta) => {
-        return {
-          label: meta.label || meta.name,
-          route: `/list/${meta.name}`,
+    getSearchableSchemas() {
+      return Object.values(fyo.schemaMap)
+        .filter((s) => !s.isChild && !s.isSingle)
+        .map((s) => ({
+          label: s.label,
+          route: `/list/${s.name}`,
           group: 'List',
-        };
-      });
+        }));
     },
     getReports() {
       return Object.values(reports).map((report) => {
@@ -120,7 +114,17 @@ export default {
         {
           label: t`Chart of Accounts`,
           route: '/chartOfAccounts',
-          group: 'List',
+          group: 'Setup',
+        },
+        {
+          label: t`Data Import`,
+          route: '/data_import',
+          group: 'Setup',
+        },
+        {
+          label: t`Settings`,
+          route: '/settings',
+          group: 'Setup',
         },
       ];
     },
diff --git a/src/components/Widgets/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
index 65dfa123..31410ade 100644
--- a/src/components/Widgets/PartyWidget.vue
+++ b/src/components/Widgets/PartyWidget.vue
@@ -91,7 +91,7 @@ export default {
           [partyField]: this.doc.name,
         },
         limit: 3,
-        orderBy: 'creation',
+        orderBy: 'created',
       });
       window.pendingInvoices = this.pendingInvoices;
     },
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 90bbed77..688e37b3 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,15 +1,6 @@
 <template>
   <div class="flex flex-col overflow-y-hidden">
-    <PageHeader>
-      <template #title>
-        <h1 class="text-2xl font-bold">
-          {{ t`Chart of Accounts` }}
-        </h1>
-      </template>
-      <template #actions>
-        <SearchBar class="ml-2" />
-      </template>
-    </PageHeader>
+    <PageHeader :title="t`Chart of Accounts`" />
     <div class="flex-1 flex px-8 overflow-y-auto">
       <div class="flex-1" v-if="root">
         <div v-for="account in allAccounts" :key="account.name">
@@ -130,7 +121,6 @@
 </template>
 <script>
 import PageHeader from 'src/components/PageHeader';
-import SearchBar from 'src/components/SearchBar';
 import { fyo } from 'src/initFyo';
 import { openQuickEdit } from 'src/utils';
 import { nextTick } from 'vue';
@@ -139,7 +129,6 @@ import { handleErrorWithDialog } from '../errorHandling';
 export default {
   components: {
     PageHeader,
-    SearchBar,
   },
   data() {
     return {
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index 4433cf81..ac27809b 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -1,14 +1,6 @@
 <template>
   <div class="flex flex-col">
-    <PageHeader>
-      <template #title>
-        <h1 class="text-2xl font-bold">{{ t`Dashboard` }}</h1>
-      </template>
-      <template #actions>
-        <SearchBar class="ml-2" />
-      </template>
-    </PageHeader>
-    <hr class="border-t mx-4" />
+    <PageHeader :title="t`Dashboard`" />
     <div class="mx-4 overflow-y-scroll no-scrollbar">
       <Cashflow class="mt-5" />
       <hr class="border-t mt-10" />
@@ -24,7 +16,6 @@
 
 <script>
 import PageHeader from 'src/components/PageHeader';
-import SearchBar from 'src/components/SearchBar';
 import Cashflow from './Cashflow';
 import Expenses from './Expenses';
 import ProfitAndLoss from './ProfitAndLoss';
@@ -34,7 +25,6 @@ export default {
   name: 'Dashboard',
   components: {
     PageHeader,
-    SearchBar,
     Cashflow,
     UnpaidInvoices,
     ProfitAndLoss,
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index 5bf47e26..ce2afa94 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -1,11 +1,6 @@
 <template>
   <div class="flex flex-col overflow-hidden w-full">
-    <PageHeader>
-      <template #title>
-        <h1 class="text-2xl font-bold">
-          {{ t`Data Import` }}
-        </h1>
-      </template>
+    <PageHeader :title="t`Data Import`">
       <template #actions>
         <DropdownWithActions
           class="ml-2"
@@ -37,7 +32,7 @@
         />
 
         <p
-          class="text-base text-base ml-2"
+          class="text-base ml-2"
           :class="fileName ? 'text-gray-900 font-semibold' : 'text-gray-700'"
         >
           <span v-if="fileName" class="font-normal"
@@ -57,8 +52,6 @@
           <div
             v-if="file && isSubmittable"
             class="
-              justify-center
-              items-center
               gap-2
               flex
               justify-between
@@ -87,12 +80,7 @@
               flex flex-row
               justify-center
               items-center
-              justify-center
-              items-center
               gap-2
-              flex
-              justify-between
-              items-center
               bg-gray-100
               pl-2
               rounded
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index b44c8571..e83a4a79 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -1,17 +1,8 @@
 <template>
   <div class="flex flex-col overflow-y-hidden">
-    <PageHeader>
-      <template #title>
-        <h1 class="text-2xl font-bold">
-          {{ t`Setup your workspace` }}
-        </h1>
-      </template>
-    </PageHeader>
-    <div class="px-8">
-      <div class="border-t"></div>
-    </div>
-    <div class="flex-1 px-8 overflow-y-auto">
-      <div class="my-6" v-for="section in sections" :key="section.label">
+    <PageHeader :title="t`Setup Your Workspace`" />
+    <div class="flex-1 mx-4 overflow-y-auto">
+      <div class="my-4" v-for="section in sections" :key="section.label">
         <h2 class="font-medium">{{ section.label }}</h2>
         <div class="flex mt-4 -mx-2">
           <div
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 46510683..e73a9e8e 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="flex flex-col" v-if="doc">
-    <PageHeader>
-      <template #title>
-        <BackLink />
-      </template>
+    <PageHeader :backLink="true">
       <template #actions>
         <StatusBadge :status="status" />
         <Button
@@ -199,7 +196,6 @@
 </template>
 <script>
 import { getInvoiceStatus } from 'models/helpers';
-import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions';
@@ -223,7 +219,6 @@ export default {
     Button,
     FormControl,
     DropdownWithActions,
-    BackLink,
   },
   provide() {
     return {
@@ -273,9 +268,7 @@ export default {
       this.handleError(error);
     }
     this.printSettings = await fyo.getSingle('PrintSettings');
-    this.companyName = (
-      await fyo.getSingle('AccountingSettings')
-    ).companyName;
+    this.companyName = (await fyo.getSingle('AccountingSettings')).companyName;
 
     let query = this.$route.query;
     if (query.values && query.doctype === this.doctype) {
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 86a0aaff..7d996d73 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="flex flex-col">
-    <PageHeader>
-      <template #title>
-        <BackLink />
-      </template>
+    <PageHeader :backLink="true">
       <template #actions v-if="doc">
         <StatusBadge :status="status" />
         <DropdownWithActions class="ml-2" :actions="actions" />
@@ -128,7 +125,6 @@
   </div>
 </template>
 <script>
-import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions';
@@ -147,7 +143,6 @@ export default {
     DropdownWithActions,
     StatusBadge,
     FormControl,
-    BackLink,
   },
   provide() {
     return {
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index a577938f..1124b50b 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -1,7 +1,10 @@
 <template>
-  <div class="px-5 pb-16 text-base flex flex-col overflow-y-hidden">
-    <div class="flex px-3">
-      <div class="py-4 mr-3 w-7" v-if="hasImage"></div>
+  <div class="mx-4 pb-16 text-base flex flex-col overflow-y-hidden">
+    <!-- Title Row -->
+    <div class="flex">
+      <div class="py-4 mr-3 w-7 border-b" v-if="hasImage">
+        <p class="text-gray-700">Img</p>
+      </div>
       <Row
         class="flex-1 text-gray-700"
         :columnCount="columns.length"
@@ -19,6 +22,8 @@
         </div>
       </Row>
     </div>
+
+    <!-- Data Rows -->
     <div class="overflow-y-auto" v-if="data.length !== 0">
       <div
         class="px-3 flex hover:bg-gray-100 rounded-md"
@@ -46,6 +51,8 @@
         </Row>
       </div>
     </div>
+
+    <!-- Empty State -->
     <div v-else class="flex flex-col items-center justify-center my-auto">
       <img src="@/assets/img/list-empty-state.svg" alt="" class="w-24" />
       <p class="my-3 text-gray-800">{{ t`No entries found` }}</p>
@@ -65,7 +72,7 @@ import ListCell from './ListCell';
 
 export default {
   name: 'List',
-  props: ['listConfig', 'filters'],
+  props: { listConfig: Object, filters: Object, schemaName: String },
   emits: ['makeNewDoc'],
   components: {
     Row,
@@ -74,10 +81,12 @@ export default {
     Button,
   },
   watch: {
-    listConfig(oldValue, newValue) {
-      if (oldValue.doctype !== newValue.doctype) {
-        this.setupColumnsAndData();
+    schemaName(oldValue, newValue) {
+      if (oldValue === newValue) {
+        return;
       }
+
+      this.updateData();
     },
   },
   data() {
@@ -87,63 +96,46 @@ export default {
   },
   computed: {
     columns() {
-      return this.prepareColumns();
-    },
-    meta() {
-      return fyo.getMeta(this.listConfig.doctype);
+      const columns = this.listConfig?.columns ?? [];
+      return columns
+        .map((fieldname) => fyo.getField(this.schemaName, fieldname))
+        .filter(Boolean);
     },
     hasImage() {
-      return this.meta.hasField('image');
+      return !!fyo.getField(this.schemaName, 'image');
     },
   },
   async mounted() {
-    await this.setupColumnsAndData();
-    fyo.db.on(`change:${this.listConfig.doctype}`, () => {
+    await this.updateData();
+    /*
+    TODO: need to set callback incase that schema has data changes
+    fyo.db.on(`change:${this.schemaName}`, () => {
       this.updateData();
     });
+    */
   },
   methods: {
-    async setupColumnsAndData() {
-      this.doctype = this.listConfig.doctype;
-      await this.updateData();
-    },
     openForm(doc) {
       if (this.listConfig.formRoute) {
         routeTo(this.listConfig.formRoute(doc.name));
         return;
       }
       openQuickEdit({
-        doctype: this.doctype,
+        schemaName: this.schemaName,
         name: doc.name,
       });
     },
     async updateData(filters) {
-      if (!filters) filters = this.getFilters();
-      this.data = await fyo.db.getAll({
-        doctype: this.doctype,
+      if (!filters) {
+        filters = { ...this.filters };
+      }
+
+      this.data = await fyo.db.getAll(this.schemaName, {
         fields: ['*'],
         filters,
-        orderBy: 'creation',
+        orderBy: 'created',
       });
     },
-    getFilters() {
-      let filters = {};
-      Object.assign(filters, this.listConfig.filters || {});
-      Object.assign(filters, this.filters);
-      return filters;
-    },
-    prepareColumns() {
-      return this.listConfig.columns
-        .map((col) => {
-          if (typeof col === 'string') {
-            const field = this.meta.getField(col);
-            if (!field) return null;
-            return field;
-          }
-          return col;
-        })
-        .filter(Boolean);
-    },
   },
 };
 </script>
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 729687a0..0add7243 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -1,26 +1,21 @@
 <template>
   <div class="flex flex-col">
-    <PageHeader>
-      <template #title>
-        <h1 class="text-2xl font-bold" v-if="title">
-          {{ title }}
-        </h1>
-      </template>
+    <PageHeader :title="title">
       <template #actions>
         <FilterDropdown
           ref="filterDropdown"
           @change="applyFilter"
-          :fields="meta.fields"
+          :fields="fields"
         />
         <Button class="ml-2" :icon="true" type="primary" @click="makeNewDoc">
           <feather-icon name="plus" class="w-4 h-4 text-white" />
         </Button>
-        <SearchBar class="ml-2" />
       </template>
     </PageHeader>
     <div class="flex-1 flex h-full">
       <List
         ref="list"
+        :schemaName="schemaName"
         :listConfig="listConfig"
         :filters="filters"
         class="flex-1"
@@ -33,47 +28,36 @@
 import Button from 'src/components/Button';
 import FilterDropdown from 'src/components/FilterDropdown';
 import PageHeader from 'src/components/PageHeader';
-import SearchBar from 'src/components/SearchBar';
 import { fyo } from 'src/initFyo';
-import { routeTo } from 'src/utils';
 import List from './List';
 
 export default {
   name: 'ListView',
-  props: ['doctype', 'filters'],
+  props: ['schemaName', 'filters'],
   components: {
     PageHeader,
     List,
     Button,
-    SearchBar,
     FilterDropdown,
   },
   data() {
-    return { listConfigs: undefined };
+    return { listConfig: undefined };
   },
   async activated() {
     if (typeof this.filters === 'object') {
       this.$refs.filterDropdown.setFilter(this.filters);
     }
 
-    if (this.listConfigs === undefined) {
-      this.listConfigs = (await import('./listConfig')).default;
-    }
+    this.listConfig = getListConfig(this.schemaName);
   },
   methods: {
     async makeNewDoc() {
-      const doctype = this.listConfig.doctype;
-      const doc = await fyo.doc.getNewDoc(doctype);
-      if (this.listConfig.filters) {
-        doc.set(this.listConfig.filters);
-      }
-      if (this.filters) {
-        doc.set(this.filters);
-      }
-      let path = this.getFormPath(doc.name);
+      const doc = await fyo.doc.getNewDoc(this.schemaName, this.filters ?? {});
+      const path = this.getFormPath(doc.name);
+
       routeTo(path);
       doc.on('afterSync', () => {
-        let path = this.getFormPath(doc.name);
+        const path = this.getFormPath(doc.name);
         this.$router.replace(path);
       });
     },
@@ -82,10 +66,10 @@ export default {
     },
     getFormPath(name) {
       let path = {
-        path: `/list/${this.doctype}`,
+        path: `/list/${this.schemaName}`,
         query: {
           edit: 1,
-          doctype: this.doctype,
+          schemaName: this.schemaName,
           name,
         },
       };
@@ -104,20 +88,22 @@ export default {
     },
   },
   computed: {
-    listConfig() {
-      if (this?.listConfigs?.[this?.doctype]) {
-        return this.listConfigs[this.doctype];
-      } else {
-        return {
-          title: this.doctype,
-          doctype: this.doctype,
-          columns: fyo.schemaMap[this.doctype].keywordFields ?? ['name'],
-        };
-      }
-    },
     title() {
-      return this.listConfig.title || this.doctype;
+      return fyo.schemaMap[this.schemaName].label;
+    },
+    fields() {
+      return fyo.schemaMap[this.schemaName].fields;
     },
   },
 };
+
+function getListConfig(schemaName) {
+  const listConfig = fyo.models[schemaName]?.getListViewSettings?.(fyo);
+  if (listConfig?.columns === undefined) {
+    return {
+      columns: fyo.schemaMap[schemaName].keywordFields ?? ['name'],
+    };
+  }
+  return listConfig;
+}
 </script>
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index e797238e..0df31e81 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -1,10 +1,7 @@
 <template>
   <div class="flex">
     <div class="flex flex-col flex-1">
-      <PageHeader class="bg-white z-10">
-        <template #title>
-          <BackLink />
-        </template>
+      <PageHeader :backLink="true" class="bg-white z-10">
         <template #actions>
           <Button
             class="text-gray-900 text-xs ml-2"
@@ -53,7 +50,6 @@
 <script>
 import { ipcRenderer } from 'electron';
 import { Verb } from 'fyo/telemetry/types';
-import BackLink from 'src/components/BackLink';
 import Button from 'src/components/Button';
 import PageHeader from 'src/components/PageHeader';
 import SearchBar from 'src/components/SearchBar';
@@ -68,7 +64,6 @@ export default {
     PageHeader,
     SearchBar,
     Button,
-    BackLink,
     TwoColumnForm,
   },
   data() {
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index ecf89ecc..25418ec0 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="flex flex-col max-w-full">
-    <PageHeader>
-      <template #title>
-        <h1 class="text-2xl font-bold">{{ report.title }}</h1>
-      </template>
+    <PageHeader :title="report.title">
       <template #actions>
         <DropdownWithActions
           v-for="group of actionGroups"
@@ -15,7 +12,6 @@
           {{ group.label }}
         </DropdownWithActions>
         <DropdownWithActions class="ml-2" :actions="actions" />
-        <SearchBar class="ml-2" />
       </template>
     </PageHeader>
     <div class="flex px-8 mt-2 text-base" v-if="report.filterFields">
@@ -144,7 +140,6 @@ import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import FeatherIcon from 'src/components/FeatherIcon.vue';
 import PageHeader from 'src/components/PageHeader';
 import Row from 'src/components/Row';
-import SearchBar from 'src/components/SearchBar';
 import WithScroll from 'src/components/WithScroll';
 import { fyo } from 'src/initFyo';
 import { h, markRaw } from 'vue';
@@ -155,7 +150,6 @@ export default {
   components: {
     PageHeader,
     Button,
-    SearchBar,
     Row,
     FormControl,
     WithScroll,
@@ -196,7 +190,7 @@ export default {
       });
     },
     async fetchReportData() {
-      let data = await getReportData(this.report.method, this.filters)
+      let data = await getReportData(this.report.method, this.filters);
 
       let rows;
       if (data.rows) {
@@ -345,7 +339,7 @@ export default {
       } else if (this.usePagination) {
         return 'calc(100vh - 13rem)';
       }
-      
+
       return 'calc(100vh - 12rem)';
     },
     sliceIndex() {
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index a75dec87..d10a03e7 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -1,12 +1,6 @@
 <template>
   <div class="flex flex-col overflow-hidden">
-    <PageHeader>
-      <template #title>
-        <h1 class="text-2xl font-bold">
-          {{ t`Settings` }}
-        </h1>
-      </template>
-    </PageHeader>
+    <PageHeader :title="t`Settings`" />
     <div class="flex justify-center flex-1 mb-8 mt-2">
       <div
         class="border rounded-lg shadow h-full flex flex-col justify-between"
diff --git a/src/router.ts b/src/router.ts
index 94eeafe4..2c47a02f 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -5,9 +5,9 @@ import GetStarted from 'src/pages/GetStarted.vue';
 // import DataImport from 'src/pages/DataImport.vue';
 // import InvoiceForm from 'src/pages/InvoiceForm.vue';
 // import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
-// import ListView from 'src/pages/ListView/ListView.vue';
+import ListView from 'src/pages/ListView/ListView.vue';
 // import PrintView from 'src/pages/PrintView/PrintView.vue';
-// import QuickEditForm from 'src/pages/QuickEditForm.vue';
+import QuickEditForm from 'src/pages/QuickEditForm.vue';
 // import Report from 'src/pages/Report.vue';
 import Settings from 'src/pages/Settings/Settings.vue';
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
@@ -54,8 +54,9 @@ const routes: RouteRecordRaw[] = [
       edit: (route) => route.query,
     },
   },
+  */
   {
-    path: '/list/:doctype/:fieldname?/:value?',
+    path: '/list/:schemaName/:fieldname?/:value?',
     name: 'ListView',
     components: {
       default: ListView,
@@ -63,7 +64,7 @@ const routes: RouteRecordRaw[] = [
     },
     props: {
       default: (route) => {
-        const { doctype, fieldname, value } = route.params;
+        const { schemaName, fieldname, value } = route.params;
         let { filters } = route.params;
 
         if (filters === undefined && fieldname && value) {
@@ -72,13 +73,14 @@ const routes: RouteRecordRaw[] = [
         }
 
         return {
-          doctype,
+          schemaName,
           filters,
         };
       },
       edit: (route) => route.query,
     },
   },
+  /*
   {
     path: '/print/:doctype/:name',
     name: 'PrintView',
@@ -108,8 +110,7 @@ const routes: RouteRecordRaw[] = [
     name: 'Data Import',
     component: DataImport,
   },
-*/
-  {
+*/ {
     path: '/settings',
     name: 'Settings',
     component: Settings,
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 15743087..56f54400 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -52,25 +52,25 @@ function getCompleteSidebar(): SidebarConfig {
           label: t`Sales Invoices`,
           name: 'sales-invoices',
           route: '/list/SalesInvoice',
-          doctype: 'SalesInvoice',
+          schemaName: 'SalesInvoice',
         },
         {
           label: t`Payments`,
           name: 'payments',
           route: '/list/Payment/paymentType/Receive',
-          doctype: 'Payment',
+          schemaName: 'Payment',
         },
         {
           label: t`Customers`,
           name: 'customers',
-          route: '/list/Customer',
-          doctype: 'Customer',
+          route: '/list/Party/role/Customer',
+          schemaName: 'Party',
         },
         {
           label: t`Sales Items`,
           name: 'sales-items',
           route: '/list/Item/for/sales',
-          doctype: 'Item',
+          schemaName: 'Item',
         },
       ],
     },
@@ -84,25 +84,25 @@ function getCompleteSidebar(): SidebarConfig {
           label: t`Purchase Invoices`,
           name: 'purchase-invoices',
           route: '/list/PurchaseInvoice',
-          doctype: 'PurchaseInvoice',
+          schemaName: 'PurchaseInvoice',
         },
         {
           label: t`Payments`,
           name: 'payments',
           route: '/list/Payment/paymentType/Pay',
-          doctype: 'Payment',
+          schemaName: 'Payment',
         },
         {
           label: t`Suppliers`,
           name: 'suppliers',
-          route: '/list/Supplier',
-          doctype: 'Supplier',
+          route: '/list/Party/role/Supplier',
+          schemaName: 'Party',
         },
         {
           label: t`Purchase Items`,
           name: 'purchase-items',
           route: '/list/Item/for/purchases',
-          doctype: 'Item',
+          schemaName: 'Item',
         },
       ],
     },
@@ -116,13 +116,19 @@ function getCompleteSidebar(): SidebarConfig {
           label: t`Journal Entry`,
           name: 'journal-entry',
           route: '/list/JournalEntry',
-          doctype: 'JournalEntry',
+          schemaName: 'JournalEntry',
         },
         {
           label: t`Common Items`,
           name: 'common-items',
           route: '/list/Item/for/both',
-          doctype: 'Item',
+          schemaName: 'Item',
+        },
+        {
+          label: t`Party`,
+          name: 'party',
+          route: '/list/Party/role/Both',
+          schemaName: 'Party',
         },
       ],
     },
@@ -181,7 +187,7 @@ function getCompleteSidebar(): SidebarConfig {
           label: t`Taxes`,
           name: 'taxes',
           route: '/list/Tax',
-          doctype: 'Tax',
+          schemaName: 'Tax',
         },
         {
           label: t`Data Import`,
diff --git a/src/utils/types.ts b/src/utils/types.ts
index ba77da68..4aa2b153 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -44,6 +44,6 @@ export interface SidebarItem {
   label: string;
   name: string;
   route: string;
-  doctype?: string;
+  schemaName?: string;
   hidden?: () => boolean;
 }
diff --git a/translations/ar.csv b/translations/ar.csv
index e8083d0c..c86a3d81 100644
--- a/translations/ar.csv
+++ b/translations/ar.csv
@@ -445,7 +445,7 @@
 `Setup Complete`,`اكتمل الإعداد`
 `Setup Wizard`,`معالج الإعداد`
 `Setup your organization`,`إعداد منظمتك`
-`Setup your workspace`,`إعداد مساحة العمل الخاصة بك`
+`Setup Your Workspace`,`إعداد مساحة العمل الخاصة بك`
 `Show Me`,`أرني`
 `Smallest Currency Fraction Value`,`أصغر قيمة لكسر العملة`
 `Softwares`,`البرامج`
diff --git a/translations/ca-ES.csv b/translations/ca-ES.csv
index a2b83414..742d3ef9 100644
--- a/translations/ca-ES.csv
+++ b/translations/ca-ES.csv
@@ -491,7 +491,7 @@
 `Setup your opening balances before performing any accounting entries`,`Configureu els saldos d'obertura abans de realitzar qualsevol entrada comptable`
 `Setup your organization`,`Configura la teva empresa`
 `Setup your tax templates for your sales or purchase transactions`,`Configura les plantilles de taxes per a les vendes o compres`
-`Setup your workspace`,`Configura el teu espai de treball`
+`Setup Your Workspace`,`Configura el teu espai de treball`
 `Show Me`,`Mostra'm`
 `Smallest Currency Fraction Value`,`Valor de fracció de la divisa més petit`
 `Softwares`,`Programari`
diff --git a/translations/de.csv b/translations/de.csv
index 3aa6a6e1..8246bd65 100644
--- a/translations/de.csv
+++ b/translations/de.csv
@@ -397,7 +397,7 @@
 `Setup Complete`,`Einrichtung abgeschlossen`
 `Setup Wizard`,`Einrichtungsassistent`
 `Setup your organization`,`Einrichtung Ihrer Organisation`
-`Setup your workspace`,`Einrichten Ihres Arbeitsbereichs`
+`Setup Your Workspace`,`Einrichten Ihres Arbeitsbereichs`
 `Smallest Currency Fraction Value`,`Kleinster Wert eines Währungsbruchteils`
 `Softwares`,`Software`
 `Something has gone terribly wrong. Please check the console and raise an issue.`,`Etwas ist furchtbar schief gelaufen. Bitte prüfen Sie die Konsole und melden Sie ein Problem.`
diff --git a/translations/fr.csv b/translations/fr.csv
index 0df7e79d..70079aed 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -397,7 +397,7 @@
 `Setup Complete`,`Configuration terminée`
 `Setup Wizard`,`Assistant de configuration`
 `Setup your organization`,`Configurer votre organisation`
-`Setup your workspace`,`Configurez votre espace de travail`
+`Setup Your Workspace`,`Configurez votre espace de travail`
 `Smallest Currency Fraction Value`,`Valeur de la plus petite fraction de la monnaie`
 `Softwares`,`Logiciels`
 `Something has gone terribly wrong. Please check the console and raise an issue.`,`Quelque chose s'est terriblement mal passé. Veuillez vérifier la console et soulever un problème.`
diff --git a/translations/pt.csv b/translations/pt.csv
index 6a002cdf..082dd503 100644
--- a/translations/pt.csv
+++ b/translations/pt.csv
@@ -397,7 +397,7 @@
 `Setup Complete`,`Configuração Completa`
 `Setup Wizard`,`Assistente de Configuração`
 `Setup your organization`,`Configure a sua organização`
-`Setup your workspace`,`Configure o seu espaço de trabalho`
+`Setup Your Workspace`,`Configure o seu espaço de trabalho`
 `Smallest Currency Fraction Value`,`Menor valor de fracção da moeda`
 `Softwares`,`Aplicações informáticas`
 `Something has gone terribly wrong. Please check the console and raise an issue.`,`Algo correu terrivelmente mal. Por favor, verifique a consola e levante um problema.`

From 25dacea269c7d6c57e280600a637fbf1cbaf2f1a Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 27 Apr 2022 23:59:57 +0530
Subject: [PATCH 074/163] test: observable - add hasListener

---
 fyo/tests/testObservable.spec.ts | 131 +++++++++++++++++++++++++++++++
 fyo/utils/observable.ts          |  22 +++++-
 2 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 fyo/tests/testObservable.spec.ts

diff --git a/fyo/tests/testObservable.spec.ts b/fyo/tests/testObservable.spec.ts
new file mode 100644
index 00000000..23cfa386
--- /dev/null
+++ b/fyo/tests/testObservable.spec.ts
@@ -0,0 +1,131 @@
+import * as assert from 'assert';
+import Observable from 'fyo/utils/observable';
+import 'mocha';
+
+enum ObsEvent {
+  A = 'event-a',
+  B = 'event-b',
+}
+
+describe('Observable', function () {
+  const obs = new Observable();
+  let counter = 0;
+  const params = { aOne: 18, aTwo: 21, b: 42 };
+
+  const listenerAOnce = (value: number) => {
+    assert.strictEqual(params.aOne, value, 'listenerAOnce');
+  };
+
+  const listenerAEvery = (value: number) => {
+    if (counter === 0) {
+      assert.strictEqual(params.aOne, value, 'listenerAEvery 0');
+    } else if (counter === 1) {
+      assert.strictEqual(params.aTwo, value, 'listenerAEvery 1');
+    } else {
+      throw new Error("this shouldn't run");
+    }
+    counter += 1;
+  };
+
+  const listenerBOnce = (value: number) => {
+    assert.strictEqual(params.b, value, 'listenerBOnce');
+  };
+
+  specify('set A One', function () {
+    assert.strictEqual(obs.hasListener(ObsEvent.A), false, 'pre');
+
+    obs.once(ObsEvent.A, listenerAOnce);
+    assert.strictEqual(obs.hasListener(ObsEvent.A), true, 'non specific');
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAOnce),
+      true,
+      'specific once'
+    );
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAEvery),
+      false,
+      'specific every'
+    );
+  });
+
+  specify('set A Two', function () {
+    obs.on(ObsEvent.A, listenerAEvery);
+    assert.strictEqual(obs.hasListener(ObsEvent.A), true, 'non specific');
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAOnce),
+      true,
+      'specific once'
+    );
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAEvery),
+      true,
+      'specific every'
+    );
+  });
+
+  specify('set B', function () {
+    assert.strictEqual(obs.hasListener(ObsEvent.B), false, 'pre');
+
+    obs.once(ObsEvent.B, listenerBOnce);
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerBOnce),
+      false,
+      'specific false'
+    );
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.B, listenerBOnce),
+      true,
+      'specific true'
+    );
+  });
+
+  specify('trigger A 0', async function () {
+    await obs.trigger(ObsEvent.A, params.aOne);
+    assert.strictEqual(obs.hasListener(ObsEvent.A), true, 'non specific');
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAOnce),
+      false,
+      'specific'
+    );
+  });
+
+  specify('trigger A 1', async function () {
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAEvery),
+      true,
+      'specific pre'
+    );
+    await obs.trigger(ObsEvent.A, params.aTwo);
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAEvery),
+      true,
+      'specific post'
+    );
+  });
+
+  specify('trigger B', async function () {
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.B, listenerBOnce),
+      true,
+      'specific pre'
+    );
+    await obs.trigger(ObsEvent.B, params.b);
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.B, listenerBOnce),
+      false,
+      'specific post'
+    );
+  });
+
+  specify('remove A', async function () {
+    obs.off(ObsEvent.A, listenerAEvery);
+    assert.strictEqual(
+      obs.hasListener(ObsEvent.A, listenerAEvery),
+      false,
+      'specific pre'
+    );
+
+    assert.strictEqual(counter, 2, 'incorrect counter');
+    await obs.trigger(ObsEvent.A, 777);
+  });
+});
diff --git a/fyo/utils/observable.ts b/fyo/utils/observable.ts
index 61c8f998..2dba8abc 100644
--- a/fyo/utils/observable.ts
+++ b/fyo/utils/observable.ts
@@ -43,6 +43,26 @@ export default class Observable<T> {
     });
   }
 
+  /**
+   * Checks if any `listener` or the given `listener` has been registered
+   * for the passed `event`.
+   *
+   * @param event : name of the event for which the listener is checked
+   * @param listener : specific listener that is checked for
+   */
+  hasListener(event: string, listener?: Function) {
+    const listeners = this[EventType.Listeners].get(event) ?? [];
+    const onceListeners = this[EventType.OnceListeners].get(event) ?? [];
+
+    if (listener === undefined) {
+      return [...listeners, ...onceListeners].length > 0;
+    }
+
+    let has = listeners.includes(listener);
+    has ||= onceListeners.includes(listener);
+    return has;
+  }
+
   /**
    * Sets a `listener` that executes every time `event` is triggered
    *
@@ -91,7 +111,7 @@ export default class Observable<T> {
    * @param throttle : wait time before triggering the event.
    */
 
-  async trigger(event: string, params: unknown, throttle: number = 0) {
+  async trigger(event: string, params?: unknown, throttle: number = 0) {
     let isHot = false;
     if (throttle > 0) {
       isHot = this._throttled(event, params, throttle);

From 9ebe35fe9399ae966d70b27e5acf219d00407b41 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 28 Apr 2022 00:09:34 +0530
Subject: [PATCH 075/163] incr: set crud observable, set update listeners

---
 fyo/core/docHandler.ts      |  4 +++-
 fyo/model/doc.ts            |  8 +++++++-
 fyo/utils/observable.ts     |  7 ++++++-
 src/pages/ListView/List.vue | 21 +++++++++++++++------
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index c873af2e..43b046d5 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -9,9 +9,10 @@ import { DocValue, DocValueMap } from './types';
 
 export class DocHandler {
   fyo: Fyo;
+  models: ModelMap = {};
   singles: SinglesMap = {};
   docs: Observable<DocMap> = new Observable();
-  models: ModelMap = {};
+  observer: Observable<never> = new Observable();
 
   constructor(fyo: Fyo) {
     this.fyo = fyo;
@@ -21,6 +22,7 @@ export class DocHandler {
     this.models = {};
     this.singles = {};
     this.docs = new Observable();
+    this.observer = new Observable();
   }
 
   purgeCache() {
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index a1e4f8e2..07e74a63 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -263,7 +263,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     }
 
     const targetField = this.fieldMap[fieldname] as TargetField;
-    const schema = this.fyo.db.schemaMap[targetField.target] as Schema;
+    const schema = this.fyo.schemaMap[targetField.target] as Schema;
     const childDoc = new Doc(schema, data as DocValueMap, this.fyo);
     return childDoc;
   }
@@ -390,6 +390,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     }
 
     this._notInserted = false;
+    this.fyo.doc.observer.trigger(`load:${this.schemaName}`, this.name);
   }
 
   async loadLinks() {
@@ -627,6 +628,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     }
     this._notInserted = false;
     await this.trigger('afterSync');
+    this.fyo.doc.observer.trigger(`sync:${this.schemaName}`, this.name);
     return doc;
   }
 
@@ -636,6 +638,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     await this.trigger('afterDelete');
 
     this.fyo.telemetry.log(Verb.Deleted, this.schemaName);
+    this.fyo.doc.observer.trigger(`delete:${this.schemaName}`, this.name);
   }
 
   async _submitOrRevert(isSubmit: boolean) {
@@ -652,10 +655,12 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async submit() {
     this.cancelled = false;
     await this._submitOrRevert(true);
+    this.fyo.doc.observer.trigger(`submit:${this.schemaName}`, this.name);
   }
 
   async revert() {
     await this._submitOrRevert(false);
+    this.fyo.doc.observer.trigger(`revert:${this.schemaName}`, this.name);
   }
 
   async rename(newName: string) {
@@ -663,6 +668,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     await this.fyo.db.rename(this.schemaName, this.name!, newName);
     this.name = newName;
     await this.trigger('afterRename');
+    this.fyo.doc.observer.trigger(`rename:${this.schemaName}`, this.name);
   }
 
   async trigger(event: string, params?: unknown) {
diff --git a/fyo/utils/observable.ts b/fyo/utils/observable.ts
index 2dba8abc..8f896d66 100644
--- a/fyo/utils/observable.ts
+++ b/fyo/utils/observable.ts
@@ -170,7 +170,12 @@ export default class Observable<T> {
 
   _addListener(type: EventType, event: string, listener: Function) {
     this._initLiseners(type, event);
-    this[type].get(event)!.push(listener);
+    const list = this[type].get(event)!;
+    if (list.includes(listener)) {
+      return;
+    }
+
+    list.push(listener);
   }
 
   _initLiseners(type: EventType, event: string) {
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index 1124b50b..edf5daac 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -107,14 +107,23 @@ export default {
   },
   async mounted() {
     await this.updateData();
-    /*
-    TODO: need to set callback incase that schema has data changes
-    fyo.db.on(`change:${this.schemaName}`, () => {
-      this.updateData();
-    });
-    */
+    this.setUpdateListeners();
   },
   methods: {
+    setUpdateListeners() {
+      const listener = () => {
+        this.updateData();
+      };
+
+      if (fyo.schemaMap[this.schemaName].isSubmittable) {
+        fyo.doc.observer.on(`submit:${this.schemaName}`, listener);
+        fyo.doc.observer.on(`revert:${this.schemaName}`, listener);
+      }
+
+      fyo.doc.observer.on(`sync:${this.schemaName}`, listener);
+      fyo.doc.observer.on(`delete:${this.schemaName}`, listener);
+      fyo.doc.observer.on(`rename:${this.schemaName}`, listener);
+    },
     openForm(doc) {
       if (this.listConfig.formRoute) {
         routeTo(this.listConfig.formRoute(doc.name));

From 1bcd0f0afbd9909b4d594803921b60e0b63c6403 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 28 Apr 2022 12:04:55 +0530
Subject: [PATCH 076/163] incr: get quickedit to display

---
 models/helpers.ts                      |   2 +-
 src/App.vue                            |   6 +-
 src/components/Controls/Base.vue       |   2 +-
 src/components/StatusBadge.vue         |  15 ++-
 src/components/Widgets/PartyWidget.vue |   7 +-
 src/pages/ChartOfAccounts.vue          |  14 +--
 src/pages/Desk.vue                     |   4 +-
 src/pages/ListView/ListView.vue        |   1 +
 src/pages/QuickEditForm.vue            | 138 +++++++++++++++----------
 src/router.ts                          |   8 +-
 src/utils/quickEditWidgets.ts          |  18 ++++
 src/utils/ui.ts                        |  29 +++---
 12 files changed, 155 insertions(+), 89 deletions(-)
 create mode 100644 src/utils/quickEditWidgets.ts

diff --git a/models/helpers.ts b/models/helpers.ts
index f154803b..f8803bac 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -106,7 +106,7 @@ export const statusColor = {
 };
 
 export function getInvoiceStatus(doc: Doc) {
-  let status = `Unpaid`;
+  let status = 'Unpaid';
   if (!doc.submitted) {
     status = 'Draft';
   }
diff --git a/src/App.vue b/src/App.vue
index 90d0df0a..32bd9f0b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -33,9 +33,9 @@
 <script>
 import { ConfigKeys } from 'fyo/core/types';
 import {
-getSetupComplete,
-incrementOpenCount,
-startTelemetry
+  getSetupComplete,
+  incrementOpenCount,
+  startTelemetry,
 } from 'src/utils/misc';
 import TelemetryModal from './components/once/TelemetryModal.vue';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
diff --git a/src/components/Controls/Base.vue b/src/components/Controls/Base.vue
index 4f0ab2fe..1c58e307 100644
--- a/src/components/Controls/Base.vue
+++ b/src/components/Controls/Base.vue
@@ -25,7 +25,7 @@ export default {
   props: {
     df: Object,
     value: [String, Number, Boolean, Object],
-    inputClass: [Function, String],
+    inputClass: [Function, String, Object],
     placeholder: String,
     size: String,
     showLabel: Boolean,
diff --git a/src/components/StatusBadge.vue b/src/components/StatusBadge.vue
index 533544c7..25a3049c 100644
--- a/src/components/StatusBadge.vue
+++ b/src/components/StatusBadge.vue
@@ -1,10 +1,12 @@
 <template>
   <Badge class="text-xs flex-center px-3 ml-2" :color="color" v-if="status">{{
-    status
+    statusLabel
   }}</Badge>
 </template>
 <script>
+import { t } from 'fyo';
 import { statusColor } from 'src/utils/colors';
+import Badge from './Badge.vue';
 
 export default {
   name: 'StatusBadge',
@@ -13,6 +15,17 @@ export default {
     color() {
       return statusColor[this.status];
     },
+    statusLabel() {
+      return (
+        {
+          Draft: t`Draft`,
+          Unpaid: t`Unpaid`,
+          Paid: t`Paid`,
+          Cancelled: t`Cancelled`,
+        }[this.status] ?? this.status
+      );
+    },
   },
+  components: { Badge },
 };
 </script>
diff --git a/src/components/Widgets/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
index 31410ade..762fa0c1 100644
--- a/src/components/Widgets/PartyWidget.vue
+++ b/src/components/Widgets/PartyWidget.vue
@@ -51,7 +51,7 @@
 <script>
 import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils';
-import { getStatusColumn } from '../Transaction/Transaction';
+// import { getStatusColumn } from '../Transaction/Transaction';
 
 export default {
   name: 'PartyWidget',
@@ -96,8 +96,9 @@ export default {
       window.pendingInvoices = this.pendingInvoices;
     },
     getStatusBadge(doc) {
-      let statusColumn = getStatusColumn();
-      return statusColumn.render(doc);
+      // let statusColumn = getStatusColumn();
+      // return statusColumn.render(doc);
+      return {}
     },
     routeToForm(doc) {
       routeTo(`/edit/${this.invoiceDoctype}/${doc.name}`);
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 688e37b3..899e7574 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -120,9 +120,10 @@
   </div>
 </template>
 <script>
+import { ModelNameEnum } from 'models/types';
 import PageHeader from 'src/components/PageHeader';
 import { fyo } from 'src/initFyo';
-import { openQuickEdit } from 'src/utils';
+import { openQuickEdit } from 'src/utils/ui';
 import { nextTick } from 'vue';
 import { handleErrorWithDialog } from '../errorHandling';
 
@@ -134,7 +135,7 @@ export default {
     return {
       root: null,
       accounts: [],
-      doctype: 'Account',
+      schemaName: 'Account',
       insertingAccount: false,
     };
   },
@@ -147,8 +148,8 @@ export default {
   },
   methods: {
     async fetchAccounts() {
-      this.settings = fyo.getMeta(this.doctype).treeSettings;
-      const { currency } = await fyo.getSingle('AccountingSettings');
+      this.settings = fyo.models[ModelNameEnum.Account].getTreeSettings(fyo);
+      const { currency } = await fyo.doc.getSingle('AccountingSettings');
       this.root = {
         label: await this.settings.getRootLabel(),
         balance: 0,
@@ -159,7 +160,7 @@ export default {
     onClick(account) {
       if (account.isGroup === 0) {
         openQuickEdit({
-          doctype: 'Account',
+          schemaName: ModelNameEnum.Account,
           name: account.name,
         });
       } else {
@@ -180,8 +181,7 @@ export default {
       }
     },
     async getChildren(parent = null) {
-      const children = await fyo.db.getAll({
-        doctype: this.doctype,
+      const children = await fyo.db.getAll(ModelNameEnum.Account, {
         filters: {
           parentAccount: parent,
         },
diff --git a/src/pages/Desk.vue b/src/pages/Desk.vue
index e991ae0b..7ae46b26 100644
--- a/src/pages/Desk.vue
+++ b/src/pages/Desk.vue
@@ -17,7 +17,7 @@
             <component
               :is="Component"
               class="w-80 flex-1"
-              :key="$route.query.doctype + $route.query.name"
+              :key="$route.query.schemaName + $route.query.name"
             />
           </keep-alive>
         </router-view>
@@ -37,7 +37,7 @@ export default {
     showQuickEdit() {
       return (
         this.$route.query.edit &&
-        this.$route.query.doctype &&
+        this.$route.query.schemaName &&
         this.$route.query.name
       );
     },
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 0add7243..d2b618e2 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -29,6 +29,7 @@ import Button from 'src/components/Button';
 import FilterDropdown from 'src/components/FilterDropdown';
 import PageHeader from 'src/components/PageHeader';
 import { fyo } from 'src/initFyo';
+import { routeTo } from 'src/utils/ui';
 import List from './List';
 
 export default {
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index a0c6a612..963b0631 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -16,7 +16,7 @@
           :icon="true"
           @click="sync"
           type="primary"
-          v-if="doc && doc._notInserted"
+          v-if="doc && doc.notInserted"
           class="ml-2 text-white text-xs"
         >
           {{ t`Save` }}
@@ -26,11 +26,10 @@
           @click="submitDoc"
           type="primary"
           v-if="
-            meta &&
-            meta.isSubmittable &&
+            schema?.isSubmittable &&
             doc &&
             !doc.submitted &&
-            !doc._notInserted &&
+            !doc.notInserted &&
             !(doc.cancelled || false)
           "
           class="ml-2 text-white text-xs"
@@ -78,17 +77,24 @@
 
 <script>
 import { t } from 'fyo';
-import Button from 'src/components/Button';
+import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
-import DropdownWithActions from 'src/components/DropdownWithActions';
-import StatusBadge from 'src/components/StatusBadge';
-import TwoColumnForm from 'src/components/TwoColumnForm';
+import DropdownWithActions from 'src/components/DropdownWithActions.vue';
+import StatusBadge from 'src/components/StatusBadge.vue';
+import TwoColumnForm from 'src/components/TwoColumnForm.vue';
 import { fyo } from 'src/initFyo';
-import { getActionsForDocument, openQuickEdit } from 'src/utils';
+import { getQuickEditWidget } from 'src/utils/quickEditWidgets';
+import { getActionsForDocument, openQuickEdit } from 'src/utils/ui';
 
 export default {
   name: 'QuickEditForm',
-  props: ['doctype', 'name', 'valueJSON', 'hideFields', 'showFields'],
+  props: {
+    name: String,
+    schemaName: String,
+    defaults: String,
+    hideFields: { type: Array, default: () => [] },
+    showFields: { type: Array, default: () => [] },
+  },
   components: {
     Button,
     FormControl,
@@ -99,7 +105,7 @@ export default {
   provide() {
     let vm = this;
     return {
-      doctype: this.doctype,
+      schemaName: this.schemaName,
       name: this.name,
       get doc() {
         return vm.doc;
@@ -107,11 +113,13 @@ export default {
     };
   },
   mounted() {
-    if (!this.valueJSON) {
-      return;
+    if (this.defaults) {
+      this.values = JSON.parse(this.defaults);
     }
 
-    this.values = JSON.parse(this.valueJSON);
+    if (fyo.store.isDevelopment) {
+      window.qef = this;
+    }
   },
   data() {
     return {
@@ -123,59 +131,64 @@ export default {
     };
   },
   async created() {
-    await this.fetchMetaAndDoc();
+    await this.fetchFieldsAndDoc();
   },
   computed: {
-    meta() {
-      return fyo.getMeta(this.doctype);
+    schema() {
+      return fyo.schemaMap[this.schemaName] ?? null;
     },
     status() {
-      if (this.doc && this.doc._notInserted) {
+      if (this.doc && this.doc.notInserted) {
         return 'Draft';
       }
+
       return '';
     },
     fields() {
-      const fields = this.meta
-        .getQuickEditFields()
-        .filter((df) => !(this.hideFields || []).includes(df.fieldname));
+      if (!this.schema) {
+        return [];
+      }
 
-      if (this.showFields) {
-        fields.push(
-          ...this.meta.fields.filter(({ fieldname }) =>
-            this.showFields.includes(fieldname)
-          )
+      const fieldnames = (this.schema.quickEditFields ?? ['name']).filter(
+        (f) => !this.hideFields.includes(f)
+      );
+
+      if (this.showFields?.length) {
+        fieldnames.push(
+          ...this.schema.fields
+            .map((f) => f.fieldname)
+            .filter((f) => this.showFields.includes(f))
         );
       }
-      return fields;
+
+      return fieldnames.map((f) => fyo.getField(this.schemaName, f));
     },
     actions() {
       return getActionsForDocument(this.doc);
     },
     quickEditWidget() {
-      if (!this.meta.quickEditWidget) {
+      const widget = getQuickEditWidget(this.schemaName);
+      if (widget === null) {
         return null;
       }
-      return this.meta.quickEditWidget(this.doc);
+
+      return widget(this.doc);
     },
   },
   methods: {
-    async fetchMetaAndDoc() {
-      this.titleField = this.meta.getField(this.meta.titleField);
-      this.imageField = this.meta.getField('image');
+    async fetchFieldsAndDoc() {
+      if (!this.schema) {
+        return;
+      }
+
+      const titleField = this.schema.titleField;
+      this.titleField = fyo.getField(this.schemaName, titleField);
+      this.imageField = fyo.getField(this.schemaName, 'image');
+
       await this.fetchDoc();
 
       // setup the title field
-      if (this.doc && this.doc.notInserted && this.doc[this.titleField.fieldname]) {
-        if (!this.titleField.readOnly) {
-          this.doc.set(this.titleField.fieldname, '');
-          setTimeout(() => {
-            this.$refs.titleControl.focus();
-          }, 300);
-        } else {
-          this.doc.set(this.titleField.fieldname, 'New ' + this.doc.doctype);
-        }
-      }
+      this.setTitleField();
 
       // set default values
       if (this.values) {
@@ -185,13 +198,30 @@ export default {
       // set title size
       this.setTitleSize();
     },
+    setTitleField() {
+      const { fieldname, readOnly } = this.titleField;
+      if (!this.doc?.notInserted || !this.doc[fieldname]) {
+        return;
+      }
+
+      if (readOnly) {
+        this.doc.set(fieldname, t`New ${this.schema.label}`);
+        return;
+      }
+
+      this.doc.set(fieldname, '');
+
+      setTimeout(() => {
+        this.$refs.titleControl.focus();
+      }, 300);
+    },
     async fetchDoc() {
       try {
-        this.doc = await fyo.doc.getDoc(this.doctype, this.name);
+        this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
 
         this.doc.once('afterRename', () => {
           openQuickEdit({
-            doctype: this.doctype,
+            schemaName: this.schemaName,
             name: this.doc.name,
           });
         });
@@ -225,15 +255,19 @@ export default {
       this.$router.back();
     },
     setTitleSize() {
-      if (this.$refs.titleControl) {
-        let input = this.$refs.titleControl.getInput();
-        let value = input.value;
-        let valueLength = (value || '').length + 1;
-        if (valueLength < 7) {
-          valueLength = 7;
-        }
-        input.size = valueLength;
+      if (!this.$refs.titleControl) {
+        return;
       }
+
+      const input = this.$refs.titleControl.getInput();
+      const value = input.value;
+      let valueLength = (value || '').length + 1;
+
+      if (valueLength < 7) {
+        valueLength = 7;
+      }
+
+      input.size = valueLength;
     },
   },
 };
diff --git a/src/router.ts b/src/router.ts
index 2c47a02f..1772a89a 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,7 +1,7 @@
 import { NounEnum, Verb } from 'fyo/telemetry/types';
+import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
 import GetStarted from 'src/pages/GetStarted.vue';
-// import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 // import DataImport from 'src/pages/DataImport.vue';
 // import InvoiceForm from 'src/pages/InvoiceForm.vue';
 // import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
@@ -77,7 +77,9 @@ const routes: RouteRecordRaw[] = [
           filters,
         };
       },
-      edit: (route) => route.query,
+      edit: (route) => {
+        return route.query;
+      },
     },
   },
   /*
@@ -93,6 +95,7 @@ const routes: RouteRecordRaw[] = [
     component: Report,
     props: true,
   },
+  */
   {
     path: '/chart-of-accounts',
     name: 'Chart Of Accounts',
@@ -105,6 +108,7 @@ const routes: RouteRecordRaw[] = [
       edit: (route) => route.query,
     },
   },
+  /*
   {
     path: '/data_import',
     name: 'Data Import',
diff --git a/src/utils/quickEditWidgets.ts b/src/utils/quickEditWidgets.ts
new file mode 100644
index 00000000..a475787b
--- /dev/null
+++ b/src/utils/quickEditWidgets.ts
@@ -0,0 +1,18 @@
+import { Doc } from 'fyo/model/doc';
+import { ModelNameEnum } from 'models/types';
+import PartyWidget from 'src/components/Widgets/PartyWidget.vue';
+import { h } from 'vue';
+
+export function getQuickEditWidget(schemaName: string) {
+  if (schemaName === ModelNameEnum.Party) {
+    return (doc: Doc) => ({
+      render() {
+        return h(PartyWidget, {
+          doc,
+        });
+      },
+    });
+  }
+
+  return null;
+}
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 95b9c704..9cb6d82e 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -24,20 +24,21 @@ import {
 export async function openQuickEdit({
   schemaName,
   name,
-  hideFields,
-  showFields,
+  hideFields = [],
+  showFields = [],
   defaults = {},
 }: QuickEditOptions) {
   const currentRoute = router.currentRoute.value;
   const query = currentRoute.query;
   let method: 'push' | 'replace' = 'push';
 
-  if (query.edit && query.doctype === schemaName) {
-    // replace the current route if we are
-    // editing another document of the same doctype
+  if (query.edit && query.schemaName === schemaName) {
     method = 'replace';
   }
-  if (query.name === name) return;
+
+  if (query.name === name) {
+    return;
+  }
 
   const forWhat = (defaults?.for ?? []) as string[];
   if (forWhat[0] === 'not in') {
@@ -60,24 +61,18 @@ export async function openQuickEdit({
   router[method]({
     query: {
       edit: 1,
-      doctype: schemaName,
+      schemaName,
       name,
-      showFields: showFields ?? getShowFields(schemaName),
+      showFields,
       hideFields,
-      valueJSON: stringifyCircular(defaults),
-      // @ts-ignore
+      defaults: stringifyCircular(defaults),
+      /*
       lastRoute: currentRoute,
+      */
     },
   });
 }
 
-function getShowFields(schemaName: string) {
-  if (schemaName === 'Party') {
-    return ['customer'];
-  }
-  return [];
-}
-
 export async function showMessageDialog({
   message,
   detail,

From a2cd1bac2127acf9d950080c9fb6698f27f9fcf8 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 28 Apr 2022 18:07:07 +0530
Subject: [PATCH 077/163] incr: fix a bunch of vue files - no modes in the
 first pane

---
 backend/database/core.ts                      |   4 +-
 fyo/core/converter.ts                         |  14 +
 fyo/model/doc.ts                              |  56 ++--
 fyo/telemetry/helpers.ts                      |   2 +-
 fyo/utils/format.ts                           |   2 +-
 models/baseModels/Party/Party.ts              |   2 +-
 models/baseModels/Party/types.ts              |   5 +
 .../PurchaseInvoice/PurchaseInvoice.ts        |   6 +-
 .../baseModels/SalesInvoice/SalesInvoice.ts   |   6 +-
 models/helpers.ts                             |  14 +-
 schemas/app/Party.json                        |   9 +-
 src/components/Controls/LanguageSelector.vue  |   2 +-
 src/components/Controls/Link.vue              |   2 +-
 src/components/Controls/Table.vue             |  38 ++-
 src/components/Controls/TableRow.vue          |  21 +-
 src/components/TwoColumnForm.vue              |  53 ++--
 src/components/Widgets/PartyWidget.vue        |  89 ++++---
 src/pages/DatabaseSelector.vue                | 251 ++++++++----------
 src/pages/GetStarted.vue                      |  19 +-
 src/pages/ListView/List.vue                   |  10 +-
 src/pages/QuickEditForm.vue                   |  43 +--
 21 files changed, 361 insertions(+), 287 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index ae889b39..312e341d 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -348,7 +348,9 @@ export default class DatabaseCore extends DatabaseBase {
   }
 
   async #removeColumns(schemaName: string, targetColumns: string[]) {
-    // TODO: Implement this for sqlite
+    const fields = this.schemaMap[schemaName]?.fields.map((f) => f.fieldname);
+    const tableRows = await this.getAll(schemaName, { fields });
+    this.prestigeTheTable(schemaName, tableRows);
   }
 
   #getError(err: Error) {
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 870f6322..c3d71670 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -88,6 +88,8 @@ export class Converter {
         return toRawFloat(value, field);
       case FieldTypeEnum.Check:
         return toRawCheck(value, field);
+      case FieldTypeEnum.Link:
+        return toRawLink(value, field);
       default:
         return toRawString(value, field);
     }
@@ -335,6 +337,18 @@ function toRawString(value: DocValue, field: Field): string | null {
   throwError(value, field, 'raw');
 }
 
+function toRawLink(value: DocValue, field: Field): string | null {
+  if (value === null || !(value as string)?.length) {
+    return null;
+  }
+
+  if (typeof value === 'string') {
+    return value;
+  }
+
+  throwError(value, field, 'raw');
+}
+
 function throwError<T>(value: T, field: Field, type: 'raw' | 'doc'): never {
   throw new ValueError(
     `invalid ${type} conversion '${value}' of type ${typeof value} found, field: ${JSON.stringify(
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 07e74a63..fbb2796e 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -6,7 +6,7 @@ import {
   ConflictError,
   MandatoryError,
   NotFoundError,
-  ValidationError,
+  ValidationError
 } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
 import Money from 'pesa/dist/types/src/money';
@@ -15,7 +15,7 @@ import {
   FieldTypeEnum,
   OptionField,
   Schema,
-  TargetField,
+  TargetField
 } from 'schemas/types';
 import { getIsNullOrUndef, getMapFromList, getRandomString } from 'utils';
 import { markRaw } from 'vue';
@@ -24,7 +24,7 @@ import {
   areDocValuesEqual,
   getMissingMandatoryMessage,
   getPreDefaultValues,
-  shouldApplyFormula,
+  shouldApplyFormula
 } from './helpers';
 import { setName } from './naming';
 import {
@@ -42,7 +42,7 @@ import {
   ReadOnlyMap,
   RequiredMap,
   TreeViewSettings,
-  ValidationMap,
+  ValidationMap
 } from './types';
 import { validateOptions, validateRequired } from './validationFunction';
 
@@ -139,14 +139,16 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   // set value and trigger change
-  async set(fieldname: string | DocValueMap, value?: DocValue | Doc[]) {
+  async set(
+    fieldname: string | DocValueMap,
+    value?: DocValue | Doc[]
+  ): Promise<boolean> {
     if (typeof fieldname === 'object') {
-      await this.setMultiple(fieldname as DocValueMap);
-      return;
+      return await this.setMultiple(fieldname as DocValueMap);
     }
 
     if (!this._canSet(fieldname, value)) {
-      return;
+      return false;
     }
 
     this._setDirty(true);
@@ -168,12 +170,19 @@ export class Doc extends Observable<DocValue | Doc[]> {
     } else {
       await this._applyChange(fieldname);
     }
+
+    return true;
   }
 
-  async setMultiple(docValueMap: DocValueMap) {
+  async setMultiple(docValueMap: DocValueMap): Promise<boolean> {
+    let hasSet = false;
     for (const fieldname in docValueMap) {
-      await this.set(fieldname, docValueMap[fieldname] as DocValue | Doc[]);
+      hasSet ||= await this.set(
+        fieldname,
+        docValueMap[fieldname] as DocValue | Doc[]
+      );
     }
+    return hasSet;
   }
 
   _canSet(fieldname: string, value?: DocValue | Doc[]): boolean {
@@ -197,12 +206,14 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return !areDocValuesEqual(currentValue as DocValue, value as DocValue);
   }
 
-  async _applyChange(fieldname: string) {
+  async _applyChange(fieldname: string): Promise<boolean> {
     await this._applyFormula(fieldname);
     await this.trigger('change', {
       doc: this,
       changed: fieldname,
     });
+
+    return true;
   }
 
   _setDefaults() {
@@ -232,13 +243,29 @@ export class Doc extends Observable<DocValue | Doc[]> {
     // push child row and trigger change
     this.push(fieldname, docValueMap);
     this._dirty = true;
-    await this._applyChange(fieldname);
+    return await this._applyChange(fieldname);
+  }
+
+  async remove(fieldname: string, idx: number) {
+    let rows = this[fieldname] as Doc[] | undefined;
+    if (!Array.isArray(rows)) {
+      return;
+    }
+
+    this._setDirty(true);
+    rows = rows.filter((row, i) => row.idx !== idx || i !== idx)!;
+    rows.forEach((row, i) => {
+      row.idx = i;
+    });
+    this[fieldname] = rows;
+    return await this._applyChange(fieldname);
   }
 
   push(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
     // push child row without triggering change
     this[fieldname] ??= [];
     const childDoc = this._getChildDoc(docValueMap, fieldname);
+    childDoc.parentdoc = this;
     (this[fieldname] as Doc[]).push(childDoc);
   }
 
@@ -389,6 +416,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
       throw new NotFoundError(`Not Found: ${this.schemaName} ${this.name}`);
     }
 
+    this._setDirty(false);
     this._notInserted = false;
     this.fyo.doc.observer.trigger(`load:${this.schemaName}`, this.name);
   }
@@ -744,9 +772,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
       updateMap.name = updateMap.name + ' CPY';
     }
 
-    const doc = this.fyo.doc.getNewDoc(this.schemaName, {}, false);
-    await doc.setMultiple(updateMap);
-
+    const doc = this.fyo.doc.getNewDoc(this.schemaName, updateMap, false);
     if (shouldSync) {
       await doc.sync();
     }
diff --git a/fyo/telemetry/helpers.ts b/fyo/telemetry/helpers.ts
index 5320ee4a..42c63981 100644
--- a/fyo/telemetry/helpers.ts
+++ b/fyo/telemetry/helpers.ts
@@ -52,7 +52,7 @@ export function getDeviceId(fyo: Fyo): UniqueId {
 }
 
 export function getInstanceId(fyo: Fyo): UniqueId {
-  const files = fyo.config.get(ConfigKeys.Files) as ConfigFile[];
+  const files = (fyo.config.get(ConfigKeys.Files) ?? []) as ConfigFile[];
 
   const companyName = fyo.singles.AccountingSettings?.companyName as string;
   if (companyName === undefined) {
diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index 534c7138..2acc6b45 100644
--- a/fyo/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -129,7 +129,7 @@ function getNumberFormatter(fyo: Fyo) {
 }
 
 function getCurrency(field: Field, doc: Doc | null, fyo: Fyo): string {
-  let getCurrency = doc?.getCurrencies[field.fieldname];
+  let getCurrency = doc?.getCurrencies?.[field.fieldname];
   if (getCurrency !== undefined) {
     return getCurrency();
   }
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 308eb9a5..b7f51097 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -67,7 +67,7 @@ export class Party extends Doc {
     },
     currency: async () =>
       this.fyo.singles.AccountingSettings!.currency as string,
-    addressDisplay: async () => {
+    address: async () => {
       const address = this.address as string | undefined;
       if (address) {
         return this.getFrom('Address', address, 'addressDisplay') as string;
diff --git a/models/baseModels/Party/types.ts b/models/baseModels/Party/types.ts
index 3659b47d..e76d904f 100644
--- a/models/baseModels/Party/types.ts
+++ b/models/baseModels/Party/types.ts
@@ -1 +1,6 @@
 export type PartyRole = 'Both' | 'Supplier' | 'Customer';
+export enum PartyRoleEnum {
+  'Both' = 'Both',
+  'Supplier' = 'Supplier',
+  'Customer' = 'Customer',
+}
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index f8489f99..926d91a3 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -1,6 +1,6 @@
-import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
+import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import {
   getTransactionActions,
   getTransactionStatusColumn,
@@ -40,13 +40,13 @@ export class PurchaseInvoice extends Invoice {
     return getTransactionActions('PurchaseInvoice', fyo);
   }
 
-  static getListViewSettings(fyo: Fyo): ListViewSettings {
+  static getListViewSettings(): ListViewSettings {
     return {
       formRoute: (name) => `/edit/PurchaseInvoice/${name}`,
       columns: [
         'party',
         'name',
-        getTransactionStatusColumn(fyo),
+        getTransactionStatusColumn(),
         'date',
         'grandTotal',
         'outstandingAmount',
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
index aba42e44..abbcf294 100644
--- a/models/baseModels/SalesInvoice/SalesInvoice.ts
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -1,6 +1,6 @@
-import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
+import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
 import {
   getTransactionActions,
   getTransactionStatusColumn,
@@ -38,13 +38,13 @@ export class SalesInvoice extends Invoice {
     return getTransactionActions('SalesInvoice', fyo);
   }
 
-  static getListViewSettings(fyo: Fyo): ListViewSettings {
+  static getListViewSettings(): ListViewSettings {
     return {
       formRoute: (name) => `/edit/SalesInvoice/${name}`,
       columns: [
         'party',
         'name',
-        getTransactionStatusColumn(fyo),
+        getTransactionStatusColumn(),
         'date',
         'grandTotal',
         'outstandingAmount',
diff --git a/models/helpers.ts b/models/helpers.ts
index f8803bac..8333cb69 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -1,4 +1,4 @@
-import { Fyo } from 'fyo';
+import { Fyo, t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { Action, ColumnConfig } from 'fyo/model/types';
 import { NotFoundError } from 'fyo/utils/errors';
@@ -75,16 +75,16 @@ export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
   ];
 }
 
-export function getTransactionStatusColumn(fyo: Fyo): ColumnConfig {
+export function getTransactionStatusColumn(): ColumnConfig {
   const statusMap = {
-    Unpaid: fyo.t`Unpaid`,
-    Paid: fyo.t`Paid`,
-    Draft: fyo.t`Draft`,
-    Cancelled: fyo.t`Cancelled`,
+    Unpaid: t`Unpaid`,
+    Paid: t`Paid`,
+    Draft: t`Draft`,
+    Cancelled: t`Cancelled`,
   };
 
   return {
-    label: fyo.t`Status`,
+    label: t`Status`,
     fieldname: 'status',
     fieldtype: 'Select',
     render(doc: Doc) {
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index 843359da..1d3aa3cf 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -79,6 +79,13 @@
       "fieldtype": "Data"
     }
   ],
-  "quickEditFields": ["email", "role", "phone", "address", "defaultAccount", "currency", "taxId"],
+  "quickEditFields": [
+    "email",
+    "phone",
+    "address",
+    "defaultAccount",
+    "currency",
+    "taxId"
+  ],
   "keywordFields": ["name"]
 }
diff --git a/src/components/Controls/LanguageSelector.vue b/src/components/Controls/LanguageSelector.vue
index 60e16a9a..d67dfe2d 100644
--- a/src/components/Controls/LanguageSelector.vue
+++ b/src/components/Controls/LanguageSelector.vue
@@ -20,7 +20,7 @@ export default {
     inputClass: {
       type: String,
       default:
-        'bg-gray-100 active:bg-gray-200 focus:bg-gray-200 px-3 py-2 text-base',
+        'px-3 py-2 text-base',
     },
     dontReload: {
       type: Boolean,
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index cbae1f38..94752194 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -21,7 +21,7 @@ export default {
       const filters = await this.getFilters(keyword);
 
       if (keyword && !filters.keywords) {
-        filters.keywords = ['like', keyword];
+        filters[schema.titleField] = ['like', keyword];
       }
 
       const fields = [
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index 9e832c7c..d5b6af37 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -3,8 +3,10 @@
     <div class="text-gray-600 text-sm mb-1" v-if="showLabel">
       {{ df.label }}
     </div>
+
+    <!-- Title Row -->
     <Row :ratio="ratio" class="border-b px-2 text-gray-600 w-full">
-      <div class="flex items-center pl-2">No</div>
+      <div class="flex items-center pl-2">#</div>
       <div
         :class="{
           'px-2 py-3': size === 'small',
@@ -17,6 +19,8 @@
         {{ df.label }}
       </div>
     </Row>
+
+    <!-- Data Rows -->
     <div class="overflow-auto" :style="{ 'max-height': rowContainerHeight }">
       <TableRow
         :class="{ 'pointer-events-none': isReadOnly }"
@@ -27,6 +31,8 @@
         @remove="removeRow(row)"
       />
     </div>
+
+    <!-- Add Row and Row Count -->
     <Row
       :ratio="ratio"
       class="text-gray-500 cursor-pointer border-transparent px-2 w-full"
@@ -54,7 +60,7 @@
         }"
         v-if="maxRowsBeforeOverflow && value.length > maxRowsBeforeOverflow"
       >
-        {{ value.length }} rows
+        {{ t`${value.length} rows` }}
       </div>
     </Row>
   </div>
@@ -71,9 +77,11 @@ export default {
   extends: Base,
   props: {
     showHeader: {
+      type: Boolean,
       default: true,
     },
     maxRowsBeforeOverflow: {
+      type: Number,
       default: 0,
     },
   },
@@ -81,6 +89,7 @@ export default {
     Row,
     TableRow,
   },
+  inject: ['doc'],
   data: () => ({ rowContainerHeight: null }),
   watch: {
     value: {
@@ -101,19 +110,28 @@ export default {
   methods: {
     focus() {},
     addRow() {
-      let rows = this.value || [];
-      this.triggerChange([...rows, {}]);
-      this.$nextTick(() => {
-        this.scrollToRow(this.value.length - 1);
+      this.doc.append(this.df.fieldname, {}).then((s) => {
+        if (!s) {
+          return;
+        }
+
+        this.$nextTick(() => {
+          this.scrollToRow(this.value.length - 1);
+        });
+        this.triggerChange(this.value);
       });
     },
     removeRow(row) {
-      let rows = this.value || [];
-      rows = rows.filter((_row) => _row !== row);
-      this.triggerChange(rows);
+      this.doc.remove(this.df.fieldname, row.idx).then((s) => {
+        if (!s) {
+          return;
+        }
+
+        this.triggerChange(this.value);
+      });
     },
     scrollToRow(index) {
-      let row = this.$refs['table-row'][index];
+      const row = this.$refs['table-row'][index];
       row && row.$el.scrollIntoView({ block: 'nearest' });
     },
   },
diff --git a/src/components/Controls/TableRow.vue b/src/components/Controls/TableRow.vue
index 4d7f2e5c..eca6f00b 100644
--- a/src/components/Controls/TableRow.vue
+++ b/src/components/Controls/TableRow.vue
@@ -1,5 +1,6 @@
 <template>
   <Row :ratio="ratio" class="w-full px-2 border-b hover:bg-brand-100 group">
+    <!-- Index or Remove button -->
     <div class="flex items-center pl-2 text-gray-600">
       <span class="hidden group-hover:inline-block">
         <feather-icon
@@ -12,6 +13,8 @@
         {{ row.idx + 1 }}
       </span>
     </div>
+
+    <!-- Data Input Form Control -->
     <FormControl
       :size="size"
       class="py-2"
@@ -23,6 +26,8 @@
       @change="(value) => onChange(df, value)"
       @new-doc="(doc) => row.set(df.fieldname, doc.name)"
     />
+
+    <!-- Error Display -->
     <div
       class="text-sm text-red-600 mb-2 pl-2 col-span-full"
       v-if="Object.values(errors).length"
@@ -32,13 +37,20 @@
   </Row>
 </template>
 <script>
+import { Doc } from 'fyo/model/doc';
 import Row from 'src/components/Row.vue';
 import { getErrorMessage } from 'src/utils';
 import FormControl from './FormControl.vue';
 
 export default {
   name: 'TableRow',
-  props: ['row', 'tableFields', 'size', 'ratio', 'isNumeric'],
+  props: {
+    row: Doc,
+    tableFields: Array,
+    size: String,
+    ratio: Array,
+    isNumeric: Function,
+  },
   emits: ['remove'],
   components: {
     Row,
@@ -50,7 +62,7 @@ export default {
   },
   provide() {
     return {
-      doctype: this.row.doctype,
+      schemaName: this.row.schemaName,
       name: this.row.name,
       doc: this.row,
     };
@@ -62,11 +74,6 @@ export default {
       }
 
       this.errors[df.fieldname] = null;
-      const oldValue = this.row.get(df.fieldname);
-      if (oldValue === value) {
-        return;
-      }
-
       this.row.set(df.fieldname, value).catch((e) => {
         this.errors[df.fieldname] = getErrorMessage(e, this.row);
       });
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 0e010fc6..db5c25c5 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -117,6 +117,7 @@ export default {
     return {
       inlineEditDoc: null,
       inlineEditField: null,
+      formFields: [],
       errors: {},
     };
   },
@@ -133,8 +134,9 @@ export default {
     TwoColumnForm: () => TwoColumnForm,
   },
   mounted() {
+    this.setFormFields();
     if (this.focusFirstInput) {
-      this.$refs['controls'][0].focus();
+      this.$refs['controls']?.[0].focus();
     }
 
     if (fyo.store.isDevelopment) {
@@ -176,28 +178,34 @@ export default {
         return;
       }
 
-      const oldValue = this.doc.get(df.fieldname);
-      this.errors[df.fieldname] = null;
-      if (oldValue === value) {
-        return;
-      }
-
-      if (this.emitChange) {
-        this.$emit('change', df, value, oldValue);
-      }
-
       // handle rename
       if (this.autosave && df.fieldname === 'name' && !this.doc.notInserted) {
         return this.doc.rename(value);
       }
 
-      this.onChangeCommon(df, value);
+      const oldValue = this.doc.get(df.fieldname);
+      this.errors[df.fieldname] = null;
+      this.onChangeCommon(df, value, oldValue);
     },
-    onChangeCommon(df, value) {
-      this.doc.set(df.fieldname, value).catch((e) => {
-        // set error message for this field
-        this.errors[df.fieldname] = getErrorMessage(e, this.doc);
-      });
+    onChangeCommon(df, value, oldValue) {
+      this.doc
+        .set(df.fieldname, value)
+        .catch((e) => {
+          this.errors[df.fieldname] = getErrorMessage(e, this.doc);
+        })
+        .then((success) => {
+          if (!success) {
+            return;
+          }
+
+          this.handlePostSet(df, value, oldValue);
+        });
+    },
+    handlePostSet(df, value, oldValue) {
+      this.setFormFields();
+      if (this.emitChange) {
+        this.$emit('change', df, value, oldValue);
+      }
 
       if (this.autosave && this.doc.dirty) {
         if (df.fieldtype === 'Table') {
@@ -250,15 +258,14 @@ export default {
       await this.stopInlineEditing();
     },
     async stopInlineEditing() {
-      if (this.inlineEditDoc?.dirty) {
+      if (this.inlineEditDoc?.dirty && !this.inlineEditDoc?.notInserted) {
         await this.inlineEditDoc.load();
       }
+
       this.inlineEditDoc = null;
       this.inlineEditField = null;
     },
-  },
-  computed: {
-    formFields() {
+    setFormFields() {
       let fieldList = this.fields;
 
       if (fieldList.length === 0) {
@@ -269,10 +276,12 @@ export default {
         fieldList = this.doc.schema.fields.filter((f) => f.required);
       }
 
-      return fieldList.filter(
+      this.formFields = fieldList.filter(
         (field) => field && !evaluateHidden(field, this.doc)
       );
     },
+  },
+  computed: {
     style() {
       let templateColumns = (this.columnRatio || [1, 1])
         .map((r) => `${r}fr`)
diff --git a/src/components/Widgets/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
index 762fa0c1..0b831a0e 100644
--- a/src/components/Widgets/PartyWidget.vue
+++ b/src/components/Widgets/PartyWidget.vue
@@ -20,16 +20,14 @@
         </div>
         <div class="flex justify-between">
           <span>
-            {{ fyo.format(invoice.date, invoiceMeta.getField('date')) }}
+            {{ fyo.format(invoice.date, getInvoiceField(invoice, 'date')) }}
           </span>
           <div>
-            <span
-              class="font-medium text-gray-900"
-            >
+            <span class="font-medium text-gray-900">
               {{
                 fyo.format(
                   amountPaid(invoice),
-                  invoiceMeta.getField('baseGrandTotal')
+                  getInvoiceField(invoice, 'baseGrandTotal')
                 )
               }}
             </span>
@@ -37,7 +35,7 @@
               ({{
                 fyo.format(
                   invoice.outstandingAmount,
-                  invoiceMeta.getField('outstandingAmount')
+                  getInvoiceField(invoice, 'outstandingAmount')
                 )
               }})
             </span>
@@ -49,59 +47,74 @@
 </template>
 
 <script>
+import { Doc } from 'fyo/model/doc';
+import { PartyRoleEnum } from 'models/baseModels/Party/types';
+import { getTransactionStatusColumn } from 'models/helpers';
+import { ModelNameEnum } from 'models/types';
 import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils';
-// import { getStatusColumn } from '../Transaction/Transaction';
 
 export default {
   name: 'PartyWidget',
-  props: ['doc'],
+  props: { doc: Doc },
   data() {
     return {
       pendingInvoices: [],
     };
   },
   computed: {
-    invoiceDoctype() {
-      let isCustomer = this.doc.doctype === 'Customer';
-      return isCustomer ? 'SalesInvoice' : 'PurchaseInvoice';
-    },
-    invoiceMeta() {
-      return fyo.getMeta(this.invoiceDoctype);
+    invoiceSchemaNames() {
+      switch (this.doc.get('role')) {
+        case PartyRoleEnum.Customer:
+          return [ModelNameEnum.SalesInvoice];
+        case PartyRoleEnum.Supplier:
+          return [ModelNameEnum.PurchaseInvoice];
+        case PartyRoleEnum.Both:
+        default:
+          return [ModelNameEnum.SalesInvoice, ModelNameEnum.PurchaseInvoice];
+      }
     },
   },
   mounted() {
     this.fetchPendingInvoices();
   },
   methods: {
+    getInvoiceField(invoice, fieldname) {
+      return fyo.getField(invoice.schemaName, fieldname);
+    },
     async fetchPendingInvoices() {
-      let isCustomer = this.doc.doctype === 'Customer';
-      let doctype = this.invoiceDoctype;
-      let partyField = isCustomer ? 'customer' : 'supplier';
-      this.pendingInvoices = await fyo.db.getAll({
-        doctype,
-        fields: [
-          'name',
-          'date',
-          'outstandingAmount',
-          'baseGrandTotal',
-          'submitted',
-        ],
-        filters: {
-          [partyField]: this.doc.name,
-        },
-        limit: 3,
-        orderBy: 'created',
-      });
-      window.pendingInvoices = this.pendingInvoices;
+      const pendingInvoices = [];
+      for (const schemaName of this.invoiceSchemaNames) {
+        const invoices = await fyo.db.getAll(schemaName, {
+          fields: [
+            'name',
+            'date',
+            'outstandingAmount',
+            'baseGrandTotal',
+            'submitted',
+          ],
+          filters: {
+            party: this.doc.name,
+          },
+          limit: 3,
+          orderBy: 'created',
+        });
+
+        invoices.forEach((i) => {
+          i.schemaName = schemaName;
+        });
+
+        pendingInvoices.push(...invoices);
+      }
+
+      this.pendingInvoices = pendingInvoices;
     },
     getStatusBadge(doc) {
-      // let statusColumn = getStatusColumn();
-      // return statusColumn.render(doc);
-      return {}
+      const statusColumn = getTransactionStatusColumn();
+      return statusColumn.render(doc);
     },
-    routeToForm(doc) {
-      routeTo(`/edit/${this.invoiceDoctype}/${doc.name}`);
+    routeToForm(invoice) {
+      routeTo(`/edit/${invoice.schemaName}/${invoice.name}`);
     },
     fullyPaid(invoice) {
       return invoice.outstandingAmount.isZero();
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 9d59c62d..d7ba361e 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -10,147 +10,121 @@
       class="w-full w-600 shadow rounded-lg border relative"
       style="height: 700px"
     >
-      <div class="px-6 py-8">
-        <h1 class="text-2xl font-semibold">
+      <!-- Welcome to Frappe Books -->
+      <div class="px-6 py-10">
+        <h1 class="text-2xl font-semibold select-none">
           {{ t`Welcome to Frappe Books` }}
         </h1>
-        <p class="text-gray-600 text-base" v-if="!showFiles">
+        <p class="text-gray-600 text-base select-none">
           {{
             t`Create a new file or select an existing one from your computer`
           }}
         </p>
-        <p class="text-gray-600 text-base" v-if="showFiles">
-          {{ t`Select a file to load the company transactions` }}
-        </p>
-      </div>
-      <div class="px-12 mt-6 window-no-drag" v-if="!showFiles">
-        <div class="flex">
-          <div
-            @click="newDatabase"
-            class="
-              w-1/2
-              border
-              rounded-xl
-              flex flex-col
-              items-center
-              py-8
-              px-5
-              cursor-pointer
-              hover:shadow
-            "
-          >
-            <div
-              class="w-14 h-14 rounded-full bg-blue-200 relative flex-center"
-            >
-              <div
-                class="w-12 h-12 absolute rounded-full bg-blue-500 flex-center"
-              >
-                <feather-icon name="plus" class="text-white w-5 h-5" />
-              </div>
-            </div>
-            <div class="mt-5 font-medium">
-              <template
-                v-if="loadingDatabase && fileSelectedFrom === 'New File'"
-              >
-                {{ t`Loading...` }}
-              </template>
-              <template v-else>
-                {{ t`New File` }}
-              </template>
-            </div>
-            <div class="mt-2 text-sm text-gray-600 text-center">
-              {{ t`Create a new file and store it in your computer.` }}
-            </div>
-          </div>
-          <div
-            @click="existingDatabase"
-            class="
-              ml-6
-              w-1/2
-              border
-              rounded-xl
-              flex flex-col
-              items-center
-              py-8
-              px-5
-              cursor-pointer
-              hover:shadow
-            "
-          >
-            <div
-              class="w-14 h-14 rounded-full bg-green-200 relative flex-center"
-            >
-              <div class="w-12 h-12 rounded-full bg-green-500 flex-center">
-                <feather-icon name="upload" class="w-4 h-4 text-white" />
-              </div>
-            </div>
-            <div class="mt-5 font-medium">
-              <template
-                v-if="loadingDatabase && fileSelectedFrom === 'Existing File'"
-              >
-                {{ t`Loading...` }}
-              </template>
-              <template v-else>
-                {{ t`Existing File` }}
-              </template>
-            </div>
-            <div class="mt-2 text-sm text-gray-600 text-center">
-              {{ t`Load an existing .db file from your computer.` }}
-            </div>
-          </div>
-        </div>
-        <a
-          v-if="files.length > 0"
-          class="text-brand text-sm mt-4 inline-block cursor-pointer"
-          @click="showFiles = true"
-        >
-          {{ t`Select from existing files` }}
-        </a>
       </div>
 
-      <div v-if="showFiles">
-        <div class="px-12 mt-6">
-          <div
-            class="
-              py-2
-              px-4
-              text-sm
-              flex
-              justify-between
-              items-center
-              hover:bg-gray-100
-              cursor-pointer
-              border-b
-            "
-            :class="{ 'border-t': i === 0 }"
-            v-for="(file, i) in files"
-            :key="file.filePath"
-            @click="selectFile(file)"
-          >
-            <div class="flex items-baseline">
-              <span>
-                <template v-if="loadingDatabase && fileSelectedFrom === file">
-                  {{ t`Loading...` }}
-                </template>
-                <template v-else>
-                  {{ file.companyName }}
-                </template>
-              </span>
-            </div>
-            <div class="text-gray-700">
-              {{ file.modified }}
-            </div>
-          </div>
+      <hr />
+
+      <!-- New File (Blue Icon) -->
+      <div
+        @click="newDatabase"
+        class="
+          px-6
+          h-18
+          flex flex-row
+          items-center
+          cursor-pointer
+          gap-4
+          p-2
+          hover:bg-gray-100
+        "
+      >
+        <div class="w-8 h-8 rounded-full bg-blue-500 relative flex-center">
+          <feather-icon name="plus" class="text-white w-5 h-5" />
         </div>
-        <div class="px-12 mt-4">
-          <a
-            class="text-brand text-sm cursor-pointer"
-            @click="showFiles = false"
-          >
-            {{ t`Select file manually` }}
-          </a>
+
+        <div>
+          <p class="font-medium">
+            {{ t`New File` }}
+          </p>
+          <p class="text-sm text-gray-600">
+            {{ t`Create a new file and store it in your computer.` }}
+          </p>
         </div>
       </div>
+
+      <!-- Existing File (Green Icon) -->
+      <div
+        @click="existingDatabase"
+        class="
+          px-6
+          h-18
+          flex flex-row
+          items-center
+          cursor-pointer
+          gap-4
+          p-2
+          hover:bg-gray-100
+        "
+      >
+        <div class="w-8 h-8 rounded-full bg-green-500 relative flex-center">
+          <feather-icon name="upload" class="w-4 h-4 text-white" />
+        </div>
+        <div>
+          <p class="font-medium">
+            {{ t`Existing File` }}
+          </p>
+          <p class="text-sm text-gray-600">
+            {{ t`Load an existing .db file from your computer.` }}
+          </p>
+        </div>
+      </div>
+      <hr />
+
+      <!-- File List -->
+      <div class="overflow-scroll" style="max-height: 340px">
+        <div
+          class="
+            h-18
+            px-6
+            flex
+            gap-4
+            items-center
+            hover:bg-gray-100
+            cursor-pointer
+          "
+          v-for="(file, i) in files"
+          :key="file.dbPath"
+          @click="selectFile(file)"
+        >
+          <div
+            class="
+              w-8
+              h-8
+              rounded-full
+              flex
+              justify-center
+              items-center
+              bg-gray-200
+              text-gray-500
+              font-semibold
+              text-base
+            "
+          >
+            {{ i + 1 }}
+          </div>
+          <div>
+            <p class="font-medium">
+              {{ file.companyName }}
+            </p>
+            <p class="text-sm text-gray-600">
+              {{ file.modified }}
+            </p>
+          </div>
+        </div>
+      </div>
+      <hr v-if="files?.length" />
+
+      <!-- Language Selector -->
       <div
         class="w-full flex justify-end absolute px-6 py-6"
         style="top: 100%; transform: translateY(-100%)"
@@ -177,27 +151,20 @@ export default {
     return {
       loadingDatabase: false,
       fileSelectedFrom: null,
-      showFiles: false,
       files: [],
     };
   },
   mounted() {
     this.setFiles();
-    this.showFiles = this.files.length > 0;
-  },
-  watch: {
-    showFiles() {
-      this.setFiles();
-    },
+    window.ds = this;
   },
   methods: {
     setFiles() {
-      this.files = cloneDeep(fyo.config.get('files', [])).filter(
-        ({ filePath }) => fs.existsSync(filePath)
-      );
+      const files = cloneDeep(fyo.config.get('files', []));
+      this.files = files.filter(({ dbPath }) => fs.existsSync(dbPath));
 
       for (const file of this.files) {
-        const stats = fs.statSync(file.filePath);
+        const stats = fs.statSync(file.dbPath);
         file.modified = DateTime.fromJSDate(stats.mtime).toRelative();
       }
     },
@@ -223,7 +190,7 @@ export default {
     },
     async selectFile(file) {
       this.fileSelectedFrom = file;
-      await this.connectToDatabase(file.filePath);
+      await this.connectToDatabase(file.dbPath);
     },
     async connectToDatabase(filePath, isNew) {
       if (!filePath) {
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index e83a4a79..0f66131e 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -112,7 +112,7 @@ export default {
 
       switch (key) {
         case 'Opening Balances':
-          await this.updateChecks({ openingBalanceChecked: 1 });
+          await this.updateChecks({ openingBalanceChecked: true });
           break;
       }
     },
@@ -124,19 +124,19 @@ export default {
 
       switch (key) {
         case 'Invoice':
-          await this.updateChecks({ invoiceSetup: 1 });
+          await this.updateChecks({ invoiceSetup: true });
           break;
         case 'General':
-          await this.updateChecks({ companySetup: 1 });
+          await this.updateChecks({ companySetup: true });
           break;
         case 'System':
-          await this.updateChecks({ systemSetup: 1 });
+          await this.updateChecks({ systemSetup: true });
           break;
         case 'Review Accounts':
-          await this.updateChecks({ chartOfAccountsReviewed: 1 });
+          await this.updateChecks({ chartOfAccountsReviewed: true });
           break;
         case 'Add Taxes':
-          await this.updateChecks({ taxesAdded: 1 });
+          await this.updateChecks({ taxesAdded: true });
           break;
       }
     },
@@ -154,7 +154,7 @@ export default {
       if (onboardingComplete) {
         await this.updateChecks({ onboardingComplete });
         const systemSettings = await fyo.doc.getSingle('SystemSettings');
-        await systemSettings.set({ hideGetStarted: 1 });
+        await systemSettings.set('hideGetStarted', true);
         await systemSettings.sync();
       }
 
@@ -207,9 +207,8 @@ export default {
       await this.updateChecks(toUpdate);
     },
     async updateChecks(toUpdate) {
-      await fyo.singles.GetStarted.setMultiple(toUpdate);
-      await fyo.singles.GetStarted.sync();
-      fyo.singles.GetStarted = await fyo.doc.getSingle('GetStarted');
+      await fyo.singles.GetStarted.setAndSync(toUpdate);
+      await fyo.doc.getSingle('GetStarted');
     },
     isCompleted(item) {
       return fyo.singles.GetStarted.get(item.fieldname) || 0;
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index edf5daac..d4de650f 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -2,9 +2,7 @@
   <div class="mx-4 pb-16 text-base flex flex-col overflow-y-hidden">
     <!-- Title Row -->
     <div class="flex">
-      <div class="py-4 mr-3 w-7 border-b" v-if="hasImage">
-        <p class="text-gray-700">Img</p>
-      </div>
+      <div class="py-4 mr-3 w-7" v-if="hasImage" />
       <Row
         class="flex-1 text-gray-700"
         :columnCount="columns.length"
@@ -25,11 +23,7 @@
 
     <!-- Data Rows -->
     <div class="overflow-y-auto" v-if="data.length !== 0">
-      <div
-        class="px-3 flex hover:bg-gray-100 rounded-md"
-        v-for="doc in data"
-        :key="doc.name"
-      >
+      <div class="flex hover:bg-gray-100" v-for="doc in data" :key="doc.name">
         <div class="w-7 py-4 mr-3" v-if="hasImage">
           <Avatar :imageURL="doc.image" :label="doc.name" />
         </div>
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 963b0631..e139e324 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="border-l h-full">
+    <!-- Quick edit Tool bar -->
     <div class="flex items-center justify-between px-4 pt-4">
+      <!-- Close Button and Status Text -->
       <div class="flex items-center">
         <Button :icon="true" @click="routeToPrevious">
           <feather-icon name="x" class="w-4 h-4" />
@@ -9,6 +11,8 @@
           statusText
         }}</span>
       </div>
+
+      <!-- Actions, Badge and Status Change Buttons -->
       <div class="flex items-stretch">
         <DropdownWithActions :actions="actions" />
         <StatusBadge :status="status" />
@@ -16,7 +20,7 @@
           :icon="true"
           @click="sync"
           type="primary"
-          v-if="doc && doc.notInserted"
+          v-if="doc?.dirty || doc?.notInserted"
           class="ml-2 text-white text-xs"
         >
           {{ t`Save` }}
@@ -27,10 +31,9 @@
           type="primary"
           v-if="
             schema?.isSubmittable &&
-            doc &&
-            !doc.submitted &&
-            !doc.notInserted &&
-            !(doc.cancelled || false)
+            !doc?.submitted &&
+            !doc?.notInserted &&
+            !(doc?.cancelled || false)
           "
           class="ml-2 text-white text-xs"
         >
@@ -38,6 +41,8 @@
         </Button>
       </div>
     </div>
+
+    <!-- Name and image -->
     <div class="px-4 pt-2 pb-4 flex-center" v-if="doc">
       <div class="flex flex-col items-center">
         <FormControl
@@ -63,15 +68,19 @@
         />
       </div>
     </div>
+
+    <!-- Rest of the form -->
     <TwoColumnForm
       ref="form"
       v-if="doc"
       :doc="doc"
       :fields="fields"
-      :autosave="true"
+      :autosave="false"
       :column-ratio="[1.1, 2]"
     />
-    <component v-if="doc && quickEditWidget" :is="quickEditWidget" />
+
+    <!-- QuickEdit Widgets -->
+    <component v-if="quickEditWidget" :is="quickEditWidget" />
   </div>
 </template>
 
@@ -167,6 +176,10 @@ export default {
       return getActionsForDocument(this.doc);
     },
     quickEditWidget() {
+      if (this.doc?.notInserted ?? true) {
+        return null;
+      }
+
       const widget = getQuickEditWidget(this.schemaName);
       if (widget === null) {
         return null;
@@ -212,7 +225,7 @@ export default {
       this.doc.set(fieldname, '');
 
       setTimeout(() => {
-        this.$refs.titleControl.focus();
+        this.$refs.titleControl?.focus();
       }, 300);
     },
     async fetchDoc() {
@@ -225,9 +238,11 @@ export default {
             name: this.doc.name,
           });
         });
+
         this.doc.on('beforeSync', () => {
           this.statusText = t`Saving...`;
         });
+
         this.doc.on('afterSync', () => {
           setTimeout(() => {
             this.statusText = null;
@@ -252,6 +267,9 @@ export default {
       }
     },
     routeToPrevious() {
+      if (this.doc.dirty && !this.doc.notInserted) {
+        this.doc.load();
+      }
       this.$router.back();
     },
     setTitleSize() {
@@ -261,13 +279,8 @@ export default {
 
       const input = this.$refs.titleControl.getInput();
       const value = input.value;
-      let valueLength = (value || '').length + 1;
-
-      if (valueLength < 7) {
-        valueLength = 7;
-      }
-
-      input.size = valueLength;
+      const valueLength = (value || '').length + 1;
+      input.size = Math.max(valueLength, 15);
     },
   },
 };

From ecfae41635ab00511058318d80101c83085a6b94 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 29 Apr 2022 00:27:10 +0530
Subject: [PATCH 078/163] incr: add window controls - minor fixes

---
 backend/database/core.ts               |  4 +++-
 fyo/model/doc.ts                       |  4 +++-
 models/baseModels/Party/Party.ts       |  8 ++++----
 schemas/app/Account.json               |  8 +-------
 src/App.vue                            | 13 +++++++++----
 src/pages/ChartOfAccounts.vue          |  6 ++++--
 src/pages/Dashboard/UnpaidInvoices.vue |  4 ++--
 src/pages/DatabaseSelector.vue         |  4 +++-
 src/pages/SetupWizard/SetupWizard.vue  |  4 ++++
 tests/testSetupInstance.spec.ts        |  6 +++++-
 10 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 312e341d..f91b4014 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -348,7 +348,9 @@ export default class DatabaseCore extends DatabaseBase {
   }
 
   async #removeColumns(schemaName: string, targetColumns: string[]) {
-    const fields = this.schemaMap[schemaName]?.fields.map((f) => f.fieldname);
+    const fields = this.schemaMap[schemaName]?.fields
+      .filter((f) => f.fieldtype !== FieldTypeEnum.Table)
+      .map((f) => f.fieldname);
     const tableRows = await this.getAll(schemaName, { fields });
     this.prestigeTheTable(schemaName, tableRows);
   }
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index fbb2796e..a442a355 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -177,11 +177,13 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async setMultiple(docValueMap: DocValueMap): Promise<boolean> {
     let hasSet = false;
     for (const fieldname in docValueMap) {
-      hasSet ||= await this.set(
+      const isSet = await this.set(
         fieldname,
         docValueMap[fieldname] as DocValue | Doc[]
       );
+      hasSet ||= isSet;
     }
+
     return hasSet;
   }
 
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index b7f51097..37abc4dd 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -107,7 +107,7 @@ export class Party extends Doc {
   static getActions(fyo: Fyo): Action[] {
     return [
       {
-        label: fyo.t`Create Bill`,
+        label: fyo.t`Create Purchase`,
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
@@ -125,7 +125,7 @@ export class Party extends Doc {
         },
       },
       {
-        label: fyo.t`View Bills`,
+        label: fyo.t`View Purchases`,
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
@@ -142,7 +142,7 @@ export class Party extends Doc {
         },
       },
       {
-        label: fyo.t`Create Invoice`,
+        label: fyo.t`Create Sale`,
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
@@ -160,7 +160,7 @@ export class Party extends Doc {
         },
       },
       {
-        label: fyo.t`View Invoices`,
+        label: fyo.t`View Sales`,
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
diff --git a/schemas/app/Account.json b/schemas/app/Account.json
index 2c59b8af..6a3b5baa 100644
--- a/schemas/app/Account.json
+++ b/schemas/app/Account.json
@@ -142,12 +142,6 @@
       "fieldtype": "Check"
     }
   ],
-  "quickEditFields": [
-    "name",
-    "rootType",
-    "parentAccount",
-    "accountType",
-    "isGroup"
-  ],
+  "quickEditFields": ["name", "rootType", "parentAccount", "accountType"],
   "keywordFields": ["name", "rootType", "accountType"]
 }
diff --git a/src/App.vue b/src/App.vue
index 32bd9f0b..9cdcbb8e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,12 +4,13 @@
     class="h-screen flex flex-col font-sans overflow-hidden antialiased"
   >
     <WindowsTitleBar v-if="platform === 'Windows'" />
+    
+    <!-- Main Contents -->
     <Desk
       class="flex-1"
       v-if="activeScreen === 'Desk'"
       @change-db-file="changeDbFile"
     />
-
     <DatabaseSelector
       v-if="activeScreen === 'DatabaseSelector'"
       @file-selected="fileSelected"
@@ -19,6 +20,8 @@
       @setup-complete="setupComplete"
       @setup-canceled="changeDbFile"
     />
+    
+    <!-- Render target for toasts -->
     <div
       id="toast-container"
       class="absolute bottom-0 flex flex-col items-end mb-3 pr-6"
@@ -26,6 +29,8 @@
     >
       <div id="toast-target" />
     </div>
+    
+    <!-- Prompt to Set Telemetry -->
     <TelemetryModal />
   </div>
 </template>
@@ -33,9 +38,9 @@
 <script>
 import { ConfigKeys } from 'fyo/core/types';
 import {
-  getSetupComplete,
-  incrementOpenCount,
-  startTelemetry,
+getSetupComplete,
+incrementOpenCount,
+startTelemetry
 } from 'src/utils/misc';
 import TelemetryModal from './components/once/TelemetryModal.vue';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 899e7574..aea15075 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -143,8 +143,10 @@ export default {
     this.fetchAccounts();
   },
   async activated() {
-    window.coa = this;
     this.fetchAccounts();
+    if (fyo.store.isDevelopment) {
+      window.coa = this;
+    }
   },
   methods: {
     async fetchAccounts() {
@@ -158,7 +160,7 @@ export default {
       this.accounts = await this.getChildren();
     },
     onClick(account) {
-      if (account.isGroup === 0) {
+      if (!account.isGroup) {
         openQuickEdit({
           schemaName: ModelNameEnum.Account,
           name: account.name,
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index 64d74133..6cb08fd5 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -86,7 +86,7 @@ export default {
   data: () => ({
     invoices: [
       {
-        title: t`Invoices`,
+        title: t`Sales Invoices`,
         doctype: 'SalesInvoice',
         total: 0,
         unpaid: 0,
@@ -97,7 +97,7 @@ export default {
         barWidth: 40,
       },
       {
-        title: t`Bills`,
+        title: t`Purchase Invoices`,
         doctype: 'PurchaseInvoice',
         total: 0,
         unpaid: 0,
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index d7ba361e..85716f62 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -6,6 +6,7 @@
       'window-drag': platform !== 'Windows',
     }"
   >
+    <WindowControls v-if="platform === 'Mac'" class="absolute top-6 left-5" />
     <div
       class="w-full w-600 shadow rounded-lg border relative"
       style="height: 700px"
@@ -140,6 +141,7 @@ import fs from 'fs';
 import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
+import WindowControls from 'src/components/WindowControls.vue';
 import { fyo } from 'src/initFyo';
 import { getSavePath } from 'src/utils/ipcCalls';
 import { IPC_ACTIONS } from 'utils/messages';
@@ -205,6 +207,6 @@ export default {
       this.$emit('file-selected', filePath, !!isNew);
     },
   },
-  components: { LanguageSelector },
+  components: { LanguageSelector, WindowControls },
 };
 </script>
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 54ab3c19..bc3af5df 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -2,6 +2,8 @@
   <div
     class="py-10 flex-1 bg-white flex justify-center items-center window-drag"
   >
+    <WindowControls v-if="platform === 'Mac'" class="absolute top-6 left-5" />
+
     <!-- 0: Language Selection Slide -->
     <Slide
       @primary-clicked="handlePrimary"
@@ -95,6 +97,7 @@ import { ipcRenderer } from 'electron';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
+import WindowControls from 'src/components/WindowControls.vue';
 import { fyo } from 'src/initFyo';
 import { getErrorMessage } from 'src/utils';
 import { getSetupWizardDoc } from 'src/utils/misc';
@@ -125,6 +128,7 @@ export default {
     FormControl,
     Slide,
     LanguageSelector,
+    WindowControls,
   },
   async mounted() {
     if (fyo.config.get('language') !== undefined) {
diff --git a/tests/testSetupInstance.spec.ts b/tests/testSetupInstance.spec.ts
index 34a5b679..f2577a2b 100644
--- a/tests/testSetupInstance.spec.ts
+++ b/tests/testSetupInstance.spec.ts
@@ -57,7 +57,11 @@ describe('setupInstance', function () {
         dbValue = dbValue.toISOString().split('T')[0];
       }
 
-      assert.strictEqual(dbValue as string, optionsValue, `${field} mismatch`);
+      assert.strictEqual(
+        dbValue as string,
+        optionsValue,
+        `${field} mismatch (${dbValue},${optionsValue})`
+      );
     }
   });
 

From 3e466c647c5d4c39b0cd96363670cc5898b7a615 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 29 Apr 2022 18:30:24 +0530
Subject: [PATCH 079/163] incr: search improvements - get form to render -
 minor ui fixes

---
 fyo/model/doc.ts                              |   7 +-
 fyo/model/helpers.ts                          |  10 +-
 fyo/model/naming.ts                           |   5 +-
 fyo/model/types.ts                            |   4 +-
 models/baseModels/Account/types.ts            |  56 ++++----
 models/baseModels/Address/Address.ts          |  50 ++++---
 models/baseModels/Invoice/Invoice.ts          |  45 ++++---
 models/baseModels/InvoiceItem/InvoiceItem.ts  | 111 +++++++++-------
 models/baseModels/Item/Item.ts                |  53 ++++----
 .../JournalEntryAccount.ts                    |  10 +-
 models/baseModels/Party/Party.ts              |  45 ++++---
 models/baseModels/Payment/Payment.ts          |  30 +++--
 models/baseModels/PaymentFor/PaymentFor.ts    |  27 ++--
 models/baseModels/SetupWizard/SetupWizard.ts  |  98 +++++++-------
 models/baseModels/TaxSummary/TaxSummary.ts    |  11 +-
 models/regionalModels/in/Address.ts           |  49 ++++---
 reports/{view.js => view.ts}                  |   7 +-
 schemas/app/Item.json                         |   5 +-
 schemas/app/NumberSeries.json                 |   2 +-
 schemas/app/Party.json                        |   3 +
 schemas/app/PaymentFor.json                   |   9 +-
 schemas/regional/in/Party.json                |   1 +
 schemas/types.ts                              |   2 +-
 src/components/Controls/Link.vue              |  12 ++
 src/components/Controls/Select.vue            |   9 +-
 src/components/Controls/Table.vue             |   5 +-
 src/components/SearchBar.vue                  |  93 ++++++-------
 src/pages/ChartOfAccounts.vue                 |   3 -
 src/pages/GetStarted.vue                      |   2 +-
 src/pages/ListView/List.vue                   |  14 +-
 src/pages/ListView/ListView.vue               |  18 ++-
 src/pages/QuickEditForm.vue                   | 111 ++++++++--------
 src/utils/search.ts                           | 123 ++++++++++++++++++
 src/utils/ui.ts                               |   5 +-
 src/utils/vueUtils.ts                         |  31 +++++
 translations/ar.csv                           |   2 +-
 translations/ca-ES.csv                        |   2 +-
 translations/de.csv                           |   2 +-
 translations/fr.csv                           |   2 +-
 translations/pt.csv                           |   2 +-
 40 files changed, 679 insertions(+), 397 deletions(-)
 rename reports/{view.js => view.ts} (89%)
 create mode 100644 src/utils/search.ts
 create mode 100644 src/utils/vueUtils.ts

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index a442a355..74cdfd81 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -31,7 +31,6 @@ import {
   Action,
   CurrenciesMap,
   DefaultMap,
-  DependsOnMap,
   EmptyMessageMap,
   FiltersMap,
   FormulaMap,
@@ -42,7 +41,7 @@ import {
   ReadOnlyMap,
   RequiredMap,
   TreeViewSettings,
-  ValidationMap
+  ValidationMap,
 } from './types';
 import { validateOptions, validateRequired } from './validationFunction';
 
@@ -583,7 +582,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async _getValueFromFormula(field: Field, doc: Doc) {
-    const formula = doc.formulas[field.fieldname];
+    const { formula } = doc.formulas[field.fieldname] ?? {};
     if (formula === undefined) {
       return;
     }
@@ -594,6 +593,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     } catch {
       return;
     }
+
     if (Array.isArray(value) && field.fieldtype === FieldTypeEnum.Table) {
       value = value.map((row) => this._getChildDoc(row, field.fieldname));
     }
@@ -796,7 +796,6 @@ export class Doc extends Observable<DocValue | Doc[]> {
   required: RequiredMap = {};
   hidden: HiddenMap = {};
   readOnly: ReadOnlyMap = {};
-  dependsOn: DependsOnMap = {};
   getCurrencies: CurrenciesMap = {};
 
   static lists: ListsMap = {};
diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts
index 2bd6b6f3..368b9529 100644
--- a/fyo/model/helpers.ts
+++ b/fyo/model/helpers.ts
@@ -92,7 +92,15 @@ export function shouldApplyFormula(field: Field, doc: Doc, fieldname?: string) {
     return true;
   }
 
-  const dependsOn = doc.dependsOn[field.fieldname] ?? [];
+  const { dependsOn } = doc.formulas[field.fieldname] ?? {};
+  if (dependsOn === undefined) {
+    return true;
+  }
+
+  if (dependsOn.length === 0) {
+    return false;
+  }
+
   if (fieldname && dependsOn.includes(fieldname)) {
     return true;
   }
diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts
index d3e53c6a..49d152b1 100644
--- a/fyo/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -28,7 +28,10 @@ export function isNameAutoSet(schemaName: string, fyo: Fyo): boolean {
 }
 
 export async function setName(doc: Doc, fyo: Fyo) {
-  // if is server, always name again if autoincrement or other
+  if (doc.schema.naming === 'manual') {
+    return;
+  }
+
   if (doc.schema.naming === 'autoincrement') {
     doc.name = await getNextId(doc.schemaName, fyo);
     return;
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index 1b2346df..bbb12386 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -19,6 +19,7 @@ import { Doc } from './doc';
  */
 export type FormulaReturn = DocValue | DocValueMap[] | undefined | Doc[];
 export type Formula = () => Promise<FormulaReturn> | FormulaReturn;
+export type FormulaConfig = { dependsOn?: string[]; formula: Formula };
 export type Default = () => DocValue;
 export type Validation = (value: DocValue) => Promise<void> | void;
 export type Required = () => boolean;
@@ -26,14 +27,13 @@ export type Hidden = () => boolean;
 export type ReadOnly = () => boolean;
 export type GetCurrency = () => string;
 
-export type FormulaMap = Record<string, Formula | undefined>;
+export type FormulaMap = Record<string, FormulaConfig | undefined>;
 export type DefaultMap = Record<string, Default | undefined>;
 export type ValidationMap = Record<string, Validation | undefined>;
 export type RequiredMap = Record<string, Required | undefined>;
 export type CurrenciesMap = Record<string, GetCurrency | undefined>;
 export type HiddenMap = Record<string, Hidden | undefined>;
 export type ReadOnlyMap = Record<string, ReadOnly | undefined>;
-export type DependsOnMap = Record<string, string[]>;
 
 /**
  * Should add this for hidden too
diff --git a/models/baseModels/Account/types.ts b/models/baseModels/Account/types.ts
index 477d3007..ecc212c3 100644
--- a/models/baseModels/Account/types.ts
+++ b/models/baseModels/Account/types.ts
@@ -1,31 +1,35 @@
-export type AccountType =
-  | 'Accumulated Depreciation'
-  | 'Bank'
-  | 'Cash'
-  | 'Chargeable'
-  | 'Cost of Goods Sold'
-  | 'Depreciation'
-  | 'Equity'
-  | 'Expense Account'
-  | 'Expenses Included In Valuation'
-  | 'Fixed Asset'
-  | 'Income Account'
-  | 'Payable'
-  | 'Receivable'
-  | 'Round Off'
-  | 'Stock'
-  | 'Stock Adjustment'
-  | 'Stock Received But Not Billed'
-  | 'Tax'
-  | 'Temporary';
+export enum AccountRootTypeEnum  {
+'Asset'='Asset',
+'Liability'='Liability',
+'Equity'='Equity',
+'Income'='Income',
+'Expense'='Expense',
+}
 
-export type AccountRootType =
-  | 'Asset'
-  | 'Liability'
-  | 'Equity'
-  | 'Income'
-  | 'Expense';
+export enum AccountTypeEnum {
+  'Accumulated Depreciation' = 'Accumulated Depreciation',
+  'Bank' = 'Bank',
+  'Cash' = 'Cash',
+  'Chargeable' = 'Chargeable',
+  'Cost of Goods Sold' = 'Cost of Goods Sold',
+  'Depreciation' = 'Depreciation',
+  'Equity' = 'Equity',
+  'Expense Account' = 'Expense Account',
+  'Expenses Included In Valuation' = 'Expenses Included In Valuation',
+  'Fixed Asset' = 'Fixed Asset',
+  'Income Account' = 'Income Account',
+  'Payable' = 'Payable',
+  'Receivable' = 'Receivable',
+  'Round Off' = 'Round Off',
+  'Stock' = 'Stock',
+  'Stock Adjustment' = 'Stock Adjustment',
+  'Stock Received But Not Billed' = 'Stock Received But Not Billed',
+  'Tax' = 'Tax',
+  'Temporary' = 'Temporary',
+}
 
+export type AccountType = keyof typeof AccountTypeEnum;
+export type AccountRootType = keyof typeof AccountRootTypeEnum
 
 export interface COARootAccount {
   rootType: AccountRootType;
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
index 3084ca69..4abf5b4d 100644
--- a/models/baseModels/Address/Address.ts
+++ b/models/baseModels/Address/Address.ts
@@ -1,42 +1,36 @@
 import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
-import {
-  DependsOnMap,
-  EmptyMessageMap,
-  FormulaMap,
-  ListsMap,
-} from 'fyo/model/types';
+import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types';
 import { stateCodeMap } from 'regional/in';
 import { titleCase } from 'utils';
 import { getCountryInfo } from 'utils/misc';
 
 export class Address extends Doc {
   formulas: FormulaMap = {
-    addressDisplay: async () => {
-      return [
-        this.addressLine1,
-        this.addressLine2,
-        this.city,
-        this.state,
-        this.country,
-        this.postalCode,
-      ]
-        .filter(Boolean)
-        .join(', ');
+    addressDisplay: {
+      formula: async () => {
+        return [
+          this.addressLine1,
+          this.addressLine2,
+          this.city,
+          this.state,
+          this.country,
+          this.postalCode,
+        ]
+          .filter(Boolean)
+          .join(', ');
+      },
+      dependsOn: [
+        'addressLine1',
+        'addressLine2',
+        'city',
+        'state',
+        'country',
+        'postalCode',
+      ],
     },
   };
 
-  dependsOn: DependsOnMap = {
-    addressDisplay: [
-      'addressLine1',
-      'addressLine2',
-      'city',
-      'state',
-      'country',
-      'postalCode',
-    ],
-  };
-
   static lists: ListsMap = {
     state(doc?: Doc) {
       const country = doc?.country as string | undefined;
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 2d336c61..ec3bc999 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -162,24 +162,35 @@ export abstract class Invoice extends Doc {
   }
 
   formulas: FormulaMap = {
-    account: async () =>
-      this.getFrom('Party', this.party!, 'defaultAccount') as string,
-    currency: async () =>
-      (this.getFrom('Party', this.party!, 'currency') as string) ||
-      (this.fyo.singles.AccountingSettings!.currency as string),
-    exchangeRate: async () => await this.getExchangeRate(),
-    netTotal: async () => this.getSum('items', 'amount', false),
-    baseNetTotal: async () => this.netTotal!.mul(this.exchangeRate!),
-    taxes: async () => await this.getTaxSummary(),
-    grandTotal: async () => await this.getGrandTotal(),
-    baseGrandTotal: async () =>
-      (this.grandTotal as Money).mul(this.exchangeRate!),
-    outstandingAmount: async () => {
-      if (this.submitted) {
-        return;
-      }
+    account: {
+      formula: async () =>
+        this.getFrom('Party', this.party!, 'defaultAccount') as string,
+      dependsOn: ['party'],
+    },
+    currency: {
+      formula: async () =>
+        (this.getFrom('Party', this.party!, 'currency') as string) ||
+        (this.fyo.singles.AccountingSettings!.currency as string),
+      dependsOn: ['party'],
+    },
+    exchangeRate: { formula: async () => await this.getExchangeRate() },
+    netTotal: { formula: async () => this.getSum('items', 'amount', false) },
+    baseNetTotal: {
+      formula: async () => this.netTotal!.mul(this.exchangeRate!),
+    },
+    taxes: { formula: async () => await this.getTaxSummary() },
+    grandTotal: { formula: async () => await this.getGrandTotal() },
+    baseGrandTotal: {
+      formula: async () => (this.grandTotal as Money).mul(this.exchangeRate!),
+    },
+    outstandingAmount: {
+      formula: async () => {
+        if (this.submitted) {
+          return;
+        }
 
-      return this.baseGrandTotal!;
+        return this.baseGrandTotal!;
+      },
     },
   };
 
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index 2147d0e5..9b9ab550 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -1,11 +1,6 @@
 import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
-import {
-  DependsOnMap,
-  FiltersMap,
-  FormulaMap,
-  ValidationMap,
-} from 'fyo/model/types';
+import { FiltersMap, FormulaMap, ValidationMap } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
 import { Invoice } from '../Invoice/Invoice';
@@ -21,50 +16,74 @@ export abstract class InvoiceItem extends Doc {
   }
 
   formulas: FormulaMap = {
-    description: () =>
-      this.parentdoc!.getFrom(
-        'Item',
-        this.item as string,
-        'description'
-      ) as string,
-    rate: async () => {
-      const baseRate = ((await this.parentdoc!.getFrom(
-        'Item',
-        this.item as string,
-        'rate'
-      )) || this.fyo.pesa(0)) as Money;
-
-      return baseRate.div(this.exchangeRate!);
+    description: {
+      formula: () =>
+        this.parentdoc!.getFrom(
+          'Item',
+          this.item as string,
+          'description'
+        ) as string,
+      dependsOn: ['item'],
     },
-    baseRate: () =>
-      (this.rate as Money).mul(this.parentdoc!.exchangeRate as number),
-    account: () => {
-      let accountType = 'expenseAccount';
-      if (this.isSales) {
-        accountType = 'incomeAccount';
-      }
-      return this.parentdoc!.getFrom('Item', this.item as string, accountType);
-    },
-    tax: () => {
-      if (this.tax) {
-        return this.tax as string;
-      }
+    rate: {
+      formula: async () => {
+        const baseRate = ((await this.parentdoc!.getFrom(
+          'Item',
+          this.item as string,
+          'rate'
+        )) || this.fyo.pesa(0)) as Money;
 
-      return this.parentdoc!.getFrom(
-        'Item',
-        this.item as string,
-        'tax'
-      ) as string;
+        return baseRate.div(this.exchangeRate!);
+      },
+      dependsOn: ['item'],
     },
-    amount: () => (this.rate as Money).mul(this.quantity as number),
-    baseAmount: () =>
-      (this.amount as Money).mul(this.parentdoc!.exchangeRate as number),
-    hsnCode: () =>
-      this.parentdoc!.getFrom('Item', this.item as string, 'hsnCode'),
-  };
+    baseRate: {
+      formula: () =>
+        (this.rate as Money).mul(this.parentdoc!.exchangeRate as number),
+      dependsOn: ['item', 'rate'],
+    },
+    account: {
+      formula: () => {
+        let accountType = 'expenseAccount';
+        if (this.isSales) {
+          accountType = 'incomeAccount';
+        }
+        return this.parentdoc!.getFrom(
+          'Item',
+          this.item as string,
+          accountType
+        );
+      },
+      dependsOn: ['item'],
+    },
+    tax: {
+      formula: () => {
+        if (this.tax) {
+          return this.tax as string;
+        }
 
-  dependsOn: DependsOnMap = {
-    hsnCode: ['item'],
+        return this.parentdoc!.getFrom(
+          'Item',
+          this.item as string,
+          'tax'
+        ) as string;
+      },
+      dependsOn: ['item'],
+    },
+    amount: {
+      formula: () => (this.rate as Money).mul(this.quantity as number),
+      dependsOn: ['item', 'rate', 'quantity'],
+    },
+    baseAmount: {
+      formula: () =>
+        (this.amount as Money).mul(this.parentdoc!.exchangeRate as number),
+      dependsOn: ['item', 'amount', 'rate', 'quantity'],
+    },
+    hsnCode: {
+      formula: () =>
+        this.parentdoc!.getFrom('Item', this.item as string, 'hsnCode'),
+      dependsOn: ['item'],
+    },
   };
 
   validations: ValidationMap = {
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 06ae828a..f8d9068f 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -3,7 +3,6 @@ import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import {
   Action,
-  DependsOnMap,
   FiltersMap,
   FormulaMap,
   ListViewSettings,
@@ -11,49 +10,51 @@ import {
 } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
+import { AccountRootTypeEnum, AccountTypeEnum } from '../Account/types';
 
 export class Item extends Doc {
   formulas: FormulaMap = {
-    incomeAccount: async () => {
-      let accountName = 'Service';
-      if (this.itemType === 'Product') {
-        accountName = 'Sales';
-      }
+    incomeAccount: {
+      formula: async () => {
+        let accountName = 'Service';
+        if (this.itemType === 'Product') {
+          accountName = 'Sales';
+        }
 
-      const accountExists = await this.fyo.db.exists('Account', accountName);
-      return accountExists ? accountName : '';
+        const accountExists = await this.fyo.db.exists('Account', accountName);
+        return accountExists ? accountName : '';
+      },
+      dependsOn: ['itemType'],
     },
-    expenseAccount: async () => {
-      const cogs = await this.fyo.db.getAllRaw('Account', {
-        filters: {
-          accountType: 'Cost of Goods Sold',
-        },
-      });
+    expenseAccount: {
+      formula: async () => {
+        const cogs = await this.fyo.db.getAllRaw('Account', {
+          filters: {
+            accountType: AccountTypeEnum['Cost of Goods Sold'],
+          },
+        });
 
-      if (cogs.length === 0) {
-        return '';
-      } else {
-        return cogs[0].name as string;
-      }
+        if (cogs.length === 0) {
+          return '';
+        } else {
+          return cogs[0].name as string;
+        }
+      },
+      dependsOn: ['itemType'],
     },
   };
 
   static filters: FiltersMap = {
     incomeAccount: () => ({
       isGroup: false,
-      rootType: 'Income',
+      rootType: AccountRootTypeEnum.Income,
     }),
     expenseAccount: () => ({
       isGroup: false,
-      rootType: 'Expense',
+      rootType: AccountRootTypeEnum.Expense,
     }),
   };
 
-  dependsOn: DependsOnMap = {
-    incomeAccount: ['itemType'],
-    expenseAccount: ['itemType'],
-  };
-
   validations: ValidationMap = {
     rate: async (value: DocValue) => {
       if ((value as Money).isNegative()) {
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
index 3374b744..6e12a762 100644
--- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
+++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
@@ -24,8 +24,14 @@ export class JournalEntryAccount extends Doc {
   }
 
   formulas: FormulaMap = {
-    debit: async () => this.getAutoDebitCredit('debit'),
-    credit: async () => this.getAutoDebitCredit('credit'),
+    debit: {
+      formula: async () => this.getAutoDebitCredit('debit'),
+      dependsOn: ['credit'],
+    },
+    credit: {
+      formula: async () => this.getAutoDebitCredit('credit'),
+      dependsOn: ['debit'],
+    },
   };
 
   static filters: FiltersMap = {
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 37abc4dd..045b5fc8 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -51,28 +51,35 @@ export class Party extends Doc {
   }
 
   formulas: FormulaMap = {
-    defaultAccount: async () => {
-      const role = this.role as PartyRole;
-      if (role === 'Both') {
-        return '';
-      }
+    defaultAccount: {
+      formula: async () => {
+        const role = this.role as PartyRole;
+        if (role === 'Both') {
+          return '';
+        }
 
-      let accountName = 'Debtors';
-      if (role === 'Supplier') {
-        accountName = 'Creditors';
-      }
+        let accountName = 'Debtors';
+        if (role === 'Supplier') {
+          accountName = 'Creditors';
+        }
 
-      const accountExists = await this.fyo.db.exists('Account', accountName);
-      return accountExists ? accountName : '';
+        const accountExists = await this.fyo.db.exists('Account', accountName);
+        return accountExists ? accountName : '';
+      },
+      dependsOn: ['role'],
     },
-    currency: async () =>
-      this.fyo.singles.AccountingSettings!.currency as string,
-    address: async () => {
-      const address = this.address as string | undefined;
-      if (address) {
-        return this.getFrom('Address', address, 'addressDisplay') as string;
-      }
-      return '';
+    currency: {
+      formula: async () =>
+        this.fyo.singles.AccountingSettings!.currency as string,
+    },
+    address: {
+      formula: async () => {
+        const address = this.address as string | undefined;
+        if (address) {
+          return this.getFrom('Address', address, 'addressDisplay') as string;
+        }
+        return '';
+      },
     },
   };
 
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index a2546625..8017f48b 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -38,7 +38,8 @@ export class Payment extends Doc {
 
   async updateDetailsOnReferenceUpdate() {
     const forReferences = (this.for ?? []) as Doc[];
-    const { referenceType, referenceName } = forReferences[0];
+
+    const { referenceType, referenceName } = forReferences[0] ?? {};
     if (
       forReferences.length !== 1 ||
       this.party ||
@@ -284,17 +285,26 @@ export class Payment extends Doc {
   static defaults: DefaultMap = { date: () => new Date().toISOString() };
 
   formulas: FormulaMap = {
-    account: async () => {
-      if (this.paymentMethod === 'Cash' && this.paymentType === 'Pay') {
-        return 'Cash';
-      }
+    account: {
+      formula: async () => {
+        if (this.paymentMethod === 'Cash' && this.paymentType === 'Pay') {
+          return 'Cash';
+        }
+      },
+      dependsOn: ['paymentMethod', 'paymentType'],
     },
-    paymentAccount: async () => {
-      if (this.paymentMethod === 'Cash' && this.paymentType === 'Receive') {
-        return 'Cash';
-      }
+    paymentAccount: {
+      formula: async () => {
+        if (this.paymentMethod === 'Cash' && this.paymentType === 'Receive') {
+          return 'Cash';
+        }
+      },
+      dependsOn: ['paymentMethod', 'paymentType'],
+    },
+    amount: {
+      formula: async () => this.getSum('for', 'amount', false),
+      dependsOn: ['for'],
     },
-    amount: async () => this.getSum('for', 'amount', false),
   };
 
   validations: ValidationMap = {
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index ab3b144e..d9442f43 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -4,18 +4,25 @@ import Money from 'pesa/dist/types/src/money';
 
 export class PaymentFor extends Doc {
   formulas: FormulaMap = {
-    amount: async () => {
-      const outstandingAmount = this.parentdoc!.getFrom(
-        this.referenceType as string,
-        this.referenceName as string,
-        'outstandingAmount'
-      ) as Money;
+    amount: {
+      formula: async () => {
+        if (!this.referenceName) {
+          return this.fyo.pesa(0);
+        }
 
-      if (outstandingAmount) {
-        return outstandingAmount;
-      }
+        const outstandingAmount = this.parentdoc!.getFrom(
+          this.referenceType as string,
+          this.referenceName as string,
+          'outstandingAmount'
+        ) as Money;
 
-      return this.fyo.pesa(0);
+        if (outstandingAmount) {
+          return outstandingAmount;
+        }
+
+        return this.fyo.pesa(0);
+      },
+      dependsOn: ['referenceName'],
     },
   };
 
diff --git a/models/baseModels/SetupWizard/SetupWizard.ts b/models/baseModels/SetupWizard/SetupWizard.ts
index 093d27c1..e0b72988 100644
--- a/models/baseModels/SetupWizard/SetupWizard.ts
+++ b/models/baseModels/SetupWizard/SetupWizard.ts
@@ -1,11 +1,6 @@
 import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
-import {
-  DependsOnMap,
-  FormulaMap,
-  ListsMap,
-  ValidationMap,
-} from 'fyo/model/types';
+import { FormulaMap, ListsMap, ValidationMap } from 'fyo/model/types';
 import { validateEmail } from 'fyo/model/validationFunction';
 import { getCountryInfo, getFiscalYear } from 'utils/misc';
 
@@ -30,57 +25,64 @@ export function getCOAList() {
 }
 
 export class SetupWizard extends Doc {
-  dependsOn: DependsOnMap = {
-    fiscalYearStart: ['country'],
-    fiscalYearEnd: ['country'],
-    currency: ['country'],
-    chartOfAccounts: ['country'],
-  };
-
   formulas: FormulaMap = {
-    fiscalYearStart: async () => {
-      if (!this.country) return;
+    fiscalYearStart: {
+      formula: async () => {
+        if (!this.country) return;
 
-      const countryInfo = getCountryInfo();
-      const fyStart =
-        countryInfo[this.country as string]?.fiscal_year_start ?? '';
-      return getFiscalYear(fyStart, true);
+        const countryInfo = getCountryInfo();
+        const fyStart =
+          countryInfo[this.country as string]?.fiscal_year_start ?? '';
+        return getFiscalYear(fyStart, true);
+      },
+      dependsOn: ['country'],
     },
-    fiscalYearEnd: async () => {
-      if (!this.country) {
-        return;
-      }
+    fiscalYearEnd: {
+      formula: async () => {
+        if (!this.country) {
+          return;
+        }
 
-      const countryInfo = getCountryInfo();
-      const fyEnd = countryInfo[this.country as string]?.fiscal_year_end ?? '';
-      return getFiscalYear(fyEnd, false);
+        const countryInfo = getCountryInfo();
+        const fyEnd =
+          countryInfo[this.country as string]?.fiscal_year_end ?? '';
+        return getFiscalYear(fyEnd, false);
+      },
+      dependsOn: ['country'],
     },
-    currency: async () => {
-      if (!this.country) {
-        return;
-      }
-      const countryInfo = getCountryInfo();
-      return countryInfo[this.country as string]?.currency;
+    currency: {
+      formula: async () => {
+        if (!this.country) {
+          return;
+        }
+        const countryInfo = getCountryInfo();
+        return countryInfo[this.country as string]?.currency;
+      },
+      dependsOn: ['country'],
     },
-    chartOfAccounts: async () => {
-      const country = this.get('country') as string | undefined;
-      if (country === undefined) {
-        return;
-      }
+    chartOfAccounts: {
+      formula: async () => {
+        const country = this.get('country') as string | undefined;
+        if (country === undefined) {
+          return;
+        }
 
-      const countryInfo = getCountryInfo();
-      const code = (countryInfo[country] as undefined | { code: string })?.code;
-      if (code === undefined) {
-        return;
-      }
+        const countryInfo = getCountryInfo();
+        const code = (countryInfo[country] as undefined | { code: string })
+          ?.code;
+        if (code === undefined) {
+          return;
+        }
 
-      const coaList = getCOAList();
-      const coa = coaList.find(({ countryCode }) => countryCode === code);
+        const coaList = getCOAList();
+        const coa = coaList.find(({ countryCode }) => countryCode === code);
 
-      if (coa === undefined) {
-        return coaList[0].name;
-      }
-      return coa.name;
+        if (coa === undefined) {
+          return coaList[0].name;
+        }
+        return coa.name;
+      },
+      dependsOn: ['country'],
     },
   };
 
diff --git a/models/baseModels/TaxSummary/TaxSummary.ts b/models/baseModels/TaxSummary/TaxSummary.ts
index aa297b1f..9a751362 100644
--- a/models/baseModels/TaxSummary/TaxSummary.ts
+++ b/models/baseModels/TaxSummary/TaxSummary.ts
@@ -9,10 +9,13 @@ export class TaxSummary extends Doc {
   baseAmount?: Money;
 
   formulas: FormulaMap = {
-    baseAmount: async () => {
-      const amount = this.amount as Money;
-      const exchangeRate = (this.parentdoc?.exchangeRate ?? 1) as number;
-      return amount.mul(exchangeRate);
+    baseAmount: {
+      formula: async () => {
+        const amount = this.amount as Money;
+        const exchangeRate = (this.parentdoc?.exchangeRate ?? 1) as number;
+        return amount.mul(exchangeRate);
+      },
+      dependsOn: ['amount'],
     },
   };
 }
diff --git a/models/regionalModels/in/Address.ts b/models/regionalModels/in/Address.ts
index 6a708f14..4556d60c 100644
--- a/models/regionalModels/in/Address.ts
+++ b/models/regionalModels/in/Address.ts
@@ -5,26 +5,39 @@ import { titleCase } from 'utils';
 
 export class Address extends BaseAddress {
   formulas: FormulaMap = {
-    addressDisplay: async () => {
-      return [
-        this.addressLine1,
-        this.addressLine2,
-        this.city,
-        this.state,
-        this.country,
-        this.postalCode,
-      ]
-        .filter(Boolean)
-        .join(', ');
+    addressDisplay: {
+      formula: async () => {
+        return [
+          this.addressLine1,
+          this.addressLine2,
+          this.city,
+          this.state,
+          this.country,
+          this.postalCode,
+        ]
+          .filter(Boolean)
+          .join(', ');
+      },
+      dependsOn: [
+        'addressLine1',
+        'addressLine2',
+        'city',
+        'state',
+        'country',
+        'postalCode',
+      ],
     },
 
-    pos: async () => {
-      const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
-      const state = this.state as string;
-      if (stateList.includes(state)) {
-        return state;
-      }
-      return '';
+    pos: {
+      formula: async () => {
+        const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
+        const state = this.state as string;
+        if (stateList.includes(state)) {
+          return state;
+        }
+        return '';
+      },
+      dependsOn: ['state'],
     },
   };
 
diff --git a/reports/view.js b/reports/view.ts
similarity index 89%
rename from reports/view.js
rename to reports/view.ts
index dc2a1c3a..b75ebf9b 100644
--- a/reports/view.js
+++ b/reports/view.ts
@@ -18,4 +18,9 @@
 //   'gstr-2': GoodsAndServiceTaxGSTR2View,
 // };
 
-export default {};
+interface ReportView {
+  title: string;
+  method: string;
+}
+
+export default {} as Record<string, ReportView>;
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index 5f94526e..fb6a3e29 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -2,6 +2,7 @@
   "name": "Item",
   "label": "Item",
   "isSingle": false,
+  "naming": "manual",
   "fields": [
     {
       "fieldname": "name",
@@ -30,11 +31,11 @@
       "options": [
         {
           "value": "Unit",
-          "name": "Unit"
+          "label": "Unit"
         },
         {
           "value": "Kg",
-          "name": "Kg"
+          "label": "Kg"
         },
         {
           "value": "Gram",
diff --git a/schemas/app/NumberSeries.json b/schemas/app/NumberSeries.json
index 90ede4e4..ac6301b9 100644
--- a/schemas/app/NumberSeries.json
+++ b/schemas/app/NumberSeries.json
@@ -59,6 +59,6 @@
       "readOnly": true
     }
   ],
-  "quickEditFields": ["start", "padZeros", "referenceType"],
+  "quickEditFields": ["referenceType", "start", "padZeros"],
   "keywordFields": []
 }
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index 1d3aa3cf..c6b4c0b1 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -1,6 +1,7 @@
 {
   "name": "Party",
   "label": "Party",
+  "naming": "manual",
   "fields": [
     {
       "fieldname": "name",
@@ -33,6 +34,7 @@
           "label": "Customer"
         }
       ],
+      "readOnly": true,
       "required": true
     },
     {
@@ -85,6 +87,7 @@
     "address",
     "defaultAccount",
     "currency",
+    "role",
     "taxId"
   ],
   "keywordFields": ["name"]
diff --git a/schemas/app/PaymentFor.json b/schemas/app/PaymentFor.json
index 712ccf13..c59c4309 100644
--- a/schemas/app/PaymentFor.json
+++ b/schemas/app/PaymentFor.json
@@ -6,7 +6,7 @@
   "fields": [
     {
       "fieldname": "referenceType",
-      "label": "Reference Type",
+      "label": "Type",
       "placeholder": "Type",
       "fieldtype": "Select",
       "options": [
@@ -23,7 +23,7 @@
     },
     {
       "fieldname": "referenceName",
-      "label": "Reference Name",
+      "label": "Name",
       "fieldtype": "DynamicLink",
       "references": "referenceType",
       "placeholder": "Name",
@@ -31,9 +31,10 @@
     },
     {
       "fieldname": "amount",
-      "label": "Allocated Amount",
+      "label": "Amount",
       "fieldtype": "Currency",
       "required": true
     }
-  ]
+  ],
+  "tableFields": ["referenceType", "referenceName", "amount"]
 }
diff --git a/schemas/regional/in/Party.json b/schemas/regional/in/Party.json
index 3f12fb3c..1a7c71ff 100644
--- a/schemas/regional/in/Party.json
+++ b/schemas/regional/in/Party.json
@@ -34,6 +34,7 @@
     "address",
     "defaultAccount",
     "currency",
+    "role",
     "gstType",
     "gstin"
   ],
diff --git a/schemas/types.ts b/schemas/types.ts
index 5c0b019a..c75f2278 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -68,7 +68,7 @@ export type Field =
   | DynamicLinkField
   | NumberField;
 
-export type Naming = 'autoincrement' | 'random' | 'numberSeries'
+export type Naming = 'autoincrement' | 'random' | 'numberSeries' | 'manual';
 
 export interface Schema {
   name: string;                  // Table name
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 94752194..fffc27dd 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -13,6 +13,18 @@ export default {
     if (this.value) {
       this.linkValue = this.value;
     }
+
+    if (this.df.fieldname === 'incomeAccount') {
+      window.l = this;
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(newValue) {
+        this.linkValue = newValue;
+      },
+    },
   },
   methods: {
     async getSuggestions(keyword = '') {
diff --git a/src/components/Controls/Select.vue b/src/components/Controls/Select.vue
index 49dea2a5..871e47ec 100644
--- a/src/components/Controls/Select.vue
+++ b/src/components/Controls/Select.vue
@@ -14,7 +14,13 @@
       :class="inputClasses"
     >
       <select
-        class="appearance-none bg-transparent focus:outline-none w-11/12 cursor-pointer"
+        class="
+          appearance-none
+          bg-transparent
+          focus:outline-none
+          w-11/12
+          cursor-pointer
+        "
         :class="{
           'pointer-events-none': isReadOnly,
           'text-gray-400': !value,
@@ -36,6 +42,7 @@
         </option>
       </select>
       <svg
+        v-if="!isReadOnly"
         class="w-3 h-3"
         style="background: inherit; margin-right: -3px"
         viewBox="0 0 5 10"
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index d5b6af37..079f40ea 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="tableFields?.length">
     <div class="text-gray-600 text-sm mb-1" v-if="showLabel">
       {{ df.label }}
     </div>
@@ -90,6 +90,9 @@ export default {
     TableRow,
   },
   inject: ['doc'],
+  mounted(){
+    window.tab = this
+  },
   data: () => ({ rowContainerHeight: null }),
   watch: {
     value: {
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index e05145ab..1909beaf 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -1,3 +1,6 @@
+<script setup>
+const keys = useKeys();
+</script>
 <template>
   <div v-on-outside-click="clearInput" class="relative">
     <Dropdown :items="suggestions" class="text-sm h-full">
@@ -13,21 +16,30 @@
           class="rounded-md relative flex items-center overflow-hidden h-full"
         >
           <div class="absolute flex justify-center w-8">
-            <feather-icon name="search" class="w-3 h-3 text-gray-700" />
+            <feather-icon name="search" class="w-3 h-3 text-gray-800" />
           </div>
           <input
             type="search"
-            class="bg-gray-200 text-sm pl-8 focus:outline-none h-full w-56 placeholder-gray-700"
+            class="
+              bg-gray-100
+              text-sm
+              pl-7
+              focus:outline-none
+              h-full
+              w-56
+              placeholder-gray-800
+            "
             :placeholder="t`Search...`"
             autocomplete="off"
             spellcheck="false"
             v-model="inputValue"
-            @input="
+            @focus="
               () => {
                 search();
                 toggleDropdown(true);
               }
             "
+            @input="search"
             ref="input"
             @keydown.up="highlightItemUp"
             @keydown.down="highlightItemDown"
@@ -35,6 +47,12 @@
             @keydown.tab="toggleDropdown(false)"
             @keydown.esc="toggleDropdown(false)"
           />
+          <div
+            v-if="!inputValue"
+            class="absolute justify-center right-1.5 text-gray-500 px-1.5"
+          >
+            {{ platform === 'Mac' ? '⌘ K' : 'Ctrl K' }}
+          </div>
         </div>
       </template>
     </Dropdown>
@@ -42,10 +60,11 @@
 </template>
 <script>
 import { t } from 'fyo';
-import reports from 'reports/view';
 import Dropdown from 'src/components/Dropdown';
-import { fyo } from 'src/initFyo';
+import { getSearchList } from 'src/utils/search';
 import { routeTo } from 'src/utils/ui';
+import { useKeys } from 'src/utils/vueUtils';
+import { watch } from 'vue';
 
 export default {
   data() {
@@ -61,6 +80,19 @@ export default {
   emits: ['change'],
   mounted() {
     this.makeSearchList();
+    watch(this.keys, (keys) => {
+      if (
+        keys.size === 2 &&
+        keys.has('KeyK') &&
+        (keys.has('MetaLeft') || keys.has('ControlLeft'))
+      ) {
+        this.$refs.input.focus();
+      }
+
+      if (keys.size === 1 && keys.has('Escape')) {
+        this.$refs.input.blur();
+      }
+    });
   },
   methods: {
     async search() {
@@ -78,56 +110,17 @@ export default {
       this.$emit('change', null);
     },
     async makeSearchList() {
-      const schemas = this.getSearchableSchemas();
-      const reports = this.getReports();
-      const views = this.getViews();
-
-      let searchList = [...schemas, ...reports, ...views];
+      const searchList = getSearchList();
       this.searchList = searchList.map((d) => {
-        if (d.route) {
-          d.action = () => routeTo(d.route);
-          this.inputValue = '';
+        if (d.route && !d.action) {
+          d.action = () => {
+            routeTo(d.route);
+            this.inputValue = '';
+          };
         }
         return d;
       });
     },
-    getSearchableSchemas() {
-      return Object.values(fyo.schemaMap)
-        .filter((s) => !s.isChild && !s.isSingle)
-        .map((s) => ({
-          label: s.label,
-          route: `/list/${s.name}`,
-          group: 'List',
-        }));
-    },
-    getReports() {
-      return Object.values(reports).map((report) => {
-        return {
-          label: report.title,
-          route: `/report/${report.method}`,
-          group: 'Reports',
-        };
-      });
-    },
-    getViews() {
-      return [
-        {
-          label: t`Chart of Accounts`,
-          route: '/chartOfAccounts',
-          group: 'Setup',
-        },
-        {
-          label: t`Data Import`,
-          route: '/data_import',
-          group: 'Setup',
-        },
-        {
-          label: t`Settings`,
-          route: '/settings',
-          group: 'Setup',
-        },
-      ];
-    },
   },
 };
 </script>
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index aea15075..af1919a8 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -139,9 +139,6 @@ export default {
       insertingAccount: false,
     };
   },
-  mounted() {
-    this.fetchAccounts();
-  },
   async activated() {
     this.fetchAccounts();
     if (fyo.store.isDevelopment) {
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index 0f66131e..0d24d407 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -15,7 +15,7 @@
                 flex flex-col
                 justify-between
                 h-full
-                p-6
+                p-4
                 border
                 rounded-lg
                 cursor-pointer
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index d4de650f..47756eee 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -13,7 +13,9 @@
           :key="column.label"
           class="py-4 truncate"
           :class="
-            ['Float', 'Currency'].includes(column.fieldtype) ? 'text-right' : ''
+            ['Int', 'Float', 'Currency'].includes(column.fieldtype)
+              ? 'text-right'
+              : ''
           "
         >
           {{ column.label }}
@@ -88,9 +90,16 @@ export default {
       data: [],
     };
   },
+  mounted() {},
   computed: {
     columns() {
-      const columns = this.listConfig?.columns ?? [];
+      let columns = this.listConfig?.columns ?? [];
+
+      if (columns.length === 0) {
+        columns = fyo.schemaMap[this.schemaName].quickEditFields ?? [];
+        columns = [...new Set(['name', ...columns])];
+      }
+
       return columns
         .map((fieldname) => fyo.getField(this.schemaName, fieldname))
         .filter(Boolean);
@@ -123,6 +132,7 @@ export default {
         routeTo(this.listConfig.formRoute(doc.name));
         return;
       }
+
       openQuickEdit({
         schemaName: this.schemaName,
         name: doc.name,
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index d2b618e2..17e9e30d 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -12,16 +12,14 @@
         </Button>
       </template>
     </PageHeader>
-    <div class="flex-1 flex h-full">
-      <List
-        ref="list"
-        :schemaName="schemaName"
-        :listConfig="listConfig"
-        :filters="filters"
-        class="flex-1"
-        @makeNewDoc="makeNewDoc"
-      />
-    </div>
+    <List
+      ref="list"
+      :schemaName="schemaName"
+      :listConfig="listConfig"
+      :filters="filters"
+      class="flex-1 flex h-full"
+      @makeNewDoc="makeNewDoc"
+    />
   </div>
 </template>
 <script>
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index e139e324..a3571c30 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="border-l h-full">
+  <div class="border-l h-full overflow-auto">
     <!-- Quick edit Tool bar -->
     <div class="flex items-center justify-between px-4 pt-4">
       <!-- Close Button and Status Text -->
@@ -27,7 +27,7 @@
         </Button>
         <Button
           :icon="true"
-          @click="submitDoc"
+          @click="submit"
           type="primary"
           v-if="
             schema?.isSubmittable &&
@@ -43,30 +43,24 @@
     </div>
 
     <!-- Name and image -->
-    <div class="px-4 pt-2 pb-4 flex-center" v-if="doc">
-      <div class="flex flex-col items-center">
-        <FormControl
-          v-if="imageField"
-          :df="imageField"
-          :value="doc[imageField.fieldname]"
-          @change="(value) => valueChange(imageField, value)"
-          size="small"
-          class="mb-1"
-          :letter-placeholder="
-            // for AttachImage field
-            doc[titleField.fieldname] ? doc[titleField.fieldname][0] : null
-          "
-        />
-        <FormControl
-          input-class="text-center"
-          ref="titleControl"
-          v-if="titleField"
-          :df="titleField"
-          :value="doc[titleField.fieldname]"
-          @change="(value) => valueChange(titleField, value)"
-          @input="setTitleSize"
-        />
-      </div>
+    <div class="p-4 gap-2 flex-center flex flex-col items-center" v-if="doc">
+      <FormControl
+        v-if="imageField"
+        :df="imageField"
+        :value="doc[imageField.fieldname]"
+        @change="(value) => valueChange(imageField, value)"
+        size="small"
+        :letter-placeholder="doc[titleField.fieldname]?.[0] ?? null"
+      />
+      <FormControl
+        input-class="text-center"
+        ref="titleControl"
+        v-if="titleField"
+        :df="titleField"
+        :value="doc[titleField.fieldname]"
+        @change="(value) => valueChange(titleField, value)"
+        @input="setTitleSize"
+      />
     </div>
 
     <!-- Rest of the form -->
@@ -229,41 +223,56 @@ export default {
       }, 300);
     },
     async fetchDoc() {
-      try {
-        this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
-
-        this.doc.once('afterRename', () => {
-          openQuickEdit({
-            schemaName: this.schemaName,
-            name: this.doc.name,
-          });
-        });
-
-        this.doc.on('beforeSync', () => {
-          this.statusText = t`Saving...`;
-        });
-
-        this.doc.on('afterSync', () => {
-          setTimeout(() => {
-            this.statusText = null;
-          }, 500);
-        });
-      } catch (e) {
+      if (!this.schemaName) {
         this.$router.back();
       }
+
+      if (this.name) {
+        try {
+          this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+        } catch (e) {
+          this.$router.back();
+        }
+      } else {
+        this.doc = fyo.doc.getNewDoc(this.schemaName);
+      }
+
+      if (this.doc === null) {
+        return;
+      }
+
+      this.doc.once('afterRename', () => {
+        openQuickEdit({
+          schemaName: this.schemaName,
+          name: this.doc.name,
+        });
+      });
     },
     valueChange(df, value) {
       this.$refs.form.onChange(df, value);
     },
-    sync() {
-      this.$refs.form.sync();
+    async sync() {
+      this.statusText = t`Saving`;
+      try {
+        await this.$refs.form.sync();
+        setTimeout(() => {
+          this.statusText = null;
+        }, 300);
+      } catch (err) {
+        this.statusText = null;
+        console.error(err);
+      }
     },
-    async submitDoc() {
+    async submit() {
+      this.statusText = t`Submitting`;
       try {
         await this.$refs.form.submit();
-      } catch (e) {
+        setTimeout(() => {
+          this.statusText = null;
+        }, 300);
+      } catch (err) {
         this.statusText = null;
-        console.error(e);
+        console.error(err);
       }
     },
     routeToPrevious() {
diff --git a/src/utils/search.ts b/src/utils/search.ts
new file mode 100644
index 00000000..53c5c95a
--- /dev/null
+++ b/src/utils/search.ts
@@ -0,0 +1,123 @@
+import { t } from 'fyo';
+import { ModelNameEnum } from 'models/types';
+import reports from 'reports/view';
+import { fyo } from 'src/initFyo';
+import { routeTo } from './ui';
+
+enum SearchGroupEnum {
+  'List' = 'List',
+  'Report' = 'Report',
+  'Create' = 'Create',
+  'Setup' = 'Setup',
+}
+
+type SearchGroup = keyof typeof SearchGroupEnum;
+interface SearchItem {
+  label: string;
+  group: SearchGroup;
+  route?: string;
+  action?: () => void;
+}
+
+async function openNewDoc(schemaName: string) {
+  await routeTo(`/list/${schemaName}`);
+  const doc = await fyo.doc.getNewDoc(schemaName);
+  const { openQuickEdit } = await import('src/utils/ui');
+
+  await openQuickEdit({
+    schemaName,
+    name: doc.name as string,
+  });
+}
+
+function getCreateList(): SearchItem[] {
+  return [
+    {
+      label: t`Create Item`,
+      group: 'Create',
+      action() {
+        openNewDoc(ModelNameEnum.Item);
+      },
+    },
+    {
+      label: t`Create Party`,
+      group: 'Create',
+      action() {
+        openNewDoc(ModelNameEnum.Party);
+      },
+    },
+    {
+      label: t`Create Payment`,
+      group: 'Create',
+      action() {
+        openNewDoc(ModelNameEnum.Payment);
+      },
+    },
+  ];
+}
+
+function getReportList(): SearchItem[] {
+  return Object.values(reports).map((report) => {
+    return {
+      label: report.title,
+      route: `/report/${report.method}`,
+      group: 'Report',
+    };
+  });
+}
+
+function getListViewList(): SearchItem[] {
+  return [
+    ModelNameEnum.Account,
+    ModelNameEnum.Party,
+    ModelNameEnum.Item,
+    ModelNameEnum.Payment,
+    ModelNameEnum.JournalEntry,
+    ModelNameEnum.PurchaseInvoice,
+    ModelNameEnum.SalesInvoice,
+    ModelNameEnum.Tax,
+  ]
+    .map((s) => fyo.schemaMap[s])
+    .filter((s) => s && !s.isChild && !s.isSingle)
+    .map((s) => ({
+      label: s!.label,
+      route: `/list/${s!.name}`,
+      group: 'List',
+    }));
+}
+
+function getSetupList(): SearchItem[] {
+  return [
+    {
+      label: t`Chart of Accounts`,
+      route: '/chartOfAccounts',
+      group: 'Setup',
+    },
+    {
+      label: t`Data Import`,
+      route: '/data_import',
+      group: 'Setup',
+    },
+    {
+      label: t`Settings`,
+      route: '/settings',
+      group: 'Setup',
+    },
+  ];
+}
+
+export function getSearchList() {
+  const group: Record<SearchGroup, string> = {
+    Create: t`Create`,
+    List: t`List`,
+    Report: t`Report`,
+    Setup: t`Setup`,
+  };
+
+  return [getListViewList(), getCreateList(), getReportList(), getSetupList()]
+    .flat()
+    .map((si) => ({
+      ...si,
+      group: group[si.group],
+    }));
+}
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 9cb6d82e..daf888eb 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -125,7 +125,7 @@ export function openSettings(tab: SettingsTab) {
   routeTo({ path: '/settings', query: { tab } });
 }
 
-export function routeTo(route: string | RouteLocationRaw) {
+export async function routeTo(route: string | RouteLocationRaw) {
   let routeOptions = route;
   if (
     typeof route === 'string' &&
@@ -138,7 +138,7 @@ export function routeTo(route: string | RouteLocationRaw) {
     routeOptions = { path: route };
   }
 
-  router.push(routeOptions);
+  await router.push(routeOptions);
 }
 
 export function deleteDocWithPrompt(doc: Doc) {
@@ -292,6 +292,7 @@ function getDeleteAction(doc: Doc): Action {
       }),
   };
 }
+
 function getDuplicateAction(doc: Doc): Action {
   const isSubmittable = !!doc.schema.isSubmittable;
   return {
diff --git a/src/utils/vueUtils.ts b/src/utils/vueUtils.ts
new file mode 100644
index 00000000..93b2c88d
--- /dev/null
+++ b/src/utils/vueUtils.ts
@@ -0,0 +1,31 @@
+import { onMounted, onUnmounted, Ref, ref } from 'vue';
+
+export function useKeys(callback?: (keys: Set<string>) => void) {
+  const keys: Ref<Set<string>> = ref(new Set());
+
+  const keydownListener = (e: KeyboardEvent) => {
+    keys.value.add(e.code);
+    callback?.(keys.value);
+  };
+
+  const keyupListener = (e: KeyboardEvent) => {
+    keys.value.delete(e.code);
+
+    // Key up won't trigger on macOS for other keys.
+    if (e.code === 'MetaLeft') {
+      keys.value.clear();
+    }
+  };
+
+  onMounted(() => {
+    window.addEventListener('keydown', keydownListener);
+    window.addEventListener('keyup', keyupListener);
+  });
+
+  onUnmounted(() => {
+    window.removeEventListener('keydown', keydownListener);
+    window.removeEventListener('keyup', keyupListener);
+  });
+
+  return keys;
+}
diff --git a/translations/ar.csv b/translations/ar.csv
index c86a3d81..a600d147 100644
--- a/translations/ar.csv
+++ b/translations/ar.csv
@@ -415,7 +415,7 @@
 `Save Template`,`حفظ النموذج`
 `Save as PDF`,`حفظ كملف PDF`
 `Save as PDF Successful`,`PDF حفظ كملف ناجح`
-`Saving...`,`حفظ ...`
+`Saving`,`حفظ`
 `Schedule`,`الجدول`
 `Secured Loans`,`قروض مضمونة`
 `Securities and Deposits`,`الأوراق المالية والودائع`
diff --git a/translations/ca-ES.csv b/translations/ca-ES.csv
index 742d3ef9..16895fe5 100644
--- a/translations/ca-ES.csv
+++ b/translations/ca-ES.csv
@@ -452,7 +452,7 @@
 `Save Template`,`Guardar plantilla`
 `Save as PDF`,`Guardar com a PDF`
 `Save as PDF Successful`,`Guardat com a PDF correctament`
-`Saving...`,`Guardant...`
+`Saving`,`Guardant`
 `Schedule`,`Programar`
 `Search...`,`Search...`
 `Secured Loans`,`Préstecs `
diff --git a/translations/de.csv b/translations/de.csv
index 8246bd65..e93d94ba 100644
--- a/translations/de.csv
+++ b/translations/de.csv
@@ -374,7 +374,7 @@
 `Save & Close`,`Speichern & Schließen`
 `Save as PDF`,`Als PDF speichern`
 `Save as PDF Successful`,`PDF gespeichert`
-`Saving...`,`Speichern...`
+`Saving`,`Speichern`
 `Schedule`,`Zeitplan`
 `Secured Loans`,`Gesicherte Darlehen`
 `Securities and Deposits`,`Wertpapiere und Einlagen`
diff --git a/translations/fr.csv b/translations/fr.csv
index 70079aed..aeb2f173 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -374,7 +374,7 @@
 `Save & Close`,`Enregistrer et fermer`
 `Save as PDF`,`Enregistrer en PDF`
 `Save as PDF Successful`,`Enregistrer en PDF avec succès`
-`Saving...`,`Sauver...`
+`Saving`,`Sauver`
 `Schedule`,`Programme`
 `Secured Loans`,`Prêts garantis`
 `Securities and Deposits`,`Titres et dépôts`
diff --git a/translations/pt.csv b/translations/pt.csv
index 082dd503..37ef2bad 100644
--- a/translations/pt.csv
+++ b/translations/pt.csv
@@ -374,7 +374,7 @@
 `Save & Close`,`Guardar e Fechar`
 `Save as PDF`,`Guardar como PDF`
 `Save as PDF Successful`,`Guardar como PDF Bem sucedido`
-`Saving...`,`Salvar...`
+`Saving`,`Salvar`
 `Schedule`,`Horário`
 `Secured Loans`,`Empréstimos Garantidos`
 `Securities and Deposits`,`Títulos e Depósitos`

From e6b8c8a1b6bcd43825aa1eea19aeb136ae97bd6c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sat, 30 Apr 2022 00:34:08 +0530
Subject: [PATCH 080/163] incr: get JournalEntryForm to render

---
 fyo/utils/index.ts                       |  11 ++-
 src/components/Controls/AutoComplete.vue |   1 -
 src/components/Controls/Select.vue       |   8 +-
 src/components/Controls/Table.vue        |   8 +-
 src/pages/JournalEntryForm.vue           | 115 ++++++++++++++---------
 src/pages/QuickEditForm.vue              |  24 +++--
 src/renderer.ts                          |   1 +
 src/router.ts                            |   6 +-
 8 files changed, 98 insertions(+), 76 deletions(-)

diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index f59170df..ba7bb131 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -3,6 +3,7 @@ import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { pesa } from 'pesa';
 import { Field, OptionField, SelectOption } from 'schemas/types';
+import { getIsNullOrUndef } from 'utils';
 
 export function slug(str: string) {
   return str
@@ -77,7 +78,7 @@ export async function getSingleValue(
 
 export function getOptionList(
   field: Field,
-  doc: Doc | undefined
+  doc: Doc | undefined | null
 ): SelectOption[] {
   const list = getRawOptionList(field, doc);
   return list.map((option) => {
@@ -92,17 +93,17 @@ export function getOptionList(
   });
 }
 
-function getRawOptionList(field: Field, doc: Doc | undefined) {
+function getRawOptionList(field: Field, doc: Doc | undefined | null) {
   const options = (field as OptionField).options;
   if (options && options.length > 0) {
     return (field as OptionField).options;
   }
 
-  if (doc === undefined) {
+  if (getIsNullOrUndef(doc)) {
     return [];
   }
 
-  const Model = doc.fyo.models[doc.schemaName];
+  const Model = doc!.fyo.models[doc!.schemaName];
   if (Model === undefined) {
     return [];
   }
@@ -112,5 +113,5 @@ function getRawOptionList(field: Field, doc: Doc | undefined) {
     return [];
   }
 
-  return getList(doc);
+  return getList(doc!);
 }
diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index d317d526..f4eb00a8 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -16,7 +16,6 @@
           flex
           items-center
           justify-between
-          bg-white
           focus-within:bg-gray-200
           pr-2
           rounded
diff --git a/src/components/Controls/Select.vue b/src/components/Controls/Select.vue
index 871e47ec..b30964db 100644
--- a/src/components/Controls/Select.vue
+++ b/src/components/Controls/Select.vue
@@ -4,13 +4,7 @@
       {{ df.label }}
     </div>
     <div
-      class="
-        flex
-        items-center
-        justify-between
-        bg-white
-        focus-within:bg-gray-200
-      "
+      class="flex items-center justify-between focus-within:bg-gray-200"
       :class="inputClasses"
     >
       <select
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index 079f40ea..bfbd76d6 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -89,9 +89,11 @@ export default {
     Row,
     TableRow,
   },
-  inject: ['doc'],
-  mounted(){
-    window.tab = this
+  inject: {
+    doc: { default: null },
+  },
+  mounted() {
+    window.tab = this;
   },
   data: () => ({ rowContainerHeight: null }),
   watch: {
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 7d996d73..7beed1ec 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -1,27 +1,30 @@
 <template>
   <div class="flex flex-col">
+    <!-- Page Header (Title, Buttons, etc) -->
     <PageHeader :backLink="true">
       <template #actions v-if="doc">
         <StatusBadge :status="status" />
         <DropdownWithActions class="ml-2" :actions="actions" />
         <Button
-          v-if="doc._notInserted || doc._dirty"
+          v-if="doc.notInserted || doc.dirty"
           type="primary"
           class="text-white text-xs ml-2"
-          @click="onSaveClick"
+          @click="sync"
         >
           {{ t`Save` }}
         </Button>
         <Button
-          v-if="!doc._dirty && !doc._notInserted && !doc.submitted"
+          v-else-if="!doc.dirty && !doc.notInserted && !doc.submitted"
           type="primary"
           class="text-white text-xs ml-2"
-          @click="onSubmitClick"
+          @click="submit"
         >
           {{ t`Submit` }}
         </Button>
       </template>
     </PageHeader>
+
+    <!-- Journal Entry Form -->
     <div v-if="doc" class="flex justify-center flex-1 mb-8 mt-2">
       <div
         class="border rounded-lg shadow h-full flex flex-col justify-between"
@@ -30,12 +33,14 @@
         <div>
           <div class="mt-8 px-6">
             <h1 class="text-2xl font-semibold">
-              {{ doc._notInserted ? t`New Journal Entry` : doc.name }}
+              {{ doc.notInserted ? t`New Journal Entry` : doc.name }}
             </h1>
+
+            <!-- First Column of Fields -->
             <div class="flex justify-between mt-2 gap-2">
               <div class="w-1/3">
                 <FormControl
-                  :df="meta.getField('entryType')"
+                  :df="getField('entryType')"
                   :value="doc.entryType"
                   placeholder="Entry Type"
                   @change="(value) => doc.set('entryType', value)"
@@ -45,7 +50,7 @@
                 />
                 <FormControl
                   class="mt-2"
-                  :df="meta.getField('date')"
+                  :df="getField('date')"
                   :value="doc.date"
                   :placeholder="'Date'"
                   @change="(value) => doc.set('date', value)"
@@ -54,9 +59,11 @@
                   :class="doc.submitted && 'pointer-events-none'"
                 />
               </div>
+
+              <!-- Second Column of Fields -->
               <div class="w-1/3">
                 <FormControl
-                  :df="meta.getField('referenceNumber')"
+                  :df="getField('referenceNumber')"
                   :value="doc.referenceNumber"
                   :placeholder="'Reference Number'"
                   @change="(value) => doc.set('referenceNumber', value)"
@@ -66,7 +73,7 @@
                 />
                 <FormControl
                   class="mt-2"
-                  :df="meta.getField('referenceDate')"
+                  :df="getField('referenceDate')"
                   :value="doc.referenceDate"
                   :placeholder="'Reference Date'"
                   @change="(value) => doc.set('referenceDate', value)"
@@ -75,43 +82,52 @@
                   :class="doc.submitted && 'pointer-events-none'"
                 />
               </div>
+
+              <!-- Third Column of Fields -->
               <div class="w-1/3">
                 <FormControl
-                  :df="meta.getField('numberSeries')"
+                  :df="getField('numberSeries')"
                   :value="doc.numberSeries"
                   @change="(value) => doc.set('numberSeries', value)"
-                  input-class="bg-gray-100 p-2 text-base"
-                  :read-only="!doc._notInserted || doc.submitted"
+                  class="bg-gray-100 rounded"
+                  input-class="p-2 text-base bg-transparent"
+                  :read-only="!doc.notInserted || doc.submitted"
                   :class="doc.submitted && 'pointer-events-none'"
                 />
               </div>
             </div>
           </div>
-          <div class="mt-2 px-6 text-base">
-            <FormControl
-              :df="meta.getField('accounts')"
-              :value="doc.accounts"
-              :showHeader="true"
-              :max-rows-before-overflow="4"
-              @change="(value) => doc.set('accounts', value)"
-              :read-only="doc.submitted"
-            />
-          </div>
+
+          <!-- Account Entries Table -->
+          <FormControl
+            class="mt-2 px-6 text-base"
+            :df="getField('accounts')"
+            :value="doc.accounts"
+            :showHeader="true"
+            :max-rows-before-overflow="4"
+            @change="(value) => doc.set('accounts', value)"
+            :read-only="doc.submitted"
+          />
         </div>
+
+        <!-- Footer -->
         <div class="px-6 mb-6">
           <div
             class="grid items-center border-t pt-3 pr-2"
             style="grid-template-columns: 1.3fr 1fr 1fr"
           >
+            <!-- User Remark -->
             <div class="text-sm">
               <FormControl
-                :df="meta.getField('userRemark')"
+                :df="getField('userRemark')"
                 :value="doc.userRemark"
                 @change="(value) => doc.set('userRemark', value)"
                 :class="doc.submitted && 'pointer-events-none'"
                 :read-only="doc.submitted"
               />
             </div>
+
+            <!-- Debit and Credit -->
             <div class="text-right font-semibold text-green-600 px-3">
               {{ totalDebit }}
             </div>
@@ -125,13 +141,19 @@
   </div>
 </template>
 <script>
+import { computed } from '@vue/reactivity';
+import { ModelNameEnum } from 'models/types';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
 import { fyo } from 'src/initFyo';
-import { getActionsForDocument, routeTo, showMessageDialog } from 'src/utils';
+import {
+getActionsForDocument,
+routeTo,
+showMessageDialog
+} from 'src/utils/ui';
 import { handleErrorWithDialog } from '../errorHandling';
 
 export default {
@@ -146,22 +168,36 @@ export default {
   },
   provide() {
     return {
-      doctype: 'JournalEntry',
+      schemaName: this.schemaName,
       name: this.name,
+      doc: computed(() => this.doc),
     };
   },
   data() {
     return {
-      doctype: 'JournalEntry',
+      schemaName: ModelNameEnum.JournalEntry,
       doc: null,
     };
   },
+  async mounted() {
+    try {
+      this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
+    } catch (error) {
+      if (error instanceof fyo.errors.NotFoundError) {
+        routeTo(`/list/${this.schemaName}`);
+        return;
+      }
+
+      this.handleError(error);
+    }
+
+    if (fyo.store.isDevelopment) {
+      window.je = this;
+    }
+  },
   computed: {
-    meta() {
-      return fyo.getMeta(this.doctype);
-    },
     status() {
-      if (this.doc._notInserted || !this.doc.submitted) {
+      if (this.doc.notInserted || !this.doc.submitted) {
         return 'Draft';
       }
 
@@ -185,23 +221,14 @@ export default {
       return getActionsForDocument(this.doc);
     },
   },
-  async mounted() {
-    try {
-      this.doc = await fyo.doc.getDoc(this.doctype, this.name);
-      window.je = this.doc;
-    } catch (error) {
-      if (error instanceof fyo.errors.NotFoundError) {
-        routeTo(`/list/${this.doctype}`);
-        return;
-      }
-      this.handleError(error);
-    }
-  },
   methods: {
-    async onSaveClick() {
+    getField(fieldname) {
+      return fyo.getField(ModelNameEnum.JournalEntry, fieldname);
+    },
+    async sync() {
       return this.doc.sync().catch(this.handleError);
     },
-    async onSubmitClick() {
+    async submit() {
       showMessageDialog({
         message: this.t`Are you sure you want to submit this Journal Entry?`,
         buttons: [
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index a3571c30..85bb64aa 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -79,6 +79,7 @@
 </template>
 
 <script>
+import { computed } from '@vue/reactivity';
 import { t } from 'fyo';
 import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
@@ -106,13 +107,19 @@ export default {
     DropdownWithActions,
   },
   provide() {
-    let vm = this;
     return {
       schemaName: this.schemaName,
       name: this.name,
-      get doc() {
-        return vm.doc;
-      },
+      doc: computed(() => this.doc),
+    };
+  },
+  data() {
+    return {
+      doc: null,
+      values: null,
+      titleField: null,
+      imageField: null,
+      statusText: null,
     };
   },
   mounted() {
@@ -124,15 +131,6 @@ export default {
       window.qef = this;
     }
   },
-  data() {
-    return {
-      doc: null,
-      values: null,
-      titleField: null,
-      imageField: null,
-      statusText: null,
-    };
-  },
   async created() {
     await this.fetchFieldsAndDoc();
   },
diff --git a/src/renderer.ts b/src/renderer.ts
index 8ce8aca2..76c446d9 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -29,6 +29,7 @@ import { setLanguageMap } from './utils/language';
   const app = createApp({
     template: '<App/>',
   });
+  app.config.unwrapInjectedRef = true;
   setErrorHandlers(app);
 
   app.use(router);
diff --git a/src/router.ts b/src/router.ts
index 1772a89a..65e8615d 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -4,7 +4,7 @@ import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
 import GetStarted from 'src/pages/GetStarted.vue';
 // import DataImport from 'src/pages/DataImport.vue';
 // import InvoiceForm from 'src/pages/InvoiceForm.vue';
-// import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
+import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
 import ListView from 'src/pages/ListView/ListView.vue';
 // import PrintView from 'src/pages/PrintView/PrintView.vue';
 import QuickEditForm from 'src/pages/QuickEditForm.vue';
@@ -22,7 +22,6 @@ const routes: RouteRecordRaw[] = [
     path: '/get-started',
     component: GetStarted,
   },
-  /*
   {
     path: '/edit/JournalEntry/:name',
     name: 'JournalEntryForm',
@@ -33,7 +32,7 @@ const routes: RouteRecordRaw[] = [
     props: {
       default: (route) => {
         // for sidebar item active state
-        route.params.doctype = 'JournalEntry';
+        route.params.schemaName = 'JournalEntry';
         return {
           doctype: 'JournalEntry',
           name: route.params.name,
@@ -42,6 +41,7 @@ const routes: RouteRecordRaw[] = [
       edit: (route) => route.query,
     },
   },
+  /*
   {
     path: '/edit/:doctype/:name',
     name: 'InvoiceForm',

From d99591d0582b625d3032745cf4be99950c9a342e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sun, 1 May 2022 10:15:47 +0530
Subject: [PATCH 081/163] incr: get Invoice form to render

---
 backend/database/core.ts                      |   5 +-
 fyo/model/naming.ts                           |   4 +-
 models/baseModels/Party/Party.ts              |   8 +-
 models/helpers.ts                             |   4 +-
 src/components/Controls/TableRow.vue          |   4 +-
 .../SalesInvoice/Templates/Base.vue           |   9 +-
 .../SalesInvoice/Templates/Minimal.vue        |   2 +-
 src/components/Sidebar.vue                    |   4 +-
 src/pages/ChartOfAccounts.vue                 |   6 +-
 src/pages/Dashboard/UnpaidInvoices.vue        |  10 +-
 src/pages/DataImport.vue                      |  14 +--
 src/pages/InvoiceForm.vue                     | 116 +++++++++---------
 src/pages/PrintView/PrintView.vue             |   6 +-
 src/pages/Settings/TabInvoice.vue             |   2 +-
 src/router.ts                                 |  10 +-
 src/utils/search.ts                           |  36 +++++-
 16 files changed, 132 insertions(+), 108 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index f91b4014..b1e95f67 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -224,7 +224,7 @@ export default class DatabaseCore extends DatabaseBase {
     }
 
     if (tableFields.length) {
-      await this.#loadChildren(fieldValueMap, tableFields);
+      await this.#loadChildren(name, fieldValueMap, tableFields);
     }
     return fieldValueMap;
   }
@@ -711,13 +711,14 @@ export default class DatabaseCore extends DatabaseBase {
   }
 
   async #loadChildren(
+    parentName: string,
     fieldValueMap: FieldValueMap,
     tableFields: TargetField[]
   ) {
     for (const field of tableFields) {
       fieldValueMap[field.fieldname] = await this.getAll(field.target, {
         fields: ['*'],
-        filters: { parent: fieldValueMap.name as string },
+        filters: { parent: parentName },
         orderBy: 'idx',
         order: 'asc',
       });
diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts
index 49d152b1..f3fb62a6 100644
--- a/fyo/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -48,9 +48,9 @@ export async function setName(doc: Doc, fyo: Fyo) {
     return;
   }
 
-  // name === doctype for Single
+  // name === schemaName for Single
   if (doc.schema.isSingle) {
-    doc.name = doc.schema.name;
+    doc.name = doc.schemaName;
     return;
   }
 
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 045b5fc8..5064014e 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -122,7 +122,7 @@ export class Party extends Doc {
           router.push({
             path: `/edit/PurchaseInvoice/${doc.name}`,
             query: {
-              doctype: 'PurchaseInvoice',
+              schemaName: 'PurchaseInvoice',
               values: {
                 // @ts-ignore
                 party: partyDoc.name!,
@@ -139,7 +139,7 @@ export class Party extends Doc {
           router.push({
             name: 'ListView',
             params: {
-              doctype: 'PurchaseInvoice',
+              schemaName: 'PurchaseInvoice',
               filters: {
                 // @ts-ignore
                 party: partyDoc.name!,
@@ -157,7 +157,7 @@ export class Party extends Doc {
           router.push({
             path: `/edit/SalesInvoice/${doc.name}`,
             query: {
-              doctype: 'SalesInvoice',
+              schemaName: 'SalesInvoice',
               values: {
                 // @ts-ignore
                 party: partyDoc.name!,
@@ -174,7 +174,7 @@ export class Party extends Doc {
           router.push({
             name: 'ListView',
             params: {
-              doctype: 'SalesInvoice',
+              schemaName: 'SalesInvoice',
               filters: {
                 // @ts-ignore
                 party: partyDoc.name!,
diff --git a/models/helpers.ts b/models/helpers.ts
index 8333cb69..6caa6b9b 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -55,7 +55,7 @@ export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
             paymentType,
             for: [
               {
-                referenceType: doc.doctype,
+                referenceType: doc.schemaName,
                 referenceName: doc.name,
                 amount: doc.outstandingAmount,
               },
@@ -68,7 +68,7 @@ export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
       label: fyo.t`Print`,
       condition: (doc: Doc) => doc.submitted as boolean,
       action: async (doc: Doc, router: Router) => {
-        router.push({ path: `/print/${doc.doctype}/${doc.name}` });
+        router.push({ path: `/print/${doc.schemaName}/${doc.name}` });
       },
     },
     getLedgerLinkAction(fyo),
diff --git a/src/components/Controls/TableRow.vue b/src/components/Controls/TableRow.vue
index eca6f00b..94d2df34 100644
--- a/src/components/Controls/TableRow.vue
+++ b/src/components/Controls/TableRow.vue
@@ -30,7 +30,7 @@
     <!-- Error Display -->
     <div
       class="text-sm text-red-600 mb-2 pl-2 col-span-full"
-      v-if="Object.values(errors).length"
+      v-if="Object.values(errors).filter(Boolean).length"
     >
       {{ getErrorString() }}
     </div>
@@ -79,7 +79,7 @@ export default {
       });
     },
     getErrorString() {
-      return Object.values(this.errors).join(' ');
+      return Object.values(this.errors).filter(Boolean).join(' ');
     },
   },
 };
diff --git a/src/components/SalesInvoice/Templates/Base.vue b/src/components/SalesInvoice/Templates/Base.vue
index 2558c910..3b2ff1a3 100644
--- a/src/components/SalesInvoice/Templates/Base.vue
+++ b/src/components/SalesInvoice/Templates/Base.vue
@@ -11,17 +11,14 @@ export default {
     }
   },
   async mounted() {
-    await this.doc.loadLink(this.partyField);
-    this.party = this.doc.getLink(this.partyField);
+    await this.doc.loadLink('party');
+    this.party = this.doc.getLink('party');
     await this.printSettings.loadLink('address');
     this.companyAddress = this.printSettings.getLink('address');
   },
   computed: {
-    partyField() {
-      return this.doc.doctype === 'SalesInvoice' ? 'customer' : 'supplier';
-    },
     isSalesInvoice() {
-      return this.doc.doctype === 'SalesInvoice';
+      return this.doc.schemaName === 'SalesInvoice';
     }
   }
 };
diff --git a/src/components/SalesInvoice/Templates/Minimal.vue b/src/components/SalesInvoice/Templates/Minimal.vue
index c8dba4b5..52ba27c2 100644
--- a/src/components/SalesInvoice/Templates/Minimal.vue
+++ b/src/components/SalesInvoice/Templates/Minimal.vue
@@ -30,7 +30,7 @@
           class="font-semibold text-xl"
           :style="{ color: printSettings.color }"
         >
-          {{ doc.doctype === 'SalesInvoice' ? 'Invoice' : 'Bill' }}
+          {{ doc.schemaName === 'SalesInvoice' ? t`Sales Invoie` : t`Purchase Invoice` }}
         </div>
         <div>
           {{ doc.name }}
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index a98f0007..e941b666 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -178,8 +178,8 @@ export default {
     itemActiveClass(item) {
       let { path: currentRoute, params } = this.$route;
       let routeMatch = currentRoute === item.route;
-      let doctypeMatch = item.doctype && params.doctype === item.doctype;
-      return routeMatch || doctypeMatch ? 'bg-white text-blue-500' : '';
+      let schemaNameMatch = item.schemaName && params.schemaName === item.schemaName;
+      return routeMatch || schemaNameMatch ? 'bg-white text-blue-500' : '';
     },
     isActiveGroup(group) {
       return this.activeGroup && group.label === this.activeGroup.label;
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index af1919a8..46090e2e 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -249,7 +249,7 @@ export default {
 
         // open quick edit
         openQuickEdit({
-          doctype: 'Account',
+          schemaName: 'Account',
           name: account.name,
         });
         // unfreeze input
@@ -261,8 +261,8 @@ export default {
       }
     },
     isQuickEditOpen(account) {
-      let { edit, doctype, name } = this.$route.query;
-      if (edit && doctype === 'Account' && name === account.name) {
+      let { edit, schemaName, name } = this.$route.query;
+      if (edit && schemaName === 'Account' && name === account.name) {
         return true;
       }
       return false;
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index 6cb08fd5..ca307a19 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -87,7 +87,7 @@ export default {
     invoices: [
       {
         title: t`Sales Invoices`,
-        doctype: 'SalesInvoice',
+        schemaName: 'SalesInvoice',
         total: 0,
         unpaid: 0,
         paid: 0,
@@ -98,7 +98,7 @@ export default {
       },
       {
         title: t`Purchase Invoices`,
-        doctype: 'PurchaseInvoice',
+        schemaName: 'PurchaseInvoice',
         total: 0,
         unpaid: 0,
         paid: 0,
@@ -126,7 +126,7 @@ export default {
         );
 
         let result = await fyo.db.getTotalOutstanding(
-          d.doctype,
+          d.schemaName,
           fromDate,
           toDate
         );
@@ -143,8 +143,8 @@ export default {
       this.invoices = await Promise.all(promises);
     },
     async newInvoice(invoice) {
-      let doc = await fyo.doc.getNewDoc(invoice.doctype);
-      routeTo(`/edit/${invoice.doctype}/${doc.name}`);
+      let doc = await fyo.doc.getNewDoc(invoice.schemaName);
+      routeTo(`/edit/${invoice.schemaName}/${doc.name}`);
     },
   },
 };
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index ce2afa94..4837bb7f 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -426,9 +426,9 @@ export default {
       return this.file ? this.t`Import Data` : this.t`Select File`;
     },
     isSubmittable() {
-      const doctype = this.importer?.doctype;
-      if (doctype) {
-        return fyo.models[doctype].isSubmittable ?? false;
+      const schemaName = this.importer?.schemaName;
+      if (schemaName) {
+        return fyo.schemaMap[schemaName].isSubmittable ?? false;
       }
       return false;
     },
@@ -441,7 +441,7 @@ export default {
         getList: () => importable.map((i) => fyo.models[i].label),
       };
     },
-    labelDoctypeMap() {
+    labelSchemaNameMap() {
       return importable
         .map((i) => ({
           name: i,
@@ -465,9 +465,9 @@ export default {
   },
   methods: {
     showMe() {
-      const doctype = this.importer.doctype;
+      const schemaName = this.importer.schemaName;
       this.clear();
-      this.$router.push(`/list/${doctype}`);
+      this.$router.push(`/list/${schemaName}`);
     },
     clear() {
       this.file = null;
@@ -573,7 +573,7 @@ export default {
         this.clear();
       }
       this.importType = importType;
-      this.importer = new Importer(this.labelDoctypeMap[this.importType], fyo);
+      this.importer = new Importer(this.labelSchemaNameMap[this.importType], fyo);
     },
     setLoadingStatus(isMakingEntries, entriesMade, totalEntries) {
       this.isMakingEntries = isMakingEntries;
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index e73a9e8e..730eeeda 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -7,7 +7,7 @@
           v-if="doc.submitted"
           class="text-gray-900 text-xs ml-2"
           :icon="true"
-          @click="routeTo(`/print/${doc.doctype}/${doc.name}`)"
+          @click="routeTo(`/print/${doc.schemaName}/${doc.name}`)"
         >
           Print
         </Button>
@@ -21,7 +21,7 @@
           {{ t`Save` }}
         </Button>
         <Button
-          v-if="!doc._dirty && !doc._notInserted && !doc.submitted"
+          v-if="!doc.dirty && !doc.notInserted && !doc.submitted"
           type="primary"
           class="text-white text-xs ml-2"
           @click="onSubmitClick"
@@ -29,7 +29,7 @@
         >
       </template>
     </PageHeader>
-    <div class="flex justify-center flex-1 mb-8 mt-2" v-if="meta">
+    <div class="flex justify-center flex-1 mb-8 mt-2" v-if="doc">
       <div
         class="border rounded-lg shadow h-full flex flex-col justify-between"
         style="width: 600px"
@@ -60,31 +60,29 @@
           <div class="mt-8 px-6">
             <h1 class="text-2xl font-semibold">
               {{
-                doc._notInserted
-                  ? doc.doctype === 'SalesInvoice'
-                    ? t`New Invoice`
-                    : t`New Bill`
+                doc.notInserted
+                  ? doc.schemaName === 'SalesInvoice'
+                    ? t`New Sales Invoice`
+                    : t`New Purchase Invoice`
                   : doc.name
               }}
             </h1>
             <div class="flex justify-between mt-2">
               <div class="w-1/3">
                 <FormControl
-                  class="text-base"
-                  input-class="bg-gray-100 p-2 text-lg font-semibold"
-                  :df="meta.getField(partyField.fieldname)"
-                  :value="doc[partyField.fieldname]"
-                  :placeholder="partyField.label"
-                  @change="(value) => doc.set(partyField.fieldname, value)"
-                  @new-doc="
-                    (party) => doc.set(partyField.fieldname, party.name)
-                  "
+                  class="bg-gray-100 rounded text-base"
+                  input-class="p-2 text-lg font-semibold bg-transparent"
+                  :df="getField('party')"
+                  :value="doc.party"
+                  :placeholder="getField('party').label"
+                  @change="(value) => doc.set('party', value)"
+                  @new-doc="(party) => doc.set('party', party.name)"
                   :read-only="doc.submitted"
                 />
                 <FormControl
-                  class="mt-2 text-base"
-                  input-class="bg-gray-100 px-3 py-2 text-base"
-                  :df="meta.getField('account')"
+                  class="mt-2 text-base bg-gray-100 rounded"
+                  input-class="px-3 py-2 text-base bg-transparent"
+                  :df="getField('account')"
                   :value="doc.account"
                   :placeholder="'Account'"
                   @change="(value) => doc.set('account', value)"
@@ -94,26 +92,26 @@
               <div class="w-1/3">
                 <FormControl
                   input-class="bg-gray-100 px-3 py-2 text-base text-right"
-                  :df="meta.getField('date')"
+                  :df="getField('date')"
                   :value="doc.date"
                   :placeholder="'Date'"
                   @change="(value) => doc.set('date', value)"
                   :read-only="doc.submitted"
                 />
                 <FormControl
-                  class="mt-2 text-base"
-                  input-class="bg-gray-100 px-3 py-2 text-base text-right"
-                  :df="meta.getField('numberSeries')"
+                  class="mt-2 text-base bg-gray-100 rounded"
+                  input-class="bg-transparent px-3 py-2 text-base text-right"
+                  :df="getField('numberSeries')"
                   :value="doc.numberSeries"
                   @change="(value) => doc.set('numberSeries', value)"
-                  :read-only="!doc._notInserted || doc.submitted"
+                  :read-only="!doc.notInserted || doc.submitted"
                 />
               </div>
             </div>
           </div>
           <div class="px-6 text-base">
             <FormControl
-              :df="meta.getField('items')"
+              :df="getField('items')"
               :value="doc.items"
               :showHeader="true"
               :max-rows-before-overflow="4"
@@ -129,7 +127,7 @@
           <div class="flex-1 mr-10">
             <FormControl
               v-if="!doc.submitted || doc.terms"
-              :df="meta.getField('terms')"
+              :df="getField('terms')"
               :value="doc.terms"
               :show-label="true"
               input-class="bg-gray-100"
@@ -195,24 +193,26 @@
   </div>
 </template>
 <script>
+import { computed } from '@vue/reactivity';
 import { getInvoiceStatus } from 'models/helpers';
-import Button from 'src/components/Button';
+import { ModelNameEnum } from 'models/types';
+import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
-import DropdownWithActions from 'src/components/DropdownWithActions';
-import PageHeader from 'src/components/PageHeader';
-import StatusBadge from 'src/components/StatusBadge';
+import DropdownWithActions from 'src/components/DropdownWithActions.vue';
+import PageHeader from 'src/components/PageHeader.vue';
+import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import {
-getActionsForDocument,
-openSettings,
-routeTo,
-showMessageDialog
-} from 'src/utils';
+  getActionsForDocument,
+  openSettings,
+  routeTo,
+  showMessageDialog,
+} from 'src/utils/ui';
 import { handleErrorWithDialog } from '../errorHandling';
 
 export default {
   name: 'InvoiceForm',
-  props: ['doctype', 'name'],
+  props: { schemaName: String, name: String },
   components: {
     PageHeader,
     StatusBadge,
@@ -222,8 +222,9 @@ export default {
   },
   provide() {
     return {
-      doctype: this.doctype,
+      schemaName: this.schemaName,
       name: this.name,
+      doc: computed(() => this.doc),
     };
   },
   data() {
@@ -236,21 +237,11 @@ export default {
     };
   },
   computed: {
-    meta() {
-      return fyo.getMeta(this.doctype);
-    },
-    partyField() {
-      let fieldname = {
-        SalesInvoice: 'customer',
-        PurchaseInvoice: 'supplier',
-      }[this.doctype];
-      return this.meta.getField(fieldname);
-    },
     address() {
       return this.printSettings && this.printSettings.getLink('address');
     },
     showSave() {
-      return this.doc && (this.doc._notInserted || this.doc._dirty);
+      return this.doc && (this.doc.notInserted || this.doc.dirty);
     },
     actions() {
       return getActionsForDocument(this.doc);
@@ -258,29 +249,37 @@ export default {
   },
   async mounted() {
     try {
-      this.doc = await fyo.doc.getDoc(this.doctype, this.name);
-      window.d = this.doc;
+      this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
     } catch (error) {
       if (error instanceof fyo.errors.NotFoundError) {
-        routeTo(`/list/${this.doctype}`);
+        routeTo(`/list/${this.schemaName}`);
         return;
       }
       this.handleError(error);
     }
-    this.printSettings = await fyo.getSingle('PrintSettings');
-    this.companyName = (await fyo.getSingle('AccountingSettings')).companyName;
+    this.printSettings = await fyo.doc.getSingle('PrintSettings');
+    this.companyName = (
+      await fyo.doc.getSingle('AccountingSettings')
+    ).companyName;
 
     let query = this.$route.query;
-    if (query.values && query.doctype === this.doctype) {
+    if (query.values && query.schemaName === this.schemaName) {
       this.doc.set(this.$router.currentRoute.value.query.values);
     }
     this.status = getInvoiceStatus(this.doc);
+
+    if (fyo.store.isDevelopment) {
+      window.inv = this;
+    }
   },
   updated() {
     this.status = getInvoiceStatus(this.doc);
   },
   methods: {
     routeTo,
+    getField(fieldname) {
+      return fyo.getField(this.schemaName, fieldname);
+    },
     async onSaveClick() {
       await this.doc.set(
         'items',
@@ -290,9 +289,9 @@ export default {
     },
     onSubmitClick() {
       let message =
-        this.doctype === 'SalesInvoice'
-          ? this.t`Are you sure you want to submit this Invoice?`
-          : this.t`Are you sure you want to submit this Bill?`;
+        this.schemaName === ModelNameEnum.SalesInvoice
+          ? this.t`Are you sure you want to submit this Sales Invoice?`
+          : this.t`Are you sure you want to submit this Purchase Invoice?`;
       showMessageDialog({
         message,
         buttons: [
@@ -319,7 +318,8 @@ export default {
       if (!doc) {
         doc = this.doc;
       }
-      let df = doc.meta.getField(fieldname);
+
+      const df = this.getField(fieldname);
       return fyo.format(doc[fieldname], df, doc);
     },
   },
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 0df31e81..ee23c037 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -59,7 +59,7 @@ import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
   name: 'PrintView',
-  props: ['doctype', 'name'],
+  props: { schemaName: String, name: String },
   components: {
     PageHeader,
     SearchBar,
@@ -74,12 +74,12 @@ export default {
     };
   },
   async mounted() {
-    this.doc = await fyo.doc.getDoc(this.doctype, this.name);
+    this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
     this.printSettings = await fyo.getSingle('PrintSettings');
   },
   computed: {
     meta() {
-      return fyo.getMeta(this.doctype);
+      return fyo.getMeta(this.schemaName);
     },
     printTemplate() {
       return this.meta.printTemplate;
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index 1f8e5044..4ecb1cc3 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -59,7 +59,7 @@ export default {
   emits: ['change'],
   provide() {
     return {
-      doctype: 'PrintSettings',
+      schemaName: 'PrintSettings',
       name: 'PrintSettings',
     };
   },
diff --git a/src/router.ts b/src/router.ts
index 65e8615d..c122e310 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -3,7 +3,7 @@ import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
 import GetStarted from 'src/pages/GetStarted.vue';
 // import DataImport from 'src/pages/DataImport.vue';
-// import InvoiceForm from 'src/pages/InvoiceForm.vue';
+import InvoiceForm from 'src/pages/InvoiceForm.vue';
 import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
 import ListView from 'src/pages/ListView/ListView.vue';
 // import PrintView from 'src/pages/PrintView/PrintView.vue';
@@ -34,16 +34,15 @@ const routes: RouteRecordRaw[] = [
         // for sidebar item active state
         route.params.schemaName = 'JournalEntry';
         return {
-          doctype: 'JournalEntry',
+          schemaName: 'JournalEntry',
           name: route.params.name,
         };
       },
       edit: (route) => route.query,
     },
   },
-  /*
   {
-    path: '/edit/:doctype/:name',
+    path: '/edit/:schemaName/:name',
     name: 'InvoiceForm',
     components: {
       default: InvoiceForm,
@@ -54,7 +53,6 @@ const routes: RouteRecordRaw[] = [
       edit: (route) => route.query,
     },
   },
-  */
   {
     path: '/list/:schemaName/:fieldname?/:value?',
     name: 'ListView',
@@ -84,7 +82,7 @@ const routes: RouteRecordRaw[] = [
   },
   /*
   {
-    path: '/print/:doctype/:name',
+    path: '/print/:schemaName/:name',
     name: 'PrintView',
     component: PrintView,
     props: true,
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 53c5c95a..ae67fe3d 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -19,7 +19,7 @@ interface SearchItem {
   action?: () => void;
 }
 
-async function openNewDoc(schemaName: string) {
+async function openQuickEditDoc(schemaName: string) {
   await routeTo(`/list/${schemaName}`);
   const doc = await fyo.doc.getNewDoc(schemaName);
   const { openQuickEdit } = await import('src/utils/ui');
@@ -30,27 +30,55 @@ async function openNewDoc(schemaName: string) {
   });
 }
 
+async function openFormEditDoc(schemaName: string) {
+  const doc = fyo.doc.getNewDoc(schemaName);
+  const name = doc.name;
+
+  routeTo(`/edit/${schemaName}/${name}`);
+}
+
 function getCreateList(): SearchItem[] {
   return [
     {
       label: t`Create Item`,
       group: 'Create',
       action() {
-        openNewDoc(ModelNameEnum.Item);
+        openQuickEditDoc(ModelNameEnum.Item);
       },
     },
     {
       label: t`Create Party`,
       group: 'Create',
       action() {
-        openNewDoc(ModelNameEnum.Party);
+        openQuickEditDoc(ModelNameEnum.Party);
       },
     },
     {
       label: t`Create Payment`,
       group: 'Create',
       action() {
-        openNewDoc(ModelNameEnum.Payment);
+        openQuickEditDoc(ModelNameEnum.Payment);
+      },
+    },
+    {
+      label: t`Create Sales Invoice`,
+      group: 'Create',
+      action() {
+        openFormEditDoc(ModelNameEnum.SalesInvoice);
+      },
+    },
+    {
+      label: t`Create Purchase Invoice`,
+      group: 'Create',
+      action() {
+        openFormEditDoc(ModelNameEnum.PurchaseInvoice);
+      },
+    },
+    {
+      label: t`Create Journal Entry`,
+      group: 'Create',
+      action() {
+        openFormEditDoc(ModelNameEnum.JournalEntry);
       },
     },
   ];

From 758727b29651845c367044f52903588c34a362ab Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sun, 1 May 2022 13:09:03 +0530
Subject: [PATCH 082/163] fix(ui/ux): cleanup forms - table scroll issue, etc

---
 fyo/model/doc.ts                              |  84 ++---
 fyo/model/helpers.ts                          |   6 +
 .../JournalEntryAccount.ts                    |   8 +-
 schemas/app/PurchaseInvoice.json              |   3 +-
 src/components/Controls/Currency.vue          |   3 +-
 src/components/Controls/Table.vue             |  53 ++-
 src/components/Dropdown.vue                   |   5 +-
 src/components/PageHeader.vue                 |   6 +-
 src/components/Popover.vue                    |   3 +-
 src/pages/DataImport.vue                      |  30 +-
 src/pages/InvoiceForm.vue                     | 349 ++++++++++--------
 src/pages/JournalEntryForm.vue                | 183 ++++-----
 src/pages/ListView/ListView.vue               |  18 +-
 src/pages/PrintView/PrintView.vue             |  20 +-
 src/pages/QuickEditForm.vue                   |   4 +-
 src/pages/Report.vue                          |  26 +-
 16 files changed, 421 insertions(+), 380 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 74cdfd81..ae9f88e7 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -24,7 +24,8 @@ import {
   areDocValuesEqual,
   getMissingMandatoryMessage,
   getPreDefaultValues,
-  shouldApplyFormula
+  setChildDocIdx,
+  shouldApplyFormula,
 } from './helpers';
 import { setName } from './naming';
 import {
@@ -239,60 +240,53 @@ export class Doc extends Observable<DocValue | Doc[]> {
       this[field.fieldname] = defaultValue;
     }
   }
+  async remove(fieldname: string, idx: number) {
+    const childDocs = ((this[fieldname] ?? []) as Doc[]).filter(
+      (row, i) => row.idx !== idx || i !== idx
+    );
 
-  async append(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
-    // push child row and trigger change
-    this.push(fieldname, docValueMap);
-    this._dirty = true;
+    setChildDocIdx(childDocs);
+    this[fieldname] = childDocs;
+    this._setDirty(true);
     return await this._applyChange(fieldname);
   }
 
-  async remove(fieldname: string, idx: number) {
-    let rows = this[fieldname] as Doc[] | undefined;
-    if (!Array.isArray(rows)) {
-      return;
-    }
-
+  async append(fieldname: string, docValueMap: DocValueMap = {}) {
+    this.push(fieldname, docValueMap);
     this._setDirty(true);
-    rows = rows.filter((row, i) => row.idx !== idx || i !== idx)!;
-    rows.forEach((row, i) => {
-      row.idx = i;
-    });
-    this[fieldname] = rows;
     return await this._applyChange(fieldname);
   }
 
   push(fieldname: string, docValueMap: Doc | DocValueMap = {}) {
-    // push child row without triggering change
-    this[fieldname] ??= [];
-    const childDoc = this._getChildDoc(docValueMap, fieldname);
-    childDoc.parentdoc = this;
-    (this[fieldname] as Doc[]).push(childDoc);
+    const childDocs = [
+      (this[fieldname] ?? []) as Doc[],
+      this._getChildDoc(docValueMap, fieldname),
+    ].flat();
+
+    setChildDocIdx(childDocs);
+    this[fieldname] = childDocs;
   }
 
   _getChildDoc(docValueMap: Doc | DocValueMap, fieldname: string): Doc {
+    docValueMap.name ??= getRandomString();
+
+    // Child Meta Fields
+    docValueMap.parent ??= this.name;
+    docValueMap.parentSchemaName ??= this.schemaName;
+    docValueMap.parentFieldname ??= fieldname;
+
     if (docValueMap instanceof Doc) {
+      docValueMap.parentdoc ??= this;
       return docValueMap;
     }
 
-    const data: Record<string, unknown> = Object.assign({}, docValueMap);
-
-    data.parent = this.name;
-    data.parentSchemaName = this.schemaName;
-    data.parentFieldname = fieldname;
-    data.parentdoc = this;
-
-    if (!data.idx) {
-      data.idx = ((this[fieldname] as Doc[]) || []).length;
-    }
-
-    if (!data.name) {
-      data.name = getRandomString();
-    }
-
-    const targetField = this.fieldMap[fieldname] as TargetField;
-    const schema = this.fyo.schemaMap[targetField.target] as Schema;
-    const childDoc = new Doc(schema, data as DocValueMap, this.fyo);
+    const childSchemaName = (this.fieldMap[fieldname] as TargetField).target;
+    const childDoc = this.fyo.doc.getNewDoc(
+      childSchemaName,
+      docValueMap,
+      false
+    );
+    childDoc.parentdoc = this;
     return childDoc;
   }
 
@@ -522,7 +516,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     }
   }
 
-  async _applyFormula(fieldname?: string) {
+  async _applyFormula(fieldname?: string): Promise<boolean> {
     const doc = this;
     let changed = false;
 
@@ -532,15 +526,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
     // children
     for (const row of childDocs) {
-      const formulaFields = Object.keys(this.formulas).map(
-        (fn) => this.fieldMap[fn]
-      );
-
-      changed ||= await this._applyFormulaForFields(
-        formulaFields,
-        row,
-        fieldname
-      );
+      changed ||= (await row?._applyFormula()) ?? false;
     }
 
     // parent or child row
diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts
index 368b9529..be8f8271 100644
--- a/fyo/model/helpers.ts
+++ b/fyo/model/helpers.ts
@@ -108,3 +108,9 @@ export function shouldApplyFormula(field: Field, doc: Doc, fieldname?: string) {
   const value = doc.get(field.fieldname);
   return getIsNullOrUndef(value);
 }
+
+export function setChildDocIdx(childDocs: Doc[]) {
+  for (const idx in childDocs) {
+    childDocs[idx].idx = +idx;
+  }
+}
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
index 6e12a762..af762e95 100644
--- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
+++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
@@ -4,8 +4,12 @@ import Money from 'pesa/dist/types/src/money';
 
 export class JournalEntryAccount extends Doc {
   getAutoDebitCredit(type: 'debit' | 'credit') {
-    const otherType = type === 'debit' ? 'credit' : 'debit';
+    const currentValue = this.get(type) as Money;
+    if (!currentValue.isZero()) {
+      return;
+    }
 
+    const otherType = type === 'debit' ? 'credit' : 'debit';
     const otherTypeValue = this.get(otherType) as Money;
     if (!otherTypeValue.isZero()) {
       return this.fyo.pesa(0);
@@ -26,11 +30,9 @@ export class JournalEntryAccount extends Doc {
   formulas: FormulaMap = {
     debit: {
       formula: async () => this.getAutoDebitCredit('debit'),
-      dependsOn: ['credit'],
     },
     credit: {
       formula: async () => this.getAutoDebitCredit('credit'),
-      dependsOn: ['debit'],
     },
   };
 
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 72fc530b..06433221 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -91,6 +91,7 @@
     {
       "fieldname": "terms",
       "label": "Terms",
+      "placeholder": "Add invoice terms",
       "fieldtype": "Text"
     },
     {
@@ -103,4 +104,4 @@
     }
   ],
   "keywordFields": ["name", "party", "numberSeries"]
-}
\ No newline at end of file
+}
diff --git a/src/components/Controls/Currency.vue b/src/components/Controls/Currency.vue
index 207c6c18..2ef9a373 100644
--- a/src/components/Controls/Currency.vue
+++ b/src/components/Controls/Currency.vue
@@ -29,6 +29,7 @@
 
 <script>
 import { fyo } from 'src/initFyo';
+import { nextTick } from 'vue';
 import Float from './Float.vue';
 
 export default {
@@ -61,7 +62,7 @@ export default {
     },
     activateInput() {
       this.showInput = true;
-      this.$nextTick(() => {
+      nextTick(() => {
         this.focus();
       });
     },
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index bfbd76d6..bba5dc7e 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -21,7 +21,7 @@
     </Row>
 
     <!-- Data Rows -->
-    <div class="overflow-auto" :style="{ 'max-height': rowContainerHeight }">
+    <div class="overflow-auto" :style="{ 'max-height': maxHeight }">
       <TableRow
         :class="{ 'pointer-events-none': isReadOnly }"
         ref="table-row"
@@ -69,6 +69,7 @@
 <script>
 import Row from 'src/components/Row.vue';
 import { fyo } from 'src/initFyo';
+import { nextTick } from 'vue';
 import Base from './Base.vue';
 import TableRow from './TableRow.vue';
 
@@ -76,13 +77,14 @@ export default {
   name: 'Table',
   extends: Base,
   props: {
+    value: { type: Array, default: () => [] },
     showHeader: {
       type: Boolean,
       default: true,
     },
     maxRowsBeforeOverflow: {
       type: Number,
-      default: 0,
+      default: 3,
     },
   },
   components: {
@@ -92,26 +94,19 @@ export default {
   inject: {
     doc: { default: null },
   },
-  mounted() {
-    window.tab = this;
-  },
-  data: () => ({ rowContainerHeight: null }),
   watch: {
-    value: {
-      immediate: true,
-      handler(rows) {
-        if (!this.maxRowsBeforeOverflow) return;
-        if (this.rowContainerHeight) return;
-        if (rows && rows.length > 0) {
-          this.$nextTick(() => {
-            let rowHeight = this.$refs['table-row'][0].$el.offsetHeight;
-            let containerHeight = rowHeight * this.maxRowsBeforeOverflow;
-            this.rowContainerHeight = `${containerHeight}px`;
-          });
-        }
-      },
+    value() {
+      this.setMaxHeight();
     },
   },
+  data() {
+    return { maxHeight: '' };
+  },
+  mounted() {
+    if (fyo.store.isDevelopment) {
+      window.tab = this;
+    }
+  },
   methods: {
     focus() {},
     addRow() {
@@ -120,7 +115,7 @@ export default {
           return;
         }
 
-        this.$nextTick(() => {
+        nextTick(() => {
           this.scrollToRow(this.value.length - 1);
         });
         this.triggerChange(this.value);
@@ -139,6 +134,24 @@ export default {
       const row = this.$refs['table-row'][index];
       row && row.$el.scrollIntoView({ block: 'nearest' });
     },
+    setMaxHeight() {
+      if (this.maxRowsBeforeOverflow === 0) {
+        return (this.maxHeight = '');
+      }
+
+      const size = this?.value?.length ?? 0;
+      if (size === 0) {
+        return (this.maxHeight = '');
+      }
+
+      const rowHeight = this.$refs?.['table-row']?.[0].$el.offsetHeight;
+      if (rowHeight === undefined) {
+        return (this.maxHeight = '');
+      }
+
+      const maxHeight = rowHeight * Math.min(this.maxRowsBeforeOverflow, size);
+      return (this.maxHeight = `${maxHeight}px`);
+    },
   },
   computed: {
     ratio() {
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 68a1101c..d2769e30 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -75,6 +75,7 @@
 <script>
 import uniq from 'lodash/uniq';
 import { fyo } from 'src/initFyo';
+import { nextTick } from 'vue';
 import Popover from './Popover.vue';
 
 export default {
@@ -206,7 +207,7 @@ export default {
       if (this.highlightedIndex < 0) {
         this.highlightedIndex = 0;
       }
-      this.$nextTick(() => {
+      nextTick(() => {
         let index = this.highlightedIndex;
         if (index !== 0) {
           index -= 1;
@@ -220,7 +221,7 @@ export default {
         this.highlightedIndex = this.items.length;
       }
 
-      this.$nextTick(() => {
+      nextTick(() => {
         this.scrollToHighlighted();
       });
     },
diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index 2b8f6972..477ef3c9 100644
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -4,9 +4,9 @@
       {{ title }}
     </h1>
     <BackLink v-if="backLink" />
-    <div class="flex items-stretch window-no-drag">
-      <slot name="actions" />
-      <SearchBar v-show="!hideSearch" class="ml-2" />
+    <div class="flex items-stretch window-no-drag gap-2">
+      <slot />
+      <SearchBar v-show="!hideSearch" />
     </div>
   </div>
 </template>
diff --git a/src/components/Popover.vue b/src/components/Popover.vue
index 985af24b..811ba0ce 100644
--- a/src/components/Popover.vue
+++ b/src/components/Popover.vue
@@ -21,6 +21,7 @@
 
 <script>
 import { createPopper } from '@popperjs/core';
+import { nextTick } from 'vue';
 
 export default {
   name: 'Popover',
@@ -120,7 +121,7 @@ export default {
         return;
       }
       this.isOpen = true;
-      this.$nextTick(() => {
+      nextTick(() => {
         this.setupPopper();
       });
       this.$emit('open');
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index 4837bb7f..6a9becc5 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -1,20 +1,17 @@
 <template>
   <div class="flex flex-col overflow-hidden w-full">
     <PageHeader :title="t`Data Import`">
-      <template #actions>
-        <DropdownWithActions
-          class="ml-2"
-          :actions="actions"
-          v-if="(canCancel || importType) && !complete"
-        />
-        <Button
-          v-if="importType && !complete"
-          type="primary"
-          class="text-sm ml-2"
-          @click="handlePrimaryClick"
-          >{{ primaryLabel }}</Button
-        >
-      </template>
+      <DropdownWithActions
+        :actions="actions"
+        v-if="(canCancel || importType) && !complete"
+      />
+      <Button
+        v-if="importType && !complete"
+        type="primary"
+        class="text-sm"
+        @click="handlePrimaryClick"
+        >{{ primaryLabel }}</Button
+      >
     </PageHeader>
     <div
       class="flex px-8 mt-2 text-base w-full flex-col gap-8"
@@ -573,7 +570,10 @@ export default {
         this.clear();
       }
       this.importType = importType;
-      this.importer = new Importer(this.labelSchemaNameMap[this.importType], fyo);
+      this.importer = new Importer(
+        this.labelSchemaNameMap[this.importType],
+        fyo
+      );
     },
     setLoadingStatus(isMakingEntries, entriesMade, totalEntries) {
       this.isMakingEntries = isMakingEntries;
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 730eeeda..029e8630 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -1,63 +1,73 @@
 <template>
   <div class="flex flex-col" v-if="doc">
+    <!-- Page Header (Title, Buttons, etc) -->
     <PageHeader :backLink="true">
-      <template #actions>
-        <StatusBadge :status="status" />
-        <Button
-          v-if="doc.submitted"
-          class="text-gray-900 text-xs ml-2"
-          :icon="true"
-          @click="routeTo(`/print/${doc.schemaName}/${doc.name}`)"
-        >
-          Print
-        </Button>
-        <DropdownWithActions class="ml-2" :actions="actions" />
-        <Button
-          v-if="showSave"
-          type="primary"
-          class="text-white text-xs ml-2"
-          @click="onSaveClick"
-        >
-          {{ t`Save` }}
-        </Button>
-        <Button
-          v-if="!doc.dirty && !doc.notInserted && !doc.submitted"
-          type="primary"
-          class="text-white text-xs ml-2"
-          @click="onSubmitClick"
-          >{{ t`Submit` }}</Button
-        >
-      </template>
+      <StatusBadge :status="status" />
+      <Button
+        v-if="doc?.submitted"
+        class="text-gray-900 text-xs"
+        :icon="true"
+        @click="routeTo(`/print/${doc.schemaName}/${doc.name}`)"
+      >
+        {{ t`Print` }}
+      </Button>
+      <DropdownWithActions :actions="actions" />
+      <Button
+        v-if="showSave"
+        type="primary"
+        class="text-white text-xs"
+        @click="onSaveClick"
+      >
+        {{ t`Save` }}
+      </Button>
+      <Button
+        v-if="!doc.dirty && !doc.notInserted && !doc?.submitted"
+        type="primary"
+        class="text-white text-xs"
+        @click="onSubmitClick"
+        >{{ t`Submit` }}</Button
+      >
     </PageHeader>
+
+    <!-- Invoice Form -->
     <div class="flex justify-center flex-1 mb-8 mt-2" v-if="doc">
       <div
-        class="border rounded-lg shadow h-full flex flex-col justify-between"
-        style="width: 600px"
+        class="
+          border
+          rounded-lg
+          shadow
+          h-full
+          flex flex-col
+          justify-between
+          w-600
+        "
       >
         <div>
-          <div class="px-6 pt-6" v-if="printSettings">
-            <div class="flex text-sm text-gray-900 border-b pb-4">
-              <div class="w-1/3">
-                <div v-if="printSettings.displayLogo">
-                  <img
-                    class="h-12 max-w-32 object-contain"
-                    :src="printSettings.logo"
-                  />
-                </div>
-                <div class="text-xl text-gray-700 font-semibold" v-else>
-                  {{ companyName }}
-                </div>
+          <!-- Print Settings Info (Logo, Address, Etc)  -->
+          <div class="flex text-sm text-gray-900 p-6" v-if="printSettings">
+            <div class="w-1/3">
+              <div v-if="printSettings.displayLogo">
+                <img
+                  class="h-12 max-w-32 object-contain"
+                  :src="printSettings.logo"
+                />
               </div>
-              <div class="w-1/3">
-                <div>{{ printSettings.email }}</div>
-                <div class="mt-1">{{ printSettings.phone }}</div>
-              </div>
-              <div class="w-1/3">
-                <div v-if="address">{{ address.addressDisplay }}</div>
+              <div class="text-xl text-gray-700 font-semibold" v-else>
+                {{ companyName }}
               </div>
             </div>
+            <div class="w-1/3">
+              <div>{{ printSettings.email }}</div>
+              <div class="mt-1">{{ printSettings.phone }}</div>
+            </div>
+            <div class="w-1/3">
+              <div v-if="address">{{ address.addressDisplay }}</div>
+            </div>
           </div>
-          <div class="mt-8 px-6">
+          <hr />
+
+          <!-- Invoice Form Data Entry -->
+          <div class="m-6 flex flex-col gap-2">
             <h1 class="text-2xl font-semibold">
               {{
                 doc.notInserted
@@ -67,124 +77,139 @@
                   : doc.name
               }}
             </h1>
-            <div class="flex justify-between mt-2">
-              <div class="w-1/3">
-                <FormControl
-                  class="bg-gray-100 rounded text-base"
-                  input-class="p-2 text-lg font-semibold bg-transparent"
-                  :df="getField('party')"
-                  :value="doc.party"
-                  :placeholder="getField('party').label"
-                  @change="(value) => doc.set('party', value)"
-                  @new-doc="(party) => doc.set('party', party.name)"
-                  :read-only="doc.submitted"
-                />
-                <FormControl
-                  class="mt-2 text-base bg-gray-100 rounded"
-                  input-class="px-3 py-2 text-base bg-transparent"
-                  :df="getField('account')"
-                  :value="doc.account"
-                  :placeholder="'Account'"
-                  @change="(value) => doc.set('account', value)"
-                  :read-only="doc.submitted"
-                />
-              </div>
-              <div class="w-1/3">
-                <FormControl
-                  input-class="bg-gray-100 px-3 py-2 text-base text-right"
-                  :df="getField('date')"
-                  :value="doc.date"
-                  :placeholder="'Date'"
-                  @change="(value) => doc.set('date', value)"
-                  :read-only="doc.submitted"
-                />
-                <FormControl
-                  class="mt-2 text-base bg-gray-100 rounded"
-                  input-class="bg-transparent px-3 py-2 text-base text-right"
-                  :df="getField('numberSeries')"
-                  :value="doc.numberSeries"
-                  @change="(value) => doc.set('numberSeries', value)"
-                  :read-only="!doc.notInserted || doc.submitted"
-                />
-              </div>
+
+            <!-- First Row of Fields -->
+            <div class="flex flex-row justify-between gap-2">
+              <FormControl
+                class="bg-gray-100 rounded text-base w-1/3"
+                input-class="text-lg font-semibold bg-transparent"
+                :df="getField('party')"
+                :value="doc.party"
+                :placeholder="getField('party').label"
+                @change="(value) => doc.set('party', value)"
+                @new-doc="(party) => doc.set('party', party.name)"
+                :read-only="doc?.submitted"
+              />
+              <div class="w-1/3" />
+              <FormControl
+                class="w-1/3"
+                input-class="bg-gray-100 px-3 py-2 text-base text-right"
+                :df="getField('date')"
+                :value="doc.date"
+                :placeholder="'Date'"
+                @change="(value) => doc.set('date', value)"
+                :read-only="doc?.submitted"
+              />
+            </div>
+
+            <!-- Second Row of Fields -->
+            <div class="flex flex-row justify-between gap-2">
+              <FormControl
+                class="text-base bg-gray-100 rounded w-1/3"
+                input-class="px-3 py-2 text-base bg-transparent"
+                :df="getField('account')"
+                :value="doc.account"
+                :placeholder="'Account'"
+                @change="(value) => doc.set('account', value)"
+                :read-only="doc?.submitted"
+              />
+              <div class="w-1/3" />
+              <FormControl
+                class="text-base bg-gray-100 rounded w-1/3"
+                input-class="bg-transparent px-3 py-2 text-base text-right"
+                :df="getField('numberSeries')"
+                :value="doc.numberSeries"
+                @change="(value) => doc.set('numberSeries', value)"
+                :read-only="!doc.notInserted || doc?.submitted"
+              />
             </div>
           </div>
-          <div class="px-6 text-base">
-            <FormControl
-              :df="getField('items')"
-              :value="doc.items"
-              :showHeader="true"
-              :max-rows-before-overflow="4"
-              @change="(value) => doc.set('items', value)"
-              :read-only="doc.submitted"
-            />
-          </div>
+          <hr />
+
+          <!-- Invoice Items Table -->
+          <Table
+            class="px-6 text-base mt-4"
+            :df="getField('items')"
+            :value="doc.items"
+            :showHeader="true"
+            :max-rows-before-overflow="4"
+            @change="(value) => doc.set('items', value)"
+            :read-only="doc?.submitted"
+          />
         </div>
-        <div
-          class="px-6 mb-6 flex justify-between text-base"
-          v-if="doc.items?.length ?? 0"
-        >
-          <div class="flex-1 mr-10">
+
+        <!-- Invoice Form Footer -->
+
+        <div v-if="doc.items?.length ?? 0">
+          <hr />
+          <div class="flex justify-between text-base m-6 gap-12">
+            <!-- Form Terms-->
             <FormControl
-              v-if="!doc.submitted || doc.terms"
+              class="w-1/2 self-end"
+              v-if="!doc?.submitted || doc.terms"
               :df="getField('terms')"
               :value="doc.terms"
-              :show-label="true"
               input-class="bg-gray-100"
               @change="(value) => doc.set('terms', value)"
-              :read-only="doc.submitted"
+              :read-only="doc?.submitted"
             />
-          </div>
-          <div class="w-64">
-            <div class="flex pl-2 justify-between py-3 border-b">
-              <div>{{ t`Subtotal` }}</div>
-              <div>{{ formattedValue('netTotal') }}</div>
-            </div>
-            <div
-              class="flex pl-2 justify-between py-3"
-              v-for="tax in doc.taxes"
-              :key="tax.name"
-            >
-              <div>{{ tax.account }}</div>
-              <div>
-                {{
-                  fyo.format(tax.amount, {
-                    fieldtype: 'Currency',
-                    currency: doc.currency,
-                  })
-                }}
+
+            <!-- Totals -->
+            <div class="w-1/2 gap-2 flex flex-col self-end">
+              <!-- Subtotal -->
+              <div class="flex justify-between">
+                <div>{{ t`Subtotal` }}</div>
+                <div>{{ formattedValue('netTotal') }}</div>
+              </div>
+              <hr />
+
+              <!-- Taxes -->
+              <div
+                class="flex justify-between"
+                v-for="tax in doc.taxes"
+                :key="tax.name"
+              >
+                <div>{{ tax.account }}</div>
+                <div>
+                  {{
+                    fyo.format(tax.amount, {
+                      fieldtype: 'Currency',
+                      currency: doc.currency,
+                    })
+                  }}
+                </div>
+              </div>
+              <hr v-if="doc.taxes?.length" />
+
+              <!-- Grand Total -->
+              <div
+                class="
+                  flex
+                  justify-between
+                  text-green-600
+                  font-semibold
+                  text-base
+                "
+              >
+                <div>{{ t`Grand Total` }}</div>
+                <div>{{ formattedValue('grandTotal') }}</div>
+              </div>
+
+              <!-- Outstanding Amount -->
+              <hr v-if="doc.outstandingAmount > 0" />
+              <div
+                v-if="doc.outstandingAmount > 0"
+                class="
+                  flex
+                  justify-between
+                  text-red-600
+                  font-semibold
+                  text-base
+                "
+              >
+                <div>{{ t`Outstanding Amount` }}</div>
+                <div>{{ formattedValue('outstandingAmount') }}</div>
               </div>
-            </div>
-            <div
-              class="
-                flex
-                pl-2
-                justify-between
-                py-3
-                border-t
-                text-green-600
-                font-semibold
-                text-base
-              "
-            >
-              <div>{{ t`Grand Total` }}</div>
-              <div>{{ formattedValue('grandTotal') }}</div>
-            </div>
-            <div
-              v-if="doc.outstandingAmount > 0"
-              class="
-                flex
-                pl-2
-                justify-between
-                py-3
-                border-t
-                text-red-600
-                font-semibold
-                text-base
-              "
-            >
-              <div>{{ t`Outstanding Amount` }}</div>
-              <div>{{ formattedValue('outstandingAmount') }}</div>
             </div>
           </div>
         </div>
@@ -198,15 +223,16 @@ import { getInvoiceStatus } from 'models/helpers';
 import { ModelNameEnum } from 'models/types';
 import Button from 'src/components/Button.vue';
 import FormControl from 'src/components/Controls/FormControl.vue';
+import Table from 'src/components/Controls/Table.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
 import { fyo } from 'src/initFyo';
 import {
-  getActionsForDocument,
-  openSettings,
-  routeTo,
-  showMessageDialog,
+getActionsForDocument,
+openSettings,
+routeTo,
+showMessageDialog
 } from 'src/utils/ui';
 import { handleErrorWithDialog } from '../errorHandling';
 
@@ -219,7 +245,8 @@ export default {
     Button,
     FormControl,
     DropdownWithActions,
-  },
+    Table
+},
   provide() {
     return {
       schemaName: this.schemaName,
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 7beed1ec..e8356445 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -2,13 +2,13 @@
   <div class="flex flex-col">
     <!-- Page Header (Title, Buttons, etc) -->
     <PageHeader :backLink="true">
-      <template #actions v-if="doc">
+      <template v-if="doc">
         <StatusBadge :status="status" />
-        <DropdownWithActions class="ml-2" :actions="actions" />
+        <DropdownWithActions :actions="actions" />
         <Button
           v-if="doc.notInserted || doc.dirty"
           type="primary"
-          class="text-white text-xs ml-2"
+          class="text-white text-xs"
           @click="sync"
         >
           {{ t`Save` }}
@@ -16,7 +16,7 @@
         <Button
           v-else-if="!doc.dirty && !doc.notInserted && !doc.submitted"
           type="primary"
-          class="text-white text-xs ml-2"
+          class="text-white text-xs"
           @click="submit"
         >
           {{ t`Submit` }}
@@ -27,112 +27,119 @@
     <!-- Journal Entry Form -->
     <div v-if="doc" class="flex justify-center flex-1 mb-8 mt-2">
       <div
-        class="border rounded-lg shadow h-full flex flex-col justify-between"
-        style="width: 600px"
+        class="
+          border
+          rounded-lg
+          shadow
+          h-full
+          flex flex-col
+          justify-between
+          w-600
+        "
       >
         <div>
-          <div class="mt-8 px-6">
+          <div class="m-6 flex flex-col gap-2">
             <h1 class="text-2xl font-semibold">
               {{ doc.notInserted ? t`New Journal Entry` : doc.name }}
             </h1>
 
             <!-- First Column of Fields -->
-            <div class="flex justify-between mt-2 gap-2">
-              <div class="w-1/3">
-                <FormControl
-                  :df="getField('entryType')"
-                  :value="doc.entryType"
-                  placeholder="Entry Type"
-                  @change="(value) => doc.set('entryType', value)"
-                  input-class="bg-gray-100 px-3 py-2 text-base"
-                  :read-only="doc.submitted"
-                  :class="doc.submitted && 'pointer-events-none'"
-                />
-                <FormControl
-                  class="mt-2"
-                  :df="getField('date')"
-                  :value="doc.date"
-                  :placeholder="'Date'"
-                  @change="(value) => doc.set('date', value)"
-                  input-class="bg-gray-100 px-3 py-2 text-base"
-                  :read-only="doc.submitted"
-                  :class="doc.submitted && 'pointer-events-none'"
-                />
-              </div>
+            <div class="flex flex-row justify-between gap-2">
+              <FormControl
+                class="w-1/3"
+                :df="getField('entryType')"
+                :value="doc.entryType"
+                placeholder="Entry Type"
+                @change="(value) => doc.set('entryType', value)"
+                input-class="bg-gray-100 px-3 py-2 text-base"
+                :read-only="doc.submitted"
+                :class="doc.submitted && 'pointer-events-none'"
+              />
+              <FormControl
+                class="w-1/3"
+                :df="getField('referenceNumber')"
+                :value="doc.referenceNumber"
+                :placeholder="'Reference Number'"
+                @change="(value) => doc.set('referenceNumber', value)"
+                input-class="bg-gray-100 p-2 text-base"
+                :read-only="doc.submitted"
+                :class="doc.submitted && 'pointer-events-none'"
+              />
+              <FormControl
+                :df="getField('numberSeries')"
+                :value="doc.numberSeries"
+                @change="(value) => doc.set('numberSeries', value)"
+                class="bg-gray-100 rounded w-1/3"
+                input-class="p-2 text-base bg-transparent"
+                :read-only="!doc.notInserted || doc.submitted"
+                :class="doc.submitted && 'pointer-events-none'"
+              />
+            </div>
 
-              <!-- Second Column of Fields -->
-              <div class="w-1/3">
-                <FormControl
-                  :df="getField('referenceNumber')"
-                  :value="doc.referenceNumber"
-                  :placeholder="'Reference Number'"
-                  @change="(value) => doc.set('referenceNumber', value)"
-                  input-class="bg-gray-100 p-2 text-base"
-                  :read-only="doc.submitted"
-                  :class="doc.submitted && 'pointer-events-none'"
-                />
-                <FormControl
-                  class="mt-2"
-                  :df="getField('referenceDate')"
-                  :value="doc.referenceDate"
-                  :placeholder="'Reference Date'"
-                  @change="(value) => doc.set('referenceDate', value)"
-                  input-class="bg-gray-100 px-3 py-2 text-base"
-                  :read-only="doc.submitted"
-                  :class="doc.submitted && 'pointer-events-none'"
-                />
-              </div>
-
-              <!-- Third Column of Fields -->
-              <div class="w-1/3">
-                <FormControl
-                  :df="getField('numberSeries')"
-                  :value="doc.numberSeries"
-                  @change="(value) => doc.set('numberSeries', value)"
-                  class="bg-gray-100 rounded"
-                  input-class="p-2 text-base bg-transparent"
-                  :read-only="!doc.notInserted || doc.submitted"
-                  :class="doc.submitted && 'pointer-events-none'"
-                />
-              </div>
+            <!-- Second Row of Fields -->
+            <div class="flex flex-row justify-between gap-2">
+              <FormControl
+                class="w-1/3"
+                :df="getField('date')"
+                :value="doc.date"
+                :placeholder="'Date'"
+                @change="(value) => doc.set('date', value)"
+                input-class="bg-gray-100 px-3 py-2 text-base"
+                :read-only="doc.submitted"
+                :class="doc.submitted && 'pointer-events-none'"
+              />
+              <div class="w-1/3" />
+              <FormControl
+                class="w-1/3"
+                :df="getField('referenceDate')"
+                :value="doc.referenceDate"
+                :placeholder="'Reference Date'"
+                @change="(value) => doc.set('referenceDate', value)"
+                input-class="bg-gray-100 px-3 py-2 text-base"
+                :read-only="doc.submitted"
+                :class="doc.submitted && 'pointer-events-none'"
+              />
             </div>
           </div>
+          <hr />
 
           <!-- Account Entries Table -->
-          <FormControl
+          <Table
             class="mt-2 px-6 text-base"
             :df="getField('accounts')"
             :value="doc.accounts"
             :showHeader="true"
-            :max-rows-before-overflow="4"
-            @change="(value) => doc.set('accounts', value)"
+            :max-rows-before-overflow="6"
             :read-only="doc.submitted"
           />
         </div>
 
         <!-- Footer -->
-        <div class="px-6 mb-6">
-          <div
-            class="grid items-center border-t pt-3 pr-2"
-            style="grid-template-columns: 1.3fr 1fr 1fr"
-          >
+        <div v-if="doc.accounts?.length ?? 0">
+          <hr />
+          <div class="flex justify-between text-base m-6 gap-12">
             <!-- User Remark -->
-            <div class="text-sm">
-              <FormControl
-                :df="getField('userRemark')"
-                :value="doc.userRemark"
-                @change="(value) => doc.set('userRemark', value)"
-                :class="doc.submitted && 'pointer-events-none'"
-                :read-only="doc.submitted"
-              />
-            </div>
+            <FormControl
+              class="w-1/2 self-end"
+              input-class="bg-gray-100"
+              :df="getField('userRemark')"
+              :value="doc.userRemark"
+              @change="(value) => doc.set('userRemark', value)"
+              :class="doc.submitted && 'pointer-events-none'"
+              :read-only="doc.submitted"
+            />
 
             <!-- Debit and Credit -->
-            <div class="text-right font-semibold text-green-600 px-3">
-              {{ totalDebit }}
-            </div>
-            <div class="text-right font-semibold text-red-600 px-3">
-              {{ totalCredit }}
+            <div class="w-1/2 gap-2 flex flex-col self-end font-semibold">
+              <div class="flex justify-between text-green-600">
+                <div>{{ t`Total Debit` }}</div>
+                <div>{{ totalDebit }}</div>
+              </div>
+              <hr />
+              <div class="flex justify-between text-red-600">
+                <div>{{ t`Total Credit` }}</div>
+                <div>{{ totalCredit }}</div>
+              </div>
             </div>
           </div>
         </div>
@@ -145,6 +152,7 @@ import { computed } from '@vue/reactivity';
 import { ModelNameEnum } from 'models/types';
 import Button from 'src/components/Button';
 import FormControl from 'src/components/Controls/FormControl.vue';
+import Table from 'src/components/Controls/Table.vue';
 import DropdownWithActions from 'src/components/DropdownWithActions';
 import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
@@ -165,7 +173,8 @@ export default {
     DropdownWithActions,
     StatusBadge,
     FormControl,
-  },
+    Table
+},
   provide() {
     return {
       schemaName: this.schemaName,
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 17e9e30d..5bbe1dd3 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -1,16 +1,14 @@
 <template>
   <div class="flex flex-col">
     <PageHeader :title="title">
-      <template #actions>
-        <FilterDropdown
-          ref="filterDropdown"
-          @change="applyFilter"
-          :fields="fields"
-        />
-        <Button class="ml-2" :icon="true" type="primary" @click="makeNewDoc">
-          <feather-icon name="plus" class="w-4 h-4 text-white" />
-        </Button>
-      </template>
+      <FilterDropdown
+        ref="filterDropdown"
+        @change="applyFilter"
+        :fields="fields"
+      />
+      <Button :icon="true" type="primary" @click="makeNewDoc">
+        <feather-icon name="plus" class="w-4 h-4 text-white" />
+      </Button>
     </PageHeader>
     <List
       ref="list"
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index ee23c037..1b9e4406 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -2,17 +2,15 @@
   <div class="flex">
     <div class="flex flex-col flex-1">
       <PageHeader :backLink="true" class="bg-white z-10">
-        <template #actions>
-          <Button
-            class="text-gray-900 text-xs ml-2"
-            @click="showCustomiser = !showCustomiser"
-          >
-            {{ t`Customise` }}
-          </Button>
-          <Button class="text-gray-900 text-xs ml-2" @click="makePDF">
-            {{ t`Save as PDF` }}
-          </Button>
-        </template>
+        <Button
+          class="text-gray-900 text-xs"
+          @click="showCustomiser = !showCustomiser"
+        >
+          {{ t`Customise` }}
+        </Button>
+        <Button class="text-gray-900 text-xs" @click="makePDF">
+          {{ t`Save as PDF` }}
+        </Button>
       </PageHeader>
       <div
         v-if="doc && printSettings"
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 85bb64aa..95615689 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -197,7 +197,7 @@ export default {
 
       // set default values
       if (this.values) {
-        this.doc.set(this.values);
+        this.doc?.set(this.values);
       }
 
       // set title size
@@ -205,7 +205,7 @@ export default {
     },
     setTitleField() {
       const { fieldname, readOnly } = this.titleField;
-      if (!this.doc?.notInserted || !this.doc[fieldname]) {
+      if (!this.doc?.notInserted || !this?.doc[fieldname]) {
         return;
       }
 
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 25418ec0..be290698 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -1,18 +1,16 @@
 <template>
   <div class="flex flex-col max-w-full">
     <PageHeader :title="report.title">
-      <template #actions>
-        <DropdownWithActions
-          v-for="group of actionGroups"
-          :key="group.label"
-          :type="group.type"
-          :actions="group.actions"
-          class="ml-2 text-xs"
-        >
-          {{ group.label }}
-        </DropdownWithActions>
-        <DropdownWithActions class="ml-2" :actions="actions" />
-      </template>
+      <DropdownWithActions
+        v-for="group of actionGroups"
+        :key="group.label"
+        :type="group.type"
+        :actions="group.actions"
+        class="text-xs"
+      >
+        {{ group.label }}
+      </DropdownWithActions>
+      <DropdownWithActions :actions="actions" />
     </PageHeader>
     <div class="flex px-8 mt-2 text-base" v-if="report.filterFields">
       <div
@@ -142,7 +140,7 @@ import PageHeader from 'src/components/PageHeader';
 import Row from 'src/components/Row';
 import WithScroll from 'src/components/WithScroll';
 import { fyo } from 'src/initFyo';
-import { h, markRaw } from 'vue';
+import { h, markRaw, nextTick } from 'vue';
 
 export default {
   name: 'Report',
@@ -185,7 +183,7 @@ export default {
   },
   methods: {
     onBodyScroll({ scrollLeft }) {
-      this.$nextTick(() => {
+      nextTick(() => {
         this.$refs.header.scrollLeft = scrollLeft;
       });
     },

From 89983f24e23c30a8989312c08a872effe0edb7a1 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sun, 1 May 2022 17:04:13 +0530
Subject: [PATCH 083/163] feat: add search modal

---
 src/components/Button.vue       |   2 +-
 src/components/Modal.vue        |  20 ++-
 src/components/PageHeader.vue   |   2 +-
 src/components/SearchBar.vue    | 285 ++++++++++++++++++++++++--------
 src/pages/ListView/ListView.vue |  14 +-
 src/renderer.ts                 |   1 -
 src/router.ts                   |   2 +-
 src/utils/colors.ts             |  15 +-
 src/utils/search.ts             | 113 ++++++-------
 9 files changed, 304 insertions(+), 150 deletions(-)

diff --git a/src/components/Button.vue b/src/components/Button.vue
index 9baeeb64..725b7389 100644
--- a/src/components/Button.vue
+++ b/src/components/Button.vue
@@ -1,6 +1,6 @@
 <template>
   <button
-    class="focus:outline-none rounded-md shadow-button flex-center"
+    class="focus:outline-none rounded-md shadow-button flex-center h-8"
     :style="style"
     :class="_class"
     v-bind="$attrs"
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index c0020b0a..ae31df8f 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -1,14 +1,20 @@
 <template>
   <div
-    class="absolute w-screen h-screen z-20 flex justify-center items-center"
-    style="background: rgba(0, 0, 0, 0.25); backdrop-filter: blur(6px)"
+    class="
+      fixed
+      top-0
+      left-0
+      w-screen
+      h-screen
+      z-20
+      flex
+      justify-center
+      items-center
+    "
+    style="background: rgba(0, 0, 0, 0.2); backdrop-filter: blur(4px)"
     v-if="openModal"
   >
-    <div
-      class="bg-white rounded-lg shadow-2xl"
-      v-bind="$attrs"
-      style="width: 600px"
-    >
+    <div class="bg-white rounded-lg shadow-2xl w-600" v-bind="$attrs">
       <slot></slot>
     </div>
   </div>
diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index 477ef3c9..2db79dd5 100644
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -6,7 +6,7 @@
     <BackLink v-if="backLink" />
     <div class="flex items-stretch window-no-drag gap-2">
       <slot />
-      <SearchBar v-show="!hideSearch" />
+      <SearchBar v-if="!hideSearch"/>
     </div>
   </div>
 </template>
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 1909beaf..b1142b7d 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -2,82 +2,145 @@
 const keys = useKeys();
 </script>
 <template>
-  <div v-on-outside-click="clearInput" class="relative">
-    <Dropdown :items="suggestions" class="text-sm h-full">
-      <template
-        v-slot="{
-          toggleDropdown,
-          highlightItemUp,
-          highlightItemDown,
-          selectHighlightedItem,
-        }"
+  <div>
+    <!-- Search Bar Button -->
+    <button
+      @click="open"
+      class="
+        focus:outline-none
+        shadow-button
+        flex flex-row
+        gap-1
+        text-base text-gray-700
+        bg-gray-100
+        rounded-md
+        h-8
+        w-48
+        px-3
+        items-center
+      "
+    >
+      <feather-icon name="search" class="w-4 h-4" />
+      <p>{{ t`Search` }}</p>
+      <div v-if="!inputValue" class="text-gray-500 ml-auto">
+        {{ platform === 'Mac' ? '⌘ K' : 'Ctrl K' }}
+      </div>
+    </button>
+  </div>
+
+  <!-- Search Modal -->
+  <Modal :open-modal="openModal">
+    <!-- Search Input -->
+    <div class="p-1">
+      <input
+        ref="input"
+        type="search"
+        autocomplete="off"
+        spellcheck="false"
+        :placeholder="t`Type to search...`"
+        v-model="inputValue"
+        @focus="search"
+        @input="search"
+        @keydown.up="up"
+        @keydown.down="down"
+        @keydown.enter="() => select()"
+        @keydown.esc="close"
+        class="
+          bg-gray-100
+          text-2xl
+          focus:outline-none
+          w-full
+          placeholder-gray-700
+          text-gray-900
+          rounded-md
+          p-3
+        "
+      />
+    </div>
+    <hr v-if="suggestions.length" />
+
+    <!-- Search List -->
+    <div :style="`max-height: ${49 * 6 - 1}px`" class="overflow-scroll">
+      <div
+        v-for="(si, i) in suggestions"
+        :key="`${i}-${si.key}`"
+        ref="suggestions"
+        class="hover:bg-blue-100 cursor-pointer"
+        :class="idx === i ? 'bg-blue-100' : ''"
+        @click="select(i)"
       >
         <div
-          class="rounded-md relative flex items-center overflow-hidden h-full"
+          class="flex flex-row w-full justify-between px-3 items-center"
+          style="height: 48px"
         >
-          <div class="absolute flex justify-center w-8">
-            <feather-icon name="search" class="w-3 h-3 text-gray-800" />
-          </div>
-          <input
-            type="search"
-            class="
-              bg-gray-100
-              text-sm
-              pl-7
-              focus:outline-none
-              h-full
-              w-56
-              placeholder-gray-800
-            "
-            :placeholder="t`Search...`"
-            autocomplete="off"
-            spellcheck="false"
-            v-model="inputValue"
-            @focus="
-              () => {
-                search();
-                toggleDropdown(true);
-              }
-            "
-            @input="search"
-            ref="input"
-            @keydown.up="highlightItemUp"
-            @keydown.down="highlightItemDown"
-            @keydown.enter="selectHighlightedItem"
-            @keydown.tab="toggleDropdown(false)"
-            @keydown.esc="toggleDropdown(false)"
-          />
+          <p class="">
+            {{ si.label }}
+          </p>
           <div
-            v-if="!inputValue"
-            class="absolute justify-center right-1.5 text-gray-500 px-1.5"
+            class="text-base px-2 py-1 rounded-lg flex items-center"
+            :class="groupColorClassMap[si.group]"
           >
-            {{ platform === 'Mac' ? '⌘ K' : 'Ctrl K' }}
+            {{ groupLabelMap[si.group] }}
           </div>
         </div>
-      </template>
-    </Dropdown>
-  </div>
+        <hr v-if="i !== suggestions.length - 1" />
+      </div>
+    </div>
+
+    <!-- Footer -->
+    <hr />
+    <div class="m-2 flex justify-between items-center">
+      <!-- Group Filters -->
+      <div class="flex flex-row gap-2">
+        <button
+          v-for="g in searchGroups"
+          :key="g"
+          class="text-base border px-2 py-0.5 rounded-lg"
+          :class="getGroupFilterButtonClass(g)"
+          @click="groupFilters[g] = !groupFilters[g]"
+        >
+          {{ groupLabelMap[g] }}
+        </button>
+      </div>
+
+      <!-- Keybindings Help -->
+      <div class="flex text-base gap-3 justify-center text-gray-700">
+        <p>↑↓ {{ t`Navigate` }}</p>
+        <p>↩ {{ t`Select` }}</p>
+        <p><span class="text-sm tracking-tighter">esc</span> {{ t`Close` }}</p>
+      </div>
+    </div>
+  </Modal>
 </template>
 <script>
 import { t } from 'fyo';
-import Dropdown from 'src/components/Dropdown';
-import { getSearchList } from 'src/utils/search';
+import { fuzzyMatch } from 'src/utils';
+import { getBgTextColorClass } from 'src/utils/colors';
+import { getSearchList, searchGroups } from 'src/utils/search';
 import { routeTo } from 'src/utils/ui';
 import { useKeys } from 'src/utils/vueUtils';
-import { watch } from 'vue';
+import { getIsNullOrUndef } from 'utils/';
+import { nextTick, watch } from 'vue';
+import Modal from './Modal.vue';
 
 export default {
   data() {
     return {
+      idx: 0,
+      searchGroups,
+      openModal: false,
       inputValue: '',
       searchList: [],
-      suggestions: [],
+      groupFilters: {
+        List: true,
+        Report: true,
+        Create: true,
+        Page: true,
+        Docs: true,
+      },
     };
   },
-  components: {
-    Dropdown,
-  },
-  emits: ['change'],
+  components: { Modal },
   mounted() {
     this.makeSearchList();
     watch(this.keys, (keys) => {
@@ -86,28 +149,63 @@ export default {
         keys.has('KeyK') &&
         (keys.has('MetaLeft') || keys.has('ControlLeft'))
       ) {
-        this.$refs.input.focus();
+        this.open();
+      }
+
+      if (!this.openModal) {
+        return;
       }
 
       if (keys.size === 1 && keys.has('Escape')) {
-        this.$refs.input.blur();
+        this.close();
+      }
+
+      const input = this.$refs.input;
+      if (!getIsNullOrUndef(input) && document.activeElement !== input) {
+        input.focus();
       }
     });
+    this.openModal = false;
+  },
+  activated() {
+    this.openModal = false;
   },
   methods: {
-    async search() {
-      this.suggestions = this.searchList.filter((d) => {
-        let key = this.inputValue.toLowerCase();
-        return d.label.toLowerCase().includes(key);
+    open() {
+      this.openModal = true;
+      nextTick(() => {
+        this.$refs.input.focus();
       });
-
-      if (this.suggestions.length === 0) {
-        this.suggestions = [{ label: t`No results found.` }];
-      }
     },
-    clearInput() {
+    close() {
+      this.openModal = false;
+      this.reset();
+    },
+    reset() {
+      this.searchGroups.forEach((g) => {
+        this.groupFilters[g] = true;
+      });
       this.inputValue = '';
-      this.$emit('change', null);
+    },
+    up() {
+      this.idx = Math.max(this.idx - 1, 0);
+      this.scrollToHighlighted();
+    },
+    down() {
+      this.idx = Math.max(
+        Math.min(this.idx + 1, this.suggestions.length - 1),
+        0
+      );
+      this.scrollToHighlighted();
+    },
+    select(idx) {
+      this.idx = idx ?? this.idx;
+      this.suggestions[this.idx]?.action();
+      this.close();
+    },
+    scrollToHighlighted() {
+      const ref = this.$refs.suggestions[this.idx];
+      ref.scrollIntoView({ block: 'nearest' });
     },
     async makeSearchList() {
       const searchList = getSearchList();
@@ -115,12 +213,61 @@ export default {
         if (d.route && !d.action) {
           d.action = () => {
             routeTo(d.route);
-            this.inputValue = '';
           };
         }
         return d;
       });
     },
+    getGroupFilterButtonClass(g) {
+      const isOn = this.groupFilters[g];
+      const color = this.groupColorMap[g];
+      if (isOn) {
+        return `${getBgTextColorClass(color)} border-${color}-100`;
+      }
+
+      return `text-${color}-600 border-${color}-100`;
+    },
+  },
+  computed: {
+    groupLabelMap() {
+      return {
+        Create: t`Create`,
+        List: t`List`,
+        Report: t`Report`,
+        Docs: t`Docs`,
+        Page: t`Page`,
+      };
+    },
+    groupColorMap() {
+      return {
+        Docs: 'blue',
+        Create: 'green',
+        List: 'teal',
+        Report: 'yellow',
+        Page: 'orange',
+      };
+    },
+    groupColorClassMap() {
+      return searchGroups.reduce((map, g) => {
+        map[g] = getBgTextColorClass(this.groupColorMap[g]);
+        return map;
+      }, {});
+    },
+    suggestions() {
+      const filters = new Set(
+        this.searchGroups.filter((g) => this.groupFilters[g])
+      );
+
+      return this.searchList
+        .filter((si) => filters.has(si.group))
+        .map((si) => ({
+          ...fuzzyMatch(this.inputValue, `${si.label} ${si.group}`),
+          si,
+        }))
+        .filter(({ isMatch }) => isMatch)
+        .sort((a, b) => a.distance - b.distance)
+        .map(({ si }) => si);
+    },
   },
 };
 </script>
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 5bbe1dd3..8427924c 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -6,7 +6,13 @@
         @change="applyFilter"
         :fields="fields"
       />
-      <Button :icon="true" type="primary" @click="makeNewDoc">
+      <Button
+        :icon="true"
+        type="primary"
+        @click="makeNewDoc"
+        :padding="false"
+        class="px-3"
+      >
         <feather-icon name="plus" class="w-4 h-4 text-white" />
       </Button>
     </PageHeader>
@@ -21,9 +27,9 @@
   </div>
 </template>
 <script>
-import Button from 'src/components/Button';
-import FilterDropdown from 'src/components/FilterDropdown';
-import PageHeader from 'src/components/PageHeader';
+import Button from 'src/components/Button.vue';
+import FilterDropdown from 'src/components/FilterDropdown.vue';
+import PageHeader from 'src/components/PageHeader.vue';
 import { fyo } from 'src/initFyo';
 import { routeTo } from 'src/utils/ui';
 import List from './List';
diff --git a/src/renderer.ts b/src/renderer.ts
index 76c446d9..51cb3e8c 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -36,7 +36,6 @@ import { setLanguageMap } from './utils/language';
   app.component('App', App);
   app.component('FeatherIcon', FeatherIcon);
   app.component('Badge', Badge);
-
   app.directive('on-outside-click', outsideClickDirective);
   app.mixin({
     computed: {
diff --git a/src/router.ts b/src/router.ts
index c122e310..64b019c9 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -108,7 +108,7 @@ const routes: RouteRecordRaw[] = [
   },
   /*
   {
-    path: '/data_import',
+    path: '/data-import',
     name: 'Data Import',
     component: DataImport,
   },
diff --git a/src/utils/colors.ts b/src/utils/colors.ts
index 938eca70..d96f039d 100644
--- a/src/utils/colors.ts
+++ b/src/utils/colors.ts
@@ -18,9 +18,18 @@ export const statusColor = {
 };
 
 const getValidColor = (color: string) => {
-  const isValid = ['gray', 'orange', 'green', 'red', 'yellow', 'blue'].includes(
-    color
-  );
+  const isValid = [
+    'gray',
+    'orange',
+    'green',
+    'red',
+    'yellow',
+    'blue',
+    'indigo',
+    'pink',
+    'purple',
+    'teal',
+  ].includes(color);
   return isValid ? color : 'gray';
 };
 
diff --git a/src/utils/search.ts b/src/utils/search.ts
index ae67fe3d..983dd5d2 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -4,11 +4,13 @@ import reports from 'reports/view';
 import { fyo } from 'src/initFyo';
 import { routeTo } from './ui';
 
+export const searchGroups = ['Docs', 'List', 'Create', 'Report', 'Page'];
 enum SearchGroupEnum {
   'List' = 'List',
   'Report' = 'Report',
   'Create' = 'Create',
-  'Setup' = 'Setup',
+  'Page' = 'Page',
+  'Docs' = 'Docs',
 }
 
 type SearchGroup = keyof typeof SearchGroupEnum;
@@ -38,50 +40,37 @@ async function openFormEditDoc(schemaName: string) {
 }
 
 function getCreateList(): SearchItem[] {
-  return [
-    {
-      label: t`Create Item`,
-      group: 'Create',
-      action() {
-        openQuickEditDoc(ModelNameEnum.Item);
-      },
-    },
-    {
-      label: t`Create Party`,
-      group: 'Create',
-      action() {
-        openQuickEditDoc(ModelNameEnum.Party);
-      },
-    },
-    {
-      label: t`Create Payment`,
-      group: 'Create',
-      action() {
-        openQuickEditDoc(ModelNameEnum.Payment);
-      },
-    },
-    {
-      label: t`Create Sales Invoice`,
-      group: 'Create',
-      action() {
-        openFormEditDoc(ModelNameEnum.SalesInvoice);
-      },
-    },
-    {
-      label: t`Create Purchase Invoice`,
-      group: 'Create',
-      action() {
-        openFormEditDoc(ModelNameEnum.PurchaseInvoice);
-      },
-    },
-    {
-      label: t`Create Journal Entry`,
-      group: 'Create',
-      action() {
-        openFormEditDoc(ModelNameEnum.JournalEntry);
-      },
-    },
-  ];
+  const quickEditCreateList = [
+    ModelNameEnum.Item,
+    ModelNameEnum.Party,
+    ModelNameEnum.Payment,
+  ].map(
+    (schemaName) =>
+      ({
+        label: fyo.schemaMap[schemaName]?.label,
+        group: 'Create',
+        action() {
+          openQuickEditDoc(schemaName);
+        },
+      } as SearchItem)
+  );
+
+  const formEditCreateList = [
+    ModelNameEnum.SalesInvoice,
+    ModelNameEnum.PurchaseInvoice,
+    ModelNameEnum.JournalEntry,
+  ].map(
+    (schemaName) =>
+      ({
+        label: fyo.schemaMap[schemaName]?.label,
+        group: 'Create',
+        action() {
+          openFormEditDoc(schemaName);
+        },
+      } as SearchItem)
+  );
+
+  return [quickEditCreateList, formEditCreateList].flat();
 }
 
 function getReportList(): SearchItem[] {
@@ -116,36 +105,34 @@ function getListViewList(): SearchItem[] {
 
 function getSetupList(): SearchItem[] {
   return [
+    {
+      label: t`Dashboard`,
+      route: '/',
+      group: 'Page',
+    },
     {
       label: t`Chart of Accounts`,
-      route: '/chartOfAccounts',
-      group: 'Setup',
+      route: '/chart-of-accounts',
+      group: 'Page',
     },
     {
       label: t`Data Import`,
-      route: '/data_import',
-      group: 'Setup',
+      route: '/data-import',
+      group: 'Page',
     },
     {
       label: t`Settings`,
       route: '/settings',
-      group: 'Setup',
+      group: 'Page',
     },
   ];
 }
 
 export function getSearchList() {
-  const group: Record<SearchGroup, string> = {
-    Create: t`Create`,
-    List: t`List`,
-    Report: t`Report`,
-    Setup: t`Setup`,
-  };
-
-  return [getListViewList(), getCreateList(), getReportList(), getSetupList()]
-    .flat()
-    .map((si) => ({
-      ...si,
-      group: group[si.group],
-    }));
+  return [
+    getListViewList(),
+    getCreateList(),
+    getReportList(),
+    getSetupList(),
+  ].flat();
 }

From 185110276da28ed03c17476414a8b0f214cce1ad Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 2 May 2022 11:01:11 +0530
Subject: [PATCH 084/163] feat: add more search items - fix a few actions - fix
 listview page titles

---
 models/baseModels/Item/Item.ts         |  8 +--
 models/baseModels/Party/Party.ts       | 32 ++++------
 schemas/app/Item.json                  |  1 +
 src/components/Dropdown.vue            | 10 +++-
 src/components/DropdownWithActions.vue |  2 +
 src/components/SearchBar.vue           |  3 +-
 src/components/Sidebar.vue             |  1 +
 src/pages/ListView/ListView.vue        |  8 ++-
 src/router.ts                          |  9 +--
 src/utils/search.ts                    | 83 +++++++++++++++++++++++---
 src/utils/sidebarConfig.ts             | 10 ++--
 11 files changed, 119 insertions(+), 48 deletions(-)

diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index f8d9068f..121db713 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -66,8 +66,8 @@ export class Item extends Doc {
   static getActions(fyo: Fyo): Action[] {
     return [
       {
-        label: fyo.t`New Invoice`,
-        condition: (doc) => !doc.notInserted,
+        label: fyo.t`New Sale`,
+        condition: (doc) => !doc.notInserted && doc.for !== 'purchases',
         action: async (doc, router) => {
           const invoice = await fyo.doc.getNewDoc('SalesInvoice');
           await invoice.append('items', {
@@ -79,8 +79,8 @@ export class Item extends Doc {
         },
       },
       {
-        label: fyo.t`New Bill`,
-        condition: (doc) => !doc.notInserted,
+        label: fyo.t`New Purchase`,
+        condition: (doc) => !doc.notInserted && doc.for !== 'sales',
         action: async (doc, router) => {
           const invoice = await fyo.doc.getNewDoc('PurchaseInvoice');
           await invoice.append('items', {
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 5064014e..5d4038f7 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -118,7 +118,10 @@ export class Party extends Doc {
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
-          const doc = await fyo.doc.getNewDoc('PurchaseInvoice');
+          const doc = await fyo.doc.getNewDoc('PurchaseInvoice', {
+            party: partyDoc.name,
+            account: partyDoc.defaultAccount as string,
+          });
           router.push({
             path: `/edit/PurchaseInvoice/${doc.name}`,
             query: {
@@ -136,16 +139,7 @@ export class Party extends Doc {
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Customer',
         action: async (partyDoc, router) => {
-          router.push({
-            name: 'ListView',
-            params: {
-              schemaName: 'PurchaseInvoice',
-              filters: {
-                // @ts-ignore
-                party: partyDoc.name!,
-              },
-            },
-          });
+          router.push(`/list/PurchaseInvoice/party/${partyDoc.name}`);
         },
       },
       {
@@ -153,7 +147,10 @@ export class Party extends Doc {
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
-          const doc = await fyo.doc.getNewDoc('SalesInvoice');
+          const doc = await fyo.doc.getNewDoc('SalesInvoice', {
+            party: partyDoc.name,
+            account: partyDoc.defaultAccount as string,
+          });
           router.push({
             path: `/edit/SalesInvoice/${doc.name}`,
             query: {
@@ -171,16 +168,7 @@ export class Party extends Doc {
         condition: (doc: Doc) =>
           !doc.notInserted && (doc.role as PartyRole) !== 'Supplier',
         action: async (partyDoc, router) => {
-          router.push({
-            name: 'ListView',
-            params: {
-              schemaName: 'SalesInvoice',
-              filters: {
-                // @ts-ignore
-                party: partyDoc.name!,
-              },
-            },
-          });
+          router.push(`/list/SalesInvoice/party/${partyDoc.name}`);
         },
       },
     ];
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index fb6a3e29..0b9dec05 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -86,6 +86,7 @@
           "label": "Both"
         }
       ],
+      "readOnly": true,
       "default": "both"
     },
     {
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index d2769e30..10e1469f 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -184,9 +184,15 @@ export default {
       return emptyMessage;
     },
     selectItem(d) {
-      if (d.action) {
-        d.action();
+      if (!d.action) {
+        return;
       }
+
+      if (this.doc) {
+        return d.action(this.doc, this.$router);
+      }
+      
+      d.action()
     },
     toggleDropdown(flag) {
       if (flag == null) {
diff --git a/src/components/DropdownWithActions.vue b/src/components/DropdownWithActions.vue
index 18097d02..fb631268 100644
--- a/src/components/DropdownWithActions.vue
+++ b/src/components/DropdownWithActions.vue
@@ -3,6 +3,7 @@
     v-if="actions && actions.length"
     class="text-xs"
     :items="actions"
+    :doc="doc"
     right
   >
     <template v-slot="{ toggleDropdown }">
@@ -30,6 +31,7 @@ export default {
     actions: { default: [] },
     type: { type: String, default: 'secondary' },
   },
+  inject: ['doc'],
   components: {
     Dropdown,
     Button,
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index b1142b7d..e0e62823 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -18,6 +18,7 @@ const keys = useKeys();
         w-48
         px-3
         items-center
+        hover:bg-gray-200
       "
     >
       <feather-icon name="search" class="w-4 h-4" />
@@ -73,7 +74,7 @@ const keys = useKeys();
           class="flex flex-row w-full justify-between px-3 items-center"
           style="height: 48px"
         >
-          <p class="">
+          <p class="text-gray-900">
             {{ si.label }}
           </p>
           <div
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index e941b666..e3bb8d38 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -188,6 +188,7 @@ export default {
       if (group.action) {
         group.action();
       }
+
       if (group.route) {
         routeTo(group.route);
       }
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index 8427924c..eff3a33f 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -36,7 +36,11 @@ import List from './List';
 
 export default {
   name: 'ListView',
-  props: ['schemaName', 'filters'],
+  props: {
+    schemaName: String,
+    filters: Object,
+    pageTitle: { type: String, default: '' },
+  },
   components: {
     PageHeader,
     List,
@@ -92,7 +96,7 @@ export default {
   },
   computed: {
     title() {
-      return fyo.schemaMap[this.schemaName].label;
+      return this.pageTitle || fyo.schemaMap[this.schemaName].label;
     },
     fields() {
       return fyo.schemaMap[this.schemaName].fields;
diff --git a/src/router.ts b/src/router.ts
index 64b019c9..449d572d 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -6,7 +6,7 @@ import GetStarted from 'src/pages/GetStarted.vue';
 import InvoiceForm from 'src/pages/InvoiceForm.vue';
 import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
 import ListView from 'src/pages/ListView/ListView.vue';
-// import PrintView from 'src/pages/PrintView/PrintView.vue';
+import PrintView from 'src/pages/PrintView/PrintView.vue';
 import QuickEditForm from 'src/pages/QuickEditForm.vue';
 // import Report from 'src/pages/Report.vue';
 import Settings from 'src/pages/Settings/Settings.vue';
@@ -54,7 +54,7 @@ const routes: RouteRecordRaw[] = [
     },
   },
   {
-    path: '/list/:schemaName/:fieldname?/:value?',
+    path: '/list/:schemaName/:fieldname?/:value?/:pageTitle?',
     name: 'ListView',
     components: {
       default: ListView,
@@ -62,7 +62,7 @@ const routes: RouteRecordRaw[] = [
     },
     props: {
       default: (route) => {
-        const { schemaName, fieldname, value } = route.params;
+        const { schemaName, fieldname, value, pageTitle } = route.params;
         let { filters } = route.params;
 
         if (filters === undefined && fieldname && value) {
@@ -73,6 +73,7 @@ const routes: RouteRecordRaw[] = [
         return {
           schemaName,
           filters,
+          pageTitle: pageTitle ?? '',
         };
       },
       edit: (route) => {
@@ -80,13 +81,13 @@ const routes: RouteRecordRaw[] = [
       },
     },
   },
-  /*
   {
     path: '/print/:schemaName/:name',
     name: 'PrintView',
     component: PrintView,
     props: true,
   },
+  /*
   {
     path: '/report/:reportName',
     name: 'Report',
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 983dd5d2..15583715 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -70,7 +70,53 @@ function getCreateList(): SearchItem[] {
       } as SearchItem)
   );
 
-  return [quickEditCreateList, formEditCreateList].flat();
+  const filteredCreateList = [
+    {
+      label: t`Customers`,
+      schemaName: ModelNameEnum.Party,
+      filter: { role: 'Customer' },
+    },
+    {
+      label: t`Suppliers`,
+      schemaName: ModelNameEnum.Party,
+      filter: { role: 'Supplier' },
+    },
+    {
+      label: t`Sales Items`,
+      schemaName: ModelNameEnum.Item,
+      filter: { for: 'sales' },
+    },
+    {
+      label: t`Purchase Items`,
+      schemaName: ModelNameEnum.Item,
+      filter: { for: 'purchases' },
+    },
+    {
+      label: t`Common Items`,
+      schemaName: ModelNameEnum.Item,
+      filter: { for: 'both' },
+    },
+  ].map(({ label, filter, schemaName }) => {
+    const fk = Object.keys(filter)[0] as 'for' | 'role';
+    const ep = `${fk}/${filter[fk]}`;
+
+    const route = `/list/${schemaName}/${ep}/${label}`;
+    return {
+      label,
+      group: 'Create',
+      async action() {
+        await routeTo(route);
+        const doc = await fyo.doc.getNewDoc(schemaName, filter);
+        const { openQuickEdit } = await import('src/utils/ui');
+        await openQuickEdit({
+          schemaName,
+          name: doc.name as string,
+        });
+      },
+    } as SearchItem;
+  });
+
+  return [quickEditCreateList, formEditCreateList, filteredCreateList].flat();
 }
 
 function getReportList(): SearchItem[] {
@@ -84,10 +130,9 @@ function getReportList(): SearchItem[] {
 }
 
 function getListViewList(): SearchItem[] {
-  return [
+  const standardLists = [
     ModelNameEnum.Account,
     ModelNameEnum.Party,
-    ModelNameEnum.Item,
     ModelNameEnum.Payment,
     ModelNameEnum.JournalEntry,
     ModelNameEnum.PurchaseInvoice,
@@ -96,11 +141,33 @@ function getListViewList(): SearchItem[] {
   ]
     .map((s) => fyo.schemaMap[s])
     .filter((s) => s && !s.isChild && !s.isSingle)
-    .map((s) => ({
-      label: s!.label,
-      route: `/list/${s!.name}`,
-      group: 'List',
-    }));
+    .map(
+      (s) =>
+        ({
+          label: s!.label,
+          route: `/list/${s!.name}`,
+          group: 'List',
+        } as SearchItem)
+    );
+
+  const filteredLists = [
+    { label: t`Customers`, route: `/list/Party/role/Customer/${t`Customers`}` },
+    { label: t`Suppliers`, route: `/list/Party/role/Supplier/${t`Suppliers`}` },
+    {
+      label: t`Sales Items`,
+      route: `/list/Item/for/sales/${t`Sales Items`}`,
+    },
+    {
+      label: t`Purchase Items`,
+      route: `/list/Item/for/purchases/${t`Purchase Items`}`,
+    },
+    {
+      label: t`Common Items`,
+      route: `/list/Item/for/both/${t`Common Items`}`,
+    },
+  ].map((i) => ({ ...i, group: 'List' } as SearchItem));
+
+  return [standardLists, filteredLists].flat();
 }
 
 function getSetupList(): SearchItem[] {
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 56f54400..b52af8f7 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -63,13 +63,13 @@ function getCompleteSidebar(): SidebarConfig {
         {
           label: t`Customers`,
           name: 'customers',
-          route: '/list/Party/role/Customer',
+          route: `/list/Party/role/Customer/${t`Customers`}`,
           schemaName: 'Party',
         },
         {
           label: t`Sales Items`,
           name: 'sales-items',
-          route: '/list/Item/for/sales',
+          route: `/list/Item/for/sales/${t`Sales Items`}`,
           schemaName: 'Item',
         },
       ],
@@ -95,13 +95,13 @@ function getCompleteSidebar(): SidebarConfig {
         {
           label: t`Suppliers`,
           name: 'suppliers',
-          route: '/list/Party/role/Supplier',
+          route: `/list/Party/role/Supplier/${t`Suppliers`}`,
           schemaName: 'Party',
         },
         {
           label: t`Purchase Items`,
           name: 'purchase-items',
-          route: '/list/Item/for/purchases',
+          route: `/list/Item/for/purchases/${t`Purchase Items`}`,
           schemaName: 'Item',
         },
       ],
@@ -121,7 +121,7 @@ function getCompleteSidebar(): SidebarConfig {
         {
           label: t`Common Items`,
           name: 'common-items',
-          route: '/list/Item/for/both',
+          route: `/list/Item/for/both/${t`Common Items`}`,
           schemaName: 'Item',
         },
         {

From 8cc46c584cf3555db5e67aeca0209b21a565fd55 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 2 May 2022 15:45:16 +0530
Subject: [PATCH 085/163] fix: db updation, invoice submit, number series

---
 backend/database/core.ts                      |  18 +--
 backend/database/tests/helpers.ts             |   6 +
 backend/database/tests/testCore.spec.ts       |  31 +++++
 fyo/core/docHandler.ts                        |  14 ---
 fyo/index.ts                                  |  25 ++++
 fyo/model/doc.ts                              | 113 ++++++------------
 fyo/models/NumberSeries.ts                    |  12 +-
 models/baseModels/Invoice/Invoice.ts          |  45 +++++--
 models/baseModels/InvoiceItem/InvoiceItem.ts  |  32 ++---
 .../baseModels/JournalEntry/JournalEntry.ts   |   2 +-
 models/baseModels/Party/Party.ts              |   9 +-
 models/baseModels/Payment/Payment.ts          |   6 +-
 models/baseModels/PaymentFor/PaymentFor.ts    |   4 +-
 schemas/tests/Party.json                      |  22 ++++
 schemas/tests/testSchemaBuilder.spec.ts       |  12 +-
 src/components/Controls/AutoComplete.vue      |   1 +
 src/components/Controls/Base.vue              |   1 +
 src/components/Controls/Table.vue             |   2 +-
 src/components/Widgets/PartyWidget.vue        |  70 ++++++-----
 src/pages/InvoiceForm.vue                     |  23 ++--
 src/pages/JournalEntryForm.vue                |  17 +--
 src/pages/PrintView/PrintView.vue             |  16 +--
 src/utils/search.ts                           |   9 +-
 src/utils/ui.ts                               |  10 +-
 24 files changed, 276 insertions(+), 224 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index b1e95f67..3514d129 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -460,9 +460,8 @@ export default class DatabaseCore extends DatabaseBase {
       let comparisonValue = value as string | number | (string | number)[];
 
       if (Array.isArray(value)) {
-        operator = value[0] as string;
+        operator = (value[0] as string).toLowerCase();
         comparisonValue = value[1] as string | number | (string | number)[];
-        operator = operator.toLowerCase();
 
         if (operator === 'includes') {
           operator = 'like';
@@ -671,12 +670,12 @@ export default class DatabaseCore extends DatabaseBase {
     idx: number
   ) {
     if (!child.name) {
-      child.name = getRandomString();
+      child.name ??= getRandomString();
     }
     child.parent = parentName;
     child.parentSchemaName = parentSchemaName;
     child.parentFieldname = field.fieldname;
-    child.idx = idx;
+    child.idx ??= idx;
   }
 
   async #addForeignKeys(schemaName: string, newForeignKeys: Field[]) {
@@ -878,14 +877,19 @@ export default class DatabaseCore extends DatabaseBase {
     fieldValueMap: FieldValueMap,
     isUpdate: boolean
   ) {
+    const parentName = fieldValueMap.name as string;
     const tableFields = this.#getTableFields(schemaName);
 
-    const parentName = fieldValueMap.name as string;
     for (const field of tableFields) {
       const added: string[] = [];
 
-      const tableFieldValue = (fieldValueMap[field.fieldname] ??
-        []) as FieldValueMap[];
+      const tableFieldValue = fieldValueMap[field.fieldname] as
+        | FieldValueMap[]
+        | undefined;
+      if (tableFieldValue === undefined) {
+        continue;
+      }
+
       for (const child of tableFieldValue) {
         this.#prepareChild(schemaName, parentName, child, field, added.length);
 
diff --git a/backend/database/tests/helpers.ts b/backend/database/tests/helpers.ts
index cdf4e634..9a58e3f1 100644
--- a/backend/database/tests/helpers.ts
+++ b/backend/database/tests/helpers.ts
@@ -24,6 +24,12 @@ const Customer = {
       fieldtype: 'Data',
       placeholder: 'john@thoe.com',
     },
+    {
+      fieldname: 'phone',
+      label: 'Phone',
+      fieldtype: 'Data',
+      placeholder: '9999999999',
+    },
   ],
   quickEditFields: ['email'],
   keywordFields: ['name'],
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index c4c27bdf..42c18f89 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -351,6 +351,26 @@ describe('DatabaseCore: CRUD', function () {
       `email check update ${firstRow.email}`
     );
 
+    const phone = '8149133530';
+    await sleep(1);
+    await db.update(schemaName, {
+      name,
+      phone,
+      modified: new Date().toISOString(),
+    });
+    rows = await db.knex!(schemaName);
+    firstRow = rows?.[0];
+    assert.strictEqual(
+      firstRow.email,
+      email,
+      `email check update ${firstRow.email}`
+    );
+    assert.strictEqual(
+      firstRow.phone,
+      phone,
+      `email check update ${firstRow.phone}`
+    );
+
     for (const key in metaValues) {
       const val = firstRow[key];
       const expected = metaValues[key as BaseMetaKey];
@@ -586,6 +606,17 @@ describe('DatabaseCore: CRUD', function () {
       }
     }
 
+    invoice.date = '2022-04-01';
+    invoice.modified = new Date().toISOString();
+    await db.update('SalesInvoice', {
+      name: invoice.name,
+      date: invoice.date,
+      modified: invoice.modified,
+    });
+
+    rows = await db.knex!(SalesInvoiceItem);
+    assert.strictEqual(rows.length, 2, `postupdate ct empty ${rows.length}`);
+
     await db.delete(SalesInvoice, invoice.name as string);
     rows = await db.getAll(SalesInvoiceItem);
     assert.strictEqual(rows.length, 0, `ct length delete ${rows.length}`);
diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index 43b046d5..991b8b22 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -87,20 +87,6 @@ export class DocHandler {
     return docMap?.[name];
   }
 
-  getCachedValue(
-    schemaName: string,
-    name: string,
-    fieldname: string
-  ): DocValue | Doc[] | undefined {
-    const docMap = this.docs[schemaName] as DocMap;
-    const doc = docMap[name];
-    if (doc === undefined) {
-      return;
-    }
-
-    return doc.get(fieldname);
-  }
-
   isDirty(schemaName: string, name: string): boolean {
     const doc = (this.docs?.[schemaName] as DocMap)?.[name];
     if (doc === undefined) {
diff --git a/fyo/index.ts b/fyo/index.ts
index 650d11b1..e8e590af 100644
--- a/fyo/index.ts
+++ b/fyo/index.ts
@@ -1,5 +1,6 @@
 import { getMoneyMaker, MoneyMaker } from 'pesa';
 import { Field } from 'schemas/types';
+import { getIsNullOrUndef } from 'utils';
 import { markRaw } from 'vue';
 import { AuthHandler } from './core/authHandler';
 import { DatabaseHandler } from './core/dbHandler';
@@ -166,6 +167,30 @@ export class Fyo {
     return schema?.fields.find((f) => f.fieldname === fieldname);
   }
 
+  async getValue(
+    schemaName: string,
+    name: string,
+    fieldname?: string
+  ): Promise<DocValue | Doc[]> {
+    if (fieldname === undefined && this.schemaMap[schemaName]?.isSingle) {
+      fieldname = name;
+      name = schemaName;
+    }
+
+    if (getIsNullOrUndef(name) || getIsNullOrUndef(fieldname)) {
+      return undefined;
+    }
+
+    let doc: Doc;
+    try {
+      doc = await this.doc.getDoc(schemaName, name);
+    } catch (err) {
+      return undefined;
+    }
+
+    return doc.get(fieldname!);
+  }
+
   purgeCache() {
     this.pesa = getMoneyMaker({
       currency: DEFAULT_CURRENCY,
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index ae9f88e7..6d1679d9 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -2,12 +2,7 @@ import { Fyo } from 'fyo';
 import { DocValue, DocValueMap } from 'fyo/core/types';
 import { Verb } from 'fyo/telemetry/types';
 import { DEFAULT_USER } from 'fyo/utils/consts';
-import {
-  ConflictError,
-  MandatoryError,
-  NotFoundError,
-  ValidationError
-} from 'fyo/utils/errors';
+import { ConflictError, MandatoryError, NotFoundError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
 import Money from 'pesa/dist/types/src/money';
 import {
@@ -25,7 +20,7 @@ import {
   getMissingMandatoryMessage,
   getPreDefaultValues,
   setChildDocIdx,
-  shouldApplyFormula,
+  shouldApplyFormula
 } from './helpers';
 import { setName } from './naming';
 import {
@@ -42,7 +37,7 @@ import {
   ReadOnlyMap,
   RequiredMap,
   TreeViewSettings,
-  ValidationMap,
+  ValidationMap
 } from './types';
 import { validateOptions, validateRequired } from './validationFunction';
 
@@ -65,11 +60,6 @@ export class Doc extends Observable<DocValue | Doc[]> {
   _dirty: boolean = true;
   _notInserted: boolean = true;
 
-  flags = {
-    submitAction: false,
-    revertAction: false,
-  };
-
   constructor(schema: Schema, data: DocValueMap, fyo: Fyo) {
     super();
     this.fyo = markRaw(fyo);
@@ -469,21 +459,18 @@ export class Doc extends Observable<DocValue | Doc[]> {
     this._notInserted = true;
   }
 
-  _setChildIdx() {
+  _setChildDocsIdx() {
     const childFields = this.schema.fields.filter(
       (f) => f.fieldtype === FieldTypeEnum.Table
     ) as TargetField[];
 
     for (const field of childFields) {
       const childDocs = (this.get(field.fieldname) as Doc[]) ?? [];
-
-      for (let i = 0; i < childDocs.length; i++) {
-        childDocs[i].idx = i;
-      }
+      setChildDocIdx(childDocs);
     }
   }
 
-  async _compareWithCurrentDoc() {
+  async _validateDbNotModified() {
     if (this.notInserted || !this.name || this.schema.isSingle) {
       return;
     }
@@ -499,21 +486,6 @@ export class Doc extends Observable<DocValue | Doc[]> {
           ` ${dbModified}, ${docModified}`
       );
     }
-
-    if (this.submitted && !this.schema.isSubmittable) {
-      throw new ValidationError(
-        this.fyo.t`Document type ${this.schemaName} is not submittable`
-      );
-    }
-
-    // set submit action flag
-    if (this.submitted && !dbValues.submitted) {
-      this.flags.submitAction = true;
-    }
-
-    if (dbValues.submitted && !this.submitted) {
-      this.flags.revertAction = true;
-    }
   }
 
   async _applyFormula(fieldname?: string): Promise<boolean> {
@@ -587,17 +559,16 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return value;
   }
 
-  async _commit() {
-    // re-run triggers
-    this._setChildIdx();
+  async _preSync() {
+    this._setChildDocsIdx();
     await this._applyFormula();
-    await this.trigger('validate', null);
+    await this.trigger('validate');
   }
 
   async _insert() {
     await setName(this, this.fyo);
     this._setBaseMetaValues();
-    await this._commit();
+    await this._preSync();
     await this._validateInsert();
 
     const oldName = this.name!;
@@ -613,24 +584,14 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async _update() {
-    await this._compareWithCurrentDoc();
-    await this._commit();
-
-    // before submit
-    if (this.flags.submitAction) await this.trigger('beforeSubmit');
-    if (this.flags.revertAction) await this.trigger('beforeRevert');
-
-    // update modifiedBy and modified
+    await this._validateDbNotModified();
+    await this._preSync();
     this._updateModifiedMetaValues();
 
     const data = this.getValidDict();
     await this.fyo.db.update(this.schemaName, data);
     this._syncValues(data);
 
-    // after submit
-    if (this.flags.submitAction) await this.trigger('afterSubmit');
-    if (this.flags.revertAction) await this.trigger('afterRevert');
-
     return this;
   }
 
@@ -657,29 +618,35 @@ export class Doc extends Observable<DocValue | Doc[]> {
     this.fyo.doc.observer.trigger(`delete:${this.schemaName}`, this.name);
   }
 
-  async _submitOrRevert(isSubmit: boolean) {
-    const wasSubmitted = this.submitted;
-    this.submitted = isSubmit;
-    try {
-      await this.sync();
-    } catch (e) {
-      this.submitted = wasSubmitted;
-      throw e;
-    }
-  }
-
   async submit() {
-    this.cancelled = false;
-    await this._submitOrRevert(true);
+    if (!this.schema.isSubmittable || this.cancelled) {
+      return;
+    }
+
+    await this.trigger('beforeSubmit');
+    await this.setAndSync('submitted', true);
+    await this.trigger('afterSubmit');
+
     this.fyo.doc.observer.trigger(`submit:${this.schemaName}`, this.name);
   }
 
-  async revert() {
-    await this._submitOrRevert(false);
-    this.fyo.doc.observer.trigger(`revert:${this.schemaName}`, this.name);
+  async cancel() {
+    if (!this.schema.isSubmittable || !this.submitted) {
+      return;
+    }
+
+    await this.trigger('beforeCancel');
+    await this.setAndSync('cancelled', true);
+    await this.trigger('afterCancel');
+
+    this.fyo.doc.observer.trigger(`cancel:${this.schemaName}`, this.name);
   }
 
   async rename(newName: string) {
+    if (this.submitted) {
+      return;
+    }
+
     await this.trigger('beforeRename');
     await this.fyo.db.rename(this.schemaName, this.name!, newName);
     this.name = newName;
@@ -720,14 +687,6 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return sum;
   }
 
-  getFrom(schemaName: string, name: string, fieldname: string) {
-    if (name === undefined || fieldname === undefined) {
-      return '';
-    }
-
-    return this.fyo.doc.getCachedValue(schemaName, name, fieldname);
-  }
-
   async setAndSync(fieldname: string | DocValueMap, value?: DocValue | Doc[]) {
     await this.set(fieldname, value);
     return await this.sync();
@@ -774,8 +733,8 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async afterDelete() {}
   async beforeSubmit() {}
   async afterSubmit() {}
-  async beforeRevert() {}
-  async afterRevert() {}
+  async beforeCancel() {}
+  async afterCancel() {}
 
   formulas: FormulaMap = {};
   validations: ValidationMap = {};
diff --git a/fyo/models/NumberSeries.ts b/fyo/models/NumberSeries.ts
index f8759f4a..1f5f926f 100644
--- a/fyo/models/NumberSeries.ts
+++ b/fyo/models/NumberSeries.ts
@@ -5,15 +5,17 @@ function getPaddedName(prefix: string, next: number, padZeros: number): string {
 }
 
 export default class NumberSeries extends Doc {
-  validate() {
-    const current = this.get('current') as number | null;
-    if (current) {
-      this.current = this.get('start');
+  setCurrent() {
+    let current = this.get('current') as number | null;
+    if (!current) {
+      current = this.get('start') as number;
     }
+
+    this.current = current;
   }
 
   async next(schemaName: string) {
-    this.validate();
+    this.setCurrent();
 
     const exists = await this.checkIfCurrentExists(schemaName);
     if (!exists) {
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index ec3bc999..4138f087 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -3,7 +3,9 @@ import { Doc } from 'fyo/model/doc';
 import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
 import { getExchangeRate } from 'models/helpers';
 import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
+import { ModelNameEnum } from 'models/types';
 import Money from 'pesa/dist/types/src/money';
+import { getIsNullOrUndef } from 'utils';
 import { Party } from '../Party/Party';
 import { Payment } from '../Payment/Payment';
 import { Tax } from '../Tax/Tax';
@@ -63,7 +65,7 @@ export abstract class Invoice extends Doc {
     await party.updateOutstandingAmount();
   }
 
-  async afterRevert() {
+  async afterCancel() {
     const paymentRefList = await this.getPayments();
     for (const paymentFor of paymentRefList) {
       const paymentReference = paymentFor.parent;
@@ -89,18 +91,20 @@ export abstract class Invoice extends Doc {
   }
 
   async getExchangeRate() {
-    if (!this.currency) return 1.0;
+    if (!this.currency) {
+      return 1.0;
+    }
 
-    const accountingSettings = await this.fyo.doc.getSingle(
-      'AccountingSettings'
+    const currency = await this.fyo.getValue(
+      ModelNameEnum.SystemSettings,
+      'currency'
     );
-    const companyCurrency = accountingSettings.currency;
-    if (this.currency === companyCurrency) {
+    if (this.currency === currency) {
       return 1.0;
     }
     return await getExchangeRate({
       fromCurrency: this.currency!,
-      toCurrency: companyCurrency as string,
+      toCurrency: currency as string,
     });
   }
 
@@ -163,14 +167,28 @@ export abstract class Invoice extends Doc {
 
   formulas: FormulaMap = {
     account: {
-      formula: async () =>
-        this.getFrom('Party', this.party!, 'defaultAccount') as string,
+      formula: async () => {
+        return (await this.fyo.getValue(
+          'Party',
+          this.party!,
+          'defaultAccount'
+        )) as string;
+      },
       dependsOn: ['party'],
     },
     currency: {
-      formula: async () =>
-        (this.getFrom('Party', this.party!, 'currency') as string) ||
-        (this.fyo.singles.AccountingSettings!.currency as string),
+      formula: async () => {
+        const currency = (await this.fyo.getValue(
+          'Party',
+          this.party!,
+          'currency'
+        )) as string;
+
+        if (!getIsNullOrUndef(currency)) {
+          return currency;
+        }
+        return this.fyo.singles.SystemSettings!.currency as string;
+      },
       dependsOn: ['party'],
     },
     exchangeRate: { formula: async () => await this.getExchangeRate() },
@@ -199,6 +217,9 @@ export abstract class Invoice extends Doc {
   };
 
   static filters: FiltersMap = {
+    party: (doc: Doc) => ({
+      role: ['in', [doc.isSales ? 'Customer' : 'Supplier', 'Both']],
+    }),
     account: (doc: Doc) => ({
       isGroup: false,
       accountType: doc.isSales ? 'Receivable' : 'Payable',
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index 9b9ab550..1177af97 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -17,23 +17,23 @@ export abstract class InvoiceItem extends Doc {
 
   formulas: FormulaMap = {
     description: {
-      formula: () =>
-        this.parentdoc!.getFrom(
+      formula: async () =>
+        (await this.fyo.getValue(
           'Item',
           this.item as string,
           'description'
-        ) as string,
+        )) as string,
       dependsOn: ['item'],
     },
     rate: {
       formula: async () => {
-        const baseRate = ((await this.parentdoc!.getFrom(
+        const rate = (await this.fyo.getValue(
           'Item',
           this.item as string,
           'rate'
-        )) || this.fyo.pesa(0)) as Money;
+        )) as undefined | Money;
 
-        return baseRate.div(this.exchangeRate!);
+        return rate ?? this.fyo.pesa(0);
       },
       dependsOn: ['item'],
     },
@@ -48,25 +48,17 @@ export abstract class InvoiceItem extends Doc {
         if (this.isSales) {
           accountType = 'incomeAccount';
         }
-        return this.parentdoc!.getFrom(
-          'Item',
-          this.item as string,
-          accountType
-        );
+        return this.fyo.getValue('Item', this.item as string, accountType);
       },
       dependsOn: ['item'],
     },
     tax: {
-      formula: () => {
-        if (this.tax) {
-          return this.tax as string;
-        }
-
-        return this.parentdoc!.getFrom(
+      formula: async () => {
+        return (await this.fyo.getValue(
           'Item',
           this.item as string,
           'tax'
-        ) as string;
+        )) as string;
       },
       dependsOn: ['item'],
     },
@@ -80,8 +72,8 @@ export abstract class InvoiceItem extends Doc {
       dependsOn: ['item', 'amount', 'rate', 'quantity'],
     },
     hsnCode: {
-      formula: () =>
-        this.parentdoc!.getFrom('Item', this.item as string, 'hsnCode'),
+      formula: async () =>
+        await this.fyo.getValue('Item', this.item as string, 'hsnCode'),
       dependsOn: ['item'],
     },
   };
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index 0a9f1cc1..d498186c 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -40,7 +40,7 @@ export class JournalEntry extends Doc {
     await this.getPosting().post();
   }
 
-  async afterRevert() {
+  async afterCancel() {
     await this.getPosting().postReverse();
   }
 
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 5d4038f7..d85cae5d 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -69,14 +69,17 @@ export class Party extends Doc {
       dependsOn: ['role'],
     },
     currency: {
-      formula: async () =>
-        this.fyo.singles.AccountingSettings!.currency as string,
+      formula: async () => this.fyo.singles.SystemSettings!.currency as string,
     },
     address: {
       formula: async () => {
         const address = this.address as string | undefined;
         if (address) {
-          return this.getFrom('Address', address, 'addressDisplay') as string;
+          return (await this.fyo.getValue(
+            'Address',
+            address,
+            'addressDisplay'
+          )) as string;
         }
         return '';
       },
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 8017f48b..dfe221b0 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -256,7 +256,7 @@ export class Payment extends Doc {
     }
   }
 
-  async afterRevert() {
+  async afterCancel() {
     this.updateReferenceOutstandingAmount();
     const entryList = await this.getPosting();
     for (const entry of entryList) {
@@ -391,11 +391,11 @@ export class Payment extends Doc {
           render(doc) {
             let status = 'Draft';
             let color = 'gray';
-            if (doc.submitted === 1) {
+            if (doc.submitted) {
               color = 'green';
               status = 'Submitted';
             }
-            if (doc.cancelled === 1) {
+            if (doc.cancelled) {
               color = 'red';
               status = 'Cancelled';
             }
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index d9442f43..655047be 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -10,11 +10,11 @@ export class PaymentFor extends Doc {
           return this.fyo.pesa(0);
         }
 
-        const outstandingAmount = this.parentdoc!.getFrom(
+        const outstandingAmount = (await this.fyo.getValue(
           this.referenceType as string,
           this.referenceName as string,
           'outstandingAmount'
-        ) as Money;
+        )) as Money;
 
         if (outstandingAmount) {
           return outstandingAmount;
diff --git a/schemas/tests/Party.json b/schemas/tests/Party.json
index ae18d0fc..a95fb656 100644
--- a/schemas/tests/Party.json
+++ b/schemas/tests/Party.json
@@ -15,6 +15,28 @@
       "label": "Image",
       "fieldtype": "AttachImage"
     },
+    {
+      "fieldname": "role",
+      "label": "Role",
+      "fieldtype": "Select",
+      "default": "Both",
+      "options": [
+        {
+          "value": "Both",
+          "label": "Both"
+        },
+        {
+          "value": "Supplier",
+          "label": "Supplier"
+        },
+        {
+          "value": "Customer",
+          "label": "Customer"
+        }
+      ],
+      "readOnly": true,
+      "required": true
+    },
     {
       "fieldname": "defaultAccount",
       "label": "Default Account",
diff --git a/schemas/tests/testSchemaBuilder.spec.ts b/schemas/tests/testSchemaBuilder.spec.ts
index 31cac186..63acfc99 100644
--- a/schemas/tests/testSchemaBuilder.spec.ts
+++ b/schemas/tests/testSchemaBuilder.spec.ts
@@ -31,14 +31,14 @@ describe('Schema Builder', function () {
       assert.strictEqual(appSchemaMap.Account.fields?.length, 6);
       assert.strictEqual(appSchemaMap.JournalEntry.fields?.length, 8);
       assert.strictEqual(appSchemaMap.JournalEntryAccount.fields?.length, 3);
-      assert.strictEqual(appSchemaMap.Party.fields?.length, 8);
+      assert.strictEqual(appSchemaMap.Party.fields?.length, 9);
       assert.strictEqual(appSchemaMap.Customer.fields?.length, undefined);
       assert.strictEqual(regionalSchemaMap.Party.fields?.length, 2);
     });
 
     specify('Quick Edit Field Counts', function () {
       assert.strictEqual(appSchemaMap.Party.quickEditFields?.length, 5);
-      assert.strictEqual(regionalSchemaMap.Party.quickEditFields?.length, 7);
+      assert.strictEqual(regionalSchemaMap.Party.quickEditFields?.length, 8);
     });
   });
 
@@ -48,11 +48,11 @@ describe('Schema Builder', function () {
   );
   describe('Regional Combined Schemas', function () {
     specify('Field Counts', function () {
-      assert.strictEqual(regionalCombined.Party.fields?.length, 10);
+      assert.strictEqual(regionalCombined.Party.fields?.length, 11);
     });
 
     specify('Quick Edit Field Counts', function () {
-      assert.strictEqual(regionalSchemaMap.Party.quickEditFields?.length, 7);
+      assert.strictEqual(regionalSchemaMap.Party.quickEditFields?.length, 8);
     });
 
     specify('Schema Equality with App Schemas', function () {
@@ -95,11 +95,11 @@ describe('Schema Builder', function () {
     });
 
     specify('Field Counts', function () {
-      assert.strictEqual(abstractCombined.Customer!.fields?.length, 10);
+      assert.strictEqual(abstractCombined.Customer!.fields?.length, 11);
     });
 
     specify('Quick Edit Field Counts', function () {
-      assert.strictEqual(abstractCombined.Customer!.quickEditFields?.length, 7);
+      assert.strictEqual(abstractCombined.Customer!.quickEditFields?.length, 8);
     });
 
     specify('Schema Equality with App Schemas', function () {
diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index f4eb00a8..566ce218 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -23,6 +23,7 @@
       >
         <input
           ref="input"
+          spellcheck="false"
           :class="inputClasses"
           type="text"
           :value="linkValue"
diff --git a/src/components/Controls/Base.vue b/src/components/Controls/Base.vue
index 1c58e307..ee5300cf 100644
--- a/src/components/Controls/Base.vue
+++ b/src/components/Controls/Base.vue
@@ -4,6 +4,7 @@
       {{ df.label }}
     </div>
     <input
+      spellcheck="false"
       ref="input"
       :class="inputClasses"
       :type="inputType"
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index bba5dc7e..a4b9b6b7 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -144,7 +144,7 @@ export default {
         return (this.maxHeight = '');
       }
 
-      const rowHeight = this.$refs?.['table-row']?.[0].$el.offsetHeight;
+      const rowHeight = this.$refs?.['table-row']?.[0]?.$el.offsetHeight;
       if (rowHeight === undefined) {
         return (this.maxHeight = '');
       }
diff --git a/src/components/Widgets/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
index 0b831a0e..3115505b 100644
--- a/src/components/Widgets/PartyWidget.vue
+++ b/src/components/Widgets/PartyWidget.vue
@@ -1,46 +1,52 @@
 <template>
   <div class="py-4" v-if="pendingInvoices.length">
-    <div class="px-4 text-sm text-gray-600 mb-1">
+    <div class="px-4 text-sm text-gray-600">
       {{ t`Recent Invoices` }}
     </div>
+
+    <!-- Invoice List -->
     <div
-      class="px-4 py-3 border-b hover:bg-gray-100 cursor-pointer"
+      class="px-4 py-3 border-b hover:bg-gray-100 cursor-pointer text-base"
       v-for="invoice in pendingInvoices"
       :key="invoice.name"
       @click="routeToForm(invoice)"
     >
-      <div class="text-base">
-        <div class="flex justify-between items-center mb-1">
-          <span class="font-medium">
-            {{ invoice.name }}
+      <!-- Invoice Name & Status -->
+      <div class="flex justify-between items-center mb-1">
+        <span class="font-medium">
+          {{ invoice.name }}
+        </span>
+        <span>
+          <component :is="getStatusBadge(invoice)" />
+        </span>
+      </div>
+
+      <!-- Invoice Date & Amount -->
+      <div class="flex justify-between">
+        <span>
+          {{ fyo.format(invoice.date, getInvoiceField(invoice, 'date')) }}
+        </span>
+        <div>
+          <!-- Paid Amount -->
+          <span class="font-medium text-gray-900">
+            {{
+              fyo.format(
+                amountPaid(invoice),
+                getInvoiceField(invoice, 'baseGrandTotal')
+              )
+            }}
           </span>
-          <span>
-            <component :is="getStatusBadge(invoice)" />
+
+          <!-- Outstanding Amount -->
+          <span class="text-gray-600" v-if="!fullyPaid(invoice)">
+            ({{
+              fyo.format(
+                invoice.outstandingAmount,
+                getInvoiceField(invoice, 'outstandingAmount')
+              )
+            }})
           </span>
         </div>
-        <div class="flex justify-between">
-          <span>
-            {{ fyo.format(invoice.date, getInvoiceField(invoice, 'date')) }}
-          </span>
-          <div>
-            <span class="font-medium text-gray-900">
-              {{
-                fyo.format(
-                  amountPaid(invoice),
-                  getInvoiceField(invoice, 'baseGrandTotal')
-                )
-              }}
-            </span>
-            <span class="text-gray-600" v-if="!fullyPaid(invoice)">
-              ({{
-                fyo.format(
-                  invoice.outstandingAmount,
-                  getInvoiceField(invoice, 'outstandingAmount')
-                )
-              }})
-            </span>
-          </div>
-        </div>
       </div>
     </div>
   </div>
@@ -52,7 +58,7 @@ import { PartyRoleEnum } from 'models/baseModels/Party/types';
 import { getTransactionStatusColumn } from 'models/helpers';
 import { ModelNameEnum } from 'models/types';
 import { fyo } from 'src/initFyo';
-import { routeTo } from 'src/utils';
+import { routeTo } from 'src/utils/ui';
 
 export default {
   name: 'PartyWidget',
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 029e8630..0e6021ff 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -13,18 +13,18 @@
       </Button>
       <DropdownWithActions :actions="actions" />
       <Button
-        v-if="showSave"
+        v-if="doc?.notInserted || doc?.dirty"
         type="primary"
         class="text-white text-xs"
-        @click="onSaveClick"
+        @click="sync"
       >
         {{ t`Save` }}
       </Button>
       <Button
-        v-if="!doc.dirty && !doc.notInserted && !doc?.submitted"
+        v-if="!doc?.dirty && !doc?.notInserted && !doc?.submitted"
         type="primary"
         class="text-white text-xs"
-        @click="onSubmitClick"
+        @click="submit"
         >{{ t`Submit` }}</Button
       >
     </PageHeader>
@@ -155,7 +155,7 @@
             />
 
             <!-- Totals -->
-            <div class="w-1/2 gap-2 flex flex-col self-end">
+            <div class="w-1/2 gap-2 flex flex-col self-end ml-auto">
               <!-- Subtotal -->
               <div class="flex justify-between">
                 <div>{{ t`Subtotal` }}</div>
@@ -267,9 +267,6 @@ export default {
     address() {
       return this.printSettings && this.printSettings.getLink('address');
     },
-    showSave() {
-      return this.doc && (this.doc.notInserted || this.doc.dirty);
-    },
     actions() {
       return getActionsForDocument(this.doc);
     },
@@ -307,15 +304,11 @@ export default {
     getField(fieldname) {
       return fyo.getField(this.schemaName, fieldname);
     },
-    async onSaveClick() {
-      await this.doc.set(
-        'items',
-        this.doc.items.filter((row) => row.item)
-      );
+    async sync() {
       return this.doc.sync().catch(this.handleError);
     },
-    onSubmitClick() {
-      let message =
+    submit() {
+      const message =
         this.schemaName === ModelNameEnum.SalesInvoice
           ? this.t`Are you sure you want to submit this Sales Invoice?`
           : this.t`Are you sure you want to submit this Purchase Invoice?`;
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index e8356445..dc0a955c 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -6,7 +6,7 @@
         <StatusBadge :status="status" />
         <DropdownWithActions :actions="actions" />
         <Button
-          v-if="doc.notInserted || doc.dirty"
+          v-if="doc?.notInserted || doc?.dirty"
           type="primary"
           class="text-white text-xs"
           @click="sync"
@@ -120,6 +120,7 @@
           <div class="flex justify-between text-base m-6 gap-12">
             <!-- User Remark -->
             <FormControl
+              v-if="!doc.submitted || doc.userRemark"
               class="w-1/2 self-end"
               input-class="bg-gray-100"
               :df="getField('userRemark')"
@@ -130,7 +131,9 @@
             />
 
             <!-- Debit and Credit -->
-            <div class="w-1/2 gap-2 flex flex-col self-end font-semibold">
+            <div
+              class="w-1/2 gap-2 flex flex-col self-end font-semibold ml-auto"
+            >
               <div class="flex justify-between text-green-600">
                 <div>{{ t`Total Debit` }}</div>
                 <div>{{ totalDebit }}</div>
@@ -158,9 +161,9 @@ import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
 import { fyo } from 'src/initFyo';
 import {
-getActionsForDocument,
-routeTo,
-showMessageDialog
+  getActionsForDocument,
+  routeTo,
+  showMessageDialog,
 } from 'src/utils/ui';
 import { handleErrorWithDialog } from '../errorHandling';
 
@@ -173,8 +176,8 @@ export default {
     DropdownWithActions,
     StatusBadge,
     FormControl,
-    Table
-},
+    Table,
+  },
   provide() {
     return {
       schemaName: this.schemaName,
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 1b9e4406..2344dda0 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -48,10 +48,10 @@
 <script>
 import { ipcRenderer } from 'electron';
 import { Verb } from 'fyo/telemetry/types';
-import Button from 'src/components/Button';
-import PageHeader from 'src/components/PageHeader';
-import SearchBar from 'src/components/SearchBar';
-import TwoColumnForm from 'src/components/TwoColumnForm';
+import Button from 'src/components/Button.vue';
+import PageHeader from 'src/components/PageHeader.vue';
+import InvoiceTemplate from 'src/components/SalesInvoice/InvoiceTemplate.vue';
+import TwoColumnForm from 'src/components/TwoColumnForm.vue';
 import { makePDF } from 'src/utils';
 import { IPC_ACTIONS } from 'utils/messages';
 
@@ -60,7 +60,6 @@ export default {
   props: { schemaName: String, name: String },
   components: {
     PageHeader,
-    SearchBar,
     Button,
     TwoColumnForm,
   },
@@ -73,14 +72,11 @@ export default {
   },
   async mounted() {
     this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
-    this.printSettings = await fyo.getSingle('PrintSettings');
+    this.printSettings = await fyo.doc.getSingle('PrintSettings');
   },
   computed: {
-    meta() {
-      return fyo.getMeta(this.schemaName);
-    },
     printTemplate() {
-      return this.meta.printTemplate;
+      return InvoiceTemplate
     },
   },
   methods: {
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 15583715..f0fb35f9 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -130,7 +130,7 @@ function getReportList(): SearchItem[] {
 }
 
 function getListViewList(): SearchItem[] {
-  const standardLists = [
+  let schemaNames = [
     ModelNameEnum.Account,
     ModelNameEnum.Party,
     ModelNameEnum.Payment,
@@ -138,7 +138,12 @@ function getListViewList(): SearchItem[] {
     ModelNameEnum.PurchaseInvoice,
     ModelNameEnum.SalesInvoice,
     ModelNameEnum.Tax,
-  ]
+  ];
+
+  if (fyo.store.isDevelopment) {
+    schemaNames = Object.keys(fyo.schemaMap) as ModelNameEnum[];
+  }
+  const standardLists = schemaNames
     .map((s) => fyo.schemaMap[s])
     .filter((s) => s && !s.isChild && !s.isSingle)
     .map(
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index daf888eb..7e09cd3f 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -214,14 +214,10 @@ export async function cancelDocWithPrompt(doc: Doc) {
           label: t`Yes`,
           async action() {
             const entryDoc = await fyo.doc.getDoc(doc.schemaName, doc.name!);
-            entryDoc.cancelled = 1;
-            await entryDoc.sync();
             entryDoc
-              .revert()
+              .cancel()
               .then(() => resolve(true))
-              .catch((e) => {
-                handleErrorWithDialog(e, doc);
-              });
+              .catch((e) => handleErrorWithDialog(e, doc));
           },
         },
         {
@@ -262,7 +258,7 @@ function getCancelAction(doc: Doc): Action {
     component: {
       template: '<span class="text-red-700">{{ t`Cancel` }}</span>',
     },
-    condition: (doc: Doc) => !!(doc.submitted && !doc.cancelled),
+    condition: (doc: Doc) => !doc.cancelled,
     action: () => {
       cancelDocWithPrompt(doc).then((res) => {
         if (res) {

From 8c19f51814f967babb96333e957079dd4a066e6d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 2 May 2022 16:26:47 +0530
Subject: [PATCH 086/163] incr: get printview to display - printing still not
 working

---
 main.ts                                       |  2 +-
 models/baseModels/Party/Party.ts              |  2 +-
 .../Templates/{Base.vue => BaseTemplate.vue}  | 12 ++++----
 .../SalesInvoice/Templates/Basic.vue          | 28 +++++++++++++------
 .../SalesInvoice/Templates/Business.vue       |  2 +-
 .../SalesInvoice/Templates/Minimal.vue        |  2 +-
 src/pages/ListView/List.vue                   |  8 +++++-
 src/pages/PrintView/PrintView.vue             | 10 +++++--
 src/{saveHtmlAsPdf.js => saveHtmlAsPdf.ts}    | 17 ++++++-----
 9 files changed, 53 insertions(+), 30 deletions(-)
 rename src/components/SalesInvoice/Templates/{Base.vue => BaseTemplate.vue} (73%)
 rename src/{saveHtmlAsPdf.js => saveHtmlAsPdf.ts} (75%)

diff --git a/main.ts b/main.ts
index b6409afb..25b9fc9a 100644
--- a/main.ts
+++ b/main.ts
@@ -18,7 +18,7 @@ import registerProcessListeners from './main/registerProcessListeners';
 import { IPC_CHANNELS } from './utils/messages';
 
 const WIDTH = 1200;
-const HEIGHT = 907;
+const HEIGHT = 900;
 
 export class Main {
   title: string = 'Frappe Books';
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index d85cae5d..c5b96f4d 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -110,7 +110,7 @@ export class Party extends Doc {
 
   static getListViewSettings(): ListViewSettings {
     return {
-      columns: ['name', 'phone', 'outstandingAmount'],
+      columns: ['name', 'email', 'phone', 'outstandingAmount'],
     };
   }
 
diff --git a/src/components/SalesInvoice/Templates/Base.vue b/src/components/SalesInvoice/Templates/BaseTemplate.vue
similarity index 73%
rename from src/components/SalesInvoice/Templates/Base.vue
rename to src/components/SalesInvoice/Templates/BaseTemplate.vue
index 3b2ff1a3..de35d665 100644
--- a/src/components/SalesInvoice/Templates/Base.vue
+++ b/src/components/SalesInvoice/Templates/BaseTemplate.vue
@@ -2,13 +2,13 @@
 import { fyo } from 'src/initFyo';
 export default {
   name: 'Base',
-  props: ['doc', 'printSettings'],
+  props: { doc: Object, printSettings: Object },
   data: () => ({ party: null, companyAddress: null }),
   methods: {
     format(row, fieldname) {
-      let value = row.get(fieldname);
-      return fyo.format(value, row.meta.getField(fieldname));
-    }
+      const value = row.get(fieldname);
+      return fyo.format(value, fyo.getField(row.schemaName, fieldname));
+    },
   },
   async mounted() {
     await this.doc.loadLink('party');
@@ -19,7 +19,7 @@ export default {
   computed: {
     isSalesInvoice() {
       return this.doc.schemaName === 'SalesInvoice';
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/components/SalesInvoice/Templates/Basic.vue b/src/components/SalesInvoice/Templates/Basic.vue
index e8d3e093..74b9610a 100644
--- a/src/components/SalesInvoice/Templates/Basic.vue
+++ b/src/components/SalesInvoice/Templates/Basic.vue
@@ -23,7 +23,12 @@
           </div>
           <div class="w-1/3">
             <div v-if="companyAddress">{{ companyAddress.addressDisplay }}</div>
-            <div v-if="fyo.singles.AccountingSettings && fyo.singles.AccountingSettings.gstin">
+            <div
+              v-if="
+                fyo.singles.AccountingSettings &&
+                fyo.singles.AccountingSettings.gstin
+              "
+            >
               GSTIN: {{ fyo.singles.AccountingSettings.gstin }}
             </div>
           </div>
@@ -85,11 +90,7 @@
     </div>
     <div class="px-6 mt-2 flex justify-end text-base">
       <div class="w-1/2 bg-pink">
-        <div
-          class="text-sm tracking-widest text-gray-600 mt-2"
-        >
-          Notes
-        </div>
+        <div class="text-sm tracking-widest text-gray-600 mt-2">Notes</div>
         <div class="my-4 text-lg whitespace-pre-line">
           {{ doc.terms }}
         </div>
@@ -108,7 +109,16 @@
           <div>{{ fyo.format(tax.amount, 'Currency') }}</div>
         </div>
         <div
-          class="flex pl-2 justify-between py-3 border-t text-green-600 font-semibold text-base"
+          class="
+            flex
+            pl-2
+            justify-between
+            py-3
+            border-t
+            text-green-600
+            font-semibold
+            text-base
+          "
         >
           <div>{{ t`Grand Total` }}</div>
           <div>{{ fyo.format(doc.grandTotal, 'Currency') }}</div>
@@ -119,11 +129,11 @@
 </template>
 
 <script>
-import Base from './Base';
+import Base from './BaseTemplate.vue';
 
 export default {
   name: 'Default',
   extends: Base,
-  props: ['doc', 'printSettings']
+  props: ['doc', 'printSettings'],
 };
 </script>
diff --git a/src/components/SalesInvoice/Templates/Business.vue b/src/components/SalesInvoice/Templates/Business.vue
index 2775094b..9fc4661f 100644
--- a/src/components/SalesInvoice/Templates/Business.vue
+++ b/src/components/SalesInvoice/Templates/Business.vue
@@ -128,7 +128,7 @@
 </template>
 
 <script>
-import Base from './Base';
+import Base from './BaseTemplate.vue';
 
 export default {
   name: 'Business',
diff --git a/src/components/SalesInvoice/Templates/Minimal.vue b/src/components/SalesInvoice/Templates/Minimal.vue
index 52ba27c2..cc8dd323 100644
--- a/src/components/SalesInvoice/Templates/Minimal.vue
+++ b/src/components/SalesInvoice/Templates/Minimal.vue
@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import Base from './Base';
+import Base from './BaseTemplate.vue';
 
 export default {
   name: 'Minimal',
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index 47756eee..9868260d 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -101,7 +101,13 @@ export default {
       }
 
       return columns
-        .map((fieldname) => fyo.getField(this.schemaName, fieldname))
+        .map((fieldname) => {
+          if (typeof fieldname === 'object') {
+            return fieldname;
+          }
+
+          return fyo.getField(this.schemaName, fieldname);
+        })
         .filter(Boolean);
     },
     hasImage() {
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 2344dda0..155a0b63 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -12,6 +12,8 @@
           {{ t`Save as PDF` }}
         </Button>
       </PageHeader>
+
+      <!-- Printview Preview -->
       <div
         v-if="doc && printSettings"
         class="flex justify-center flex-1 -mt-36 overflow-auto relative"
@@ -34,6 +36,8 @@
         </div>
       </div>
     </div>
+
+    <!-- Printview Customizer -->
     <div class="border-l w-80" v-if="showCustomiser">
       <div class="mt-4 px-4 flex items-center justify-between">
         <h2 class="font-semibold">{{ t`Customise` }}</h2>
@@ -52,7 +56,7 @@ import Button from 'src/components/Button.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import InvoiceTemplate from 'src/components/SalesInvoice/InvoiceTemplate.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm.vue';
-import { makePDF } from 'src/utils';
+import { makePDF } from 'src/utils/ipcCalls';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
@@ -76,7 +80,7 @@ export default {
   },
   computed: {
     printTemplate() {
-      return InvoiceTemplate
+      return InvoiceTemplate;
     },
   },
   methods: {
@@ -86,7 +90,7 @@ export default {
 
       const html = this.$refs.printContainer.innerHTML;
       fyo.telemetry.log(Verb.Exported, 'SalesInvoice', { extension: 'pdf' });
-      makePDF(html, savePath);
+      await makePDF(html, savePath);
     },
     async getSavePath() {
       const options = {
diff --git a/src/saveHtmlAsPdf.js b/src/saveHtmlAsPdf.ts
similarity index 75%
rename from src/saveHtmlAsPdf.js
rename to src/saveHtmlAsPdf.ts
index 5ca7817d..ead6de7a 100644
--- a/src/saveHtmlAsPdf.js
+++ b/src/saveHtmlAsPdf.ts
@@ -10,7 +10,10 @@ const PRINT_OPTIONS = {
   printSelectionOnly: false,
 };
 
-export default async function makePDF(html, savePath) {
+export default async function saveHtmlAsPdf(
+  html: string,
+  savePath: string
+): Promise<void> {
   const printWindow = getInitializedPrintWindow();
 
   printWindow.webContents.executeJavaScript(`
@@ -22,9 +25,7 @@ export default async function makePDF(html, savePath) {
       await sleep(1); // Required else pdf'll be blank.
 
       const data = await printWindow.webContents.printToPDF(PRINT_OPTIONS);
-      await fs.writeFile(savePath, data, (error) => {
-        if (error) throw error;
-      });
+      await fs.writeFile(savePath, data);
 
       resolve();
     });
@@ -38,15 +39,17 @@ function getInitializedPrintWindow() {
     show: false,
     webPreferences: {
       contextIsolation: false,
-      nodeIntegration: process.env.ELECTRON_NODE_INTEGRATION,
+      nodeIntegration: false,
     },
   });
-  printWindow.loadURL(getPrintWindowUrl());
+  const printWindowUrl = getPrintWindowUrl();
+  printWindow.loadURL(printWindowUrl);
   return printWindow;
 }
 
 function getPrintWindowUrl() {
-  let url = global.WEBPACK_DEV_SERVER_URL;
+  // @ts-ignore
+  let url = global.WEBPACK_DEV_SERVER_URL as string | undefined;
   if (url) {
     url = url + 'print';
   } else {

From 9a012207f1317149078a15700eaf1d7057130e52 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 2 May 2022 20:47:14 +0530
Subject: [PATCH 087/163] incr: clean up coa markup, show balance on leaf ac

---
 fyo/core/converter.ts                         |  18 +-
 .../PurchaseInvoice/PurchaseInvoice.ts        |   8 +-
 .../baseModels/SalesInvoice/SalesInvoice.ts   |   8 +-
 models/helpers.ts                             |  14 +-
 src/pages/ChartOfAccounts.vue                 | 248 ++++++++++--------
 src/utils/ui.ts                               |   9 +-
 6 files changed, 167 insertions(+), 138 deletions(-)

diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index c3d71670..1c402d51 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -152,11 +152,11 @@ export class Converter {
 }
 
 function toDocString(value: RawValue, field: Field) {
-  if (typeof value === 'string') {
-    return value;
+  if (value === null) {
+    return null;
   }
 
-  if (value === null) {
+  if (typeof value === 'string') {
     return value;
   }
 
@@ -164,6 +164,10 @@ function toDocString(value: RawValue, field: Field) {
 }
 
 function toDocDate(value: RawValue, field: Field) {
+  if (value === null) {
+    return null;
+  }
+
   if (typeof value !== 'number' && typeof value !== 'string') {
     throwError(value, field, 'doc');
   }
@@ -189,6 +193,10 @@ function toDocCurrency(value: RawValue, field: Field, fyo: Fyo) {
     return fyo.pesa(Number(value));
   }
 
+  if (value === null) {
+    return fyo.pesa(0);
+  }
+
   throwError(value, field, 'doc');
 }
 
@@ -209,6 +217,10 @@ function toDocFloat(value: RawValue, field: Field): number {
     value = parseFloat(value);
   }
 
+  if (value === null) {
+    value = 0;
+  }
+
   if (typeof value === 'number' && !Number.isNaN(value)) {
     return value;
   }
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index 926d91a3..569b0392 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -1,10 +1,8 @@
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
 import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
-import {
-  getTransactionActions,
-  getTransactionStatusColumn,
-} from '../../helpers';
+import { ModelNameEnum } from 'models/types';
+import { getInvoiceActions, getTransactionStatusColumn } from '../../helpers';
 import { Invoice } from '../Invoice/Invoice';
 import { PurchaseInvoiceItem } from '../PurchaseInvoiceItem/PurchaseInvoiceItem';
 
@@ -37,7 +35,7 @@ export class PurchaseInvoice extends Invoice {
   }
 
   static getActions(fyo: Fyo): Action[] {
-    return getTransactionActions('PurchaseInvoice', fyo);
+    return getInvoiceActions(ModelNameEnum.PurchaseInvoice, fyo);
   }
 
   static getListViewSettings(): ListViewSettings {
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
index abbcf294..9b5062af 100644
--- a/models/baseModels/SalesInvoice/SalesInvoice.ts
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -1,10 +1,8 @@
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
 import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
-import {
-  getTransactionActions,
-  getTransactionStatusColumn,
-} from '../../helpers';
+import { ModelNameEnum } from 'models/types';
+import { getInvoiceActions, getTransactionStatusColumn } from '../../helpers';
 import { Invoice } from '../Invoice/Invoice';
 import { SalesInvoiceItem } from '../SalesInvoiceItem/SalesInvoiceItem';
 
@@ -35,7 +33,7 @@ export class SalesInvoice extends Invoice {
   }
 
   static getActions(fyo: Fyo): Action[] {
-    return getTransactionActions('SalesInvoice', fyo);
+    return getInvoiceActions(ModelNameEnum.SalesInvoice, fyo);
   }
 
   static getListViewSettings(): ListViewSettings {
diff --git a/models/helpers.ts b/models/helpers.ts
index 6caa6b9b..b4cf3051 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -5,7 +5,7 @@ import { NotFoundError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
 import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
-import { InvoiceStatus } from './types';
+import { InvoiceStatus, ModelNameEnum } from './types';
 
 export function getLedgerLinkAction(fyo: Fyo): Action {
   return {
@@ -27,7 +27,10 @@ export function getLedgerLinkAction(fyo: Fyo): Action {
   };
 }
 
-export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
+export function getInvoiceActions(
+  schemaName: ModelNameEnum.PurchaseInvoice | ModelNameEnum.SalesInvoice,
+  fyo: Fyo
+): Action[] {
   return [
     {
       label: fyo.t`Make Payment`,
@@ -64,13 +67,6 @@ export function getTransactionActions(schemaName: string, fyo: Fyo): Action[] {
         });
       },
     },
-    {
-      label: fyo.t`Print`,
-      condition: (doc: Doc) => doc.submitted as boolean,
-      action: async (doc: Doc, router: Router) => {
-        router.push({ path: `/print/${doc.schemaName}/${doc.name}` });
-      },
-    },
     getLedgerLinkAction(fyo),
   ];
 }
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 46090e2e..092933a4 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,125 +1,133 @@
 <template>
   <div class="flex flex-col overflow-y-hidden">
     <PageHeader :title="t`Chart of Accounts`" />
-    <div class="flex-1 flex px-8 overflow-y-auto">
-      <div class="flex-1" v-if="root">
-        <div v-for="account in allAccounts" :key="account.name">
-          <div
-            class="
-              mt-2
-              px-4
-              py-2
-              cursor-pointer
-              hover:bg-gray-100
-              rounded-md
-              group
-            "
-            :class="[
-              account.level !== 0 ? 'text-base' : 'text-lg',
-              isQuickEditOpen(account) ? 'bg-gray-200' : '',
-            ]"
-            @click="onClick(account)"
-          >
-            <div class="flex items-center" :class="`pl-${account.level * 8}`">
-              <component :is="getIconComponent(account)" />
-              <div class="flex items-baseline">
-                <div
-                  class="ml-3"
-                  :class="[!account.parentAccount && 'font-semibold']"
-                >
-                  {{ account.name }}
-                </div>
-                <div
-                  v-if="account.isGroup"
-                  class="ml-6 hidden group-hover:block"
-                >
-                  <button
-                    class="
-                      text-xs text-gray-800
-                      hover:text-gray-900
-                      focus:outline-none
-                    "
-                    @click.stop="addAccount(account, 'addingAccount')"
-                  >
-                    {{ t`Add Account` }}
-                  </button>
-                  <button
-                    class="
-                      ml-3
-                      text-xs text-gray-800
-                      hover:text-gray-900
-                      focus:outline-none
-                    "
-                    @click.stop="addAccount(account, 'addingGroupAccount')"
-                  >
-                    {{ t`Add Group` }}
-                  </button>
-                </div>
-              </div>
+
+    <!-- Chart of Accounts -->
+    <div class="flex-1 flex flex-col px-8 overflow-y-auto" v-if="root">
+      <!-- Chart of Accounts Indented List -->
+      <template v-for="account in allAccounts" :key="account.name">
+        <!-- Account List Item -->
+        <div
+          class="
+            mt-2
+            px-4
+            py-2
+            cursor-pointer
+            hover:bg-gray-100
+            rounded-md
+            group
+            flex
+            items-center
+          "
+          :class="[
+            account.level !== 0 ? 'text-base' : 'text-lg',
+            isQuickEditOpen(account) ? 'bg-gray-200' : '',
+            `pl-${account.level * 8}`,
+          ]"
+          @click="onClick(account)"
+        >
+          <component :is="getIconComponent(account)" />
+          <div class="flex items-baseline">
+            <div
+              class="ml-3"
+              :class="[!account.parentAccount && 'font-semibold']"
+            >
+              {{ account.name }}
+            </div>
+
+            <!-- Add Account Buttons on Group Hover -->
+            <div v-if="account.isGroup" class="ml-6 hidden group-hover:block">
+              <button
+                class="
+                  text-xs text-gray-800
+                  hover:text-gray-900
+                  focus:outline-none
+                "
+                @click.stop="addAccount(account, 'addingAccount')"
+              >
+                {{ t`Add Account` }}
+              </button>
+              <button
+                class="
+                  ml-3
+                  text-xs text-gray-800
+                  hover:text-gray-900
+                  focus:outline-none
+                "
+                @click.stop="addAccount(account, 'addingGroupAccount')"
+              >
+                {{ t`Add Group` }}
+              </button>
             </div>
           </div>
-          <div
-            v-if="account.addingAccount || account.addingGroupAccount"
-            class="
-              mt-2
-              px-4
-              py-2
-              cursor-pointer
-              hover:bg-gray-100
-              rounded-md
-              group
-            "
-            :class="[account.level !== 0 ? 'text-base' : 'text-lg']"
-            :key="account.name + '-adding-account'"
-          >
-            <div
-              class="flex items-center"
-              :class="`pl-${(account.level + 1) * 8}`"
+
+          <!-- Account Balance String -->
+          <p class="ml-auto text-base text-gray-800" v-if="!account.isGroup">
+            {{ getBalanceString(account) }}
+          </p>
+        </div>
+
+        <!-- Add Account/Group -->
+        <div
+          v-if="account.addingAccount || account.addingGroupAccount"
+          class="
+            mt-2
+            px-4
+            py-2
+            cursor-pointer
+            hover:bg-gray-100
+            rounded-md
+            group
+            flex
+            items-center
+          "
+          :class="`${account.level !== 0 ? 'text-base' : 'text-lg'} pl-${
+            (account.level + 1) * 8
+          }`"
+          :key="account.name + '-adding-account'"
+        >
+          <component
+            :is="getIconComponent({ isGroup: account.addingGroupAccount })"
+          />
+          <div class="flex items-baseline ml-3">
+            <input
+              class="focus:outline-none bg-transparent"
+              :class="{ 'text-gray-600': insertingAccount }"
+              :placeholder="t`New Account`"
+              :ref="account.name"
+              @keydown.esc="cancelAddingAccount(account)"
+              @keydown.enter="
+                (e) =>
+                  createNewAccount(
+                    e.target.value,
+                    account,
+                    account.addingGroupAccount
+                  )
+              "
+              type="text"
+              :disabled="insertingAccount"
+            />
+            <button
+              v-if="!insertingAccount"
+              class="
+                ml-4
+                text-xs text-gray-800
+                hover:text-gray-900
+                focus:outline-none
+              "
+              @click="cancelAddingAccount(account)"
             >
-              <component
-                :is="getIconComponent({ isGroup: account.addingGroupAccount })"
-              />
-              <div class="flex items-baseline">
-                <div class="ml-3">
-                  <input
-                    class="focus:outline-none bg-transparent"
-                    :class="{ 'text-gray-600': insertingAccount }"
-                    :placeholder="t`New Account`"
-                    :ref="account.name"
-                    @keydown.esc="cancelAddingAccount(account)"
-                    @keydown.enter="
-                      (e) =>
-                        createNewAccount(
-                          e.target.value,
-                          account,
-                          account.addingGroupAccount
-                        )
-                    "
-                    type="text"
-                    :disabled="insertingAccount"
-                  />
-                  <button
-                    v-if="!insertingAccount"
-                    class="
-                      ml-4
-                      text-xs text-gray-800
-                      hover:text-gray-900
-                      focus:outline-none
-                    "
-                    @click="cancelAddingAccount(account)"
-                  >
-                    {{ t`Cancel` }}
-                  </button>
-                </div>
-              </div>
-            </div>
+              {{ t`Cancel` }}
+            </button>
           </div>
         </div>
-      </div>
+      </template>
     </div>
   </div>
 </template>
 <script>
+import { t } from 'fyo';
+import { AccountRootTypeEnum } from 'models/baseModels/Account/types';
 import { ModelNameEnum } from 'models/types';
 import PageHeader from 'src/components/PageHeader';
 import { fyo } from 'src/initFyo';
@@ -146,6 +154,26 @@ export default {
     }
   },
   methods: {
+    isCredit(rootType) {
+      switch (rootType) {
+        case AccountRootTypeEnum.Asset:
+          return false;
+        case AccountRootTypeEnum.Liability:
+          return true;
+        case AccountRootTypeEnum.Equity:
+          return true;
+        case AccountRootTypeEnum.Expense:
+          return false;
+        case AccountRootTypeEnum.Income:
+          return true;
+        default:
+          return true;
+      }
+    },
+    getBalanceString(account) {
+      const suffix = this.isCredit(account.rootType) ? t`Cr.` : t`Dr.`;
+      return `${fyo.format(account.balance, 'Currency')} ${suffix}`;
+    },
     async fetchAccounts() {
       this.settings = fyo.models[ModelNameEnum.Account].getTreeSettings(fyo);
       const { currency } = await fyo.doc.getSingle('AccountingSettings');
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 7e09cd3f..87fc5139 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -258,7 +258,7 @@ function getCancelAction(doc: Doc): Action {
     component: {
       template: '<span class="text-red-700">{{ t`Cancel` }}</span>',
     },
-    condition: (doc: Doc) => !doc.cancelled,
+    condition: (doc: Doc) => !!doc.submitted && !doc.cancelled,
     action: () => {
       cancelDocWithPrompt(doc).then((res) => {
         if (res) {
@@ -276,10 +276,7 @@ function getDeleteAction(doc: Doc): Action {
       template: '<span class="text-red-700">{{ t`Delete` }}</span>',
     },
     condition: (doc: Doc) =>
-      !doc.notInserted &&
-      !doc.submitted &&
-      !doc.schema.isSingle &&
-      !doc.cancelled,
+      !doc.notInserted && !doc.submitted && !doc.schema.isSingle,
     action: () =>
       deleteDocWithPrompt(doc).then((res) => {
         if (res) {
@@ -296,7 +293,7 @@ function getDuplicateAction(doc: Doc): Action {
     condition: (doc: Doc) =>
       !!(
         ((isSubmittable && doc && doc.submitted) || !isSubmittable) &&
-        !doc._notInserted &&
+        !doc.notInserted &&
         !(doc.cancelled || false)
       ),
     action: () => {

From 20ea214a4bfcc998e8a4f6bdbdd6955e7a983082 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 3 May 2022 18:43:47 +0530
Subject: [PATCH 088/163] incr: abstract away transactional - add deletion -
 fix reversion

---
 backend/database/core.ts                      |   4 +
 fyo/model/doc.ts                              |  47 +++-
 fyo/model/types.ts                            |   2 +
 models/Transactional/LedgerPosting.ts         | 207 ++++++++++++++
 models/Transactional/Transactional.ts         |  57 ++++
 .../{ledgerPosting => Transactional}/types.ts |   8 +-
 models/baseModels/Account/Account.ts          |  16 +-
 .../AccountingLedgerEntry.ts                  |  37 +++
 models/baseModels/Invoice/Invoice.ts          |  87 +++---
 .../baseModels/JournalEntry/JournalEntry.ts   |  27 +-
 models/baseModels/Party/Party.ts              |  60 ++--
 models/baseModels/Payment/Payment.ts          | 258 +++++++++---------
 models/baseModels/PaymentFor/PaymentFor.ts    |  49 +++-
 .../PurchaseInvoice/PurchaseInvoice.ts        |  20 +-
 .../baseModels/SalesInvoice/SalesInvoice.ts   |  21 +-
 models/helpers.ts                             |  45 +--
 models/ledgerPosting/ledgerPosting.ts         | 209 --------------
 schemas/app/AccountingLedgerEntry.json        |  40 ++-
 schemas/app/PaymentFor.json                   |   4 +-
 src/components/Controls/Check.vue             |   2 +-
 src/components/Controls/DynamicLink.vue       |  12 +-
 src/components/Controls/Link.vue              |   9 +-
 src/components/Widgets/PartyWidget.vue        |   1 +
 src/pages/InvoiceForm.vue                     |  16 +-
 src/pages/JournalEntryForm.vue                |   8 +-
 src/utils/ui.ts                               |  23 +-
 26 files changed, 738 insertions(+), 531 deletions(-)
 create mode 100644 models/Transactional/LedgerPosting.ts
 create mode 100644 models/Transactional/Transactional.ts
 rename models/{ledgerPosting => Transactional}/types.ts (77%)
 delete mode 100644 models/ledgerPosting/ledgerPosting.ts

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 3514d129..3590d16e 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -234,6 +234,10 @@ export default class DatabaseCore extends DatabaseBase {
     options: GetAllOptions = {}
   ): Promise<FieldValueMap[]> {
     const schema = this.schemaMap[schemaName] as Schema;
+    if (schema === undefined) {
+      throw new NotFoundError(`schema ${schemaName} not found`);
+    }
+
     const hasCreated = !!schema.fields.find((f) => f.fieldname === 'created');
     const {
       fields = ['name', ...(schema.keywordFields ?? [])],
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 6d1679d9..8cc6d0d4 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -25,6 +25,7 @@ import {
 import { setName } from './naming';
 import {
   Action,
+  ChangeArg,
   CurrenciesMap,
   DefaultMap,
   EmptyMessageMap,
@@ -37,7 +38,7 @@ import {
   ReadOnlyMap,
   RequiredMap,
   TreeViewSettings,
-  ValidationMap
+  ValidationMap,
 } from './types';
 import { validateOptions, validateRequired } from './validationFunction';
 
@@ -106,6 +107,14 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return fieldnames.map((f) => this.fieldMap[f]);
   }
 
+  get isSubmitted() {
+    return !!this.submitted && !this.cancelled;
+  }
+
+  get isCancelled() {
+    return !!this.submitted && !!this.cancelled;
+  }
+
   _setValuesWithoutChecks(data: DocValueMap) {
     for (const field of this.schema.fields) {
       const fieldname = field.fieldname;
@@ -131,7 +140,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   // set value and trigger change
   async set(
     fieldname: string | DocValueMap,
-    value?: DocValue | Doc[]
+    value?: DocValue | Doc[] | DocValueMap[]
   ): Promise<boolean> {
     if (typeof fieldname === 'object') {
       return await this.setMultiple(fieldname as DocValueMap);
@@ -143,10 +152,9 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
     this._setDirty(true);
     if (Array.isArray(value)) {
-      this[fieldname] = value.map((row, i) => {
-        row.idx = i;
-        return row;
-      });
+      for (const row of value) {
+        this.push(fieldname, row);
+      }
     } else {
       const field = this.fieldMap[fieldname];
       await this._validateField(field, value);
@@ -177,7 +185,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return hasSet;
   }
 
-  _canSet(fieldname: string, value?: DocValue | Doc[]): boolean {
+  _canSet(
+    fieldname: string,
+    value?: DocValue | Doc[] | DocValueMap[]
+  ): boolean {
     if (fieldname === 'numberSeries' && !this.notInserted) {
       return false;
     }
@@ -610,6 +621,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async delete() {
+    if (this.schema.isSubmittable && !this.isCancelled) {
+      return;
+    }
+
     await this.trigger('beforeDelete');
     await this.fyo.db.delete(this.schemaName, this.name!);
     await this.trigger('afterDelete');
@@ -619,7 +634,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async submit() {
-    if (!this.schema.isSubmittable || this.cancelled) {
+    if (!this.schema.isSubmittable || this.submitted || this.cancelled) {
       return;
     }
 
@@ -631,7 +646,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async cancel() {
-    if (!this.schema.isSubmittable || !this.submitted) {
+    if (!this.schema.isSubmittable || !this.submitted || this.cancelled) {
       return;
     }
 
@@ -727,14 +742,24 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return doc;
   }
 
+  /**
+   * Lifecycle Methods
+   *
+   * Abstractish methods that are called using `this.trigger`.
+   * These are to be overridden if required when subclassing.
+   */
+  async change(ch: ChangeArg) {}
+  async validate() {}
   async beforeSync() {}
   async afterSync() {}
-  async beforeDelete() {}
-  async afterDelete() {}
   async beforeSubmit() {}
   async afterSubmit() {}
+  async beforeRename() {}
+  async afterRename() {}
   async beforeCancel() {}
   async afterCancel() {}
+  async beforeDelete() {}
+  async afterDelete() {}
 
   formulas: FormulaMap = {};
   validations: ValidationMap = {};
diff --git a/fyo/model/types.ts b/fyo/model/types.ts
index bbb12386..35184f18 100644
--- a/fyo/model/types.ts
+++ b/fyo/model/types.ts
@@ -35,6 +35,8 @@ export type CurrenciesMap = Record<string, GetCurrency | undefined>;
 export type HiddenMap = Record<string, Hidden | undefined>;
 export type ReadOnlyMap = Record<string, ReadOnly | undefined>;
 
+export type ChangeArg = { doc: Doc; changed: string };
+
 /**
  * Should add this for hidden too
  */
diff --git a/models/Transactional/LedgerPosting.ts b/models/Transactional/LedgerPosting.ts
new file mode 100644
index 00000000..11274d94
--- /dev/null
+++ b/models/Transactional/LedgerPosting.ts
@@ -0,0 +1,207 @@
+import { Fyo, t } from 'fyo';
+import { ValidationError } from 'fyo/utils/errors';
+import { Account } from 'models/baseModels/Account/Account';
+import { AccountingLedgerEntry } from 'models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
+import { ModelNameEnum } from 'models/types';
+import Money from 'pesa/dist/types/src/money';
+import { Transactional } from './Transactional';
+import { AccountBalanceChange, TransactionType } from './types';
+
+/**
+ * # LedgerPosting
+ *
+ * Class that maintains a set of AccountingLedgerEntries pertaining to
+ * a single Transactional doc, example a Payment entry.
+ *
+ * For each account touched in a transactional doc a separate ledger entry is
+ * created.
+ *
+ * This is done using the `debit(...)` and `credit(...)` methods which also
+ * keep track of the change in balance to an account.
+ *
+ * Unless `post()` or `postReverese()` is called the entries aren't made.
+ */
+
+export class LedgerPosting {
+  fyo: Fyo;
+  refDoc: Transactional;
+  entries: AccountingLedgerEntry[];
+  entryMap: Record<string, AccountingLedgerEntry>;
+  reverted: boolean;
+  accountBalanceChanges: AccountBalanceChange[];
+
+  constructor(refDoc: Transactional, fyo: Fyo) {
+    this.fyo = fyo;
+    this.refDoc = refDoc;
+    this.entries = [];
+    this.entryMap = {};
+    this.reverted = false;
+    this.accountBalanceChanges = [];
+  }
+
+  async debit(account: string, amount: Money) {
+    const ledgerEntry = this._getLedgerEntry(account);
+    await ledgerEntry.set('debit', ledgerEntry.debit!.add(amount));
+    await this._updateAccountBalanceChange(account, 'debit', amount);
+  }
+
+  async credit(account: string, amount: Money) {
+    const ledgerEntry = this._getLedgerEntry(account);
+    await ledgerEntry.set('credit', ledgerEntry.credit!.add(amount));
+    await this._updateAccountBalanceChange(account, 'credit', amount);
+  }
+
+  async post() {
+    this._validateIsEqual();
+    await this._sync();
+  }
+
+  async postReverse() {
+    this._validateIsEqual();
+    await this._syncReverse();
+  }
+
+  validate() {
+    this._validateIsEqual();
+  }
+
+  async makeRoundOffEntry() {
+    const { debit, credit } = this._getTotalDebitAndCredit();
+    const difference = debit.sub(credit);
+    const absoluteValue = difference.abs();
+    if (absoluteValue.eq(0)) {
+      return;
+    }
+
+    const roundOffAccount = await this._getRoundOffAccount();
+    if (difference.gt(0)) {
+      this.credit(roundOffAccount, absoluteValue);
+    } else {
+      this.debit(roundOffAccount, absoluteValue);
+    }
+  }
+
+  async _updateAccountBalanceChange(
+    name: string,
+    type: TransactionType,
+    amount: Money
+  ) {
+    const accountDoc = (await this.fyo.doc.getDoc('Account', name)) as Account;
+
+    let change: Money;
+    if (accountDoc.isDebit) {
+      change = type === 'debit' ? amount : amount.neg();
+    } else {
+      change = type === 'credit' ? amount : amount.neg();
+    }
+
+    this.accountBalanceChanges.push({
+      name,
+      change,
+    });
+  }
+
+  _getLedgerEntry(account: string): AccountingLedgerEntry {
+    if (this.entryMap[account]) {
+      return this.entryMap[account];
+    }
+
+    const ledgerEntry = this.fyo.doc.getNewDoc(
+      ModelNameEnum.AccountingLedgerEntry,
+      {
+        account: account,
+        party: (this.refDoc.party as string) ?? '',
+        date: this.refDoc.date as string | Date,
+        referenceType: this.refDoc.schemaName,
+        referenceName: this.refDoc.name!,
+        reverted: this.reverted,
+        debit: this.fyo.pesa(0),
+        credit: this.fyo.pesa(0),
+      }
+    ) as AccountingLedgerEntry;
+
+    this.entries.push(ledgerEntry);
+    this.entryMap[account] = ledgerEntry;
+
+    return this.entryMap[account];
+  }
+
+  _validateIsEqual() {
+    const { debit, credit } = this._getTotalDebitAndCredit();
+    if (debit.eq(credit)) {
+      return;
+    }
+
+    throw new ValidationError(
+      t`Total Debit: ${this.fyo.format(
+        debit,
+        'Currency'
+      )} must be equal to Total Credit: ${this.fyo.format(credit, 'Currency')}`
+    );
+  }
+
+  _getTotalDebitAndCredit() {
+    let debit = this.fyo.pesa(0);
+    let credit = this.fyo.pesa(0);
+
+    for (const entry of this.entries) {
+      debit = debit.add(entry.debit!);
+      credit = credit.add(entry.credit!);
+    }
+
+    return { debit, credit };
+  }
+
+  async _sync() {
+    await this._syncLedgerEntries();
+    await this._syncBalanceChanges();
+  }
+
+  async _syncLedgerEntries() {
+    for (const entry of this.entries) {
+      await entry.sync();
+    }
+  }
+
+  async _syncReverse() {
+    await this._syncReverseLedgerEntries();
+    for (const entry of this.accountBalanceChanges) {
+      entry.change = (entry.change as Money).neg();
+    }
+    await this._syncBalanceChanges();
+  }
+
+  async _syncBalanceChanges() {
+    for (const { name, change } of this.accountBalanceChanges) {
+      const accountDoc = await this.fyo.doc.getDoc(ModelNameEnum.Account, name);
+      const balance = accountDoc.get('balance') as Money;
+      await accountDoc.setAndSync('balance', balance.add(change));
+    }
+  }
+
+  async _syncReverseLedgerEntries() {
+    const data = (await this.fyo.db.getAll('AccountingLedgerEntry', {
+      fields: ['name'],
+      filters: {
+        referenceType: this.refDoc.schemaName,
+        referenceName: this.refDoc.name!,
+        reverted: false,
+      },
+    })) as { name: string }[];
+
+    for (const { name } of data) {
+      const doc = (await this.fyo.doc.getDoc(
+        'AccountingLedgerEntry',
+        name
+      )) as AccountingLedgerEntry;
+      await doc.revert();
+    }
+  }
+
+  async _getRoundOffAccount() {
+    return (await this.fyo.getValue(
+      ModelNameEnum.AccountingSettings,
+      'roundOffAccount'
+    )) as string;
+  }
+}
diff --git a/models/Transactional/Transactional.ts b/models/Transactional/Transactional.ts
new file mode 100644
index 00000000..d304d7b6
--- /dev/null
+++ b/models/Transactional/Transactional.ts
@@ -0,0 +1,57 @@
+import { Doc } from 'fyo/model/doc';
+import { ModelNameEnum } from 'models/types';
+import { LedgerPosting } from './LedgerPosting';
+
+/**
+ * # Transactional
+ *
+ * Any model that creates ledger entries on submit should extend the
+ * `Transactional` model.
+ *
+ * Example of transactional models:
+ * - Invoice
+ * - Payment
+ * - JournalEntry
+ *
+ * Basically it does the following:
+ * - `afterSubmit`: create the ledger entries.
+ * - `afterCancel`: create reverse ledger entries.
+ * - `afterDelete`: delete the normal and reversed ledger entries.
+ */
+
+export abstract class Transactional extends Doc {
+  isTransactional = true;
+  abstract getPosting(): Promise<LedgerPosting>;
+
+  async validate() {
+    const posting = await this.getPosting();
+    posting.validate();
+  }
+
+  async afterSubmit(): Promise<void> {
+    const posting = await this.getPosting();
+    await posting.post();
+  }
+
+  async afterCancel(): Promise<void> {
+    const posting = await this.getPosting();
+    await posting.postReverse();
+  }
+
+  async afterDelete(): Promise<void> {
+    const ledgerEntryIds = (await this.fyo.db.getAll(
+      ModelNameEnum.AccountingLedgerEntry,
+      {
+        fields: ['name'],
+        filters: {
+          referenceType: this.schemaName,
+          referenceName: this.name!,
+        },
+      }
+    )) as { name: string }[];
+
+    for (const { name } of ledgerEntryIds) {
+      await this.fyo.db.delete(ModelNameEnum.AccountingLedgerEntry, name);
+    }
+  }
+}
diff --git a/models/ledgerPosting/types.ts b/models/Transactional/types.ts
similarity index 77%
rename from models/ledgerPosting/types.ts
rename to models/Transactional/types.ts
index 4461cd86..dc58ee8b 100644
--- a/models/ledgerPosting/types.ts
+++ b/models/Transactional/types.ts
@@ -4,24 +4,22 @@ import Money from 'pesa/dist/types/src/money';
 export interface LedgerPostingOptions {
   reference: Doc;
   party?: string;
-  date?: string;
-  description?: string;
 }
+
 export interface LedgerEntry {
   account: string;
   party: string;
   date: string;
   referenceType: string;
   referenceName: string;
-  description?: string;
   reverted: boolean;
   debit: Money;
   credit: Money;
 }
 
-export interface AccountEntry {
+export interface AccountBalanceChange {
   name: string;
-  balanceChange: Money;
+  change: Money;
 }
 
 export type TransactionType = 'credit' | 'debit';
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index 74b57680..58bff4e5 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -7,13 +7,25 @@ import {
   TreeViewSettings,
 } from 'fyo/model/types';
 import { QueryFilter } from 'utils/db/types';
-import { AccountRootType, AccountType } from './types';
+import { AccountRootType, AccountRootTypeEnum, AccountType } from './types';
 
 export class Account extends Doc {
   rootType?: AccountRootType;
   accountType?: AccountType;
   parentAccount?: string;
 
+  get isDebit() {
+    const debitAccounts = [
+      AccountRootTypeEnum.Asset,
+      AccountRootTypeEnum.Expense,
+    ] as AccountRootType[];
+    return debitAccounts.includes(this.rootType!);
+  }
+
+  get isCredit() {
+    return !this.isDebit;
+  }
+
   static defaults: DefaultMap = {
     /**
      * NestedSet indices are actually not used
@@ -55,7 +67,7 @@ export class Account extends Doc {
   }
 
   static filters: FiltersMap = {
-    parentAccount: (doc: Account) => {
+    parentAccount: (doc: Doc) => {
       const filter: QueryFilter = {
         isGroup: true,
       };
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
index 6441b9f3..0c0b91c6 100644
--- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
+++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
@@ -1,7 +1,44 @@
 import { Doc } from 'fyo/model/doc';
 import { ListViewSettings } from 'fyo/model/types';
+import { ModelNameEnum } from 'models/types';
+import Money from 'pesa/dist/types/src/money';
 
 export class AccountingLedgerEntry extends Doc {
+  date?: string | Date;
+  account?: string;
+  party?: string;
+  debit?: Money;
+  credit?: Money;
+  referenceType?: string;
+  referenceName?: string;
+  balance?: Money;
+  reverted?: boolean;
+
+  async revert() {
+    if (this.reverted) {
+      return;
+    }
+
+    await this.set('reverted', true);
+    const revertedEntry = this.fyo.doc.getNewDoc(
+      ModelNameEnum.AccountingLedgerEntry,
+      {
+        account: this.account,
+        party: this.party,
+        date: new Date(),
+        referenceType: this.referenceType,
+        referenceName: this.referenceName,
+        debit: this.credit,
+        credit: this.debit,
+        reverted: true,
+        reverts: this.name,
+      }
+    );
+
+    await this.sync();
+    await revertedEntry.sync();
+  }
+
   static getListViewSettings(): ListViewSettings {
     return {
       columns: ['account', 'party', 'debit', 'credit', 'balance'],
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 4138f087..affaf3a4 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -2,7 +2,7 @@ import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
 import { getExchangeRate } from 'models/helpers';
-import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
+import { Transactional } from 'models/Transactional/Transactional';
 import { ModelNameEnum } from 'models/types';
 import Money from 'pesa/dist/types/src/money';
 import { getIsNullOrUndef } from 'utils';
@@ -11,7 +11,7 @@ import { Payment } from '../Payment/Payment';
 import { Tax } from '../Tax/Tax';
 import { TaxSummary } from '../TaxSummary/TaxSummary';
 
-export abstract class Invoice extends Doc {
+export abstract class Invoice extends Transactional {
   _taxes: Record<string, Tax> = {};
   taxes?: TaxSummary[];
 
@@ -26,34 +26,12 @@ export abstract class Invoice extends Doc {
   submitted?: boolean;
   cancelled?: boolean;
 
-  abstract getPosting(): Promise<LedgerPosting>;
-
   get isSales() {
     return this.schemaName === 'SalesInvoice';
   }
 
-  async getPayments() {
-    const payments = await this.fyo.db.getAll('PaymentFor', {
-      fields: ['parent'],
-      filters: { referenceName: this.name! },
-      orderBy: 'name',
-    });
-
-    if (payments.length != 0) {
-      return payments;
-    }
-    return [];
-  }
-
-  async beforeSync() {
-    const entries = await this.getPosting();
-    await entries.validateEntries();
-  }
-
   async afterSubmit() {
-    // post ledger entries
-    const entries = await this.getPosting();
-    await entries.post();
+    await super.afterSubmit();
 
     // update outstanding amounts
     await this.fyo.db.update(this.schemaName, {
@@ -65,29 +43,48 @@ export abstract class Invoice extends Doc {
     await party.updateOutstandingAmount();
   }
 
-  async afterCancel() {
-    const paymentRefList = await this.getPayments();
-    for (const paymentFor of paymentRefList) {
-      const paymentReference = paymentFor.parent;
-      const payment = (await this.fyo.doc.getDoc(
+  async beforeCancel() {
+    await super.beforeCancel();
+    const paymentIds = await this.getPaymentIds();
+    for (const paymentId of paymentIds) {
+      const paymentDoc = (await this.fyo.doc.getDoc(
         'Payment',
-        paymentReference as string
+        paymentId
       )) as Payment;
-
-      const paymentEntries = await payment.getPosting();
-      for (const entry of paymentEntries) {
-        await entry.postReverse();
-      }
-
-      // To set the payment status as unsubmitted.
-      await this.fyo.db.update('Payment', {
-        name: paymentReference,
-        submitted: false,
-        cancelled: true,
-      });
+      await paymentDoc.cancel();
     }
-    const entries = await this.getPosting();
-    await entries.postReverse();
+  }
+
+  async afterCancel() {
+    await super.afterCancel();
+    const partyDoc = (await this.fyo.doc.getDoc(
+      ModelNameEnum.Party,
+      this.party!
+    )) as Party;
+
+    await partyDoc.updateOutstandingAmount();
+  }
+
+  async afterDelete() {
+    await super.afterDelete();
+    const paymentIds = await this.getPaymentIds();
+    for (const name of paymentIds) {
+      await this.fyo.db.delete(ModelNameEnum.AccountingLedgerEntry, name);
+    }
+  }
+
+  async getPaymentIds() {
+    const payments = (await this.fyo.db.getAll('PaymentFor', {
+      fields: ['parent'],
+      filters: { referenceType: this.schemaName, referenceName: this.name! },
+      orderBy: 'name',
+    })) as { parent: string }[];
+
+    if (payments.length != 0) {
+      return [...new Set(payments.map(({ parent }) => parent))];
+    }
+
+    return [];
   }
 
   async getExchangeRate() {
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index d498186c..7702d255 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -8,14 +8,15 @@ import {
 } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { getLedgerLinkAction } from 'models/helpers';
+import { Transactional } from 'models/Transactional/Transactional';
 import Money from 'pesa/dist/types/src/money';
-import { LedgerPosting } from '../../ledgerPosting/ledgerPosting';
+import { LedgerPosting } from '../../Transactional/LedgerPosting';
 
-export class JournalEntry extends Doc {
+export class JournalEntry extends Transactional {
   accounts: Doc[] = [];
 
-  getPosting() {
-    const entries = new LedgerPosting({ reference: this }, this.fyo);
+  async getPosting() {
+    const posting: LedgerPosting = new LedgerPosting(this, this.fyo);
 
     for (const row of this.accounts) {
       const debit = row.debit as Money;
@@ -23,25 +24,13 @@ export class JournalEntry extends Doc {
       const account = row.account as string;
 
       if (!debit.isZero()) {
-        entries.debit(account, debit);
+        await posting.debit(account, debit);
       } else if (!credit.isZero()) {
-        entries.credit(account, credit);
+        await posting.credit(account, credit);
       }
     }
 
-    return entries;
-  }
-
-  async beforeSync() {
-    this.getPosting().validateEntries();
-  }
-
-  async beforeSubmit() {
-    await this.getPosting().post();
-  }
-
-  async afterCancel() {
-    await this.getPosting().postReverse();
+    return posting;
   }
 
   static defaults: DefaultMap = {
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index c5b96f4d..9b60ccb2 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -15,39 +15,55 @@ import { PartyRole } from './types';
 
 export class Party extends Doc {
   async updateOutstandingAmount() {
+    /**
+     * If Role === "Both" then outstanding Amount
+     * will be the amount to be paid to the party.
+     */
+
     const role = this.role as PartyRole;
-    switch (role) {
-      case 'Customer':
-        await this._updateOutstandingAmount('SalesInvoice');
-        break;
-      case 'Supplier':
-        await this._updateOutstandingAmount('PurchaseInvoice');
-        break;
-      case 'Both':
-        await this._updateOutstandingAmount('SalesInvoice');
-        await this._updateOutstandingAmount('PurchaseInvoice');
-        break;
+    let outstandingAmount = this.fyo.pesa(0);
+
+    if (role === 'Customer' || role === 'Both') {
+      const outstandingReceive = await this._getTotalOutstandingAmount(
+        'SalesInvoice'
+      );
+      outstandingAmount = outstandingAmount.add(outstandingReceive);
     }
+
+    if (role === 'Supplier') {
+      const outstandingPay = await this._getTotalOutstandingAmount(
+        'PurchaseInvoice'
+      );
+      outstandingAmount = outstandingAmount.add(outstandingPay);
+    }
+
+    if (role === 'Both') {
+      const outstandingPay = await this._getTotalOutstandingAmount(
+        'PurchaseInvoice'
+      );
+      outstandingAmount = outstandingAmount.sub(outstandingPay);
+    }
+
+    await this.setAndSync({ outstandingAmount });
   }
 
-  async _updateOutstandingAmount(
+  async _getTotalOutstandingAmount(
     schemaName: 'SalesInvoice' | 'PurchaseInvoice'
   ) {
-    const outstandingAmounts = (
-      await this.fyo.db.getAllRaw(schemaName, {
-        fields: ['outstandingAmount', 'party'],
-        filters: { submitted: true },
-      })
-    ).filter(({ party }) => party === this.name);
+    const outstandingAmounts = await this.fyo.db.getAllRaw(schemaName, {
+      fields: ['outstandingAmount'],
+      filters: {
+        submitted: true,
+        cancelled: false,
+        party: this.name as string,
+      },
+    });
 
-    const totalOutstanding = outstandingAmounts
+    return outstandingAmounts
       .map(({ outstandingAmount }) =>
         this.fyo.pesa(outstandingAmount as number)
       )
       .reduce((a, b) => a.add(b), this.fyo.pesa(0));
-
-    await this.set('outstandingAmount', totalOutstanding);
-    await this.sync();
   }
 
   formulas: FormulaMap = {
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index dfe221b0..4419107f 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -3,6 +3,7 @@ import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import {
   Action,
+  ChangeArg,
   DefaultMap,
   FiltersMap,
   FormulaMap,
@@ -13,26 +14,29 @@ import {
 } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
 import { getLedgerLinkAction } from 'models/helpers';
-import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
+import { LedgerPosting } from 'models/Transactional/LedgerPosting';
+import { Transactional } from 'models/Transactional/Transactional';
+import { ModelNameEnum } from 'models/types';
 import Money from 'pesa/dist/types/src/money';
-import { getIsNullOrUndef } from 'utils';
+import { Invoice } from '../Invoice/Invoice';
 import { Party } from '../Party/Party';
+import { PaymentFor } from '../PaymentFor/PaymentFor';
 import { PaymentMethod, PaymentType } from './types';
 
-export class Payment extends Doc {
+export class Payment extends Transactional {
   party?: string;
   amount?: Money;
   writeoff?: Money;
+  paymentType?: PaymentType;
 
-  async change({ changed }: { changed: string }) {
-    switch (changed) {
-      case 'for': {
-        this.updateAmountOnReferenceUpdate();
-        await this.updateDetailsOnReferenceUpdate();
-      }
-      case 'amount': {
-        this.updateReferenceOnAmountUpdate();
-      }
+  async change({ changed }: ChangeArg) {
+    if (changed === 'for') {
+      this.updateAmountOnReferenceUpdate();
+      await this.updateDetailsOnReferenceUpdate();
+    }
+
+    if (changed === 'amount') {
+      this.updateReferenceOnAmountUpdate();
     }
   }
 
@@ -51,20 +55,19 @@ export class Payment extends Doc {
     }
 
     const schemaName = referenceType as string;
-    const doc = await this.fyo.doc.getDoc(schemaName, referenceName as string);
+    const doc = (await this.fyo.doc.getDoc(
+      schemaName,
+      referenceName as string
+    )) as Invoice;
 
-    let party;
     let paymentType: PaymentType;
-
-    if (schemaName === 'SalesInvoice') {
-      party = doc.customer;
+    if (doc.isSales) {
       paymentType = 'Receive';
     } else {
-      party = doc.supplier;
       paymentType = 'Pay';
     }
 
-    this.party = party as string;
+    this.party = doc.party as string;
     this.paymentType = paymentType;
   }
 
@@ -87,21 +90,26 @@ export class Payment extends Doc {
   }
 
   async validate() {
+    await super.validate();
     this.validateAccounts();
-    this.validateReferenceAmount();
-    this.validateWriteOff();
+    this.validateTotalReferenceAmount();
+    this.validateWriteOffAccount();
+    await this.validateReferences();
   }
 
   validateAccounts() {
     if (this.paymentAccount !== this.account || !this.account) {
       return;
     }
+
     throw new this.fyo.errors.ValidationError(
-      `To Account and From Account can't be the same: ${this.account}`
+      t`To Account and From Account can't be the same: ${
+        this.account as string
+      }`
     );
   }
 
-  validateReferenceAmount() {
+  validateTotalReferenceAmount() {
     const forReferences = (this.for ?? []) as Doc[];
     if (forReferences.length === 0) {
       return;
@@ -137,7 +145,7 @@ export class Payment extends Doc {
     );
   }
 
-  validateWriteOff() {
+  validateWriteOffAccount() {
     if ((this.writeoff as Money).isZero()) {
       return;
     }
@@ -155,131 +163,134 @@ export class Payment extends Doc {
     const paymentAccount = this.paymentAccount as string;
     const amount = this.amount as Money;
     const writeoff = this.writeoff as Money;
-    const entries = new LedgerPosting(
-      {
-        reference: this,
-        party: this.party!,
-      },
-      this.fyo
-    );
+    const posting: LedgerPosting = new LedgerPosting(this, this.fyo);
 
-    await entries.debit(paymentAccount as string, amount.sub(writeoff));
-    await entries.credit(account as string, amount.sub(writeoff));
+    await posting.debit(paymentAccount as string, amount.sub(writeoff));
+    await posting.credit(account as string, amount.sub(writeoff));
 
+    this.applyWriteOffPosting(posting);
+    return posting;
+  }
+
+  async applyWriteOffPosting(posting: LedgerPosting) {
+    const writeoff = this.writeoff as Money;
     if (writeoff.isZero()) {
-      return [entries];
+      return posting;
     }
 
-    const writeoffEntry = new LedgerPosting(
-      {
-        reference: this,
-        party: this.party!,
-      },
-      this.fyo
-    );
+    const account = this.account as string;
     const writeOffAccount = this.fyo.singles.AccountingSettings!
       .writeOffAccount as string;
 
     if (this.paymentType === 'Pay') {
-      await writeoffEntry.debit(account, writeoff);
-      await writeoffEntry.credit(writeOffAccount, writeoff);
+      await posting.credit(account, writeoff);
+      await posting.debit(writeOffAccount, writeoff);
     } else {
-      await writeoffEntry.debit(writeOffAccount, writeoff);
-      await writeoffEntry.credit(account, writeoff);
+      await posting.debit(account, writeoff);
+      await posting.credit(writeOffAccount, writeoff);
     }
-
-    return [entries, writeoffEntry];
   }
 
-  async beforeSubmit() {
-    const forReferences = (this.for ?? []) as Doc[];
+  async validateReferences() {
+    const forReferences = (this.for ?? []) as PaymentFor[];
     if (forReferences.length === 0) {
       return;
     }
 
     for (const row of forReferences) {
-      if (
-        !['SalesInvoice', 'PurchaseInvoice'].includes(
-          row.referenceType as string
-        )
-      ) {
-        continue;
-      }
-      const referenceDoc = await this.fyo.doc.getDoc(
-        row.referenceType as string,
-        row.referenceName as string
-      );
-
-      let outstandingAmount = referenceDoc.outstandingAmount as Money;
-      const baseGrandTotal = referenceDoc.baseGrandTotal as Money;
-      const amount = this.amount as Money;
-
-      if (getIsNullOrUndef(outstandingAmount)) {
-        outstandingAmount = baseGrandTotal;
-      }
-
-      if (amount.lte(0) || amount.gt(outstandingAmount)) {
-        let message = this.fyo.t`Payment amount: ${this.fyo.format(
-          this.amount!,
-          'Currency'
-        )} should be less than Outstanding amount: ${this.fyo.format(
-          outstandingAmount,
-          'Currency'
-        )}.`;
-
-        if (amount.lte(0)) {
-          const amt = this.fyo.format(this.amount!, 'Currency');
-          message = this.fyo
-            .t`Payment amount: ${amt} should be greater than 0.`;
-        }
-
-        throw new ValidationError(message);
-      } else {
-        // update outstanding amounts in invoice and party
-        const newOutstanding = outstandingAmount.sub(amount);
-        await referenceDoc.set('outstandingAmount', newOutstanding);
-        await referenceDoc.sync();
-        const party = (await this.fyo.doc.getDoc(
-          'Party',
-          this.party!
-        )) as Party;
-
-        await party.updateOutstandingAmount();
-      }
+      this.validateReferenceType(row);
+      await this.validateReferenceOutstanding(row);
     }
   }
 
-  async afterSubmit() {
-    const entryList = await this.getPosting();
-    for (const entry of entryList) {
-      await entry.post();
+  validateReferenceType(row: PaymentFor) {
+    const referenceType = row.referenceType;
+    if (
+      ![ModelNameEnum.SalesInvoice, ModelNameEnum.PurchaseInvoice].includes(
+        referenceType!
+      )
+    ) {
+      throw new ValidationError(t`Please select a valid reference type.`);
+    }
+  }
+
+  async validateReferenceOutstanding(row: PaymentFor) {
+    const referenceDoc = await this.fyo.doc.getDoc(
+      row.referenceType as string,
+      row.referenceName as string
+    );
+
+    const outstandingAmount = referenceDoc.outstandingAmount as Money;
+    const amount = this.amount as Money;
+
+    if (amount.gt(0) && amount.lte(outstandingAmount)) {
+      return;
+    }
+
+    let message = this.fyo.t`Payment amount: ${this.fyo.format(
+      this.amount!,
+      'Currency'
+    )} should be less than Outstanding amount: ${this.fyo.format(
+      outstandingAmount,
+      'Currency'
+    )}.`;
+
+    if (amount.lte(0)) {
+      const amt = this.fyo.format(this.amount!, 'Currency');
+      message = this.fyo.t`Payment amount: ${amt} should be greater than 0.`;
+    }
+
+    throw new ValidationError(message);
+  }
+
+  async beforeSubmit() {
+    await this.updateReferenceDocOutstanding();
+    await this.updatePartyOutstanding();
+  }
+
+  async updateReferenceDocOutstanding() {
+    for (const row of (this.for ?? []) as PaymentFor[]) {
+      const referenceDoc = await this.fyo.doc.getDoc(
+        row.referenceType!,
+        row.referenceName!
+      );
+
+      const previousOutstandingAmount = referenceDoc.outstandingAmount as Money;
+      const outstandingAmount = previousOutstandingAmount.sub(this.amount!);
+      await referenceDoc.setAndSync({ outstandingAmount });
     }
   }
 
   async afterCancel() {
-    this.updateReferenceOutstandingAmount();
-    const entryList = await this.getPosting();
-    for (const entry of entryList) {
-      await entry.postReverse();
+    await super.afterCancel();
+    this.revertOutstandingAmount();
+  }
+
+  async revertOutstandingAmount() {
+    await this._revertReferenceOutstanding();
+    await this.updatePartyOutstanding();
+  }
+
+  async _revertReferenceOutstanding() {
+    for (const ref of this.for as PaymentFor[]) {
+      const refDoc = await this.fyo.doc.getDoc(
+        ref.referenceType!,
+        ref.referenceName!
+      );
+
+      const outstandingAmount = (refDoc.outstandingAmount as Money).add(
+        ref.amount!
+      );
+      await refDoc.setAndSync({ outstandingAmount });
     }
   }
 
-  async updateReferenceOutstandingAmount() {
-    await (this.for as Doc[]).forEach(
-      async ({ amount, referenceType, referenceName }) => {
-        const refDoc = await this.fyo.doc.getDoc(
-          referenceType as string,
-          referenceName as string
-        );
-
-        refDoc.setMultiple({
-          outstandingAmount: (refDoc.outstandingAmount as Money).add(
-            amount as Money
-          ),
-        });
-        refDoc.sync();
-      }
-    );
+  async updatePartyOutstanding() {
+    const partyDoc = (await this.fyo.doc.getDoc(
+      ModelNameEnum.Party,
+      this.party!
+    )) as Party;
+    await partyDoc.updateOutstandingAmount();
   }
 
   static defaults: DefaultMap = { date: () => new Date().toISOString() };
@@ -334,11 +345,12 @@ export class Payment extends Doc {
 
   required: RequiredMap = {
     referenceId: () => this.paymentMethod !== 'Cash',
-    clearanceDate: () => this.paymentMethod === 'Cash',
+    clearanceDate: () => this.paymentMethod !== 'Cash',
   };
 
   hidden: HiddenMap = {
-    referenceId: () => this.paymentMethod !== 'Cash',
+    referenceId: () => this.paymentMethod === 'Cash',
+    clearanceDate: () => this.paymentMethod === 'Cash',
   };
 
   static filters: FiltersMap = {
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index 655047be..9aeedcd1 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -1,9 +1,41 @@
 import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap } from 'fyo/model/types';
+import { ModelNameEnum } from 'models/types';
 import Money from 'pesa/dist/types/src/money';
+import { PartyRoleEnum } from '../Party/types';
+import { Payment } from '../Payment/Payment';
 
 export class PaymentFor extends Doc {
+  parentdoc?: Payment | undefined;
+  referenceType?: ModelNameEnum.SalesInvoice | ModelNameEnum.PurchaseInvoice;
+  referenceName?: string;
+  amount?: Money;
+
   formulas: FormulaMap = {
+    referenceType: {
+      formula: async () => {
+        if (this.referenceType) {
+          return;
+        }
+
+        const party = this.parentdoc!.party;
+        if (party === undefined) {
+          return ModelNameEnum.SalesInvoice;
+        }
+
+        const role = await this.fyo.getValue(
+          ModelNameEnum.Party,
+          party,
+          'role'
+        );
+
+        if (role === PartyRoleEnum.Supplier) {
+          return ModelNameEnum.PurchaseInvoice;
+        }
+
+        return ModelNameEnum.SalesInvoice;
+      },
+    },
     amount: {
       formula: async () => {
         if (!this.referenceName) {
@@ -27,8 +59,19 @@ export class PaymentFor extends Doc {
   };
 
   static filters: FiltersMap = {
-    referenceName: () => ({
-      outstandingAmount: ['>', 0],
-    }),
+    referenceName: (doc) => {
+      const baseFilters = {
+        outstandingAmount: ['>', 0],
+        submitted: true,
+        cancelled: false,
+      };
+
+      const party = doc?.parentdoc?.party as undefined | string;
+      if (party === undefined) {
+        return baseFilters;
+      }
+
+      return { ...baseFilters, party };
+    },
   };
 }
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index 569b0392..b1d586d4 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -1,6 +1,6 @@
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
-import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
+import { LedgerPosting } from 'models/Transactional/LedgerPosting';
 import { ModelNameEnum } from 'models/types';
 import { getInvoiceActions, getTransactionStatusColumn } from '../../helpers';
 import { Invoice } from '../Invoice/Invoice';
@@ -10,28 +10,22 @@ export class PurchaseInvoice extends Invoice {
   items?: PurchaseInvoiceItem[];
 
   async getPosting() {
-    const entries: LedgerPosting = new LedgerPosting(
-      {
-        reference: this,
-        party: this.party,
-      },
-      this.fyo
-    );
+    const posting: LedgerPosting = new LedgerPosting(this, this.fyo);
 
-    await entries.credit(this.account!, this.baseGrandTotal!);
+    await posting.credit(this.account!, this.baseGrandTotal!);
 
     for (const item of this.items!) {
-      await entries.debit(item.account!, item.baseAmount!);
+      await posting.debit(item.account!, item.baseAmount!);
     }
 
     if (this.taxes) {
       for (const tax of this.taxes) {
-        await entries.debit(tax.account!, tax.baseAmount!);
+        await posting.debit(tax.account!, tax.baseAmount!);
       }
     }
 
-    entries.makeRoundOffEntry();
-    return entries;
+    await posting.makeRoundOffEntry();
+    return posting;
   }
 
   static getActions(fyo: Fyo): Action[] {
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
index 9b5062af..180e48cc 100644
--- a/models/baseModels/SalesInvoice/SalesInvoice.ts
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -1,6 +1,6 @@
 import { Fyo } from 'fyo';
 import { Action, ListViewSettings } from 'fyo/model/types';
-import { LedgerPosting } from 'models/ledgerPosting/ledgerPosting';
+import { LedgerPosting } from 'models/Transactional/LedgerPosting';
 import { ModelNameEnum } from 'models/types';
 import { getInvoiceActions, getTransactionStatusColumn } from '../../helpers';
 import { Invoice } from '../Invoice/Invoice';
@@ -10,26 +10,21 @@ export class SalesInvoice extends Invoice {
   items?: SalesInvoiceItem[];
 
   async getPosting() {
-    const entries: LedgerPosting = new LedgerPosting(
-      {
-        reference: this,
-        party: this.party,
-      },
-      this.fyo
-    );
-    await entries.debit(this.account!, this.baseGrandTotal!);
+    const posting: LedgerPosting = new LedgerPosting(this, this.fyo);
+    await posting.debit(this.account!, this.baseGrandTotal!);
 
     for (const item of this.items!) {
-      await entries.credit(item.account!, item.baseAmount!);
+      await posting.credit(item.account!, item.baseAmount!);
     }
 
     if (this.taxes) {
       for (const tax of this.taxes!) {
-        await entries.credit(tax.account!, tax.baseAmount!);
+        await posting.credit(tax.account!, tax.baseAmount!);
       }
     }
-    entries.makeRoundOffEntry();
-    return entries;
+
+    await posting.makeRoundOffEntry();
+    return posting;
   }
 
   static getActions(fyo: Fyo): Action[] {
diff --git a/models/helpers.ts b/models/helpers.ts
index b4cf3051..0f3103ad 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -7,26 +7,6 @@ import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
 import { InvoiceStatus, ModelNameEnum } from './types';
 
-export function getLedgerLinkAction(fyo: Fyo): Action {
-  return {
-    label: fyo.t`Ledger Entries`,
-    condition: (doc: Doc) => !!doc.submitted,
-    action: async (doc: Doc, router: Router) => {
-      router.push({
-        name: 'Report',
-        params: {
-          reportName: 'general-ledger',
-          defaultFilters: {
-            // @ts-ignore
-            referenceType: doc.schemaName,
-            referenceName: doc.name,
-          },
-        },
-      });
-    },
-  };
-}
-
 export function getInvoiceActions(
   schemaName: ModelNameEnum.PurchaseInvoice | ModelNameEnum.SalesInvoice,
   fyo: Fyo
@@ -35,14 +15,15 @@ export function getInvoiceActions(
     {
       label: fyo.t`Make Payment`,
       condition: (doc: Doc) =>
-        (doc.submitted as boolean) && (doc.outstandingAmount as Money).gt(0),
+        doc.isSubmitted && !(doc.outstandingAmount as Money).isZero(),
       action: async function makePayment(doc: Doc) {
         const payment = await fyo.doc.getNewDoc('Payment');
         payment.once('afterSync', async () => {
           await payment.submit();
         });
+
         const isSales = schemaName === 'SalesInvoice';
-        const party = isSales ? doc.customer : doc.supplier;
+        const party = doc.party as string;
         const paymentType = isSales ? 'Receive' : 'Pay';
         const hideAccountField = isSales ? 'account' : 'paymentAccount';
 
@@ -71,6 +52,26 @@ export function getInvoiceActions(
   ];
 }
 
+export function getLedgerLinkAction(fyo: Fyo): Action {
+  return {
+    label: fyo.t`Ledger Entries`,
+    condition: (doc: Doc) => doc.isSubmitted,
+    action: async (doc: Doc, router: Router) => {
+      router.push({
+        name: 'Report',
+        params: {
+          reportName: 'general-ledger',
+          defaultFilters: {
+            // @ts-ignore
+            referenceType: doc.schemaName,
+            referenceName: doc.name,
+          },
+        },
+      });
+    },
+  };
+}
+
 export function getTransactionStatusColumn(): ColumnConfig {
   const statusMap = {
     Unpaid: t`Unpaid`,
diff --git a/models/ledgerPosting/ledgerPosting.ts b/models/ledgerPosting/ledgerPosting.ts
deleted file mode 100644
index 08d64494..00000000
--- a/models/ledgerPosting/ledgerPosting.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import { Fyo } from 'fyo';
-import { Doc } from 'fyo/model/doc';
-import { ValidationError } from 'fyo/utils/errors';
-import Money from 'pesa/dist/types/src/money';
-import {
-  AccountEntry,
-  LedgerEntry,
-  LedgerPostingOptions,
-  TransactionType,
-} from './types';
-
-export class LedgerPosting {
-  reference: Doc;
-  party?: string;
-  date?: string;
-  description?: string;
-  entries: LedgerEntry[];
-  entryMap: Record<string, LedgerEntry>;
-  reverted: boolean;
-  accountEntries: AccountEntry[];
-
-  fyo: Fyo;
-
-  constructor(
-    { reference, party, date, description }: LedgerPostingOptions,
-    fyo: Fyo
-  ) {
-    this.reference = reference;
-    this.party = party;
-    this.date = date;
-    this.description = description ?? '';
-    this.entries = [];
-    this.entryMap = {};
-    this.reverted = false;
-    // To change balance while entering ledger entries
-    this.accountEntries = [];
-
-    this.fyo = fyo;
-  }
-
-  async debit(
-    account: string,
-    amount: Money,
-    referenceType?: string,
-    referenceName?: string
-  ) {
-    const entry = this.getEntry(account, referenceType, referenceName);
-    entry.debit = entry.debit.add(amount);
-    await this.setAccountBalanceChange(account, 'debit', amount);
-  }
-
-  async credit(
-    account: string,
-    amount: Money,
-    referenceType?: string,
-    referenceName?: string
-  ) {
-    const entry = this.getEntry(account, referenceType, referenceName);
-    entry.credit = entry.credit.add(amount);
-    await this.setAccountBalanceChange(account, 'credit', amount);
-  }
-
-  async setAccountBalanceChange(
-    accountName: string,
-    type: TransactionType,
-    amount: Money
-  ) {
-    const debitAccounts = ['Asset', 'Expense'];
-    const accountDoc = await this.fyo.doc.getDoc('Account', accountName);
-    const rootType = accountDoc.rootType as string;
-
-    if (debitAccounts.indexOf(rootType) === -1) {
-      const change = type == 'credit' ? amount : amount.neg();
-      this.accountEntries.push({
-        name: accountName,
-        balanceChange: change,
-      });
-    } else {
-      const change = type == 'debit' ? amount : amount.neg();
-      this.accountEntries.push({
-        name: accountName,
-        balanceChange: change,
-      });
-    }
-  }
-
-  getEntry(account: string, referenceType?: string, referenceName?: string) {
-    if (!this.entryMap[account]) {
-      const entry: LedgerEntry = {
-        account: account,
-        party: this.party ?? '',
-        date: this.date ?? (this.reference.date as string),
-        referenceType: referenceType ?? this.reference.schemaName,
-        referenceName: referenceName ?? this.reference.name!,
-        description: this.description,
-        reverted: this.reverted,
-        debit: this.fyo.pesa(0),
-        credit: this.fyo.pesa(0),
-      };
-
-      this.entries.push(entry);
-      this.entryMap[account] = entry;
-    }
-
-    return this.entryMap[account];
-  }
-
-  async post() {
-    this.validateEntries();
-    await this.insertEntries();
-  }
-
-  async postReverse() {
-    this.validateEntries();
-
-    const data = await this.fyo.db.getAll('AccountingLedgerEntry', {
-      fields: ['name'],
-      filters: {
-        referenceName: this.reference.name!,
-        reverted: false,
-      },
-    });
-
-    for (const entry of data) {
-      const entryDoc = await this.fyo.doc.getDoc(
-        'AccountingLedgerEntry',
-        entry.name as string
-      );
-      entryDoc.reverted = true;
-      await entryDoc.sync();
-    }
-
-    let temp;
-    for (const entry of this.entries) {
-      temp = entry.debit;
-      entry.debit = entry.credit;
-      entry.credit = temp;
-      entry.reverted = true;
-    }
-    for (const entry of this.accountEntries) {
-      entry.balanceChange = (entry.balanceChange as Money).neg();
-    }
-    await this.insertEntries();
-  }
-
-  makeRoundOffEntry() {
-    const { debit, credit } = this.getTotalDebitAndCredit();
-    const difference = debit.sub(credit);
-    const absoluteValue = difference.abs();
-    const allowance = 0.5;
-    if (absoluteValue.eq(0)) {
-      return;
-    }
-
-    const roundOffAccount = this.getRoundOffAccount();
-    if (absoluteValue.lte(allowance)) {
-      if (difference.gt(0)) {
-        this.credit(roundOffAccount, absoluteValue);
-      } else {
-        this.debit(roundOffAccount, absoluteValue);
-      }
-    }
-  }
-
-  validateEntries() {
-    const { debit, credit } = this.getTotalDebitAndCredit();
-    if (debit.neq(credit)) {
-      throw new ValidationError(
-        `Total Debit: ${this.fyo.format(
-          debit,
-          'Currency'
-        )} must be equal to Total Credit: ${this.fyo.format(
-          credit,
-          'Currency'
-        )}`
-      );
-    }
-  }
-
-  getTotalDebitAndCredit() {
-    let debit = this.fyo.pesa(0);
-    let credit = this.fyo.pesa(0);
-
-    for (const entry of this.entries) {
-      debit = debit.add(entry.debit);
-      credit = credit.add(entry.credit);
-    }
-
-    return { debit, credit };
-  }
-
-  async insertEntries() {
-    for (const entry of this.entries) {
-      const entryDoc = this.fyo.doc.getNewDoc('AccountingLedgerEntry');
-      Object.assign(entryDoc, entry);
-      await entryDoc.sync();
-    }
-    for (const entry of this.accountEntries) {
-      const entryDoc = await this.fyo.doc.getDoc('Account', entry.name);
-      const balance = entryDoc.get('balance') as Money;
-      entryDoc.balance = balance.add(entry.balanceChange);
-      await entryDoc.sync();
-    }
-  }
-
-  getRoundOffAccount() {
-    return this.fyo.singles.AccountingSettings!.roundOffAccount as string;
-  }
-}
diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index b834ad3b..303fc7bf 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -1,6 +1,6 @@
 {
   "name": "AccountingLedgerEntry",
-  "label": "Ledger Entry",
+  "label": "Accounting Ledger Entry",
   "isSingle": false,
   "isChild": false,
   "naming": "autoincrement",
@@ -8,52 +8,68 @@
     {
       "fieldname": "date",
       "label": "Date",
-      "fieldtype": "Date"
+      "fieldtype": "Date",
+      "readOnly": true
     },
     {
       "fieldname": "account",
       "label": "Account",
       "fieldtype": "Link",
       "target": "Account",
-      "required": true
+      "required": true,
+      "readOnly": true
     },
     {
       "fieldname": "party",
       "label": "Party",
       "fieldtype": "Link",
-      "target": "Party"
+      "target": "Party",
+      "readOnly": true
     },
     {
       "fieldname": "debit",
       "label": "Debit",
-      "fieldtype": "Currency"
+      "fieldtype": "Currency",
+      "readOnly": true
     },
     {
       "fieldname": "credit",
       "label": "Credit",
-      "fieldtype": "Currency"
+      "fieldtype": "Currency",
+      "readOnly": true
     },
     {
       "fieldname": "referenceType",
       "label": "Ref. Type",
-      "fieldtype": "Data"
+      "fieldtype": "Data",
+      "readOnly": true
     },
     {
       "fieldname": "referenceName",
       "label": "Ref. Name",
       "fieldtype": "DynamicLink",
-      "references": "referenceType"
+      "references": "referenceType",
+      "readOnly": true
     },
     {
       "fieldname": "balance",
       "label": "Balance",
-      "fieldtype": "Currency"
+      "fieldtype": "Currency",
+      "readOnly": true
     },
     {
       "fieldname": "reverted",
       "label": "Reverted",
       "fieldtype": "Check",
-      "default": false
+      "default": false,
+      "readOnly": true
+    },
+    {
+      "fieldname": "reverts",
+      "label": "Reverts",
+      "fieldtype": "Link",
+      "target": "AccountingLedgerEntry",
+      "readOnly": true
     }
   ],
   "quickEditFields": [
@@ -64,7 +80,9 @@
     "credit",
     "referenceType",
     "referenceName",
-    "balance"
+    "balance",
+    "reverted",
+    "reverts"
   ],
   "keywordFields": ["account", "party", "referenceName"]
 }
diff --git a/schemas/app/PaymentFor.json b/schemas/app/PaymentFor.json
index c59c4309..ff80d68e 100644
--- a/schemas/app/PaymentFor.json
+++ b/schemas/app/PaymentFor.json
@@ -12,11 +12,11 @@
       "options": [
         {
           "value": "SalesInvoice",
-          "label": "Sales Invoice"
+          "label": "Sales"
         },
         {
           "value": "PurchaseInvoice",
-          "label": "Purchase Invoice"
+          "label": "Purchase"
         }
       ],
       "required": true
diff --git a/src/components/Controls/Check.vue b/src/components/Controls/Check.vue
index e8ea4f57..f449381d 100644
--- a/src/components/Controls/Check.vue
+++ b/src/components/Controls/Check.vue
@@ -57,7 +57,7 @@
           :class="inputClasses"
           :checked="value"
           :readonly="isReadOnly"
-          @change="(e) => triggerChange(e.target.checked)"
+          @change="(e) => !isReadOnly && triggerChange(e.target.checked)"
           @focus="(e) => $emit('focus', e)"
         />
       </div>
diff --git a/src/components/Controls/DynamicLink.vue b/src/components/Controls/DynamicLink.vue
index 395322ef..bbd80669 100644
--- a/src/components/Controls/DynamicLink.vue
+++ b/src/components/Controls/DynamicLink.vue
@@ -6,7 +6,7 @@ export default {
   extends: Link,
   created() {
     const watchKey = `doc.${this.df.references}`;
-    this.targetWatcher = this.$watch(watchKey, function(newTarget, oldTarget) {
+    this.targetWatcher = this.$watch(watchKey, function (newTarget, oldTarget) {
       if (oldTarget && newTarget !== oldTarget) {
         this.triggerChange('');
       }
@@ -16,13 +16,13 @@ export default {
     this.targetWatcher();
   },
   methods: {
-    getTarget() {
-      if (!this.doc) {
-        throw new Error('You must provide `doc` for DynamicLink to work.');
+    getTargetSchemaName() {
+      if (!this.doc || !this.df.references) {
+        return null;
       }
 
       return this.doc[this.df.references];
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index fffc27dd..7ad65d9c 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -27,8 +27,15 @@ export default {
     },
   },
   methods: {
+    getTargetSchemaName() {
+      return this.df.target;
+    },
     async getSuggestions(keyword = '') {
-      const schemaName = this.df.target;
+      const schemaName = this.getTargetSchemaName();
+      if (!schemaName) {
+        return [];
+      }
+
       const schema = fyo.schemaMap[schemaName];
       const filters = await this.getFilters(keyword);
 
diff --git a/src/components/Widgets/PartyWidget.vue b/src/components/Widgets/PartyWidget.vue
index 3115505b..d981e9e1 100644
--- a/src/components/Widgets/PartyWidget.vue
+++ b/src/components/Widgets/PartyWidget.vue
@@ -101,6 +101,7 @@ export default {
           ],
           filters: {
             party: this.doc.name,
+            cancelled: false,
           },
           limit: 3,
           orderBy: 'created',
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 0e6021ff..b9ebebf9 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -11,7 +11,7 @@
       >
         {{ t`Print` }}
       </Button>
-      <DropdownWithActions :actions="actions" />
+      <DropdownWithActions :actions="actions()" />
       <Button
         v-if="doc?.notInserted || doc?.dirty"
         type="primary"
@@ -245,8 +245,8 @@ export default {
     Button,
     FormControl,
     DropdownWithActions,
-    Table
-},
+    Table,
+  },
   provide() {
     return {
       schemaName: this.schemaName,
@@ -267,9 +267,6 @@ export default {
     address() {
       return this.printSettings && this.printSettings.getLink('address');
     },
-    actions() {
-      return getActionsForDocument(this.doc);
-    },
   },
   async mounted() {
     try {
@@ -301,6 +298,9 @@ export default {
   },
   methods: {
     routeTo,
+    actions() {
+      return getActionsForDocument(this.doc);
+    },
     getField(fieldname) {
       return fyo.getField(this.schemaName, fieldname);
     },
@@ -310,8 +310,8 @@ export default {
     submit() {
       const message =
         this.schemaName === ModelNameEnum.SalesInvoice
-          ? this.t`Are you sure you want to submit this Sales Invoice?`
-          : this.t`Are you sure you want to submit this Purchase Invoice?`;
+          ? this.t`Submit Sales Invoice?`
+          : this.t`Submit Purchase Invoice?`;
       showMessageDialog({
         message,
         buttons: [
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index dc0a955c..4b62ef1c 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -161,9 +161,9 @@ import PageHeader from 'src/components/PageHeader';
 import StatusBadge from 'src/components/StatusBadge';
 import { fyo } from 'src/initFyo';
 import {
-  getActionsForDocument,
-  routeTo,
-  showMessageDialog,
+getActionsForDocument,
+routeTo,
+showMessageDialog
 } from 'src/utils/ui';
 import { handleErrorWithDialog } from '../errorHandling';
 
@@ -242,7 +242,7 @@ export default {
     },
     async submit() {
       showMessageDialog({
-        message: this.t`Are you sure you want to submit this Journal Entry?`,
+        message: this.t`Submit Journal Entry?`,
         buttons: [
           {
             label: this.t`Yes`,
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 87fc5139..731912d7 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -66,9 +66,6 @@ export async function openQuickEdit({
       showFields,
       hideFields,
       defaults: stringifyCircular(defaults),
-      /*
-      lastRoute: currentRoute,
-      */
     },
   });
 }
@@ -142,12 +139,16 @@ export async function routeTo(route: string | RouteLocationRaw) {
 }
 
 export function deleteDocWithPrompt(doc: Doc) {
+  const schemaLabel = fyo.schemaMap[doc.schemaName]!.label;
+  let detail = t`This action is permanent.`;
+  if (doc.isTransactional) {
+    detail = t`This action is permanent and will delete all ledger entries.`;
+  }
+
   return new Promise((resolve) => {
     showMessageDialog({
-      message: t`Are you sure you want to delete ${
-        doc.schemaName
-      } ${doc.name!}?`,
-      detail: t`This action is permanent`,
+      message: t`Delete ${schemaLabel} ${doc.name!}?`,
+      detail,
       buttons: [
         {
           label: t`Delete`,
@@ -204,10 +205,9 @@ export async function cancelDocWithPrompt(doc: Doc) {
   }
 
   return new Promise((resolve) => {
+    const schemaLabel = fyo.schemaMap[doc.schemaName]!.label;
     showMessageDialog({
-      message: t`Are you sure you want to cancel ${
-        doc.schemaName
-      } ${doc.name!}?`,
+      message: t`Cancel ${schemaLabel} ${doc.name!}?`,
       detail,
       buttons: [
         {
@@ -276,7 +276,8 @@ function getDeleteAction(doc: Doc): Action {
       template: '<span class="text-red-700">{{ t`Delete` }}</span>',
     },
     condition: (doc: Doc) =>
-      !doc.notInserted && !doc.submitted && !doc.schema.isSingle,
+      (!doc.notInserted && !doc.schema.isSubmittable && !doc.schema.isSingle) ||
+      doc.isCancelled,
     action: () =>
       deleteDocWithPrompt(doc).then((res) => {
         if (res) {

From 456a1546a0af2fb2f191028216662b0387ae5d47 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 3 May 2022 20:43:55 +0530
Subject: [PATCH 089/163] fix: validation, error display

---
 fyo/model/doc.ts                 |  6 +++---
 fyo/utils/errors.ts              | 12 ++++++++++++
 schemas/app/JournalEntry.json    |  3 ++-
 schemas/app/Payment.json         |  6 ++++--
 schemas/app/PurchaseInvoice.json |  6 ++++--
 schemas/app/SalesInvoice.json    |  8 +++++---
 src/errorHandling.ts             |  5 +++--
 7 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 8cc6d0d4..c2bfb27e 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -291,7 +291,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return childDoc;
   }
 
-  async _validateInsert() {
+  async _validateSync() {
     this._validateMandatory();
     await this._validateFields();
   }
@@ -573,6 +573,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   async _preSync() {
     this._setChildDocsIdx();
     await this._applyFormula();
+    await this._validateSync();
     await this.trigger('validate');
   }
 
@@ -580,7 +581,6 @@ export class Doc extends Observable<DocValue | Doc[]> {
     await setName(this, this.fyo);
     this._setBaseMetaValues();
     await this._preSync();
-    await this._validateInsert();
 
     const oldName = this.name!;
     const validDict = this.getValidDict();
@@ -596,8 +596,8 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
   async _update() {
     await this._validateDbNotModified();
-    await this._preSync();
     this._updateModifiedMetaValues();
+    await this._preSync();
 
     const data = this.getValidDict();
     await this.fyo.db.update(this.schemaName, data);
diff --git a/fyo/utils/errors.ts b/fyo/utils/errors.ts
index 636f80db..9ca6cdad 100644
--- a/fyo/utils/errors.ts
+++ b/fyo/utils/errors.ts
@@ -1,9 +1,13 @@
+import { t } from './translation';
+
 export class BaseError extends Error {
+  label: string;
   message: string;
   statusCode: number;
 
   constructor(statusCode: number, message: string) {
     super(message);
+    this.label = t`Base Error`;
     this.name = 'BaseError';
     this.statusCode = statusCode;
     this.message = message;
@@ -13,6 +17,7 @@ export class BaseError extends Error {
 export class ValidationError extends BaseError {
   constructor(message: string) {
     super(417, message);
+    this.label = t`Validation Error`;
     this.name = 'ValidationError';
   }
 }
@@ -20,6 +25,7 @@ export class ValidationError extends BaseError {
 export class NotFoundError extends BaseError {
   constructor(message: string) {
     super(404, message);
+    this.label = t`Not Found Error`;
     this.name = 'NotFoundError';
   }
 }
@@ -27,6 +33,7 @@ export class NotFoundError extends BaseError {
 export class ForbiddenError extends BaseError {
   constructor(message: string) {
     super(403, message);
+    this.label = t`Forbidden Error`;
     this.name = 'ForbiddenError';
   }
 }
@@ -34,6 +41,7 @@ export class ForbiddenError extends BaseError {
 export class DuplicateEntryError extends ValidationError {
   constructor(message: string) {
     super(message);
+    this.label = t`Duplicate Entry Error`;
     this.name = 'DuplicateEntryError';
   }
 }
@@ -41,6 +49,7 @@ export class DuplicateEntryError extends ValidationError {
 export class LinkValidationError extends ValidationError {
   constructor(message: string) {
     super(message);
+    this.label = t`Link Validation Error`;
     this.name = 'LinkValidationError';
   }
 }
@@ -48,6 +57,7 @@ export class LinkValidationError extends ValidationError {
 export class MandatoryError extends ValidationError {
   constructor(message: string) {
     super(message);
+    this.label = t`Mandatory Error`;
     this.name = 'MandatoryError';
   }
 }
@@ -55,6 +65,7 @@ export class MandatoryError extends ValidationError {
 export class DatabaseError extends BaseError {
   constructor(message: string) {
     super(500, message);
+    this.label = t`Database Error`;
     this.name = 'DatabaseError';
   }
 }
@@ -62,6 +73,7 @@ export class DatabaseError extends BaseError {
 export class CannotCommitError extends DatabaseError {
   constructor(message: string) {
     super(message);
+    this.label = t`Cannot Commit Error`;
     this.name = 'CannotCommitError';
   }
 }
diff --git a/schemas/app/JournalEntry.json b/schemas/app/JournalEntry.json
index a53ba3dc..ba2f372f 100644
--- a/schemas/app/JournalEntry.json
+++ b/schemas/app/JournalEntry.json
@@ -66,7 +66,8 @@
     {
       "fieldname": "date",
       "label": "Date",
-      "fieldtype": "Date"
+      "fieldtype": "Date",
+      "required": true
     },
     {
       "fieldname": "accounts",
diff --git a/schemas/app/Payment.json b/schemas/app/Payment.json
index f488786d..7048d310 100644
--- a/schemas/app/Payment.json
+++ b/schemas/app/Payment.json
@@ -16,12 +16,14 @@
       "fieldname": "party",
       "label": "Party",
       "fieldtype": "Link",
-      "target": "Party"
+      "target": "Party",
+      "required": true
     },
     {
       "fieldname": "date",
       "label": "Posting Date",
-      "fieldtype": "Date"
+      "fieldtype": "Date",
+      "required": true
     },
     {
       "fieldname": "account",
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 06433221..072406af 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -16,7 +16,8 @@
     {
       "fieldname": "date",
       "label": "Date",
-      "fieldtype": "Date"
+      "fieldtype": "Date",
+      "required": true
     },
     {
       "fieldname": "party",
@@ -29,7 +30,8 @@
       "fieldname": "account",
       "label": "Account",
       "fieldtype": "Link",
-      "target": "Account"
+      "target": "Account",
+      "required": true
     },
     {
       "fieldname": "currency",
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index da0d778d..2bf1d585 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -16,7 +16,8 @@
     {
       "fieldname": "date",
       "label": "Date",
-      "fieldtype": "Date"
+      "fieldtype": "Date",
+      "required": true
     },
     {
       "fieldname": "party",
@@ -29,7 +30,8 @@
       "fieldname": "account",
       "label": "Account",
       "fieldtype": "Link",
-      "target": "Account"
+      "target": "Account",
+      "required": true
     },
     {
       "fieldname": "currency",
@@ -102,4 +104,4 @@
       "default": "SINV-"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 9ecf7e41..ec6ca811 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -3,7 +3,7 @@ import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { TelemetrySetting } from 'fyo/telemetry/types';
-import { MandatoryError, ValidationError } from 'fyo/utils/errors';
+import { BaseError, MandatoryError, ValidationError } from 'fyo/utils/errors';
 import { ErrorLog } from 'fyo/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { fyo } from './initFyo';
@@ -106,7 +106,8 @@ export function handleErrorWithDialog(error: Error, doc?: Doc) {
   const errorMessage = getErrorMessage(error, doc);
   handleError(false, error, { errorMessage, doc });
 
-  showMessageDialog({ message: error.name, detail: errorMessage });
+  const name = (error as BaseError).label ?? error.name;
+  showMessageDialog({ message: name, detail: errorMessage });
   throw error;
 }
 

From 5999c3d37a3ee9390d1a34839ea304f498997edc Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 3 May 2022 21:22:11 +0530
Subject: [PATCH 090/163] feat: keybindings for filters

---
 src/components/SearchBar.vue | 54 ++++++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index e0e62823..9b81117c 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -24,7 +24,7 @@ const keys = useKeys();
       <feather-icon name="search" class="w-4 h-4" />
       <p>{{ t`Search` }}</p>
       <div v-if="!inputValue" class="text-gray-500 ml-auto">
-        {{ platform === 'Mac' ? '⌘ K' : 'Ctrl K' }}
+        {{ modKey('k') }}
       </div>
     </button>
   </div>
@@ -78,7 +78,7 @@ const keys = useKeys();
             {{ si.label }}
           </p>
           <div
-            class="text-base px-2 py-1 rounded-lg flex items-center"
+            class="text-base px-2 py-1 rounded-xl flex items-center"
             :class="groupColorClassMap[si.group]"
           >
             {{ groupLabelMap[si.group] }}
@@ -90,25 +90,30 @@ const keys = useKeys();
 
     <!-- Footer -->
     <hr />
-    <div class="m-2 flex justify-between items-center">
+    <div class="m-1 flex justify-between items-center flex-col gap-2 text-sm select-none">
       <!-- Group Filters -->
       <div class="flex flex-row gap-2">
         <button
-          v-for="g in searchGroups"
+          v-for="(g, i) in searchGroups"
           :key="g"
-          class="text-base border px-2 py-0.5 rounded-lg"
+          class="border px-1 py-0.5 rounded-lg"
           :class="getGroupFilterButtonClass(g)"
           @click="groupFilters[g] = !groupFilters[g]"
         >
-          {{ groupLabelMap[g] }}
+          {{ groupLabelMap[g]
+          }}<span
+            class="ml-2 whitespace-nowrap brightness-50 tracking-tighter"
+            :class="`text-${groupColorMap[g]}-500`"
+            >{{ modKey(String(i + 1)) }}</span
+          >
         </button>
       </div>
 
       <!-- Keybindings Help -->
-      <div class="flex text-base gap-3 justify-center text-gray-700">
+      <div class="flex text-sm gap-8 text-gray-500">
         <p>↑↓ {{ t`Navigate` }}</p>
         <p>↩ {{ t`Select` }}</p>
-        <p><span class="text-sm tracking-tighter">esc</span> {{ t`Close` }}</p>
+        <p><span class="tracking-tighter">esc</span> {{ t`Close` }}</p>
       </div>
     </div>
   </Modal>
@@ -165,6 +170,8 @@ export default {
       if (!getIsNullOrUndef(input) && document.activeElement !== input) {
         input.focus();
       }
+
+      this.setFilter(keys);
     });
     this.openModal = false;
   },
@@ -172,6 +179,37 @@ export default {
     this.openModal = false;
   },
   methods: {
+    setFilter(keys) {
+      if (!keys.has('MetaLeft') && !keys.has('ControlLeft')) {
+        return;
+      }
+
+      if (!keys.size === 2) {
+        return;
+      }
+
+      const matches = [...keys].join(',').match(/Digit(\d+)/);
+      if (!matches) {
+        return;
+      }
+
+      const digit = matches[1];
+      const index = parseInt(digit) - 1;
+      const group = searchGroups[index];
+      if (!group || this.groupFilters[group] === undefined) {
+        return;
+      }
+
+      this.groupFilters[group] = !this.groupFilters[group];
+    },
+    modKey(key) {
+      key = key.toUpperCase();
+      if (this.platform === 'Mac') {
+        return `⌘ ${key}`;
+      }
+
+      return `Ctrl ${key}`;
+    },
     open() {
       this.openModal = true;
       nextTick(() => {

From 104a0fc43f9d8c2b01b7d7553550f584d18317d2 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 3 May 2022 23:18:50 +0530
Subject: [PATCH 091/163] fix: add a few event listeners on cached docs

---
 fyo/core/docHandler.ts   | 130 +++++++++++++++++----------------------
 fyo/model/doc.ts         |  13 ++--
 fyo/utils/observable.ts  |   2 +-
 schemas/app/Account.json |   1 -
 4 files changed, 61 insertions(+), 85 deletions(-)

diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index 991b8b22..495b3816 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -5,13 +5,13 @@ import Observable from 'fyo/utils/observable';
 import { Schema } from 'schemas/types';
 import { getRandomString } from 'utils';
 import { Fyo } from '..';
-import { DocValue, DocValueMap } from './types';
+import { DocValueMap } from './types';
 
 export class DocHandler {
   fyo: Fyo;
   models: ModelMap = {};
   singles: SinglesMap = {};
-  docs: Observable<DocMap> = new Observable();
+  docs: Observable<DocMap | undefined> = new Observable();
   observer: Observable<never> = new Observable();
 
   constructor(fyo: Fyo) {
@@ -43,59 +43,6 @@ export class DocHandler {
     }
   }
 
-  /**
-   * Cache operations
-   */
-
-  addToCache(doc: Doc) {
-    if (!this.docs) {
-      return;
-    }
-
-    // add to `docs` cache
-    const name = doc.name;
-    const schemaName = doc.schemaName;
-
-    if (!name) {
-      return;
-    }
-
-    if (!this.docs[schemaName]) {
-      this.docs[schemaName] = {};
-    }
-
-    (this.docs[schemaName] as DocMap)[name] = doc;
-
-    // singles available as first level objects too
-    if (schemaName === doc.name) {
-      this.singles[name] = doc;
-    }
-
-    // propagate change to `docs`
-    doc.on('change', (params: unknown) => {
-      this.docs!.trigger('change', params);
-    });
-  }
-
-  removeFromCache(schemaName: string, name: string) {
-    const docMap = this.docs[schemaName] as DocMap | undefined;
-    delete docMap?.[name];
-  }
-
-  getFromCache(schemaName: string, name: string): Doc | undefined {
-    const docMap = this.docs[schemaName] as DocMap | undefined;
-    return docMap?.[name];
-  }
-
-  isDirty(schemaName: string, name: string): boolean {
-    const doc = (this.docs?.[schemaName] as DocMap)?.[name];
-    if (doc === undefined) {
-      return false;
-    }
-
-    return doc.dirty;
-  }
-
   /**
    * Doc Operations
    */
@@ -107,7 +54,7 @@ export class DocHandler {
   ) {
     let doc: Doc | undefined;
     if (!options?.skipDocumentCache) {
-      doc = this.getFromCache(schemaName, name);
+      doc = this.#getFromCache(schemaName, name);
     }
 
     if (doc) {
@@ -116,7 +63,7 @@ export class DocHandler {
 
     doc = this.getNewDoc(schemaName, { name });
     await doc.load();
-    this.addToCache(doc);
+    this.#addToCache(doc);
 
     return doc;
   }
@@ -125,12 +72,6 @@ export class DocHandler {
     return await this.getDoc(schemaName, schemaName);
   }
 
-  async getDuplicate(doc: Doc): Promise<Doc> {
-    const newDoc = await doc.duplicate(false);
-    delete newDoc.name;
-    return newDoc;
-  }
-
   getNewDoc(
     schemaName: string,
     data: DocValueMap = {},
@@ -152,27 +93,66 @@ export class DocHandler {
     const doc = new Model!(schema, data, this.fyo);
     doc.name ??= getRandomString();
     if (cacheDoc) {
-      this.addToCache(doc);
+      this.#addToCache(doc);
     }
 
     return doc;
   }
 
-  async syncDoc(schemaName: string, data: DocValueMap) {
-    const name = data.name as string | undefined;
-    if (name === undefined) {
+  /**
+   * Cache operations
+   */
+
+  #addToCache(doc: Doc) {
+    if (!doc.name) {
       return;
     }
 
-    const docExists = await this.fyo.db.exists(schemaName, name);
-    if (!docExists) {
-      const doc = this.getNewDoc(schemaName, data);
-      await doc.sync();
-      return;
+    const name = doc.name;
+    const schemaName = doc.schemaName;
+
+    if (!this.docs[schemaName]) {
+      this.docs.set(schemaName, {});
     }
 
-    const doc = await this.getDoc(schemaName, name);
-    await doc.setMultiple(data);
-    await doc.sync();
+    this.docs.get(schemaName)![name] = doc;
+
+    // singles available as first level objects too
+    if (schemaName === doc.name) {
+      this.singles[name] = doc;
+    }
+
+    // propagate change to `docs`
+    doc.on('change', (params: unknown) => {
+      this.docs!.trigger('change', params);
+    });
+
+    doc.on('afterRename', (names: { oldName: string }) => {
+      this.#removeFromCache(doc.schemaName, names.oldName);
+      this.#addToCache(doc);
+    });
+
+    doc.on('afterSync', () => {
+      if (doc.name === name) {
+        return;
+      }
+
+      this.#removeFromCache(doc.schemaName, name);
+      this.#addToCache(doc);
+    });
+
+    doc.once('afterDelete', () => {
+      this.#removeFromCache(doc.schemaName, doc.name!);
+    });
+  }
+
+  #removeFromCache(schemaName: string, name: string) {
+    const docMap = this.docs.get(schemaName);
+    delete docMap?.[name];
+  }
+
+  #getFromCache(schemaName: string, name: string): Doc | undefined {
+    const docMap = this.docs.get(schemaName);
+    return docMap?.[name];
   }
 }
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index c2bfb27e..600e79bf 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -10,7 +10,7 @@ import {
   FieldTypeEnum,
   OptionField,
   Schema,
-  TargetField
+  TargetField,
 } from 'schemas/types';
 import { getIsNullOrUndef, getMapFromList, getRandomString } from 'utils';
 import { markRaw } from 'vue';
@@ -20,7 +20,7 @@ import {
   getMissingMandatoryMessage,
   getPreDefaultValues,
   setChildDocIdx,
-  shouldApplyFormula
+  shouldApplyFormula,
 } from './helpers';
 import { setName } from './naming';
 import {
@@ -582,14 +582,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
     this._setBaseMetaValues();
     await this._preSync();
 
-    const oldName = this.name!;
     const validDict = this.getValidDict();
     const data = await this.fyo.db.insert(this.schemaName, validDict);
     this._syncValues(data);
 
-    if (oldName !== this.name) {
-      this.fyo.doc.removeFromCache(this.schemaName, oldName);
-    }
     this.fyo.telemetry.log(Verb.Created, this.schemaName);
     return this;
   }
@@ -662,10 +658,11 @@ export class Doc extends Observable<DocValue | Doc[]> {
       return;
     }
 
-    await this.trigger('beforeRename');
+    const oldName = this.name;
+    await this.trigger('beforeRename', { oldName, newName });
     await this.fyo.db.rename(this.schemaName, this.name!, newName);
     this.name = newName;
-    await this.trigger('afterRename');
+    await this.trigger('afterRename', { oldName, newName });
     this.fyo.doc.observer.trigger(`rename:${this.schemaName}`, this.name);
   }
 
diff --git a/fyo/utils/observable.ts b/fyo/utils/observable.ts
index 8f896d66..5847c888 100644
--- a/fyo/utils/observable.ts
+++ b/fyo/utils/observable.ts
@@ -39,7 +39,7 @@ export default class Observable<T> {
     this[key] = value;
     this.trigger('change', {
       doc: this,
-      fieldname: key,
+      changed: key,
     });
   }
 
diff --git a/schemas/app/Account.json b/schemas/app/Account.json
index 6a3b5baa..4e61ae7a 100644
--- a/schemas/app/Account.json
+++ b/schemas/app/Account.json
@@ -1,7 +1,6 @@
 {
   "name": "Account",
   "label": "Account",
-  "doctype": "DocType",
   "isSingle": false,
   "isTree": true,
   "fields": [

From fefc79024d9f26da7a323c868bd9388be916365b Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 4 May 2022 13:49:40 +0530
Subject: [PATCH 092/163] fix: async issue, transactional deletion cascade -
 add db observers

---
 backend/database/bespoke.ts                   |   1 +
 fyo/README.md                                 |  15 +-
 fyo/core/dbHandler.ts                         |  32 +++-
 fyo/core/docHandler.ts                        |  28 +++-
 fyo/model/doc.ts                              |   9 +-
 models/Transactional/LedgerPosting.ts         |   3 +-
 models/Transactional/Transactional.ts         |  15 +-
 .../AccountingLedgerEntry.ts                  |  10 +-
 models/baseModels/Invoice/Invoice.ts          |  15 +-
 models/baseModels/Payment/Payment.ts          |   8 +-
 schemas/app/Account.json                      |  17 ++-
 src/components/Dropdown.vue                   |  12 +-
 src/components/TwoColumnForm.vue              |  58 ++++----
 src/errorHandling.ts                          |   4 +-
 src/pages/ChartOfAccounts.vue                 |   4 +-
 src/pages/DataImport.vue                      |  16 +-
 src/pages/InvoiceForm.vue                     |  25 +++-
 src/pages/JournalEntryForm.vue                |  23 ++-
 src/pages/ListView/List.vue                   |   4 +-
 src/pages/SetupWizard/SetupWizard.vue         |   5 +-
 src/utils/types.ts                            |   2 +-
 src/utils/ui.ts                               | 137 +++++++++---------
 22 files changed, 283 insertions(+), 160 deletions(-)

diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts
index f6b18181..1c17d85a 100644
--- a/backend/database/bespoke.ts
+++ b/backend/database/bespoke.ts
@@ -41,6 +41,7 @@ export class BespokeQueries {
       .sum({ total: 'baseGrandTotal' })
       .sum({ outstanding: 'outstandingAmount' })
       .where('submitted', true)
+      .where('cancelled', false)
       .whereBetween('date', [fromDate, toDate])
       .first();
   }
diff --git a/fyo/README.md b/fyo/README.md
index 5271c738..ec315a15 100644
--- a/fyo/README.md
+++ b/fyo/README.md
@@ -25,7 +25,7 @@ located in `model`, all classes exported from `books/models` extend this.
 
 ### Terminology
 
-- **Schema**: object that defines shape of the data in the database
+- **Schema**: object that defines shape of the data in the database.
 - **Model**: the controller class that extends the `Doc` class or the `Doc`
   class itself (if a controller doesn't exist).
 - **Doc**: instance of a Model, i.e. what has the data.
@@ -95,3 +95,16 @@ This can be done using `fyo/utils/translation.ts/setLanguageMapOnTranslationStri
 Since translations are runtime, if the code is evaluated before the language map
 is loaded, translations won't work. To prevent this, don't maintain translation
 strings globally.
+
+## Observers
+
+The doc and db handlers have observers (instances of `Observable`) as
+properties, these can be accessed using
+- `fyo.db.observer`
+- `fyo.doc.observer`
+
+The purpose of the observer is to trigger registered callbacks when some `doc`
+operation or `db` operation takes place.
+
+These are schema level observers i.e. they are registered like so:
+`method:schemaName`. The callbacks receive args passed to the functions.
\ No newline at end of file
diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index b5ee7750..09158cee 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -1,6 +1,7 @@
 import { SingleValue } from 'backend/database/types';
 import { Fyo } from 'fyo';
 import { DatabaseDemux } from 'fyo/demux/db';
+import Observable from 'fyo/utils/observable';
 import { Field, RawValue, SchemaMap } from 'schemas/types';
 import { getMapFromList } from 'utils';
 import { DatabaseBase, DatabaseDemuxBase, GetAllOptions } from 'utils/db/types';
@@ -23,6 +24,7 @@ export class DatabaseHandler extends DatabaseBase {
   #demux: DatabaseDemuxBase;
   dbPath?: string;
   schemaMap: Readonly<SchemaMap> = {};
+  observer: Observable<never> = new Observable();
   fieldValueMap: Record<string, Record<string, Field>> = {};
 
   constructor(fyo: Fyo, Demux?: DatabaseDemuxConstructor) {
@@ -62,6 +64,7 @@ export class DatabaseHandler extends DatabaseBase {
       const fields = this.schemaMap[schemaName]!.fields!;
       this.fieldValueMap[schemaName] = getMapFromList(fields, 'fieldname');
     }
+    this.observer = new Observable();
   }
 
   purgeCache() {
@@ -83,6 +86,7 @@ export class DatabaseHandler extends DatabaseBase {
       schemaName,
       rawValueMap
     )) as RawValueMap;
+    this.observer.trigger(`insert:${schemaName}`, docValueMap);
     return this.converter.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
   }
 
@@ -98,6 +102,7 @@ export class DatabaseHandler extends DatabaseBase {
       name,
       fields
     )) as RawValueMap;
+    this.observer.trigger(`get:${schemaName}`, { name, fields });
     return this.converter.toDocValueMap(schemaName, rawValueMap) as DocValueMap;
   }
 
@@ -106,6 +111,7 @@ export class DatabaseHandler extends DatabaseBase {
     options: GetAllOptions = {}
   ): Promise<DocValueMap[]> {
     const rawValueMap = await this.#getAll(schemaName, options);
+    this.observer.trigger(`getAll:${schemaName}`, options);
     return this.converter.toDocValueMap(
       schemaName,
       rawValueMap
@@ -116,7 +122,9 @@ export class DatabaseHandler extends DatabaseBase {
     schemaName: string,
     options: GetAllOptions = {}
   ): Promise<DocValueMap[]> {
-    return await this.#getAll(schemaName, options);
+    const all = await this.#getAll(schemaName, options);
+    this.observer.trigger(`getAllRaw:${schemaName}`, options);
+    return all;
   }
 
   async getSingleValues(
@@ -139,6 +147,7 @@ export class DatabaseHandler extends DatabaseBase {
       });
     }
 
+    this.observer.trigger(`getSingleValues`, fieldnames);
     return docSingleValue;
   }
 
@@ -147,7 +156,9 @@ export class DatabaseHandler extends DatabaseBase {
     options: GetAllOptions = {}
   ): Promise<number> {
     const rawValueMap = await this.#getAll(schemaName, options);
-    return rawValueMap.length;
+    const count = rawValueMap.length;
+    this.observer.trigger(`count:${schemaName}`, options);
+    return count;
   }
 
   // Update
@@ -157,28 +168,37 @@ export class DatabaseHandler extends DatabaseBase {
     newName: string
   ): Promise<void> {
     await this.#demux.call('rename', schemaName, oldName, newName);
+    this.observer.trigger(`rename:${schemaName}`, { oldName, newName });
   }
 
   async update(schemaName: string, docValueMap: DocValueMap): Promise<void> {
     const rawValueMap = this.converter.toRawValueMap(schemaName, docValueMap);
     await this.#demux.call('update', schemaName, rawValueMap);
+    this.observer.trigger(`update:${schemaName}`, docValueMap);
   }
 
   // Delete
   async delete(schemaName: string, name: string): Promise<void> {
     await this.#demux.call('delete', schemaName, name);
+    this.observer.trigger(`delete:${schemaName}`, name);
   }
 
   // Other
+  async exists(schemaName: string, name?: string): Promise<boolean> {
+    const doesExist = (await this.#demux.call(
+      'exists',
+      schemaName,
+      name
+    )) as boolean;
+    this.observer.trigger(`exists:${schemaName}`, name);
+    return doesExist;
+  }
+
   async close(): Promise<void> {
     await this.#demux.call('close');
     this.purgeCache();
   }
 
-  async exists(schemaName: string, name?: string): Promise<boolean> {
-    return (await this.#demux.call('exists', schemaName, name)) as boolean;
-  }
-
   /**
    * Bespoke function
    *
diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index 495b3816..76bba70c 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -1,6 +1,7 @@
 import { Doc } from 'fyo/model/doc';
 import { DocMap, ModelMap, SinglesMap } from 'fyo/model/types';
 import { coreModels } from 'fyo/models';
+import { NotFoundError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
 import { Schema } from 'schemas/types';
 import { getRandomString } from 'utils';
@@ -87,7 +88,7 @@ export class DocHandler {
     schema ??= this.fyo.schemaMap[schemaName];
 
     if (schema === undefined) {
-      throw new Error(`Schema not found for ${schemaName}`);
+      throw new NotFoundError(`Schema not found for ${schemaName}`);
     }
 
     const doc = new Model!(schema, data, this.fyo);
@@ -113,6 +114,7 @@ export class DocHandler {
 
     if (!this.docs[schemaName]) {
       this.docs.set(schemaName, {});
+      this.#setCacheUpdationListeners(schemaName);
     }
 
     this.docs.get(schemaName)![name] = doc;
@@ -127,11 +129,6 @@ export class DocHandler {
       this.docs!.trigger('change', params);
     });
 
-    doc.on('afterRename', (names: { oldName: string }) => {
-      this.#removeFromCache(doc.schemaName, names.oldName);
-      this.#addToCache(doc);
-    });
-
     doc.on('afterSync', () => {
       if (doc.name === name) {
         return;
@@ -140,10 +137,25 @@ export class DocHandler {
       this.#removeFromCache(doc.schemaName, name);
       this.#addToCache(doc);
     });
+  }
 
-    doc.once('afterDelete', () => {
-      this.#removeFromCache(doc.schemaName, doc.name!);
+  #setCacheUpdationListeners(schemaName: string) {
+    this.fyo.db.observer.on(`delete:${schemaName}`, (name: string) => {
+      this.#removeFromCache(schemaName, name);
     });
+
+    this.fyo.db.observer.on(
+      `rename:${schemaName}`,
+      (names: { oldName: string; newName: string }) => {
+        const doc = this.#getFromCache(schemaName, names.oldName);
+        if (doc === undefined) {
+          return;
+        }
+
+        this.#removeFromCache(schemaName, names.oldName);
+        this.#addToCache(doc);
+      }
+    );
   }
 
   #removeFromCache(schemaName: string, name: string) {
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 600e79bf..ee610310 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -374,7 +374,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   _setBaseMetaValues() {
-    if (this.schema.isSubmittable && typeof this.submitted !== 'boolean') {
+    if (this.schema.isSubmittable) {
       this.submitted = false;
       this.cancelled = false;
     }
@@ -602,7 +602,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return this;
   }
 
-  async sync() {
+  async sync(): Promise<Doc> {
     await this.trigger('beforeSync');
     let doc;
     if (this.notInserted) {
@@ -744,6 +744,11 @@ export class Doc extends Observable<DocValue | Doc[]> {
    *
    * Abstractish methods that are called using `this.trigger`.
    * These are to be overridden if required when subclassing.
+   *
+   * Refrain from running methods that call `this.sync`
+   * in the `beforeLifecycle` methods.
+   *
+   * This may cause the lifecycle function to execute incorrectly.
    */
   async change(ch: ChangeArg) {}
   async validate() {}
diff --git a/models/Transactional/LedgerPosting.ts b/models/Transactional/LedgerPosting.ts
index 11274d94..008bcf3e 100644
--- a/models/Transactional/LedgerPosting.ts
+++ b/models/Transactional/LedgerPosting.ts
@@ -117,7 +117,8 @@ export class LedgerPosting {
         reverted: this.reverted,
         debit: this.fyo.pesa(0),
         credit: this.fyo.pesa(0),
-      }
+      },
+      false
     ) as AccountingLedgerEntry;
 
     this.entries.push(ledgerEntry);
diff --git a/models/Transactional/Transactional.ts b/models/Transactional/Transactional.ts
index d304d7b6..fc0f2dc5 100644
--- a/models/Transactional/Transactional.ts
+++ b/models/Transactional/Transactional.ts
@@ -20,25 +20,32 @@ import { LedgerPosting } from './LedgerPosting';
  */
 
 export abstract class Transactional extends Doc {
-  isTransactional = true;
+  get isTransactional() {
+    return true;
+  }
+
   abstract getPosting(): Promise<LedgerPosting>;
 
   async validate() {
+    super.validate();
     const posting = await this.getPosting();
     posting.validate();
   }
 
   async afterSubmit(): Promise<void> {
+    super.afterSubmit();
     const posting = await this.getPosting();
     await posting.post();
   }
 
   async afterCancel(): Promise<void> {
+    super.afterCancel();
     const posting = await this.getPosting();
     await posting.postReverse();
   }
 
   async afterDelete(): Promise<void> {
+    super.afterDelete();
     const ledgerEntryIds = (await this.fyo.db.getAll(
       ModelNameEnum.AccountingLedgerEntry,
       {
@@ -51,7 +58,11 @@ export abstract class Transactional extends Doc {
     )) as { name: string }[];
 
     for (const { name } of ledgerEntryIds) {
-      await this.fyo.db.delete(ModelNameEnum.AccountingLedgerEntry, name);
+      const ledgerEntryDoc = await this.fyo.doc.getDoc(
+        ModelNameEnum.AccountingLedgerEntry,
+        name
+      );
+      await ledgerEntryDoc.delete();
     }
   }
 }
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
index 0c0b91c6..91318f94 100644
--- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
+++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
@@ -41,7 +41,15 @@ export class AccountingLedgerEntry extends Doc {
 
   static getListViewSettings(): ListViewSettings {
     return {
-      columns: ['account', 'party', 'debit', 'credit', 'balance'],
+      columns: [
+        'account',
+        'party',
+        'debit',
+        'credit',
+        'balance',
+        'referenceName',
+        'reverted',
+      ],
     };
   }
 }
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index affaf3a4..540ab938 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -43,8 +43,13 @@ export abstract class Invoice extends Transactional {
     await party.updateOutstandingAmount();
   }
 
-  async beforeCancel() {
-    await super.beforeCancel();
+  async afterCancel() {
+    await super.afterCancel();
+    await this._cancelPayments();
+    await this._updatePartyOutStanding();
+  }
+
+  async _cancelPayments() {
     const paymentIds = await this.getPaymentIds();
     for (const paymentId of paymentIds) {
       const paymentDoc = (await this.fyo.doc.getDoc(
@@ -55,8 +60,7 @@ export abstract class Invoice extends Transactional {
     }
   }
 
-  async afterCancel() {
-    await super.afterCancel();
+  async _updatePartyOutStanding() {
     const partyDoc = (await this.fyo.doc.getDoc(
       ModelNameEnum.Party,
       this.party!
@@ -69,7 +73,8 @@ export abstract class Invoice extends Transactional {
     await super.afterDelete();
     const paymentIds = await this.getPaymentIds();
     for (const name of paymentIds) {
-      await this.fyo.db.delete(ModelNameEnum.AccountingLedgerEntry, name);
+      const paymentDoc = await this.fyo.doc.getDoc(ModelNameEnum.Payment, name);
+      await paymentDoc.delete();
     }
   }
 
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 4419107f..88345efd 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -91,6 +91,10 @@ export class Payment extends Transactional {
 
   async validate() {
     await super.validate();
+    if (this.submitted) {
+      return;
+    }
+
     this.validateAccounts();
     this.validateTotalReferenceAmount();
     this.validateWriteOffAccount();
@@ -243,7 +247,8 @@ export class Payment extends Transactional {
     throw new ValidationError(message);
   }
 
-  async beforeSubmit() {
+  async afterSubmit() {
+    await super.afterSubmit();
     await this.updateReferenceDocOutstanding();
     await this.updatePartyOutstanding();
   }
@@ -281,6 +286,7 @@ export class Payment extends Transactional {
       const outstandingAmount = (refDoc.outstandingAmount as Money).add(
         ref.amount!
       );
+
       await refDoc.setAndSync({ outstandingAmount });
     }
   }
diff --git a/schemas/app/Account.json b/schemas/app/Account.json
index 4e61ae7a..651a57bb 100644
--- a/schemas/app/Account.json
+++ b/schemas/app/Account.json
@@ -37,13 +37,14 @@
           "label": "Expense"
         }
       ],
-      "required": true
+      "readOnly": true
     },
     {
       "fieldname": "parentAccount",
       "label": "Parent Account",
       "fieldtype": "Link",
-      "target": "Account"
+      "target": "Account",
+      "readOnly": true
     },
     {
       "fieldname": "accountType",
@@ -138,9 +139,17 @@
     {
       "fieldname": "isGroup",
       "label": "Is Group",
-      "fieldtype": "Check"
+      "fieldtype": "Check",
+      "readOnly": true
     }
   ],
-  "quickEditFields": ["name", "rootType", "parentAccount", "accountType"],
+  "quickEditFields": [
+    "name",
+    "rootType",
+    "parentAccount",
+    "accountType",
+    "isGroup",
+    "balance"
+  ],
   "keywordFields": ["name", "rootType", "accountType"]
 }
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 10e1469f..56d593de 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -183,16 +183,16 @@ export default {
 
       return emptyMessage;
     },
-    selectItem(d) {
+    async selectItem(d) {
       if (!d.action) {
         return;
       }
 
       if (this.doc) {
-        return d.action(this.doc, this.$router);
+        return await d.action(this.doc, this.$router);
       }
-      
-      d.action()
+
+      await d.action();
     },
     toggleDropdown(flag) {
       if (flag == null) {
@@ -201,11 +201,11 @@ export default {
         this.isShown = Boolean(flag);
       }
     },
-    selectHighlightedItem() {
+    async selectHighlightedItem() {
       if (![-1, this.items.length].includes(this.highlightedIndex)) {
         // valid selection
         let item = this.items[this.highlightedIndex];
-        this.selectItem(item);
+        await this.selectItem(item);
       }
     },
     highlightItemUp() {
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index db5c25c5..13e62801 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -10,7 +10,7 @@
         :df="df"
         :value="doc[df.fieldname]"
         :read-only="evaluateReadOnly(df)"
-        @change="(value) => onChange(df, value)"
+        @change="async (value) => await onChange(df, value)"
       />
 
       <!-- Inline Field Form (Eg: Address) -->
@@ -71,9 +71,9 @@
             :value="getRegularValue(df)"
             :class="{ 'p-2': df.fieldtype === 'Check' }"
             :read-only="evaluateReadOnly(df)"
-            @change="(value) => onChange(df, value)"
+            @change="async (value) => await onChange(df, value)"
             @focus="activateInlineEditing(df)"
-            @new-doc="(newdoc) => onChange(df, newdoc.name)"
+            @new-doc="async (newdoc) => await onChange(df, newdoc.name)"
           />
           <div
             class="text-sm text-red-600 mt-2 pl-2"
@@ -173,7 +173,7 @@ export default {
 
       return evaluateReadOnly(df, this.doc);
     },
-    onChange(df, value) {
+    async onChange(df, value) {
       if (df.inline) {
         return;
       }
@@ -185,23 +185,23 @@ export default {
 
       const oldValue = this.doc.get(df.fieldname);
       this.errors[df.fieldname] = null;
-      this.onChangeCommon(df, value, oldValue);
+      await this.onChangeCommon(df, value, oldValue);
     },
-    onChangeCommon(df, value, oldValue) {
-      this.doc
-        .set(df.fieldname, value)
-        .catch((e) => {
-          this.errors[df.fieldname] = getErrorMessage(e, this.doc);
-        })
-        .then((success) => {
-          if (!success) {
-            return;
-          }
+    async onChangeCommon(df, value, oldValue) {
+      let isSet = false;
+      try {
+        isSet = this.doc.set(df.fieldname, value);
+      } catch (err) {
+        this.errors[df.fieldname] = getErrorMessage(err, this.doc);
+      }
 
-          this.handlePostSet(df, value, oldValue);
-        });
+      if (!isSet) {
+        return;
+      }
+
+      await this.handlePostSet(df, value, oldValue);
     },
-    handlePostSet(df, value, oldValue) {
+    async handlePostSet(df, value, oldValue) {
       this.setFormFields();
       if (this.emitChange) {
         this.$emit('change', df, value, oldValue);
@@ -212,14 +212,22 @@ export default {
           return;
         }
 
-        this.doc.sync();
+        await this.doc.sync();
       }
     },
-    sync() {
-      return this.doc.sync().catch((e) => handleErrorWithDialog(e, this.doc));
+    async sync() {
+      try {
+        await this.doc.sync();
+      } catch (err) {
+        await handleErrorWithDialog(err, this.doc);
+      }
     },
-    submit() {
-      return this.doc.submit().catch((e) => handleErrorWithDialog(e, this.doc));
+    async submit() {
+      try {
+        await this.doc.submit();
+      } catch (err) {
+        await handleErrorWithDialog(err, this.doc);
+      }
     },
     async activateInlineEditing(df) {
       if (!df.inline) {
@@ -229,8 +237,8 @@ export default {
       this.inlineEditField = df;
       if (!this.doc[df.fieldname]) {
         this.inlineEditDoc = await fyo.doc.getNewDoc(df.target);
-        this.inlineEditDoc.once('afterSync', () => {
-          this.onChangeCommon(df, this.inlineEditDoc.name);
+        this.inlineEditDoc.once('afterSync', async () => {
+          await this.onChangeCommon(df, this.inlineEditDoc.name);
         });
       } else {
         this.inlineEditDoc = this.doc.getLink(df.fieldname);
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index ec6ca811..4979816a 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -102,12 +102,12 @@ export function handleError(
   }
 }
 
-export function handleErrorWithDialog(error: Error, doc?: Doc) {
+export async function handleErrorWithDialog(error: Error, doc?: Doc) {
   const errorMessage = getErrorMessage(error, doc);
   handleError(false, error, { errorMessage, doc });
 
   const name = (error as BaseError).label ?? error.name;
-  showMessageDialog({ message: name, detail: errorMessage });
+  await showMessageDialog({ message: name, detail: errorMessage });
   throw error;
 }
 
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 092933a4..0a32ae76 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -276,7 +276,7 @@ export default {
         await this.fetchChildren(parentAccount, true);
 
         // open quick edit
-        openQuickEdit({
+        await openQuickEdit({
           schemaName: 'Account',
           name: account.name,
         });
@@ -285,7 +285,7 @@ export default {
       } catch (e) {
         // unfreeze input
         this.insertingAccount = false;
-        handleErrorWithDialog(e, account);
+        await handleErrorWithDialog(e, account);
       }
     },
     isQuickEditOpen(account) {
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index 6a9becc5..f5a7e08d 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -533,33 +533,30 @@ export default {
       }
 
       if (this.isRequiredUnassigned) {
-        showMessageDialog({
+        return await showMessageDialog({
           message: this.t`Required Fields not Assigned`,
           detail: this
             .t`Please assign the following fields ${this.requiredUnassigned.join(
             ', '
           )}`,
         });
-        return;
       }
 
       if (this.importer.assignedMatrix.length === 0) {
-        showMessageDialog({
+        return await showMessageDialog({
           message: this.t`No Data to Import`,
           detail: this.t`Please select a file with data to import.`,
         });
-        return;
       }
 
       const { success, names, message } = await this.importer.importData(
         this.setLoadingStatus
       );
       if (!success) {
-        showMessageDialog({
+        return await showMessageDialog({
           message: this.t`Import Failed`,
           detail: message,
         });
-        return;
       }
 
       this.names = names;
@@ -593,7 +590,9 @@ export default {
         await ipcRenderer.invoke(IPC_ACTIONS.GET_FILE, options);
 
       if (!success && !canceled) {
-        showMessageDialog({ message: this.t`File selection failed.` });
+        return await showMessageDialog({
+          message: this.t`File selection failed.`,
+        });
       }
 
       if (!success || canceled) {
@@ -603,11 +602,10 @@ export default {
       const text = new TextDecoder().decode(data);
       const isValid = this.importer.selectFile(text);
       if (!isValid) {
-        showMessageDialog({
+        return await showMessageDialog({
           message: this.t`Bad import data.`,
           detail: this.t`Could not select file.`,
         });
-        return;
       }
 
       this.file = {
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index b9ebebf9..0f11d010 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -276,7 +276,7 @@ export default {
         routeTo(`/list/${this.schemaName}`);
         return;
       }
-      this.handleError(error);
+      await this.handleError(error);
     }
     this.printSettings = await fyo.doc.getSingle('PrintSettings');
     this.companyName = (
@@ -305,20 +305,29 @@ export default {
       return fyo.getField(this.schemaName, fieldname);
     },
     async sync() {
-      return this.doc.sync().catch(this.handleError);
+      try {
+        await this.doc.sync();
+      } catch (err) {
+        await this.handleError(err);
+      }
     },
-    submit() {
+    async submit() {
       const message =
         this.schemaName === ModelNameEnum.SalesInvoice
           ? this.t`Submit Sales Invoice?`
           : this.t`Submit Purchase Invoice?`;
-      showMessageDialog({
+      const ref = this
+      await showMessageDialog({
         message,
         buttons: [
           {
             label: this.t`Yes`,
-            action: () => {
-              this.doc.submit().catch(this.handleError);
+            async action() {
+              try {
+                await ref.doc.submit();
+              } catch (err) {
+                await ref.handleError(err);
+              }
             },
           },
           {
@@ -328,8 +337,8 @@ export default {
         ],
       });
     },
-    handleError(e) {
-      handleErrorWithDialog(e, this.doc);
+    async handleError(e) {
+      await handleErrorWithDialog(e, this.doc);
     },
     openInvoiceSettings() {
       openSettings('Invoice');
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index 4b62ef1c..d751cb86 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -200,7 +200,7 @@ export default {
         return;
       }
 
-      this.handleError(error);
+      await this.handleError(error);
     }
 
     if (fyo.store.isDevelopment) {
@@ -238,16 +238,25 @@ export default {
       return fyo.getField(ModelNameEnum.JournalEntry, fieldname);
     },
     async sync() {
-      return this.doc.sync().catch(this.handleError);
+      try {
+        await this.doc.sync();
+      } catch (err) {
+        this.handleError(err);
+      }
     },
     async submit() {
-      showMessageDialog({
+      const ref = this;
+      await showMessageDialog({
         message: this.t`Submit Journal Entry?`,
         buttons: [
           {
             label: this.t`Yes`,
-            action: () => {
-              this.doc.submit().catch(this.handleError);
+            async action() {
+              try {
+                await ref.doc.submit();
+              } catch (err) {
+                await ref.handleError(err);
+              }
             },
           },
           {
@@ -257,8 +266,8 @@ export default {
         ],
       });
     },
-    handleError(e) {
-      handleErrorWithDialog(e, this.doc);
+    async handleError(e) {
+      await handleErrorWithDialog(e, this.doc);
     },
   },
 };
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index 9868260d..d17baf94 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -120,7 +120,7 @@ export default {
   },
   methods: {
     setUpdateListeners() {
-      const listener = () => {
+      const listener = (name) => {
         this.updateData();
       };
 
@@ -130,7 +130,7 @@ export default {
       }
 
       fyo.doc.observer.on(`sync:${this.schemaName}`, listener);
-      fyo.doc.observer.on(`delete:${this.schemaName}`, listener);
+      fyo.db.observer.on(`delete:${this.schemaName}`, listener);
       fyo.doc.observer.on(`rename:${this.schemaName}`, listener);
     },
     openForm(doc) {
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index bc3af5df..64cf4977 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -180,8 +180,9 @@ export default {
     },
     async submit() {
       if (!this.allValuesFilled()) {
-        showMessageDialog({ message: this.t`Please fill all values` });
-        return;
+        return await showMessageDialog({
+          message: this.t`Please fill all values`,
+        });
       }
 
       this.loading = true;
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 4aa2b153..d9809bb1 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -1,6 +1,6 @@
 export interface MessageDialogButton {
   label: string;
-  action: () => void;
+  action: () => Promise<unknown> | unknown;
 }
 
 export interface MessageDialogOptions {
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 731912d7..52ade811 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -87,9 +87,11 @@ export async function showMessageDialog({
   )) as { response: number };
 
   const button = buttons[response];
-  if (button && button.action) {
-    button.action();
+  if (!button?.action) {
+    return null;
   }
+
+  return await button.action();
 }
 
 export async function showToast(options: ToastOptions) {
@@ -138,37 +140,36 @@ export async function routeTo(route: string | RouteLocationRaw) {
   await router.push(routeOptions);
 }
 
-export function deleteDocWithPrompt(doc: Doc) {
+export async function deleteDocWithPrompt(doc: Doc) {
   const schemaLabel = fyo.schemaMap[doc.schemaName]!.label;
   let detail = t`This action is permanent.`;
   if (doc.isTransactional) {
-    detail = t`This action is permanent and will delete all ledger entries.`;
+    detail = t`This action is permanent and will delete associated ledger entries.`;
   }
 
-  return new Promise((resolve) => {
-    showMessageDialog({
-      message: t`Delete ${schemaLabel} ${doc.name!}?`,
-      detail,
-      buttons: [
-        {
-          label: t`Delete`,
-          action: () => {
-            doc
-              .delete()
-              .then(() => resolve(true))
-              .catch((e: Error) => {
-                handleErrorWithDialog(e, doc);
-              });
-          },
+  return await showMessageDialog({
+    message: t`Delete ${schemaLabel} ${doc.name!}?`,
+    detail,
+    buttons: [
+      {
+        label: t`Delete`,
+        async action() {
+          try {
+            await doc.delete();
+            return true;
+          } catch (err) {
+            handleErrorWithDialog(err as Error, doc);
+            return false;
+          }
         },
-        {
-          label: t`Cancel`,
-          action() {
-            resolve(false);
-          },
+      },
+      {
+        label: t`Cancel`,
+        action() {
+          return false;
         },
-      ],
-    });
+      },
+    ],
   });
 }
 
@@ -204,30 +205,30 @@ export async function cancelDocWithPrompt(doc: Doc) {
     }
   }
 
-  return new Promise((resolve) => {
-    const schemaLabel = fyo.schemaMap[doc.schemaName]!.label;
-    showMessageDialog({
-      message: t`Cancel ${schemaLabel} ${doc.name!}?`,
-      detail,
-      buttons: [
-        {
-          label: t`Yes`,
-          async action() {
-            const entryDoc = await fyo.doc.getDoc(doc.schemaName, doc.name!);
-            entryDoc
-              .cancel()
-              .then(() => resolve(true))
-              .catch((e) => handleErrorWithDialog(e, doc));
-          },
+  const schemaLabel = fyo.schemaMap[doc.schemaName]!.label;
+  return await showMessageDialog({
+    message: t`Cancel ${schemaLabel} ${doc.name!}?`,
+    detail,
+    buttons: [
+      {
+        label: t`Yes`,
+        async action() {
+          try {
+            await doc.cancel();
+            return true;
+          } catch (err) {
+            handleErrorWithDialog(err as Error, doc);
+            return false;
+          }
         },
-        {
-          label: t`No`,
-          action() {
-            resolve(false);
-          },
+      },
+      {
+        label: t`No`,
+        action() {
+          return false;
         },
-      ],
-    });
+      },
+    ],
   });
 }
 
@@ -258,13 +259,13 @@ function getCancelAction(doc: Doc): Action {
     component: {
       template: '<span class="text-red-700">{{ t`Cancel` }}</span>',
     },
-    condition: (doc: Doc) => !!doc.submitted && !doc.cancelled,
-    action: () => {
-      cancelDocWithPrompt(doc).then((res) => {
-        if (res) {
-          router.push(`/list/${doc.schemaName}`);
-        }
-      });
+    condition: (doc: Doc) => doc.isSubmitted,
+    async action() {
+      const res = await cancelDocWithPrompt(doc);
+
+      if (res) {
+        router.push(`/list/${doc.schemaName}`);
+      }
     },
   };
 }
@@ -278,12 +279,12 @@ function getDeleteAction(doc: Doc): Action {
     condition: (doc: Doc) =>
       (!doc.notInserted && !doc.schema.isSubmittable && !doc.schema.isSingle) ||
       doc.isCancelled,
-    action: () =>
-      deleteDocWithPrompt(doc).then((res) => {
-        if (res) {
-          routeTo(`/list/${doc.schemaName}`);
-        }
-      }),
+    async action() {
+      const res = await deleteDocWithPrompt(doc);
+      if (res) {
+        routeTo(`/list/${doc.schemaName}`);
+      }
+    },
   };
 }
 
@@ -297,20 +298,26 @@ function getDuplicateAction(doc: Doc): Action {
         !doc.notInserted &&
         !(doc.cancelled || false)
       ),
-    action: () => {
-      showMessageDialog({
+    async action() {
+      await showMessageDialog({
         message: t`Duplicate ${doc.schemaName} ${doc.name!}?`,
         buttons: [
           {
             label: t`Yes`,
             async action() {
-              doc.duplicate();
+              try {
+                doc.duplicate();
+                return true;
+              } catch (err) {
+                handleErrorWithDialog(err as Error, doc);
+                return false;
+              }
             },
           },
           {
             label: t`No`,
             action() {
-              // no-op
+              return false;
             },
           },
         ],

From eedb4415ce15416c22361caee8ca834a8eac39b0 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 4 May 2022 18:17:45 +0530
Subject: [PATCH 093/163] incr: redo duplication (don't sync) - fix journal
 entry

---
 backend/database/core.ts                      | 13 ++--
 fyo/model/doc.ts                              | 52 ++++++++-------
 models/Transactional/LedgerPosting.ts         | 28 +++++---
 .../baseModels/JournalEntry/JournalEntry.ts   |  4 +-
 models/baseModels/Party/Party.ts              |  2 +
 models/baseModels/Payment/Payment.ts          | 64 +++++++++++++++----
 schemas/app/Payment.json                      |  2 +-
 src/components/Controls/Table.vue             | 10 ++-
 src/utils/ui.ts                               | 23 +++++--
 9 files changed, 141 insertions(+), 57 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 3590d16e..7af66a76 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -15,7 +15,11 @@ import {
   SchemaMap,
   TargetField,
 } from '../../schemas/types';
-import { getRandomString, getValueMapFromList } from '../../utils';
+import {
+  getIsNullOrUndef,
+  getRandomString,
+  getValueMapFromList,
+} from '../../utils';
 import { DatabaseBase, GetAllOptions, QueryFilter } from '../../utils/db/types';
 import { getDefaultMetaFieldValueMap, sqliteTypeMap, SYSTEM } from '../helpers';
 import {
@@ -889,12 +893,13 @@ export default class DatabaseCore extends DatabaseBase {
 
       const tableFieldValue = fieldValueMap[field.fieldname] as
         | FieldValueMap[]
-        | undefined;
-      if (tableFieldValue === undefined) {
+        | undefined
+        | null;
+      if (getIsNullOrUndef(tableFieldValue)) {
         continue;
       }
 
-      for (const child of tableFieldValue) {
+      for (const child of tableFieldValue!) {
         this.#prepareChild(schemaName, parentName, child, field, added.length);
 
         if (
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index ee610310..d32e6e14 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -127,6 +127,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
       } else {
         this[fieldname] = value ?? this[fieldname] ?? null;
       }
+
+      if (field.fieldtype === FieldTypeEnum.Table && !this[fieldname]) {
+        this[fieldname] = [];
+      }
     }
   }
 
@@ -269,6 +273,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   _getChildDoc(docValueMap: Doc | DocValueMap, fieldname: string): Doc {
+    if (!this.name) {
+      this.name = getRandomString();
+    }
+
     docValueMap.name ??= getRandomString();
 
     // Child Meta Fields
@@ -304,6 +312,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
     for (const field of tableFields) {
       const childDocs = this.get(field.fieldname) as Doc[];
+      if (!childDocs) {
+        continue;
+      }
+
       checkForMandatory.push(...childDocs);
     }
 
@@ -351,13 +363,18 @@ export class Doc extends Observable<DocValue | Doc[]> {
     await validator(value);
   }
 
-  getValidDict(): DocValueMap {
+  getValidDict(filterMeta: boolean = false): DocValueMap {
+    let fields = this.schema.fields;
+    if (filterMeta) {
+      fields = this.schema.fields.filter((f) => !f.meta);
+    }
+
     const data: DocValueMap = {};
-    for (const field of this.schema.fields) {
+    for (const field of fields) {
       let value = this[field.fieldname] as DocValue | DocValueMap[];
 
       if (Array.isArray(value)) {
-        value = value.map((doc) => (doc as Doc).getValidDict());
+        value = value.map((doc) => (doc as Doc).getValidDict(filterMeta));
       }
 
       if (isPesa(value)) {
@@ -704,25 +721,17 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return await this.sync();
   }
 
-  async duplicate(shouldSync: boolean = true): Promise<Doc> {
-    const updateMap: DocValueMap = {};
-    const docValueMap = this.getValidDict();
-    const fieldnames = this.schema.fields.map((f) => f.fieldname);
-
-    for (const fn of fieldnames) {
-      const value = docValueMap[fn];
-      if (getIsNullOrUndef(value)) {
+  duplicate(): Doc {
+    const updateMap = this.getValidDict(true);
+    for (const field in updateMap) {
+      const value = updateMap[field];
+      if (!Array.isArray(value)) {
         continue;
       }
 
-      if (Array.isArray(value)) {
-        value.forEach((row) => {
-          delete row.name;
-          delete row.parent;
-        });
+      for (const row of value) {
+        delete row.name;
       }
-
-      updateMap[fn] = value;
     }
 
     if (this.numberSeries) {
@@ -731,12 +740,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
       updateMap.name = updateMap.name + ' CPY';
     }
 
-    const doc = this.fyo.doc.getNewDoc(this.schemaName, updateMap, false);
-    if (shouldSync) {
-      await doc.sync();
-    }
-
-    return doc;
+    return this.fyo.doc.getNewDoc(this.schemaName, updateMap);
   }
 
   /**
diff --git a/models/Transactional/LedgerPosting.ts b/models/Transactional/LedgerPosting.ts
index 008bcf3e..dfd34d00 100644
--- a/models/Transactional/LedgerPosting.ts
+++ b/models/Transactional/LedgerPosting.ts
@@ -26,7 +26,8 @@ export class LedgerPosting {
   fyo: Fyo;
   refDoc: Transactional;
   entries: AccountingLedgerEntry[];
-  entryMap: Record<string, AccountingLedgerEntry>;
+  creditMap: Record<string, AccountingLedgerEntry>;
+  debitMap: Record<string, AccountingLedgerEntry>;
   reverted: boolean;
   accountBalanceChanges: AccountBalanceChange[];
 
@@ -34,19 +35,20 @@ export class LedgerPosting {
     this.fyo = fyo;
     this.refDoc = refDoc;
     this.entries = [];
-    this.entryMap = {};
+    this.creditMap = {};
+    this.debitMap = {};
     this.reverted = false;
     this.accountBalanceChanges = [];
   }
 
   async debit(account: string, amount: Money) {
-    const ledgerEntry = this._getLedgerEntry(account);
+    const ledgerEntry = this._getLedgerEntry(account, 'debit');
     await ledgerEntry.set('debit', ledgerEntry.debit!.add(amount));
     await this._updateAccountBalanceChange(account, 'debit', amount);
   }
 
   async credit(account: string, amount: Money) {
-    const ledgerEntry = this._getLedgerEntry(account);
+    const ledgerEntry = this._getLedgerEntry(account, 'credit');
     await ledgerEntry.set('credit', ledgerEntry.credit!.add(amount));
     await this._updateAccountBalanceChange(account, 'credit', amount);
   }
@@ -101,9 +103,17 @@ export class LedgerPosting {
     });
   }
 
-  _getLedgerEntry(account: string): AccountingLedgerEntry {
-    if (this.entryMap[account]) {
-      return this.entryMap[account];
+  _getLedgerEntry(
+    account: string,
+    type: TransactionType
+  ): AccountingLedgerEntry {
+    let map = this.creditMap;
+    if (type === 'debit') {
+      map = this.debitMap;
+    }
+
+    if (map[account]) {
+      return map[account];
     }
 
     const ledgerEntry = this.fyo.doc.getNewDoc(
@@ -122,9 +132,9 @@ export class LedgerPosting {
     ) as AccountingLedgerEntry;
 
     this.entries.push(ledgerEntry);
-    this.entryMap[account] = ledgerEntry;
+    map[account] = ledgerEntry;
 
-    return this.entryMap[account];
+    return map[account];
   }
 
   _validateIsEqual() {
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index 7702d255..7a9e16d1 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -13,12 +13,12 @@ import Money from 'pesa/dist/types/src/money';
 import { LedgerPosting } from '../../Transactional/LedgerPosting';
 
 export class JournalEntry extends Transactional {
-  accounts: Doc[] = [];
+  accounts?: Doc[];
 
   async getPosting() {
     const posting: LedgerPosting = new LedgerPosting(this, this.fyo);
 
-    for (const row of this.accounts) {
+    for (const row of this.accounts ?? []) {
       const debit = row.debit as Money;
       const credit = row.credit as Money;
       const account = row.account as string;
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 9b60ccb2..932df43d 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -11,9 +11,11 @@ import {
   validateEmail,
   validatePhoneNumber,
 } from 'fyo/model/validationFunction';
+import Money from 'pesa/dist/types/src/money';
 import { PartyRole } from './types';
 
 export class Party extends Doc {
+  outstandingAmount?: Money;
   async updateOutstandingAmount() {
     /**
      * If Role === "Both" then outstanding Amount
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 88345efd..9232f163 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -73,7 +73,7 @@ export class Payment extends Transactional {
 
   updateAmountOnReferenceUpdate() {
     this.amount = this.fyo.pesa(0);
-    for (const paymentReference of this.for as Doc[]) {
+    for (const paymentReference of (this.for ?? []) as Doc[]) {
       this.amount = (this.amount as Money).add(
         paymentReference.amount as Money
       );
@@ -163,16 +163,28 @@ export class Payment extends Transactional {
   }
 
   async getPosting() {
-    const account = this.account as string;
-    const paymentAccount = this.paymentAccount as string;
-    const amount = this.amount as Money;
-    const writeoff = this.writeoff as Money;
+    /**
+     * account        : From Account
+     * paymentAccount : To Account
+     *
+     * if Receive
+     * -        account : Debtors, etc
+     * - paymentAccount : Cash, Bank, etc
+     *
+     * if Pay
+     * -        account : Cash, Bank, etc
+     * - paymentAccount : Creditors, etc
+     */
     const posting: LedgerPosting = new LedgerPosting(this, this.fyo);
 
-    await posting.debit(paymentAccount as string, amount.sub(writeoff));
-    await posting.credit(account as string, amount.sub(writeoff));
+    const paymentAccount = this.paymentAccount as string;
+    const account = this.account as string;
+    const amount = this.amount as Money;
 
-    this.applyWriteOffPosting(posting);
+    await posting.debit(paymentAccount as string, amount);
+    await posting.credit(account as string, amount);
+
+    await this.applyWriteOffPosting(posting);
     return posting;
   }
 
@@ -183,11 +195,12 @@ export class Payment extends Transactional {
     }
 
     const account = this.account as string;
+    const paymentAccount = this.paymentAccount as string;
     const writeOffAccount = this.fyo.singles.AccountingSettings!
       .writeOffAccount as string;
 
     if (this.paymentType === 'Pay') {
-      await posting.credit(account, writeoff);
+      await posting.credit(paymentAccount, writeoff);
       await posting.debit(writeOffAccount, writeoff);
     } else {
       await posting.debit(account, writeoff);
@@ -277,7 +290,7 @@ export class Payment extends Transactional {
   }
 
   async _revertReferenceOutstanding() {
-    for (const ref of this.for as PaymentFor[]) {
+    for (const ref of (this.for ?? []) as PaymentFor[]) {
       const refDoc = await this.fyo.doc.getDoc(
         ref.referenceType!,
         ref.referenceName!
@@ -318,6 +331,32 @@ export class Payment extends Transactional {
       },
       dependsOn: ['paymentMethod', 'paymentType'],
     },
+    paymentType: {
+      formula: async () => {
+        if (!this.party) {
+          return;
+        }
+        const partyDoc = await this.fyo.doc.getDoc(
+          ModelNameEnum.Party,
+          this.party
+        );
+        if (partyDoc.role === 'Supplier') {
+          return 'Pay';
+        } else if (partyDoc.role === 'Customer') {
+          return 'Receive';
+        }
+
+        const outstanding = partyDoc.outstandingAmount as Money;
+        if (outstanding?.isZero() ?? true) {
+          return '';
+        }
+
+        if (outstanding?.isPositive()) {
+          return 'Receive';
+        }
+        return 'Pay';
+      },
+    },
     amount: {
       formula: async () => this.getSum('for', 'amount', false),
       dependsOn: ['for'],
@@ -332,7 +371,10 @@ export class Payment extends Transactional {
         );
       }
 
-      if ((this.for as Doc[]).length === 0) return;
+      if (((this.for ?? []) as Doc[]).length === 0) {
+        return;
+      }
+
       const amount = this.getSum('for', 'amount', false);
 
       if ((value as Money).gt(amount)) {
diff --git a/schemas/app/Payment.json b/schemas/app/Payment.json
index 7048d310..e57780e2 100644
--- a/schemas/app/Payment.json
+++ b/schemas/app/Payment.json
@@ -113,7 +113,7 @@
     },
     {
       "fieldname": "writeoff",
-      "label": "Write Off / Refund",
+      "label": "Write Off",
       "fieldtype": "Currency"
     },
     {
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index a4b9b6b7..0ecf3f39 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -21,7 +21,11 @@
     </Row>
 
     <!-- Data Rows -->
-    <div class="overflow-auto" :style="{ 'max-height': maxHeight }">
+    <div
+      class="overflow-auto"
+      :style="{ 'max-height': maxHeight }"
+      v-if="value"
+    >
       <TableRow
         :class="{ 'pointer-events-none': isReadOnly }"
         ref="table-row"
@@ -58,7 +62,9 @@
           'px-2 py-3': size === 'small',
           'px-3 py-4': size !== 'small',
         }"
-        v-if="maxRowsBeforeOverflow && value.length > maxRowsBeforeOverflow"
+        v-if="
+          value && maxRowsBeforeOverflow && value.length > maxRowsBeforeOverflow
+        "
       >
         {{ t`${value.length} rows` }}
       </div>
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 52ade811..a10ee395 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -7,6 +7,7 @@ import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
 import { getActions } from 'fyo/utils';
+import { ModelNameEnum } from 'models/types';
 import { handleErrorWithDialog } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
 import router from 'src/router';
@@ -288,15 +289,28 @@ function getDeleteAction(doc: Doc): Action {
   };
 }
 
+async function openEdit(doc: Doc) {
+  const isFormEdit = [
+    ModelNameEnum.SalesInvoice,
+    ModelNameEnum.PurchaseInvoice,
+    ModelNameEnum.JournalEntry,
+  ].includes(doc.schemaName as ModelNameEnum);
+
+  if (isFormEdit) {
+    return await routeTo(`/edit/${doc.schemaName}/${doc.name!}`);
+  }
+
+  await openQuickEdit({ schemaName: doc.schemaName, name: doc.name! });
+}
+
 function getDuplicateAction(doc: Doc): Action {
   const isSubmittable = !!doc.schema.isSubmittable;
   return {
     label: t`Duplicate`,
     condition: (doc: Doc) =>
       !!(
-        ((isSubmittable && doc && doc.submitted) || !isSubmittable) &&
-        !doc.notInserted &&
-        !(doc.cancelled || false)
+        ((isSubmittable && doc.submitted) || !isSubmittable) &&
+        !doc.notInserted
       ),
     async action() {
       await showMessageDialog({
@@ -306,7 +320,8 @@ function getDuplicateAction(doc: Doc): Action {
             label: t`Yes`,
             async action() {
               try {
-                doc.duplicate();
+                const dupe = await doc.duplicate();
+                await openEdit(dupe);
                 return true;
               } catch (err) {
                 handleErrorWithDialog(err as Error, doc);

From a0f812e1a8ece7397530b3aa3d8985b3b275bd90 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 4 May 2022 21:55:08 +0530
Subject: [PATCH 094/163] incr: add keyword fields, start with doc search

---
 backend/database/core.ts               |   3 +-
 schemas/app/Account.json               |  10 +-
 schemas/app/AccountingLedgerEntry.json |   3 +-
 schemas/app/Address.json               |   8 --
 schemas/app/CompanySettings.json       |   3 +-
 schemas/app/Currency.json              |   1 -
 schemas/app/Item.json                  |   2 +-
 schemas/app/JournalEntry.json          |   7 +-
 schemas/app/JournalEntryAccount.json   |   5 +-
 schemas/app/NumberSeries.json          |   3 +-
 schemas/app/Party.json                 |   2 +-
 schemas/app/PaymentFor.json            |   3 +-
 schemas/app/PurchaseInvoice.json       |   2 +-
 schemas/app/PurchaseInvoiceItem.json   |   3 +-
 schemas/app/SalesInvoice.json          |   5 +-
 schemas/app/SalesInvoiceItem.json      |   3 +-
 schemas/core/SingleValue.json          |   5 +-
 schemas/core/SystemSettings.json       |   9 +-
 src/components/Controls/Link.vue       |   1 -
 src/pages/ListView/ListView.vue        |   2 +-
 src/utils/search.ts                    | 161 +++++++++++++++++++++++++
 21 files changed, 190 insertions(+), 51 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index 7af66a76..f5518bb3 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -243,8 +243,9 @@ export default class DatabaseCore extends DatabaseBase {
     }
 
     const hasCreated = !!schema.fields.find((f) => f.fieldname === 'created');
+
     const {
-      fields = ['name', ...(schema.keywordFields ?? [])],
+      fields = ['name'],
       filters,
       offset,
       limit,
diff --git a/schemas/app/Account.json b/schemas/app/Account.json
index 651a57bb..2ad675ca 100644
--- a/schemas/app/Account.json
+++ b/schemas/app/Account.json
@@ -143,13 +143,5 @@
       "readOnly": true
     }
   ],
-  "quickEditFields": [
-    "name",
-    "rootType",
-    "parentAccount",
-    "accountType",
-    "isGroup",
-    "balance"
-  ],
-  "keywordFields": ["name", "rootType", "accountType"]
+  "quickEditFields": ["name", "rootType", "parentAccount", "accountType", "isGroup", "balance"]
 }
diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index 303fc7bf..3ff9e833 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -83,6 +83,5 @@
     "balance",
     "reverted",
     "reverts"
-  ],
-  "keywordFields": ["account", "party", "referenceName"]
+  ]
 }
diff --git a/schemas/app/Address.json b/schemas/app/Address.json
index f41758f4..c3a40516 100644
--- a/schemas/app/Address.json
+++ b/schemas/app/Address.json
@@ -76,13 +76,5 @@
     "country",
     "postalCode"
   ],
-  "keywordFields": [
-    "addressLine1",
-    "addressLine2",
-    "city",
-    "state",
-    "country",
-    "postalCode"
-  ],
   "inlineEditDisplayField": "addressDisplay"
 }
diff --git a/schemas/app/CompanySettings.json b/schemas/app/CompanySettings.json
index db405430..61f5e62b 100644
--- a/schemas/app/CompanySettings.json
+++ b/schemas/app/CompanySettings.json
@@ -18,6 +18,5 @@
       "required": true,
       "target": "Address"
     }
-  ],
-  "keywordFields": ["companyName"]
+  ]
 }
diff --git a/schemas/app/Currency.json b/schemas/app/Currency.json
index 44c13664..94ab6cad 100644
--- a/schemas/app/Currency.json
+++ b/schemas/app/Currency.json
@@ -30,6 +30,5 @@
       "fieldtype": "Data"
     }
   ],
-  "keywordFields": ["name", "symbol"],
   "quickEditFields": ["name", "symbol"]
 }
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index 0b9dec05..10456a88 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -135,5 +135,5 @@
     "expenseAccount",
     "hsnCode"
   ],
-  "keywordFields": ["name", "description"]
+  "keywordFields": ["name", "itemType", "for"]
 }
diff --git a/schemas/app/JournalEntry.json b/schemas/app/JournalEntry.json
index ba2f372f..b5c5c603 100644
--- a/schemas/app/JournalEntry.json
+++ b/schemas/app/JournalEntry.json
@@ -90,7 +90,7 @@
       "fieldname": "userRemark",
       "label": "User Remark",
       "fieldtype": "Text",
-      "placeholder": "User Remark"
+      "placeholder": "Add a remark"
     },
     {
       "fieldname": "numberSeries",
@@ -100,5 +100,6 @@
       "required": true,
       "default": "JV-"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "keywordFields": ["name", "entryType"]
+}
diff --git a/schemas/app/JournalEntryAccount.json b/schemas/app/JournalEntryAccount.json
index 810caadc..5c31e7e1 100644
--- a/schemas/app/JournalEntryAccount.json
+++ b/schemas/app/JournalEntryAccount.json
@@ -23,5 +23,6 @@
       "fieldtype": "Currency"
     }
   ],
-  "tableFields": ["account", "debit", "credit"]
-}
\ No newline at end of file
+  "tableFields": ["account", "debit", "credit"],
+  "keywordFields": ["account"]
+}
diff --git a/schemas/app/NumberSeries.json b/schemas/app/NumberSeries.json
index ac6301b9..0f917a76 100644
--- a/schemas/app/NumberSeries.json
+++ b/schemas/app/NumberSeries.json
@@ -59,6 +59,5 @@
       "readOnly": true
     }
   ],
-  "quickEditFields": ["referenceType", "start", "padZeros"],
-  "keywordFields": []
+  "quickEditFields": ["referenceType", "start", "padZeros"]
 }
diff --git a/schemas/app/Party.json b/schemas/app/Party.json
index c6b4c0b1..0803fb6e 100644
--- a/schemas/app/Party.json
+++ b/schemas/app/Party.json
@@ -90,5 +90,5 @@
     "role",
     "taxId"
   ],
-  "keywordFields": ["name"]
+  "keywordFields": ["name", "email", "role"]
 }
diff --git a/schemas/app/PaymentFor.json b/schemas/app/PaymentFor.json
index ff80d68e..0bdf7367 100644
--- a/schemas/app/PaymentFor.json
+++ b/schemas/app/PaymentFor.json
@@ -36,5 +36,6 @@
       "required": true
     }
   ],
-  "tableFields": ["referenceType", "referenceName", "amount"]
+  "tableFields": ["referenceType", "referenceName", "amount"],
+  "keywordFields": ["referenceName", "referenceType"]
 }
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 072406af..7ae099f1 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -105,5 +105,5 @@
       "default": "PINV-"
     }
   ],
-  "keywordFields": ["name", "party", "numberSeries"]
+  "keywordFields": ["name", "party"]
 }
diff --git a/schemas/app/PurchaseInvoiceItem.json b/schemas/app/PurchaseInvoiceItem.json
index ff0b6283..5bb48e2f 100644
--- a/schemas/app/PurchaseInvoiceItem.json
+++ b/schemas/app/PurchaseInvoiceItem.json
@@ -68,5 +68,6 @@
       "placeholder": "HSN/SAC Code"
     }
   ],
-  "tableFields": ["item", "tax", "quantity", "rate", "amount"]
+  "tableFields": ["item", "tax", "quantity", "rate", "amount"],
+  "keywordFields": ["item", "tax"]
 }
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 2bf1d585..4bbe22ae 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -4,7 +4,6 @@
   "isSingle": false,
   "isChild": false,
   "isSubmittable": true,
-  "keywordFields": ["name", "party"],
   "fields": [
     {
       "label": "Invoice No",
@@ -93,6 +92,7 @@
     {
       "fieldname": "terms",
       "label": "Notes",
+      "placeholder": "Add invoice terms",
       "fieldtype": "Text"
     },
     {
@@ -103,5 +103,6 @@
       "required": true,
       "default": "SINV-"
     }
-  ]
+  ],
+  "keywordFields": ["name", "party"]
 }
diff --git a/schemas/app/SalesInvoiceItem.json b/schemas/app/SalesInvoiceItem.json
index 31598e87..7407f42a 100644
--- a/schemas/app/SalesInvoiceItem.json
+++ b/schemas/app/SalesInvoiceItem.json
@@ -69,5 +69,6 @@
       "placeholder": "HSN/SAC Code"
     }
   ],
-  "tableFields": ["item", "tax", "quantity", "rate", "amount"]
+  "tableFields": ["item", "tax", "quantity", "rate", "amount"],
+  "keywordFields": ["item", "tax"]
 }
diff --git a/schemas/core/SingleValue.json b/schemas/core/SingleValue.json
index c34d2570..a36c93cb 100644
--- a/schemas/core/SingleValue.json
+++ b/schemas/core/SingleValue.json
@@ -22,6 +22,5 @@
       "fieldtype": "Data",
       "required": true
     }
-  ],
-  "keywordFields": []
-}
\ No newline at end of file
+  ]
+}
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index c9683496..4fe68c98 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -90,12 +90,5 @@
       "required": true
     }
   ],
-  "quickEditFields": [
-    "locale",
-    "dateFormat",
-    "currency",
-    "displayPrecision",
-    "hideGetStarted"
-  ],
-  "keywordFields": []
+  "quickEditFields": ["locale", "dateFormat", "currency", "displayPrecision", "hideGetStarted"]
 }
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 7ad65d9c..d78a4d16 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -48,7 +48,6 @@ export default {
           'name',
           schema.titleField,
           this.df.groupBy,
-          ...schema.keywordFields,
         ]),
       ].filter(Boolean);
 
diff --git a/src/pages/ListView/ListView.vue b/src/pages/ListView/ListView.vue
index eff3a33f..d5bd4fcf 100644
--- a/src/pages/ListView/ListView.vue
+++ b/src/pages/ListView/ListView.vue
@@ -108,7 +108,7 @@ function getListConfig(schemaName) {
   const listConfig = fyo.models[schemaName]?.getListViewSettings?.(fyo);
   if (listConfig?.columns === undefined) {
     return {
-      columns: fyo.schemaMap[schemaName].keywordFields ?? ['name'],
+      columns: ['name'],
     };
   }
   return listConfig;
diff --git a/src/utils/search.ts b/src/utils/search.ts
index f0fb35f9..274e6134 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -1,7 +1,10 @@
 import { t } from 'fyo';
+import { DocValueMap } from 'fyo/core/types';
 import { ModelNameEnum } from 'models/types';
 import reports from 'reports/view';
+import { OptionField } from 'schemas/types';
 import { fyo } from 'src/initFyo';
+import { GetAllOptions } from 'utils/db/types';
 import { routeTo } from './ui';
 
 export const searchGroups = ['Docs', 'List', 'Create', 'Report', 'Page'];
@@ -208,3 +211,161 @@ export function getSearchList() {
     getSetupList(),
   ].flat();
 }
+
+interface Searchable {
+  schemaName: string;
+  fields: string[];
+  meta: string[];
+  isChild: boolean;
+  isSubmittable: boolean;
+}
+
+interface Keyword {
+  values: string[];
+  meta: Record<string, string | boolean | undefined>;
+  priority: number;
+}
+
+interface Keywords {
+  searchable: Searchable;
+  keywords: Keyword[];
+}
+
+class Search {
+  keywords: Record<string, Keywords>;
+  priorityMap: Record<string, number> = {
+    [ModelNameEnum.SalesInvoice]: 125,
+    [ModelNameEnum.PurchaseInvoice]: 100,
+    [ModelNameEnum.Payment]: 75,
+    [ModelNameEnum.Item]: 50,
+    [ModelNameEnum.Party]: 50,
+    [ModelNameEnum.JournalEntry]: 50,
+  };
+
+  constructor() {
+    this.keywords = {};
+  }
+
+  getSearchList() {
+    const keywords = Object.values(this.keywords);
+    return keywords.map((kw) => kw.keywords).flat();
+  }
+
+  async fetchKeywords() {
+    const searchables = this.#getSearchables();
+    for (const searchable of searchables) {
+      const options: GetAllOptions = {
+        fields: [searchable.fields, searchable.meta].flat(),
+        order: 'desc',
+      };
+
+      if (!searchable.isChild) {
+        options.orderBy = 'modified';
+      }
+
+      const maps = await fyo.db.getAllRaw(searchable.schemaName, options);
+      this.addToSearchable(maps, searchable);
+    }
+
+    this.#setPriority();
+  }
+
+  #getSearchables(): Searchable[] {
+    const searchable: Searchable[] = [];
+    for (const schemaName of Object.keys(fyo.schemaMap)) {
+      const schema = fyo.schemaMap[schemaName];
+      if (!schema?.keywordFields?.length) {
+        continue;
+      }
+
+      const fields = [...schema.keywordFields];
+      const meta = [];
+      if (schema.isChild) {
+        meta.push('parent', 'parentSchemaName');
+      }
+
+      if (schema.isSubmittable) {
+        meta.push('submitted', 'cancelled');
+      }
+
+      searchable.push({
+        schemaName,
+        fields,
+        meta,
+        isChild: !!schema.isChild,
+        isSubmittable: !!schema.isSubmittable,
+      });
+    }
+
+    return searchable;
+  }
+
+  #setPriority() {
+    for (const schemaName in this.keywords) {
+      const kw = this.keywords[schemaName];
+      const basePriority = this.priorityMap[schemaName] ?? 0;
+
+      for (const k of kw.keywords) {
+        k.priority += basePriority;
+
+        if (k.meta.submitted) {
+          k.priority += 25;
+        }
+
+        if (k.meta.cancelled) {
+          k.priority -= 200;
+        }
+
+        if (kw.searchable.isChild) {
+          k.priority -= 150;
+        }
+      }
+    }
+  }
+
+  addToSearchable(maps: DocValueMap[], searchable: Searchable) {
+    if (!maps.length) {
+      return;
+    }
+
+    this.keywords[searchable.schemaName] ??= { searchable, keywords: [] };
+
+    for (const map of maps) {
+      const keyword: Keyword = { values: [], meta: {}, priority: 0 };
+      this.#setKeywords(map, searchable, keyword);
+      this.#setMeta(map, searchable, keyword);
+      this.keywords[searchable.schemaName]!.keywords.push(keyword);
+    }
+  }
+
+  #setKeywords(map: DocValueMap, searchable: Searchable, keyword: Keyword) {
+    // Set individual field values
+    for (const fn of searchable.fields) {
+      let value = map[fn] as string | undefined;
+      const field = fyo.getField(searchable.schemaName, fn);
+      const { options } = field as OptionField;
+      if (options) {
+        value = options.find((o) => o.value === value)?.label ?? value;
+      }
+
+      keyword.values.push(value ?? '');
+    }
+  }
+
+  #setMeta(map: DocValueMap, searchable: Searchable, keyword: Keyword) {
+    // Set the meta map
+    for (const fn of searchable.meta) {
+      const meta = map[fn];
+      if (typeof meta === 'number') {
+        keyword.meta[fn] = Boolean(meta);
+      } else if (typeof meta === 'string') {
+        keyword.meta[fn] = meta;
+      }
+    }
+
+    keyword.meta.schemaName = searchable.schemaName;
+  }
+}
+
+//@ts-ignore
+window.sc = new Search();

From 0a3fe9099081a880af53149b36a729fa8b85544f Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 5 May 2022 13:22:08 +0530
Subject: [PATCH 095/163] incr: add code to generate csv

---
 utils/csvParser.ts | 83 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 71 insertions(+), 12 deletions(-)

diff --git a/utils/csvParser.ts b/utils/csvParser.ts
index 3df54758..3ec3b7be 100644
--- a/utils/csvParser.ts
+++ b/utils/csvParser.ts
@@ -1,11 +1,16 @@
-function unwrapDq(item: string): string {
-  const s = item.at(0);
-  const e = item.at(-1);
-  if (s === '"' && e === '"') {
-    return item.slice(1, -1);
+export function parseCSV(text: string): string[][] {
+  //  Works on RFC 4180 csv
+  let rows = splitCsvBlock(text);
+  if (rows.length === 1) {
+    rows = splitCsvBlock(text, '\n');
   }
+  return rows.map(splitCsvLine);
+}
 
-  return item;
+export function generateCSV(matrix: unknown[][]): string {
+  // Generates RFC 4180 csv
+  const formattedRows = getFormattedRows(matrix);
+  return formattedRows.join('\r\n');
 }
 
 function splitCsvBlock(text: string, splitter: string = '\r\n'): string[] {
@@ -78,11 +83,65 @@ function splitCsvLine(line: string): string[] {
   return items;
 }
 
-export function parseCSV(text: string): string[][] {
-  //  Works on RFC 4180
-  let rows = splitCsvBlock(text);
-  if (rows.length === 1) {
-    rows = splitCsvBlock(text, '\n');
+function unwrapDq(item: string): string {
+  const s = item.at(0);
+  const e = item.at(-1);
+  if (s === '"' && e === '"') {
+    return item.slice(1, -1);
   }
-  return rows.map(splitCsvLine);
+
+  return item;
+}
+
+function getFormattedRows(matrix: unknown[][]): string[] {
+  const formattedMatrix: string[] = [];
+  for (const row of matrix) {
+    const formattedRow: string[] = [];
+    for (const item of row) {
+      const formattedItem = getFormattedItem(item);
+      formattedRow.push(formattedItem);
+    }
+    formattedMatrix.push(formattedRow.join(','));
+  }
+
+  return formattedMatrix;
+}
+
+function getFormattedItem(item: unknown): string {
+  if (typeof item === 'string') {
+    return formatStringToCSV(item);
+  }
+
+  if (item === null || item === undefined) {
+    return '';
+  }
+
+  if (typeof item === 'object') {
+    return item.toString();
+  }
+
+  return String(item);
+}
+
+function formatStringToCSV(item: string): string {
+  let shouldDq = false;
+  if (item.match(/^".*"$/)) {
+    shouldDq = true;
+    item = item.slice(1, -1);
+  }
+
+  if (item.match(/"/)) {
+    shouldDq = true;
+    item = item.replaceAll('"', '""');
+  }
+
+  if (item.match(/,|\s/)) {
+    shouldDq = true;
+  }
+
+  if (shouldDq) {
+    return '"' + item + '"';
+  }
+
+  return item;
 }

From bd6f11055319df322bd1000dbad7dda0e26871ee Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 5 May 2022 16:14:26 +0530
Subject: [PATCH 096/163] incr: get dataimport to work - need to test on child
 table docs

---
 fyo/core/converter.ts                        |  14 +-
 fyo/model/naming.ts                          |  18 +-
 models/baseModels/InvoiceItem/InvoiceItem.ts |   4 +-
 models/baseModels/Item/Item.ts               |   4 +-
 schemas/app/Item.json                        |   9 +-
 schemas/app/PurchaseInvoiceItem.json         |   3 +-
 schemas/app/SalesInvoiceItem.json            |   3 +-
 src/components/Dropdown.vue                  |   2 +
 src/components/DropdownWithActions.vue       |   4 +-
 src/dataImport.ts                            | 206 ++++++++-----------
 src/pages/DataImport.vue                     |  19 +-
 src/router.ts                                |   5 +-
 src/utils/search.ts                          |  12 +-
 src/utils/sidebarConfig.ts                   |  20 +-
 src/utils/ui.ts                              |  14 +-
 utils/index.ts                               |  27 ++-
 16 files changed, 192 insertions(+), 172 deletions(-)

diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 1c402d51..a9f37bd7 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -164,7 +164,7 @@ function toDocString(value: RawValue, field: Field) {
 }
 
 function toDocDate(value: RawValue, field: Field) {
-  if (value === null) {
+  if (value === null || value === '') {
     return null;
   }
 
@@ -181,6 +181,10 @@ function toDocDate(value: RawValue, field: Field) {
 }
 
 function toDocCurrency(value: RawValue, field: Field, fyo: Fyo) {
+  if (value === '') {
+    return fyo.pesa(0);
+  }
+
   if (typeof value === 'string') {
     return fyo.pesa(value);
   }
@@ -201,6 +205,10 @@ function toDocCurrency(value: RawValue, field: Field, fyo: Fyo) {
 }
 
 function toDocInt(value: RawValue, field: Field): number {
+  if (value === '') {
+    return 0;
+  }
+
   if (typeof value === 'string') {
     value = parseInt(value);
   }
@@ -209,6 +217,10 @@ function toDocInt(value: RawValue, field: Field): number {
 }
 
 function toDocFloat(value: RawValue, field: Field): number {
+  if (value === '') {
+    return 0;
+  }
+
   if (typeof value === 'boolean') {
     return Number(value);
   }
diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts
index f3fb62a6..6eba9b07 100644
--- a/fyo/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -2,24 +2,24 @@ import { Fyo } from 'fyo';
 import NumberSeries from 'fyo/models/NumberSeries';
 import { DEFAULT_SERIES_START } from 'fyo/utils/consts';
 import { BaseError } from 'fyo/utils/errors';
-import { Field, Schema } from 'schemas/types';
 import { getRandomString } from 'utils';
 import { Doc } from './doc';
 
-export function getNumberSeries(schema: Schema): Field | undefined {
-  const numberSeries = schema.fields.find(
-    (f) => f.fieldname === 'numberSeries'
-  );
-  return numberSeries;
-}
-
 export function isNameAutoSet(schemaName: string, fyo: Fyo): boolean {
   const schema = fyo.schemaMap[schemaName]!;
+  if (schema.naming === 'manual') {
+    return false;
+  }
+
   if (schema.naming === 'autoincrement') {
     return true;
   }
 
-  const numberSeries = getNumberSeries(schema);
+  if (schema.naming === 'random') {
+    return true;
+  }
+
+  const numberSeries = fyo.getField(schema.name, 'numberSeries');
   if (numberSeries) {
     return true;
   }
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index 1177af97..d1675083 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -98,9 +98,9 @@ export abstract class InvoiceItem extends Doc {
       const itemList = doc.parentdoc!.items as Doc[];
       const items = itemList.map((d) => d.item as string).filter(Boolean);
 
-      let itemNotFor = 'sales';
+      let itemNotFor = 'Sales';
       if (doc.isSales) {
-        itemNotFor = 'purchases';
+        itemNotFor = 'Purchases';
       }
 
       const baseFilter = { for: ['not in', [itemNotFor]] };
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index 121db713..a7f07549 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -67,7 +67,7 @@ export class Item extends Doc {
     return [
       {
         label: fyo.t`New Sale`,
-        condition: (doc) => !doc.notInserted && doc.for !== 'purchases',
+        condition: (doc) => !doc.notInserted && doc.for !== 'Purchases',
         action: async (doc, router) => {
           const invoice = await fyo.doc.getNewDoc('SalesInvoice');
           await invoice.append('items', {
@@ -80,7 +80,7 @@ export class Item extends Doc {
       },
       {
         label: fyo.t`New Purchase`,
-        condition: (doc) => !doc.notInserted && doc.for !== 'sales',
+        condition: (doc) => !doc.notInserted && doc.for !== 'Sales',
         action: async (doc, router) => {
           const invoice = await fyo.doc.getNewDoc('PurchaseInvoice');
           await invoice.append('items', {
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index 10456a88..20dccaa8 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -74,20 +74,21 @@
       "fieldtype": "Select",
       "options": [
         {
-          "value": "purchases",
+          "value": "Purchases",
           "label": "Purchases"
         },
         {
-          "value": "sales",
+          "value": "Sales",
           "label": "Sales"
         },
         {
-          "value": "both",
+          "value": "Both",
           "label": "Both"
         }
       ],
       "readOnly": true,
-      "default": "both"
+      "required": true,
+      "default": "Both"
     },
     {
       "fieldname": "incomeAccount",
diff --git a/schemas/app/PurchaseInvoiceItem.json b/schemas/app/PurchaseInvoiceItem.json
index 5bb48e2f..df6eadbc 100644
--- a/schemas/app/PurchaseInvoiceItem.json
+++ b/schemas/app/PurchaseInvoiceItem.json
@@ -65,7 +65,8 @@
       "fieldname": "hsnCode",
       "label": "HSN/SAC",
       "fieldtype": "Int",
-      "placeholder": "HSN/SAC Code"
+      "placeholder": "HSN/SAC Code",
+      "hidden": true
     }
   ],
   "tableFields": ["item", "tax", "quantity", "rate", "amount"],
diff --git a/schemas/app/SalesInvoiceItem.json b/schemas/app/SalesInvoiceItem.json
index 7407f42a..81cec3c6 100644
--- a/schemas/app/SalesInvoiceItem.json
+++ b/schemas/app/SalesInvoiceItem.json
@@ -66,7 +66,8 @@
       "fieldname": "hsnCode",
       "label": "HSN/SAC",
       "fieldtype": "Int",
-      "placeholder": "HSN/SAC Code"
+      "placeholder": "HSN/SAC Code",
+      "hidden": true
     }
   ],
   "tableFields": ["item", "tax", "quantity", "rate", "amount"],
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 56d593de..4bdc1b2b 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -206,6 +206,8 @@ export default {
         // valid selection
         let item = this.items[this.highlightedIndex];
         await this.selectItem(item);
+      } else if (this.items.length === 1) {
+        await this.selectItem(this.items[0])
       }
     },
     highlightItemUp() {
diff --git a/src/components/DropdownWithActions.vue b/src/components/DropdownWithActions.vue
index fb631268..613a7a0b 100644
--- a/src/components/DropdownWithActions.vue
+++ b/src/components/DropdownWithActions.vue
@@ -31,7 +31,9 @@ export default {
     actions: { default: [] },
     type: { type: String, default: 'secondary' },
   },
-  inject: ['doc'],
+  inject: {
+    doc: { default: null },
+  },
   components: {
     Dropdown,
     Button,
diff --git a/src/dataImport.ts b/src/dataImport.ts
index 79eb46da..91e4bc7c 100644
--- a/src/dataImport.ts
+++ b/src/dataImport.ts
@@ -1,8 +1,10 @@
 import { Fyo, t } from 'fyo';
+import { Converter } from 'fyo/core/converter';
 import { DocValueMap } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { isNameAutoSet } from 'fyo/model/naming';
 import { Noun, Verb } from 'fyo/telemetry/types';
+import { ModelNameEnum } from 'models/types';
 import {
   Field,
   FieldType,
@@ -11,16 +13,20 @@ import {
   SelectOption,
   TargetField,
 } from 'schemas/types';
-import { parseCSV } from '../utils/csvParser';
+import {
+  getDefaultMapFromList,
+  getMapFromList,
+  getValueMapFromList,
+} from 'utils';
+import { generateCSV, parseCSV } from '../utils/csvParser';
 
 export const importable = [
-  'SalesInvoice',
-  'PurchaseInvoice',
-  'Payment',
-  'JournalEntry',
-  'Customer',
-  'Supplier',
-  'Item',
+  ModelNameEnum.SalesInvoice,
+  ModelNameEnum.PurchaseInvoice,
+  ModelNameEnum.Payment,
+  ModelNameEnum.Party,
+  ModelNameEnum.Item,
+  ModelNameEnum.JournalEntry,
 ];
 
 type Status = {
@@ -29,16 +35,7 @@ type Status = {
   names: string[];
 };
 
-type Exclusion = {
-  [key: string]: string[];
-};
-
-type Map = Record<string, unknown>;
-type ObjectMap = Record<string, Map>;
-
-type LabelTemplateFieldMap = {
-  [key: string]: TemplateField;
-};
+type Exclusion = Record<string, string[]>;
 
 type LoadingStatusCallback = (
   isMakingEntries: boolean,
@@ -56,33 +53,9 @@ interface TemplateField {
   parentField: string;
 }
 
-function formatValue(value: string, fieldtype: FieldType): unknown {
-  switch (fieldtype) {
-    case FieldTypeEnum.Date:
-      if (value === '') {
-        return '';
-      }
-      return new Date(value);
-    case FieldTypeEnum.Currency:
-      // @ts-ignore
-      return this.fyo.pesa(value || 0);
-    case FieldTypeEnum.Int:
-    case FieldTypeEnum.Float: {
-      const n = parseFloat(value);
-      if (!Number.isNaN(n)) {
-        return n;
-      }
-      return 0;
-    }
-    default:
-      return value;
-  }
-}
-
 const exclusion: Exclusion = {
   Item: ['image'],
-  Supplier: ['address', 'outstandingAmount', 'supplier', 'image', 'customer'],
-  Customer: ['address', 'outstandingAmount', 'supplier', 'image', 'customer'],
+  Party: ['address', 'outstandingAmount', 'image'],
 };
 
 function getFilteredDocFields(
@@ -97,48 +70,68 @@ function getFilteredDocFields(
     parentField = '';
   }
 
-  // @ts-ignore
-  const primaryFields: Field[] = fyo.schemaMap[schemaName]?.fields ?? [];
+  const primaryFields: Field[] = fyo.schemaMap[schemaName]!.fields;
   const fields: TemplateField[] = [];
   const tableTypes: string[][] = [];
   const exclusionFields: string[] = exclusion[schemaName] ?? [];
 
-  primaryFields.forEach((field) => {
-    const { label, fieldtype, fieldname, readOnly, required, hidden } = field;
+  for (const field of primaryFields) {
+    const { label, fieldtype, fieldname, required } = field;
 
-    if (
-      !(fieldname === 'name' && !parentField) &&
-      (readOnly ||
-        (hidden && typeof hidden === 'number') ||
-        exclusionFields.includes(fieldname))
-    ) {
-      return;
+    if (shouldSkip(field, exclusionFields, parentField)) {
+      continue;
     }
 
-    if (fieldtype === FieldTypeEnum.Table && (field as TargetField).target) {
-      tableTypes.push([(field as TargetField).target, fieldname]);
-      return;
+    if (fieldtype === FieldTypeEnum.Table) {
+      const { target } = field as TargetField;
+      tableTypes.push([target, fieldname]);
+      continue;
     }
 
-    let options: SelectOption[] = [];
-    if ((field as OptionField).options !== undefined) {
-      options = (field as OptionField).options;
-    }
+    const options: SelectOption[] = (field as OptionField).options ?? [];
 
     fields.push({
       label,
       fieldname,
-      schemaName: schemaName,
+      schemaName,
       options,
       fieldtype,
       parentField,
-      required: Boolean(required ?? false),
+      required: required ?? false,
     });
-  });
+  }
 
   return [fields, tableTypes];
 }
 
+function shouldSkip(
+  field: Field,
+  exclusionFields: string[],
+  parentField: string
+): boolean {
+  if (field.meta) {
+    return true;
+  }
+
+  if (field.fieldname === 'name' && parentField) {
+    return true;
+  }
+
+  if (field.required) {
+    return false;
+  }
+
+  if (exclusionFields.includes(field.fieldname)) {
+    return true;
+  }
+
+  if (field.hidden || field.readOnly) {
+    return true;
+  }
+
+  return false;
+}
+
 function getTemplateFields(schemaName: string, fyo: Fyo): TemplateField[] {
   const fields: TemplateField[] = [];
   if (!schemaName) {
@@ -147,46 +140,28 @@ function getTemplateFields(schemaName: string, fyo: Fyo): TemplateField[] {
 
   const schemaNames: string[][] = [[schemaName]];
   while (schemaNames.length > 0) {
-    const dt = schemaNames.pop();
-    if (!dt) {
+    const sn = schemaNames.pop();
+    if (!sn) {
       break;
     }
 
-    const [templateFields, tableTypes] = getFilteredDocFields(dt, fyo);
+    const [templateFields, tableTypes] = getFilteredDocFields(sn, fyo);
     fields.push(...templateFields);
     schemaNames.push(...tableTypes);
   }
   return fields;
 }
 
-function getLabelFieldMap(templateFields: TemplateField[]): Map {
-  const map: Map = {};
-
-  templateFields.reduce((acc, tf) => {
-    const key = tf.label as string;
-    acc[key] = tf.fieldname;
-    return acc;
-  }, map);
-
-  return map;
-}
-
-function getTemplate(templateFields: TemplateField[]): string {
-  const labels = templateFields.map(({ label }) => `"${label}"`).join(',');
-  return [labels, ''].join('\n');
-}
-
 export class Importer {
   schemaName: string;
   templateFields: TemplateField[];
-  map: Map;
+  labelTemplateFieldMap: Record<string, TemplateField> = {};
   template: string;
   indices: number[] = [];
   parsedLabels: string[] = [];
   parsedValues: string[][] = [];
-  assignedMap: Map = {}; // target: import
-  requiredMap: Map = {};
-  labelTemplateFieldMap: LabelTemplateFieldMap = {};
+  assignedMap: Record<string, string> = {}; // target: import
+  requiredMap: Record<string, boolean> = {};
   shouldSubmit: boolean = false;
   labelIndex: number = -1;
   csv: string[][] = [];
@@ -196,38 +171,30 @@ export class Importer {
     this.schemaName = schemaName;
     this.fyo = fyo;
     this.templateFields = getTemplateFields(schemaName, this.fyo);
-    this.map = getLabelFieldMap(this.templateFields);
-    this.template = getTemplate(this.templateFields);
-    this.assignedMap = this.assignableLabels.reduce((acc: Map, k) => {
-      acc[k] = '';
-      return acc;
-    }, {});
-    this.requiredMap = this.templateFields.reduce((acc: Map, k) => {
-      acc[k.label] = k.required;
-      return acc;
-    }, {});
-    this.labelTemplateFieldMap = this.templateFields.reduce(
-      (acc: LabelTemplateFieldMap, k) => {
-        acc[k.label] = k;
-        return acc;
-      },
-      {}
-    );
+    this.template = generateCSV([this.templateFields.map((t) => t.label)]);
+    this.labelTemplateFieldMap = getMapFromList(this.templateFields, 'label');
+    this.assignedMap = getDefaultMapFromList(this.templateFields, '', 'label');
+    this.requiredMap = getValueMapFromList(
+      this.templateFields,
+      'label',
+      'required'
+    ) as Record<string, boolean>;
   }
 
   get assignableLabels() {
     const req: string[] = [];
     const nreq: string[] = [];
-    Object.keys(this.map).forEach((k) => {
-      if (this.requiredMap[k]) {
-        req.push(k);
-        return;
+
+    for (const label in this.labelTemplateFieldMap) {
+      if (this.requiredMap[label]) {
+        req.push(label);
+        continue;
       }
 
-      nreq.push(k);
-    });
+      nreq.push(label);
+    }
 
-    return [...req, ...nreq];
+    return [req, nreq].flat();
   }
 
   get unassignedLabels() {
@@ -332,23 +299,23 @@ export class Importer {
     });
   }
 
-  getDocs(): Map[] {
+  getDocs(): DocValueMap[] {
     const fields = this.columnLabels.map((k) => this.labelTemplateFieldMap[k]);
     const nameIndex = fields.findIndex(({ fieldname }) => fieldname === 'name');
 
-    const docMap: ObjectMap = {};
+    const docMap: Record<string, DocValueMap> = {};
 
     const assignedMatrix = this.assignedMatrix;
     for (let r = 0; r < assignedMatrix.length; r++) {
       const row = assignedMatrix[r];
-      const cts: ObjectMap = {};
+      const cts: Record<string, DocValueMap> = {};
       const name = row[nameIndex];
 
       docMap[name] ??= {};
 
       for (let f = 0; f < fields.length; f++) {
         const field = fields[f];
-        const value = formatValue(row[f], field.fieldtype);
+        const value = Converter.toDocValue(row[f], field, this.fyo);
 
         if (field.parentField) {
           cts[field.parentField] ??= {};
@@ -361,7 +328,7 @@ export class Importer {
 
       for (const k of Object.keys(cts)) {
         docMap[name][k] ??= [];
-        (docMap[name][k] as Map[]).push(cts[k]);
+        (docMap[name][k] as DocValueMap[]).push(cts[k]);
       }
     }
 
@@ -423,9 +390,8 @@ export class Importer {
     this.parsedValues.push(emptyRow);
   }
 
-  async makeEntry(doc: Doc, docObj: Map) {
-    await doc.setMultiple(docObj as DocValueMap);
-    await doc.sync();
+  async makeEntry(doc: Doc, docObj: DocValueMap) {
+    await doc.setAndSync(docObj);
     if (this.shouldSubmit) {
       await doc.submit();
     }
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index f5a7e08d..986bfcbb 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="flex flex-col overflow-hidden w-full">
+    <!-- Header -->
     <PageHeader :title="t`Data Import`">
       <DropdownWithActions
         :actions="actions"
@@ -13,6 +14,7 @@
         >{{ primaryLabel }}</Button
       >
     </PageHeader>
+
     <div
       class="flex px-8 mt-2 text-base w-full flex-col gap-8"
       v-if="!complete"
@@ -21,8 +23,8 @@
       <div class="flex flex-row justify-start items-center w-full gap-2">
         <FormControl
           :df="importableDf"
-          input-class="bg-gray-100 text-gray-900 text-base"
-          class="w-40"
+          input-class="bg-transparent text-gray-900 text-base"
+          class="w-40 bg-gray-100 rounded"
           :value="importType"
           size="small"
           @change="setImportType"
@@ -330,9 +332,11 @@ import HowTo from 'src/components/HowTo.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import { importable, Importer } from 'src/dataImport';
 import { fyo } from 'src/initFyo';
-import { getSavePath, saveData, showMessageDialog } from 'src/utils';
+import { getSavePath, saveData } from 'src/utils/ipcCalls';
+import { showMessageDialog } from 'src/utils/ui';
 import { IPC_ACTIONS } from 'utils/messages';
 import Loading from '../components/Loading.vue';
+
 export default {
   components: {
     PageHeader,
@@ -356,6 +360,11 @@ export default {
       messageLoading: '',
     };
   },
+  mounted() {
+    if (fyo.store.isDevelopment) {
+      window.di = this;
+    }
+  },
   computed: {
     labelIndex() {
       return this.importer.labelIndex;
@@ -435,14 +444,14 @@ export default {
         label: this.t`Import Type`,
         fieldtype: 'AutoComplete',
         placeholder: this.t`Import Type`,
-        getList: () => importable.map((i) => fyo.models[i].label),
+        options: Object.keys(this.labelSchemaNameMap)
       };
     },
     labelSchemaNameMap() {
       return importable
         .map((i) => ({
           name: i,
-          label: fyo.models[i].label,
+          label: fyo.schemaMap[i].label,
         }))
         .reduce((acc, { name, label }) => {
           acc[label] = name;
diff --git a/src/router.ts b/src/router.ts
index 449d572d..c15a3440 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,8 +1,8 @@
 import { NounEnum, Verb } from 'fyo/telemetry/types';
 import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
+import DataImport from 'src/pages/DataImport.vue';
 import GetStarted from 'src/pages/GetStarted.vue';
-// import DataImport from 'src/pages/DataImport.vue';
 import InvoiceForm from 'src/pages/InvoiceForm.vue';
 import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
 import ListView from 'src/pages/ListView/ListView.vue';
@@ -107,13 +107,12 @@ const routes: RouteRecordRaw[] = [
       edit: (route) => route.query,
     },
   },
-  /*
   {
     path: '/data-import',
     name: 'Data Import',
     component: DataImport,
   },
-*/ {
+  {
     path: '/settings',
     name: 'Settings',
     component: Settings,
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 274e6134..f446bdeb 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -87,17 +87,17 @@ function getCreateList(): SearchItem[] {
     {
       label: t`Sales Items`,
       schemaName: ModelNameEnum.Item,
-      filter: { for: 'sales' },
+      filter: { for: 'Sales' },
     },
     {
       label: t`Purchase Items`,
       schemaName: ModelNameEnum.Item,
-      filter: { for: 'purchases' },
+      filter: { for: 'Purchases' },
     },
     {
       label: t`Common Items`,
       schemaName: ModelNameEnum.Item,
-      filter: { for: 'both' },
+      filter: { for: 'Both' },
     },
   ].map(({ label, filter, schemaName }) => {
     const fk = Object.keys(filter)[0] as 'for' | 'role';
@@ -163,15 +163,15 @@ function getListViewList(): SearchItem[] {
     { label: t`Suppliers`, route: `/list/Party/role/Supplier/${t`Suppliers`}` },
     {
       label: t`Sales Items`,
-      route: `/list/Item/for/sales/${t`Sales Items`}`,
+      route: `/list/Item/for/Sales/${t`Sales Items`}`,
     },
     {
       label: t`Purchase Items`,
-      route: `/list/Item/for/purchases/${t`Purchase Items`}`,
+      route: `/list/Item/for/Purchases/${t`Purchase Items`}`,
     },
     {
       label: t`Common Items`,
-      route: `/list/Item/for/both/${t`Common Items`}`,
+      route: `/list/Item/for/Both/${t`Common Items`}`,
     },
   ].map((i) => ({ ...i, group: 'List' } as SearchItem));
 
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index b52af8f7..ad6307c7 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -69,7 +69,7 @@ function getCompleteSidebar(): SidebarConfig {
         {
           label: t`Sales Items`,
           name: 'sales-items',
-          route: `/list/Item/for/sales/${t`Sales Items`}`,
+          route: `/list/Item/for/Sales/${t`Sales Items`}`,
           schemaName: 'Item',
         },
       ],
@@ -101,7 +101,7 @@ function getCompleteSidebar(): SidebarConfig {
         {
           label: t`Purchase Items`,
           name: 'purchase-items',
-          route: `/list/Item/for/purchases/${t`Purchase Items`}`,
+          route: `/list/Item/for/Purchases/${t`Purchase Items`}`,
           schemaName: 'Item',
         },
       ],
@@ -118,20 +118,21 @@ function getCompleteSidebar(): SidebarConfig {
           route: '/list/JournalEntry',
           schemaName: 'JournalEntry',
         },
-        {
-          label: t`Common Items`,
-          name: 'common-items',
-          route: `/list/Item/for/both/${t`Common Items`}`,
-          schemaName: 'Item',
-        },
         {
           label: t`Party`,
           name: 'party',
           route: '/list/Party/role/Both',
           schemaName: 'Party',
         },
+        {
+          label: t`Common Items`,
+          name: 'common-items',
+          route: `/list/Item/for/Both/${t`Common Items`}`,
+          schemaName: 'Item',
+        },
       ],
     },
+    /*
     {
       label: t`Reports`,
       name: t`reports`,
@@ -172,6 +173,7 @@ function getCompleteSidebar(): SidebarConfig {
         },
       ],
     },
+    */
     {
       label: t`Setup`,
       name: t`setup`,
@@ -192,7 +194,7 @@ function getCompleteSidebar(): SidebarConfig {
         {
           label: t`Data Import`,
           name: 'data-import',
-          route: '/data_import',
+          route: '/data-import',
         },
         {
           label: t`Settings`,
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index a10ee395..5170ae57 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -47,16 +47,16 @@ export async function openQuickEdit({
 
     defaults = Object.assign({
       for:
-        purpose === 'sales'
-          ? 'purchases'
-          : purpose === 'purchases'
-          ? 'sales'
-          : 'both',
+        purpose === 'Sales'
+          ? 'Purchases'
+          : purpose === 'Purchases'
+          ? 'Sales'
+          : 'Both',
     });
   }
 
-  if (forWhat[0] === 'not in' && forWhat[1] === 'sales') {
-    defaults = Object.assign({ for: 'purchases' });
+  if (forWhat[0] === 'not in' && forWhat[1] === 'Sales') {
+    defaults = Object.assign({ for: 'Purchases' });
   }
 
   router[method]({
diff --git a/utils/index.ts b/utils/index.ts
index b70cced9..9ee0bbfc 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -1,5 +1,4 @@
 /**
- * Functions in utils/*.ts can be used by the frontend or the backends
  * And so should not contain and platforma specific imports.
  */
 export function getValueMapFromList<T, K extends keyof T, V extends keyof T>(
@@ -48,6 +47,32 @@ export function getMapFromList<T, K extends keyof T>(
   return acc;
 }
 
+export function getDefaultMapFromList<T, K extends keyof T, D>(
+  list: T[] | string[],
+  defaultValue: D,
+  name?: K
+): Record<string, D> {
+  const acc: Record<string, D> = {};
+  if (typeof list[0] === 'string') {
+    for (const l of list as string[]) {
+      acc[l] = defaultValue;
+    }
+
+    return acc;
+  }
+
+  if (!name) {
+    return {};
+  }
+
+  for (const l of list as T[]) {
+    const key = String(l[name]);
+    acc[key] = defaultValue;
+  }
+
+  return acc;
+}
+
 export function getListFromMap<T>(map: Record<string, T>): T[] {
   return Object.keys(map).map((n) => map[n]);
 }

From 0f2d1284b25a5fe81ac7a0398c0aedb997f9e8e9 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 5 May 2022 17:00:09 +0530
Subject: [PATCH 097/163] incr: make Link fuzzy matchable

---
 src/components/Controls/Link.vue | 43 ++++++++++++++++++++------------
 src/utils/index.ts               |  7 ++++--
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index d78a4d16..6c3bc56d 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -2,6 +2,7 @@
 import { t } from 'fyo';
 import Badge from 'src/components/Badge.vue';
 import { fyo } from 'src/initFyo';
+import { fuzzyMatch } from 'src/utils';
 import { markRaw } from 'vue';
 import AutoComplete from './AutoComplete.vue';
 
@@ -9,6 +10,9 @@ export default {
   name: 'Link',
   extends: AutoComplete,
   emits: ['new-doc'],
+  data() {
+    return { results: [] };
+  },
   mounted() {
     if (this.value) {
       this.linkValue = this.value;
@@ -30,25 +34,21 @@ export default {
     getTargetSchemaName() {
       return this.df.target;
     },
-    async getSuggestions(keyword = '') {
+    async getOptions() {
       const schemaName = this.getTargetSchemaName();
       if (!schemaName) {
         return [];
       }
 
-      const schema = fyo.schemaMap[schemaName];
-      const filters = await this.getFilters(keyword);
-
-      if (keyword && !filters.keywords) {
-        filters[schema.titleField] = ['like', keyword];
+      if (this.results?.length) {
+        return this.results;
       }
 
+      const schema = fyo.schemaMap[schemaName];
+      const filters = await this.getFilters();
+
       const fields = [
-        ...new Set([
-          'name',
-          schema.titleField,
-          this.df.groupBy,
-        ]),
+        ...new Set(['name', schema.titleField, this.df.groupBy]),
       ].filter(Boolean);
 
       const results = await fyo.db.getAll(schemaName, {
@@ -56,7 +56,7 @@ export default {
         fields,
       });
 
-      const suggestions = results
+      return (this.results = results
         .map((r) => {
           const option = { label: r[schema.titleField], value: r.name };
           if (this.df.groupBy) {
@@ -64,10 +64,21 @@ export default {
           }
           return option;
         })
-        .concat(this.getCreateNewOption())
-        .filter(Boolean);
+        .filter(Boolean));
+    },
+    async getSuggestions(keyword = '') {
+      let options = await this.getOptions();
 
-      if (suggestions.length === 0) {
+      if (keyword) {
+        options = options
+          .map((item) => ({ ...fuzzyMatch(keyword, item.label), item }))
+          .filter(({ isMatch }) => isMatch)
+          .sort((a, b) => a.distance - b.distance)
+          .map(({ item }) => item);
+      }
+
+      options = options.concat(this.getCreateNewOption());
+      if (options.length === 0) {
         return [
           {
             component: markRaw({
@@ -79,7 +90,7 @@ export default {
         ];
       }
 
-      return suggestions;
+      return options;
     },
     getCreateNewOption() {
       return {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 710fcdd5..da0b8f1f 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -49,8 +49,11 @@ export function fuzzyMatch(keyword: string, candidate: string) {
   let distance = 0;
 
   while (keywordLetter && candidateLetter) {
-    if (keywordLetter.toLowerCase() === candidateLetter.toLowerCase()) {
+    if (keywordLetter === candidateLetter) {
       keywordLetter = keywordLetters.shift();
+    } else if (keywordLetter.toLowerCase() === candidateLetter.toLowerCase()) {
+      keywordLetter = keywordLetters.shift();
+      distance += 0.5;
     } else {
       distance += 1;
     }
@@ -93,4 +96,4 @@ export function getErrorMessage(e: Error, doc?: Doc): string {
   }
 
   return errorMessage;
-}
\ No newline at end of file
+}

From b7f0757d699a4aa271c68676aa14619e08102271 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 6 May 2022 11:57:28 +0530
Subject: [PATCH 098/163] fix: maximize behaviour

---
 main.ts                                | 10 +++++-----
 main/registerAppLifecycleListeners.ts  |  1 -
 main/registerIpcMainActionListeners.ts | 11 ++++++-----
 src/components/WindowControls.vue      | 24 +++++++++++++++++++++---
 src/pages/Dashboard/UnpaidInvoices.vue |  2 +-
 src/utils/ipcCalls.ts                  |  6 ++++--
 6 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/main.ts b/main.ts
index 25b9fc9a..b4784dd0 100644
--- a/main.ts
+++ b/main.ts
@@ -17,9 +17,6 @@ import registerIpcMainMessageListeners from './main/registerIpcMainMessageListen
 import registerProcessListeners from './main/registerProcessListeners';
 import { IPC_CHANNELS } from './utils/messages';
 
-const WIDTH = 1200;
-const HEIGHT = 900;
-
 export class Main {
   title: string = 'Frappe Books';
   icon: string;
@@ -29,6 +26,9 @@ export class Main {
   checkedForUpdate = false;
   mainWindow: BrowserWindow | null = null;
 
+  WIDTH = 1200;
+  HEIGHT = 900;
+
   constructor() {
     this.icon = this.isDevelopment
       ? path.resolve('./build/icon.png')
@@ -75,8 +75,8 @@ export class Main {
       vibrancy: 'sidebar',
       transparent: this.isMac,
       backgroundColor: '#80FFFFFF',
-      width: WIDTH,
-      height: HEIGHT,
+      width: this.WIDTH,
+      height: this.HEIGHT,
       title: this.title,
       webPreferences: {
         contextIsolation: false, // TODO: Switch this off
diff --git a/main/registerAppLifecycleListeners.ts b/main/registerAppLifecycleListeners.ts
index 588532d0..3156d466 100644
--- a/main/registerAppLifecycleListeners.ts
+++ b/main/registerAppLifecycleListeners.ts
@@ -1,5 +1,4 @@
 import { app } from 'electron';
-// @ts-ignore
 import installExtension, { VUEJS3_DEVTOOLS } from 'electron-devtools-installer';
 import { Main } from '../main';
 
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 0f6a46bc..06606c5c 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -13,13 +13,14 @@ import { IPC_ACTIONS } from '../utils/messages';
 
 export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(IPC_ACTIONS.TOGGLE_MAXIMIZE_CURRENT_WINDOW, (event) => {
-    const maximizing = main.mainWindow!.isMaximized();
-    if (maximizing) {
-      main.mainWindow!.maximize();
+    const maximized = main.mainWindow!.isFullScreen();
+    if (maximized) {
+      main.mainWindow?.setFullScreen(false);
+      main.mainWindow?.setSize(main.WIDTH, main.HEIGHT, true);
     } else {
-      main.mainWindow!.unmaximize();
+      main.mainWindow?.setFullScreen(true);
     }
-    return maximizing;
+    return maximized;
   });
 
   ipcMain.handle(IPC_ACTIONS.GET_OPEN_FILEPATH, async (event, options) => {
diff --git a/src/components/WindowControls.vue b/src/components/WindowControls.vue
index 55e4bc8e..1df4a75d 100644
--- a/src/components/WindowControls.vue
+++ b/src/components/WindowControls.vue
@@ -19,8 +19,7 @@
 </template>
 
 <script>
-import { runWindowAction } from "src/utils/ipcCalls";
-
+import { runWindowAction } from 'src/utils/ipcCalls';
 
 export default {
   name: 'WindowControls',
@@ -31,6 +30,11 @@ export default {
       default: () => ['close', 'minimize', 'maximize'],
     },
   },
+  data() {
+    return {
+      fullscreen: false,
+    };
+  },
   methods: {
     async action(name) {
       if (!this.buttons.includes(name)) {
@@ -38,12 +42,26 @@ export default {
       }
 
       const actionRan = await runWindowAction(name);
+
+      this.setFullscreen(actionRan);
       this.$emit(actionRan);
     },
+    setFullscreen(actionRan) {
+      if (actionRan === 'maximize') {
+        this.fullscreen = true;
+      } else if (actionRan === 'unmaximize') {
+        this.fullscreen = false;
+      }
+    },
     getColorClasses(name) {
+      let minimize = 'bg-yellow-500 hover:bg-yellow-700';
+      if (this.fullscreen) {
+        minimize = 'bg-gray-500';
+      }
+
       let classes = {
         close: 'bg-red-500 hover:bg-red-700',
-        minimize: 'bg-yellow-500 hover:bg-yellow-700',
+        minimize,
         maximize: 'bg-green-500 hover:bg-green-700',
       }[name];
 
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index ca307a19..e154e69a 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -71,8 +71,8 @@
 import { t } from 'fyo';
 import Button from 'src/components/Button';
 import { fyo } from 'src/initFyo';
-import { routeTo } from 'src/utils';
 import { getDatesAndPeriodicity } from 'src/utils/misc';
+import { routeTo } from 'src/utils/ui';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
 
diff --git a/src/utils/ipcCalls.ts b/src/utils/ipcCalls.ts
index 7d809366..5b2813f6 100644
--- a/src/utils/ipcCalls.ts
+++ b/src/utils/ipcCalls.ts
@@ -35,11 +35,13 @@ export async function runWindowAction(name: WindowAction) {
       ipcRenderer.send(IPC_MESSAGES.MINIMIZE_CURRENT_WINDOW);
       break;
     case 'maximize':
-      const maximizing = await ipcRenderer.invoke(
+      const maximized = await ipcRenderer.invoke(
         IPC_ACTIONS.TOGGLE_MAXIMIZE_CURRENT_WINDOW
       );
-      name = maximizing ? name : 'unmaximize';
+      name = maximized ? 'unmaximize' : name;
       break;
+    default:
+      throw new Error(`invalid window action ${name}`);
   }
   return name;
 }

From 58dce76d10faeaee344ad521f1d8448ae4ab3fb4 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 6 May 2022 12:21:58 +0530
Subject: [PATCH 099/163] incr: set user email on created, modded - set
 specific purposed payment paths in search

---
 fyo/core/authHandler.ts    |  8 ++++++++
 src/initFyo.ts             | 10 ++++++++++
 src/utils/search.ts        |  8 ++++++++
 src/utils/sidebarConfig.ts |  4 ++--
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/fyo/core/authHandler.ts b/fyo/core/authHandler.ts
index e304e59c..8f8c2b10 100644
--- a/fyo/core/authHandler.ts
+++ b/fyo/core/authHandler.ts
@@ -40,6 +40,14 @@ export class AuthHandler {
     }
   }
 
+  set user(value: string) {
+    this.#session.user = value;
+  }
+
+  get user(): string {
+    return this.#session.user;
+  }
+
   get session(): Readonly<Session> {
     return { ...this.#session };
   }
diff --git a/src/initFyo.ts b/src/initFyo.ts
index 73fec946..721d5450 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -30,6 +30,7 @@ export async function initializeInstance(
   await fyo.initializeAndRegister(models, regionalModels);
 
   await setSingles(fyo);
+  await setCreds(fyo);
   await setCurrencySymbols(fyo);
 }
 
@@ -38,6 +39,15 @@ async function setSingles(fyo: Fyo) {
   await fyo.doc.getSingle(ModelNameEnum.GetStarted);
 }
 
+async function setCreds(fyo: Fyo) {
+  const email = (await fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'email'
+  )) as string | undefined;
+  const user = fyo.auth.user;
+  fyo.auth.user = email ?? user;
+}
+
 async function setCurrencySymbols(fyo: Fyo) {
   const currencies = (await fyo.db.getAll(ModelNameEnum.Currency, {
     fields: ['name', 'symbol'],
diff --git a/src/utils/search.ts b/src/utils/search.ts
index f446bdeb..1ecca7c9 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -165,6 +165,10 @@ function getListViewList(): SearchItem[] {
       label: t`Sales Items`,
       route: `/list/Item/for/Sales/${t`Sales Items`}`,
     },
+    {
+      label: t`Sales Payments`,
+      route: `/list/Payment/paymentType/Receive/${t`Sales Payments`}`,
+    },
     {
       label: t`Purchase Items`,
       route: `/list/Item/for/Purchases/${t`Purchase Items`}`,
@@ -173,6 +177,10 @@ function getListViewList(): SearchItem[] {
       label: t`Common Items`,
       route: `/list/Item/for/Both/${t`Common Items`}`,
     },
+    {
+      label: t`Purchase Payments`,
+      route: `/list/Payment/paymentType/Pay/${t`Purchase Payments`}`,
+    },
   ].map((i) => ({ ...i, group: 'List' } as SearchItem));
 
   return [standardLists, filteredLists].flat();
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index ad6307c7..cd8fa1af 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -55,7 +55,7 @@ function getCompleteSidebar(): SidebarConfig {
           schemaName: 'SalesInvoice',
         },
         {
-          label: t`Payments`,
+          label: t`Sales Payments`,
           name: 'payments',
           route: '/list/Payment/paymentType/Receive',
           schemaName: 'Payment',
@@ -87,7 +87,7 @@ function getCompleteSidebar(): SidebarConfig {
           schemaName: 'PurchaseInvoice',
         },
         {
-          label: t`Payments`,
+          label: t`Purchase Payments`,
           name: 'payments',
           route: '/list/Payment/paymentType/Pay',
           schemaName: 'Payment',

From 6dfad44ba3982bcbbc9d23b265960f0fe001872a Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 6 May 2022 12:30:32 +0530
Subject: [PATCH 100/163] incr: save version in the db

---
 schemas/core/SystemSettings.json | 14 +++++++++++++-
 src/initFyo.ts                   | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 4fe68c98..3d5cc287 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -88,7 +88,19 @@
       "label": "Currency",
       "fieldtype": "AutoComplete",
       "required": true
+    },
+    {
+      "fieldname": "version",
+      "label": "Version",
+      "fieldtype": "Data",
+      "readOnly": true
     }
   ],
-  "quickEditFields": ["locale", "dateFormat", "currency", "displayPrecision", "hideGetStarted"]
+  "quickEditFields": [
+    "locale",
+    "dateFormat",
+    "currency",
+    "displayPrecision",
+    "hideGetStarted"
+  ]
 }
diff --git a/src/initFyo.ts b/src/initFyo.ts
index 721d5450..1c02a3f8 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -31,6 +31,7 @@ export async function initializeInstance(
 
   await setSingles(fyo);
   await setCreds(fyo);
+  await setVersion(fyo);
   await setCurrencySymbols(fyo);
 }
 
@@ -48,6 +49,21 @@ async function setCreds(fyo: Fyo) {
   fyo.auth.user = email ?? user;
 }
 
+async function setVersion(fyo: Fyo) {
+  const version = (await fyo.getValue(
+    ModelNameEnum.SystemSettings,
+    'version'
+  )) as string | undefined;
+
+  const { appVersion } = fyo.store;
+  if (version !== appVersion) {
+    const systemSettings = await fyo.doc.getSingle(
+      ModelNameEnum.SystemSettings
+    );
+    await systemSettings?.setAndSync('version', appVersion);
+  }
+}
+
 async function setCurrencySymbols(fyo: Fyo) {
   const currencies = (await fyo.db.getAll(ModelNameEnum.Currency, {
     fields: ['name', 'symbol'],

From 93f8844c654a75f581cf864ea435c697c5ddbe61 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 6 May 2022 12:32:26 +0530
Subject: [PATCH 101/163] incr: remove balance from ALE

---
 schemas/app/AccountingLedgerEntry.json | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index 3ff9e833..f59f8141 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -51,12 +51,6 @@
       "references": "referenceType",
       "readOnly": true
     },
-    {
-      "fieldname": "balance",
-      "label": "Balance",
-      "fieldtype": "Currency",
-      "readOnly": true
-    },
     {
       "fieldname": "reverted",
       "label": "Reverted",
@@ -80,7 +74,6 @@
     "credit",
     "referenceType",
     "referenceName",
-    "balance",
     "reverted",
     "reverts"
   ]

From ee1a694c4f3f6417fe0239a205bb2572dd107e8f Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 10 May 2022 11:12:35 +0530
Subject: [PATCH 102/163] fix: Angolan currency code

---
 fixtures/countryInfo.json | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/fixtures/countryInfo.json b/fixtures/countryInfo.json
index 1ed66118..1b5c9d01 100644
--- a/fixtures/countryInfo.json
+++ b/fixtures/countryInfo.json
@@ -61,16 +61,13 @@
     },
     "Angola": 
     {
-        "code": "ao",
-        "currency": "KZ",
-        "currency_fraction": "Cêntimo",
-        "currency_fraction_units": 100,
-        "currency_symbol": "AOA",
-        "currency_name": "Kwanza",
-        "timezones": 
-        [
-            "Africa/Luanda"
-        ]
+      "code": "ao",
+      "currency": "AOA",
+      "currency_fraction": "Cêntimo",
+      "currency_fraction_units": 100,
+      "currency_symbol": "Kz",
+      "currency_name": "Kwanza",
+      "timezones": ["Africa/Luanda"]
     },
     "Anguilla": 
     {

From d5d40dd807745147320d7e930df7d90b824445c3 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 10 May 2022 14:56:17 +0530
Subject: [PATCH 103/163] incr: add party and items dummy stuff

---
 META.md                          |  1 +
 dummy/index.ts                   | 45 ++++++++++++++++++++++++++++++++
 dummy/items.json                 |  1 +
 dummy/parties.json               |  1 +
 dummy/tests/testDummy.spec.ts    | 32 +++++++++++++++++++++++
 fyo/core/converter.ts            |  8 ++++++
 fyo/model/doc.ts                 | 10 ++++++-
 regional/in.ts                   | 18 ++++++-------
 schemas/app/Item.json            |  4 +++
 schemas/core/SystemSettings.json |  1 +
 tests/helpers.ts                 |  4 +--
 tsconfig.json                    |  6 +++--
 vue.config.js                    |  1 +
 13 files changed, 118 insertions(+), 14 deletions(-)
 create mode 100644 dummy/index.ts
 create mode 100644 dummy/items.json
 create mode 100644 dummy/parties.json
 create mode 100644 dummy/tests/testDummy.spec.ts

diff --git a/META.md b/META.md
index 3a73a0eb..f0fd65be 100644
--- a/META.md
+++ b/META.md
@@ -55,6 +55,7 @@ individual ones, check the `README.md` in those subdirectories:
 | `models`       | _client\*_ | Collection of `Model.ts` files that manage the data and some business logic on the client side.                            |
 | `fyo`          | _client\*_ | Code for the underlying library that manages the client side                                                               |
 | `utils`        | _agnostic_ | Collection of code used by either sides.                                                                                   |
+| `dummy`        | _agnostic_ | Code used to generate dummy data for testing or demo purposes                                                              |
 
 #### _client\*_
 
diff --git a/dummy/index.ts b/dummy/index.ts
new file mode 100644
index 00000000..93250253
--- /dev/null
+++ b/dummy/index.ts
@@ -0,0 +1,45 @@
+import { Fyo } from 'fyo';
+import setupInstance from 'src/setup/setupInstance';
+import { getFiscalYear } from 'utils/misc';
+import items from './items.json';
+import parties from './parties.json';
+
+export async function setupDummyInstance(dbPath: string, fyo: Fyo) {
+  await setupInstance(
+    dbPath,
+    {
+      logo: null,
+      companyName: "Flo's Clothes",
+      country: 'India',
+      fullname: 'Lin Florentine',
+      email: 'lin@flosclothes.com',
+      bankName: 'Supreme Bank',
+      currency: 'INR',
+      fiscalYearStart: getFiscalYear('04-01', true),
+      fiscalYearEnd: getFiscalYear('04-01', false),
+      chartOfAccounts: 'India - Chart of Accounts',
+    },
+    fyo
+  );
+
+  await generateEntries(fyo);
+}
+
+async function generateEntries(fyo: Fyo) {
+  await generateItems(fyo);
+  await generateParties(fyo);
+}
+
+async function generateItems(fyo: Fyo) {
+  for (const item of items) {
+    const doc = fyo.doc.getNewDoc('Item', item, false);
+    await doc.sync();
+  }
+}
+
+async function generateParties(fyo: Fyo) {
+  for (const party of parties) {
+    const doc = fyo.doc.getNewDoc('Party', party, false);
+    await doc.sync();
+  }
+}
diff --git a/dummy/items.json b/dummy/items.json
new file mode 100644
index 00000000..d0d42c6d
--- /dev/null
+++ b/dummy/items.json
@@ -0,0 +1 @@
+[{"name": "611 Jeans - PCH", "description": "Peach coloured 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 4499, "hsnCode": 62034990, "for": "Sales"}, {"name": "611 Jeans - SHR", "description": "Shark skin 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 6499, "hsnCode": 62034990, "for": "Sales"}, {"name": "Bominga Shoes", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4999, "hsnCode": 640291, "for": "Sales"}, {"name": "Cryo Gloves", "description": "Keeps hands cool", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 3499, "hsnCode": 611693, "for": "Sales"}, {"name": "Epaulettes - 4POR", "description": "Porcelain epaulettes", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2499, "hsnCode": 62179090, "for": "Sales"}, {"name": "Full Sleeve - BLK", "description": "Black sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 599, "hsnCode": 100820, "for": "Sales"}, {"name": "Full Sleeve - COL", "description": "All color sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 499, "hsnCode": 100820, "for": "Sales"}, {"name": "Jacket - RAW", "description": "Raw baby skinned jackets", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 8999, "hsnCode": 100820, "for": "Sales"}, {"name": "Jade Slippers", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2999, "hsnCode": 640520, "for": "Sales"}, {"name": "Dry-Cleaning", "description": null, "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 69, "hsnCode": 999712, "for": "Sales"}, {"name": "Electricity", "description": "Bzz Bzz", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Utility Expenses", "tax": "GST-0", "rate": 6000, "hsnCode": 271600, "for": "Purchases"}, {"name": "Marketing - Video", "description": "One single video", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 15000, "hsnCode": 998371, "for": "Purchases"}, {"name": "Office Rent", "description": "Rent per day", "unit": "Day", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Office Rent", "tax": "GST-18", "rate": 100000, "hsnCode": 997212, "for": "Purchases"}, {"name": "Office Cleaning", "description": "Cleaning cost per day", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Office Maintenance Expenses", "tax": "GST-18", "rate": 100000, "hsnCode": 998533, "for": "Purchases"}, {"name": "Social Ads", "description": "Cost per click", "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 50, "hsnCode": 99836, "for": "Purchases"}, {"name": "Cool Cloth", "description": "Some real \ud83c\udd92 cloth", "unit": "Meter", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4000, "hsnCode": 59111000, "for": "Both"}]
\ No newline at end of file
diff --git a/dummy/parties.json b/dummy/parties.json
new file mode 100644
index 00000000..5f04df76
--- /dev/null
+++ b/dummy/parties.json
@@ -0,0 +1 @@
+[{"name": "Roy Rolston", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy_rolston@generic_indian.in", "phone": "+91 8085-761809", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Aloysius Albuquerque", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6734-433583", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "James", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "james-679@gmail.com", "phone": "+91 9409-252148", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Mary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9686-432601", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Robert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "robert_827@redis.rs", "phone": "+91 8866-405100", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patricia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patricia_64@gmail.com", "phone": "+91 6199-779289", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "John", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "john.916@generic_indian.in", "phone": "+91 7190-555768", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jennifer", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jennifer.709@generic_indian.in", "phone": "+91 9233-632140", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Michael", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michael.784@yahoo.co.in", "phone": "+91 6561-728159", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Linda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "linda_768@partiesunited.co", "phone": "+91 8655-717226", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "William", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "william-775@gmail.com", "phone": "+91 8255-462112", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elizabeth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elizabeth.763@gmail.com", "phone": "+91 8451-416308", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "David", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "david-88@gmail.com", "phone": "+91 6646-333642", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Barbara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "barbara.714@yahoo.co.in", "phone": "+91 9996-777529", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Richard", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "richard-315@gmail.com", "phone": "+91 6816-661508", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Susan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "susan_795@redis.rs", "phone": "+91 9317-150134", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joseph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joseph.725@gmail.com", "phone": "+91 9743-597180", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jessica", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jessica.913@gmail.com", "phone": "+91 8690-848811", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Thomas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "thomas.821@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sarah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sarah-338@redis.rs", "phone": "+91 8608-462496", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charles", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7122-160573", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Karen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "karen.536@yahoo.co.in", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Christopher", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christopher.38@gmail.com", "phone": "+91 8001-980273", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nancy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nancy@gmail.com", "phone": "+91 7453-772757", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Daniel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "daniel-934@partiesunited.co", "phone": "+91 7718-704011", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lisa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lisa.330@gmail.com", "phone": "+91 6622-345518", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Matthew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "matthew_66@partiesunited.co", "phone": "+91 6218-703147", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Betty", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "betty-510@yahoo.co.in", "phone": "+91 6860-603906", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Anthony", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anthony_229@generic_indian.in", "phone": "+91 8533-030553", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Margaret", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "margaret_28@redis.rs", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Mark", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "mark_721@partiesunited.co", "phone": "+91 7590-436520", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sandra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sandra-425@gmail.com", "phone": "+91 6015-720815", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Donald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donald_821@partiesunited.co", "phone": "+91 6145-759778", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Ashley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ashley_684@redis.rs", "phone": "+91 8799-436202", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Steven", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "steven@yahoo.co.in", "phone": "+91 6761-152125", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kimberly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kimberly-388@redis.rs", "phone": "+91 6352-411349", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Paul", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "paul_181@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emily", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emily_596@generic_indian.in", "phone": "+91 9989-626151", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrew.38@redis.rs", "phone": "+91 7966-700777", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Donna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donna-412@gmail.com", "phone": "+91 9856-353641", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joshua", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joshua.955@redis.rs", "phone": "+91 6038-514242", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Michelle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michelle-582@redis.rs", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Kenneth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kenneth_162@generic_indian.in", "phone": "+91 6175-284068", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dorothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dorothy.997@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kevin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kevin.162@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carol", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carol-967@generic_indian.in", "phone": "+91 8175-539735", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brian-574@partiesunited.co", "phone": "+91 6408-864464", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amanda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amanda-45@redis.rs", "phone": "+91 6665-854328", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "George", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "george@yahoo.co.in", "phone": "+91 7223-035503", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Melissa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "melissa.551@partiesunited.co", "phone": "+91 6464-081038", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Edward", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "edward_852@yahoo.co.in", "phone": "+91 7192-818190", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Deborah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8780-967375", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ronald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ronald@yahoo.co.in", "phone": "+91 8346-532731", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephanie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephanie-233@gmail.com", "phone": "+91 7648-287693", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Timothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "timothy-640@partiesunited.co", "phone": "+91 8930-966620", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rebecca", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9481-932348", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jason", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jason@yahoo.co.in", "phone": "+91 7610-820391", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Sharon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sharon@generic_indian.in", "phone": "+91 8363-472658", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeffrey", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6612-342986", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Laura", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "laura_237@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ryan.14@generic_indian.in", "phone": "+91 9829-797485", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cynthia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cynthia@gmail.com", "phone": "+91 7484-063430", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jacob", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacob-561@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathleen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathleen-858@redis.rs", "phone": "+91 6036-133810", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gary-984@redis.rs", "phone": "+91 7994-524709", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amy_614@redis.rs", "phone": "+91 9025-426780", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nicholas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicholas@partiesunited.co", "phone": "+91 7824-209517", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Shirley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "shirley.562@redis.rs", "phone": "+91 9426-173760", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Eric", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eric-200@yahoo.co.in", "phone": "+91 8251-483966", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Angela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "angela_303@redis.rs", "phone": "+91 6358-368039", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jonathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jonathan_654@gmail.com", "phone": "+91 9121-267798", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Helen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "helen_379@partiesunited.co", "phone": "+91 6041-179352", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephen-30@yahoo.co.in", "phone": "+91 6776-201802", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Anna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anna.448@partiesunited.co", "phone": "+91 7869-863595", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Larry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "larry.397@yahoo.co.in", "phone": "+91 8792-636435", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Brenda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brenda.80@gmail.com", "phone": "+91 9022-343413", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Justin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "justin.813@yahoo.co.in", "phone": "+91 7690-923779", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Pamela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "pamela_579@redis.rs", "phone": "+91 7179-474249", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Scott", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "scott_33@yahoo.co.in", "phone": "+91 9935-153243", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Nicole", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicole_502@partiesunited.co", "phone": "+91 8032-745703", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brandon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brandon-680@redis.rs", "phone": "+91 9232-437897", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emma", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emma.999@yahoo.co.in", "phone": "+91 7288-589962", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Benjamin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "benjamin.48@yahoo.co.in", "phone": "+91 9613-588904", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samantha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samantha-762@redis.rs", "phone": "+91 8466-379168", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samuel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samuel@redis.rs", "phone": "+91 8854-408752", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Katherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "katherine-405@generic_indian.in", "phone": "+91 7309-798133", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Gregory", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gregory-159@yahoo.co.in", "phone": "+91 8826-959138", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christine_485@redis.rs", "phone": "+91 8898-070095", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frank", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frank-704@partiesunited.co", "phone": "+91 9428-163927", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Debra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "debra-377@redis.rs", "phone": "+91 8018-135106", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexander", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexander_788@generic_indian.in", "phone": "+91 8365-096935", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rachel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rachel_514@partiesunited.co", "phone": "+91 9965-186958", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Raymond", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "raymond@generic_indian.in", "phone": "+91 6784-916094", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Catherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "catherine-601@redis.rs", "phone": "+91 8330-882492", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patrick", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patrick-622@yahoo.co.in", "phone": "+91 7594-725819", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carolyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carolyn-466@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jack", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jack-640@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janet", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janet-760@partiesunited.co", "phone": "+91 7252-043072", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dennis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dennis_81@gmail.com", "phone": "+91 9461-535482", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ruth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ruth-611@partiesunited.co", "phone": "+91 8959-614592", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jerry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jerry.518@yahoo.co.in", "phone": "+91 9123-649030", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Maria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "maria.299@redis.rs", "phone": "+91 9687-298902", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Tyler", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "tyler.215@gmail.com", "phone": "+91 6765-553393", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Heather", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "heather-956@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Aaron", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aaron_383@gmail.com", "phone": "+91 6076-015156", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diane", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diane_350@gmail.com", "phone": "+91 7462-322376", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jose-947@generic_indian.in", "phone": "+91 6194-056675", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Virginia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6301-631552", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Adam", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "adam-130@generic_indian.in", "phone": "+91 9800-873022", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julie-333@yahoo.co.in", "phone": "+91 6659-434111", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Henry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "henry@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joyce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joyce_494@partiesunited.co", "phone": "+91 7744-359088", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nathan-933@partiesunited.co", "phone": "+91 9115-768363", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Victoria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "victoria.328@redis.rs", "phone": "+91 6493-123642", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Douglas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "douglas_267@redis.rs", "phone": "+91 6720-749237", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Olivia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "olivia-549@generic_indian.in", "phone": "+91 7797-704174", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Zachary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "zachary-203@generic_indian.in", "phone": "+91 9685-059823", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kelly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kelly-564@redis.rs", "phone": "+91 6234-293587", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Peter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "peter-340@yahoo.co.in", "phone": "+91 8149-678841", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kyle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kyle.260@gmail.com", "phone": "+91 7182-108922", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lauren", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lauren.8@yahoo.co.in", "phone": "+91 8460-088373", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Walter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "walter.907@gmail.com", "phone": "+91 8254-010872", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joan_650@generic_indian.in", "phone": "+91 6003-673443", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ethan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ethan.526@generic_indian.in", "phone": "+91 9442-752228", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Evelyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "evelyn.107@redis.rs", "phone": "+91 9222-443000", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeremy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeremy_209@generic_indian.in", "phone": "+91 9408-935791", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judith_703@redis.rs", "phone": "+91 9995-636649", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Harold", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "harold-414@yahoo.co.in", "phone": "+91 9659-145174", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Megan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "megan@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Keith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "keith@yahoo.co.in", "phone": "+91 8989-391625", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cheryl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cheryl-747@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christian.228@gmail.com", "phone": "+91 9562-383440", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrea", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrea-309@gmail.com", "phone": "+91 6733-480461", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Roger", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roger_565@redis.rs", "phone": "+91 6314-629890", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Hannah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "hannah_364@generic_indian.in", "phone": "+91 7736-658408", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Noah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "noah-946@gmail.com", "phone": "+91 8027-306313", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Martha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9785-077655", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gerald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gerald.354@yahoo.co.in", "phone": "+91 9497-574913", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Jacqueline", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacqueline-382@partiesunited.co", "phone": "+91 7043-234053", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carl_341@partiesunited.co", "phone": "+91 8812-115615", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frances", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frances_355@gmail.com", "phone": "+91 9054-407598", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Terry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6387-710013", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gloria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gloria.799@redis.rs", "phone": "+91 8797-429670", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sean_73@gmail.com", "phone": "+91 8427-861481", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ann", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ann_912@yahoo.co.in", "phone": "+91 9385-716140", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Austin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "austin.678@gmail.com", "phone": "+91 6045-642747", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Teresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7076-371232", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Arthur", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "arthur.822@gmail.com", "phone": "+91 8881-783525", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathryn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathryn-603@gmail.com", "phone": "+91 7932-982026", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lawrence", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lawrence_129@generic_indian.in", "phone": "+91 9812-545509", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sara@yahoo.co.in", "phone": "+91 6009-874805", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jesse", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jesse.78@gmail.com", "phone": "+91 6760-743479", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janice.495@redis.rs", "phone": "+91 7092-191443", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dylan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dylan.30@redis.rs", "phone": "+91 8967-598834", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jean-531@partiesunited.co", "phone": "+91 8169-759257", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bryan-459@redis.rs", "phone": "+91 9647-121952", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alice-175@yahoo.co.in", "phone": "+91 6454-520472", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joe", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joe@yahoo.co.in", "phone": "+91 9638-522193", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Madison", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "madison-518@partiesunited.co", "phone": "+91 7305-596248", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jordan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jordan_10@yahoo.co.in", "phone": "+91 6726-448100", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Doris", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "doris-269@redis.rs", "phone": "+91 9171-162126", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Billy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "billy@generic_indian.in", "phone": "+91 9208-612407", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Abigail", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "abigail.731@generic_indian.in", "phone": "+91 6830-093346", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Bruce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bruce-398@partiesunited.co", "phone": "+91 9435-070909", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6592-024845", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Albert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "albert@yahoo.co.in", "phone": "+91 6406-174202", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judy.987@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Willie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "willie_337@generic_indian.in", "phone": "+91 7520-743677", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Grace", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "grace_297@yahoo.co.in", "phone": "+91 7316-247530", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gabriel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gabriel_526@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Denise", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "denise@gmail.com", "phone": "+91 8133-719930", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Logan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "logan-148@yahoo.co.in", "phone": "+91 9399-697849", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amber", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amber-306@redis.rs", "phone": "+91 7622-921929", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alan-174@redis.rs", "phone": "+91 8924-088014", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marilyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marilyn.188@yahoo.co.in", "phone": "+91 7936-027760", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Juan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "juan_88@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Beverly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "beverly.429@partiesunited.co", "phone": "+91 9319-019163", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Wayne", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "wayne.248@generic_indian.in", "phone": "+91 6307-827364", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Danielle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "danielle.602@partiesunited.co", "phone": "+91 7885-866986", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Roy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy_794@redis.rs", "phone": "+91 8511-570498", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Theresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "theresa_330@yahoo.co.in", "phone": "+91 6394-578237", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ralph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ralph_837@yahoo.co.in", "phone": "+91 9973-097921", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sophia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sophia_430@partiesunited.co", "phone": "+91 9914-756832", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Randy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "randy-187@gmail.com", "phone": "+91 7553-323773", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marie_949@generic_indian.in", "phone": "+91 9584-722241", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Eugene", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eugene_49@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diana", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diana_424@generic_indian.in", "phone": "+91 7682-534386", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Vincent", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "vincent-832@yahoo.co.in", "phone": "+91 9733-825837", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brittany", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brittany-933@generic_indian.in", "phone": "+91 8279-322638", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Russell", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "russell-225@generic_indian.in", "phone": "+91 7289-620267", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Natalie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "natalie_769@generic_indian.in", "phone": "+91 9110-784610", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elijah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elijah@gmail.com", "phone": "+91 9566-594853", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Isabella", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8864-421179", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Louis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "louis_827@yahoo.co.in", "phone": "+91 7326-663215", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charlotte", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charlotte.746@redis.rs", "phone": "+91 6613-120888", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bobby", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bobby-771@yahoo.co.in", "phone": "+91 6805-102693", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rose.459@yahoo.co.in", "phone": "+91 6094-891120", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Philip", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "philip_64@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexis-127@yahoo.co.in", "phone": "+91 6283-621956", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Johnny", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7552-522002", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kayla", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kayla_622@generic_indian.in", "phone": "+91 9442-288182", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janky Office Spaces", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "janky_office_spaces.8@yahoo.co.in", "phone": "+91 6163-603540", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Josf\u00e9\u00f1a's 611s", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "josf\u00e9\u00f1a's.611s-187@redis.rs", "phone": "+91 8049-040228", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Lankness Feet Fomenters", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "lankness.feet.fomenters_920@partiesunited.co", "phone": "+91 6366-746997", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "The Overclothes Company", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "the.overclothes.company_154@partiesunited.co", "phone": "+91 7361-295433", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Adani Electricity Mumbai Limited ", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "adani.electricity.mumbai.limited.-597@redis.rs", "phone": "+91 7651-069128", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Only Fulls", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "only-fulls@gmail.com", "phone": "+91 7179-901187", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Just Epaulettes", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "just.epaulettes_184@gmail.com", "phone": "+91 6562-362537", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Maxwell", "role": "Both", "defaultAccount": null, "currency": "INR", "email": "maxwell@partiesunited.co", "phone": "+91 8157-631915", "address": null, "gst_type": "Unregistered", "gstin": null}]
\ No newline at end of file
diff --git a/dummy/tests/testDummy.spec.ts b/dummy/tests/testDummy.spec.ts
new file mode 100644
index 00000000..0971ad81
--- /dev/null
+++ b/dummy/tests/testDummy.spec.ts
@@ -0,0 +1,32 @@
+import { DatabaseManager } from 'backend/database/manager';
+import { assertDoesNotThrow } from 'backend/database/tests/helpers';
+import { Fyo } from 'fyo';
+import { DummyAuthDemux } from 'fyo/tests/helpers';
+import 'mocha';
+import { getTestDbPath } from 'tests/helpers';
+import { setupDummyInstance } from '..';
+
+describe('dummy', function () {
+  const dbPath = getTestDbPath();
+
+  let fyo: Fyo;
+
+  this.beforeAll(function () {
+    fyo = new Fyo({
+      DatabaseDemux: DatabaseManager,
+      AuthDemux: DummyAuthDemux,
+      isTest: true,
+      isElectron: false,
+    });
+  });
+
+  this.afterAll(async function () {
+    await fyo.close();
+  });
+
+  specify('setupDummyInstance', async function () {
+    await assertDoesNotThrow(async () => {
+      await setupDummyInstance(dbPath, fyo);
+    }, 'setup instance failed');
+  });
+});
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index a9f37bd7..1794b1a4 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -164,6 +164,10 @@ function toDocString(value: RawValue, field: Field) {
 }
 
 function toDocDate(value: RawValue, field: Field) {
+  if ((value as any) instanceof Date) {
+    return value;
+  }
+
   if (value === null || value === '') {
     return null;
   }
@@ -181,6 +185,10 @@ function toDocDate(value: RawValue, field: Field) {
 }
 
 function toDocCurrency(value: RawValue, field: Field, fyo: Fyo) {
+  if (isPesa(value)) {
+    return value;
+  }
+
   if (value === '') {
     return fyo.pesa(0);
   }
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index d32e6e14..fd02c0e7 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -1,4 +1,5 @@
 import { Fyo } from 'fyo';
+import { Converter } from 'fyo/core/converter';
 import { DocValue, DocValueMap } from 'fyo/core/types';
 import { Verb } from 'fyo/telemetry/types';
 import { DEFAULT_USER } from 'fyo/utils/consts';
@@ -9,6 +10,7 @@ import {
   Field,
   FieldTypeEnum,
   OptionField,
+  RawValue,
   Schema,
   TargetField,
 } from 'schemas/types';
@@ -124,8 +126,14 @@ export class Doc extends Observable<DocValue | Doc[]> {
         for (const row of value) {
           this.push(fieldname, row);
         }
+      } else if (value !== undefined) {
+        this[fieldname] = Converter.toDocValue(
+          value as RawValue,
+          field,
+          this.fyo
+        );
       } else {
-        this[fieldname] = value ?? this[fieldname] ?? null;
+        this[fieldname] = this[fieldname] ?? null;
       }
 
       if (field.fieldtype === FieldTypeEnum.Table && !this[fieldname]) {
diff --git a/regional/in.ts b/regional/in.ts
index 96cf866b..ac8d0d87 100644
--- a/regional/in.ts
+++ b/regional/in.ts
@@ -1,14 +1,14 @@
 // prettier-ignore
 export const stateCodeMap = {
-  'JAMMU AND KASHMIR': '1',
-  'HIMACHAL PRADESH': '2',
-  'PUNJAB': '3',
-  'CHANDIGARH': '4',
-  'UTTARAKHAND': '5',
-  'HARYANA': '6',
-  'DELHI': '7',
-  'RAJASTHAN': '8',
-  'UTTAR PRADESH': '9',
+  'JAMMU AND KASHMIR': '01',
+  'HIMACHAL PRADESH': '02',
+  'PUNJAB': '03',
+  'CHANDIGARH': '04',
+  'UTTARAKHAND': '05',
+  'HARYANA': '06',
+  'DELHI': '07',
+  'RAJASTHAN': '08',
+  'UTTAR PRADESH': '09',
   'BIHAR': '10',
   'SIKKIM': '11',
   'ARUNACHAL PRADESH': '12',
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index 20dccaa8..f0ed6288 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -41,6 +41,10 @@
           "value": "Gram",
           "label": "Gram"
         },
+        {
+          "value": "Meter",
+          "label": "Meter"
+        },
         {
           "value": "Hour",
           "label": "Hour"
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 3d5cc287..8a111be4 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -87,6 +87,7 @@
       "fieldname": "currency",
       "label": "Currency",
       "fieldtype": "AutoComplete",
+      "default": "INR",
       "required": true
     },
     {
diff --git a/tests/helpers.ts b/tests/helpers.ts
index 4dfcd9de..415d8a12 100644
--- a/tests/helpers.ts
+++ b/tests/helpers.ts
@@ -17,7 +17,7 @@ export function getTestSetupWizardOptions(): SetupWizardOptions {
   };
 }
 
-export function getTestDbPath() {
+export function getTestDbPath(dbPath?: string) {
   config();
-  return process.env.TEST_DB_PATH ?? ':memory:';
+  return dbPath ?? process.env.TEST_DB_PATH ?? ':memory:';
 }
diff --git a/tsconfig.json b/tsconfig.json
index acf610fe..330c2f0e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,7 +23,8 @@
       "fixtures/*": ["fixtures/*"],
       "reports/*": ["reports/*"],
       "models/*": ["models/*"],
-      "utils/*": ["utils/*"]
+      "utils/*": ["utils/*"],
+      "dummy/*": ["dummy/*"]
     },
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"]
   },
@@ -46,7 +47,8 @@
     "regional/**/*.ts",
     "reports/**/*.ts",
     "utils/**/*.ts",
-    "tests/**/*.ts"
+    "tests/**/*.ts",
+    "dummy/**/*.ts"
   ],
   "exclude": ["node_modules"]
 }
diff --git a/vue.config.js b/vue.config.js
index b435979f..77d81bc4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -49,6 +49,7 @@ module.exports = {
       utils: path.resolve(__dirname, './utils'),
       regional: path.resolve(__dirname, './regional'),
       reports: path.resolve(__dirname, './reports'),
+      dummy: path.resolve(__dirname, './dummy'),
       fixtures: path.resolve(__dirname, './fixtures'),
     });
 

From 0701c56429bedf8c3dedf0ed3dcbaacbb121619e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 11 May 2022 16:14:31 +0530
Subject: [PATCH 104/163] incr: add code to generate a dummy instance

---
 backend/database/bespoke.ts                  |  16 +
 dummy/README.md                              |   7 +
 dummy/helpers.ts                             |  54 +++
 dummy/index.ts                               | 417 ++++++++++++++++++-
 dummy/items.json                             |   2 +-
 dummy/parties.json                           |   2 +-
 dummy/tests/testDummy.spec.ts                |  21 +-
 fyo/core/converter.ts                        |   8 +
 fyo/core/dbHandler.ts                        |  15 +
 fyo/model/doc.ts                             |   7 +
 fyo/model/naming.ts                          |  49 +--
 fyo/utils/index.ts                           |   6 -
 models/Transactional/Transactional.ts        |  10 +-
 models/baseModels/InvoiceItem/InvoiceItem.ts |   1 +
 models/helpers.ts                            |   2 +-
 models/types.ts                              |   2 +
 src/renderer.ts                              |   4 +
 17 files changed, 570 insertions(+), 53 deletions(-)
 create mode 100644 dummy/README.md
 create mode 100644 dummy/helpers.ts

diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts
index 1c17d85a..64db95ba 100644
--- a/backend/database/bespoke.ts
+++ b/backend/database/bespoke.ts
@@ -4,6 +4,22 @@ import { BespokeFunction } from './types';
 export class BespokeQueries {
   [key: string]: BespokeFunction;
 
+  static async getLastInserted(
+    db: DatabaseCore,
+    schemaName: string
+  ): Promise<number> {
+    const lastInserted = (await db.knex!.raw(
+      'select cast(name as int) as num from ?? order by num desc limit 1',
+      [schemaName]
+    )) as { num: number }[];
+
+    const num = lastInserted?.[0]?.num;
+    if (num === undefined) {
+      return 0;
+    }
+    return num;
+  }
+
   static async getTopExpenses(
     db: DatabaseCore,
     fromDate: string,
diff --git a/dummy/README.md b/dummy/README.md
new file mode 100644
index 00000000..7da57f33
--- /dev/null
+++ b/dummy/README.md
@@ -0,0 +1,7 @@
+# Dummy
+
+This will be used to generate dummy data for the purposes of tests and to create
+a demo instance.
+
+There are a few `.json` files here (eg: `items.json`) which have been generated,
+these are not to be edited.
diff --git a/dummy/helpers.ts b/dummy/helpers.ts
new file mode 100644
index 00000000..f8fe6308
--- /dev/null
+++ b/dummy/helpers.ts
@@ -0,0 +1,54 @@
+import { DateTime } from 'luxon';
+
+// prettier-ignore
+export const partyPurchaseItemMap: Record<string, string[]> = {
+  'Janky Office Spaces': ['Office Rent', 'Office Cleaning'],
+  "Josféña's 611s": ['611 Jeans - PCH', '611 Jeans - SHR'],
+  'Lankness Feet Fomenters': ['Bominga Shoes', 'Jade Slippers'],
+  'The Overclothes Company': ['Jacket - RAW', 'Cryo Gloves', 'Cool Cloth'],
+  'Adani Electricity Mumbai Limited': ['Electricity'],
+  'Only Fulls': ['Full Sleeve - BLK', 'Full Sleeve - COL'],
+  'Just Epaulettes': ['Epaulettes - 4POR'],
+  'Le Socials': ['Social Ads'],
+  'Maxwell': ['Marketing - Video'],
+};
+
+export const purchaseItemPartyMap: Record<string, string> = Object.keys(
+  partyPurchaseItemMap
+).reduce((acc, party) => {
+  for (const item of partyPurchaseItemMap[party]) {
+    acc[item] = party;
+  }
+  return acc;
+}, {} as Record<string, string>);
+
+export function getFlowConstant(months: number) {
+  // Jan to December
+  const flow = [
+    0.15, 0.1, 0.25, 0.1, 0.01, 0.01, 0.01, 0.05, 0, 0.15, 0.2, 0.4,
+  ];
+
+  const d = DateTime.now().minus({ months });
+  return flow[d.month - 1];
+}
+
+export function getRandomDates(count: number, months: number): Date[] {
+  /**
+   * Returns `count` number of dates for a month, `months` back from the
+   * current date.
+   */
+  let endDate = DateTime.now();
+  if (months !== 0) {
+    const back = endDate.minus({ months });
+    endDate = DateTime.local(endDate.year, back.month, back.daysInMonth);
+  }
+
+  const dates: Date[] = [];
+  for (let i = 0; i < count; i++) {
+    const day = Math.ceil(endDate.day * Math.random());
+    const date = DateTime.local(endDate.year, endDate.month, day);
+    dates.push(date.toJSDate());
+  }
+
+  return dates;
+}
diff --git a/dummy/index.ts b/dummy/index.ts
index 93250253..c4b07d14 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -1,10 +1,33 @@
 import { Fyo } from 'fyo';
+import { Doc } from 'fyo/model/doc';
+import { range, sample } from 'lodash';
+import { DateTime } from 'luxon';
+import { Invoice } from 'models/baseModels/Invoice/Invoice';
+import { Payment } from 'models/baseModels/Payment/Payment';
+import { PurchaseInvoice } from 'models/baseModels/PurchaseInvoice/PurchaseInvoice';
+import { SalesInvoice } from 'models/baseModels/SalesInvoice/SalesInvoice';
+import { ModelNameEnum } from 'models/types';
 import setupInstance from 'src/setup/setupInstance';
+import { getMapFromList } from 'utils';
 import { getFiscalYear } from 'utils/misc';
+import {
+  getFlowConstant,
+  getRandomDates,
+  purchaseItemPartyMap,
+} from './helpers';
 import items from './items.json';
 import parties from './parties.json';
 
-export async function setupDummyInstance(dbPath: string, fyo: Fyo) {
+type Notifier = (stage: string, count: number, total: number) => void;
+
+export async function setupDummyInstance(
+  dbPath: string,
+  fyo: Fyo,
+  years: number = 1,
+  baseCount: number = 1000,
+  notifier?: Notifier
+) {
+  notifier?.(fyo.t`Setting Up Instance`, 0, 0);
   await setupInstance(
     dbPath,
     {
@@ -22,10 +45,385 @@ export async function setupDummyInstance(dbPath: string, fyo: Fyo) {
     fyo
   );
 
-  await generateEntries(fyo);
+  years = Math.floor(years);
+  notifier?.(fyo.t`Creating Items and Parties`, 0, 0);
+  await generateStaticEntries(fyo);
+  await generateDynamicEntries(fyo, years, baseCount, notifier);
 }
 
-async function generateEntries(fyo: Fyo) {
+/**
+ *  warning: long functions ahead!
+ */
+
+async function generateDynamicEntries(
+  fyo: Fyo,
+  years: number,
+  baseCount: number,
+  notifier?: Notifier
+) {
+  notifier?.(fyo.t`Getting Sales Invoices`, 0, 0);
+  const salesInvoices = await getSalesInvoices(fyo, years, baseCount);
+
+  notifier?.(fyo.t`Getting Purchase Invoices`, 0, 0);
+  const purchaseInvoices = await getPurchaseInvoices(fyo, years, salesInvoices);
+
+  notifier?.(fyo.t`Getting Journal Entries`, 0, 0);
+  const journalEntries = await getJournalEntries(fyo, salesInvoices);
+  await syncAndSubmit(journalEntries, (count: number, total: number) =>
+    notifier?.(fyo.t`Syncing Journal Entries`, count, total)
+  );
+
+  const invoices = ([salesInvoices, purchaseInvoices].flat() as Invoice[]).sort(
+    (a, b) => +(a.date as Date) - +(b.date as Date)
+  );
+  await syncAndSubmit(invoices, (count: number, total: number) =>
+    notifier?.(fyo.t`Syncing Invoices`, count, total)
+  );
+
+  const payments = await getPayments(fyo, invoices);
+  await syncAndSubmit(payments, (count: number, total: number) =>
+    notifier?.(fyo.t`Syncing Payments`, count, total)
+  );
+}
+
+async function getJournalEntries(fyo: Fyo, salesInvoices: SalesInvoice[]) {
+  const entries = [];
+  const amount = salesInvoices
+    .map((i) => i.items!)
+    .flat()
+    .reduce((a, b) => a.add(b.amount!), fyo.pesa(0))
+    .percent(75)
+    .clip(0);
+  const lastInv = salesInvoices.sort((a, b) => +a.date! - +b.date!).at(-1)!
+    .date!;
+  const date = DateTime.fromJSDate(lastInv).minus({ months: 6 }).toJSDate();
+
+  // Bank Entry
+  let doc = fyo.doc.getNewDoc(ModelNameEnum.JournalEntry, {
+    date,
+    entryType: 'Bank Entry',
+  });
+  await doc.append('accounts', {
+    account: 'Supreme Bank',
+    debit: amount,
+    credit: fyo.pesa(0),
+  });
+
+  await doc.append('accounts', {
+    account: 'Secured Loans',
+    credit: amount,
+    debit: fyo.pesa(0),
+  });
+  entries.push(doc);
+
+  // Cash Entry
+  doc = fyo.doc.getNewDoc(ModelNameEnum.JournalEntry, {
+    date,
+    entryType: 'Cash Entry',
+  });
+  await doc.append('accounts', {
+    account: 'Cash',
+    debit: amount.percent(30),
+    credit: fyo.pesa(0),
+  });
+
+  await doc.append('accounts', {
+    account: 'Supreme Bank',
+    credit: amount.percent(30),
+    debit: fyo.pesa(0),
+  });
+  entries.push(doc);
+
+  return entries;
+}
+
+async function getPayments(fyo: Fyo, invoices: Invoice[]) {
+  const payments = [];
+  for (const invoice of invoices) {
+    // Defaulters
+    if (invoice.isSales && Math.random() < 0.007) {
+      continue;
+    }
+
+    const doc = fyo.doc.getNewDoc(ModelNameEnum.Payment) as Payment;
+    doc.party = invoice.party as string;
+    doc.paymentType = invoice.isSales ? 'Receive' : 'Pay';
+    doc.paymentMethod = 'Cash';
+    doc.date = DateTime.fromJSDate(invoice.date as Date)
+      .plus({ hours: 1 })
+      .toJSDate();
+    if (doc.paymentType === 'Receive') {
+      doc.account = 'Debtors';
+      doc.paymentAccount = 'Cash';
+    } else {
+      doc.account = 'Cash';
+      doc.paymentAccount = 'Creditors';
+    }
+    doc.amount = invoice.outstandingAmount;
+
+    // Discount
+    if (invoice.isSales && Math.random() < 0.05) {
+      await doc.set('writeOff', invoice.outstandingAmount?.percent(15));
+    }
+
+    doc.push('for', {
+      referenceType: invoice.schemaName,
+      referenceName: invoice.name,
+      amount: invoice.outstandingAmount,
+    });
+
+    payments.push(doc);
+  }
+
+  return payments;
+}
+
+async function getSalesInvoices(fyo: Fyo, years: number, baseCount: number) {
+  const invoices: SalesInvoice[] = [];
+  const salesItems = items.filter((i) => i.for !== 'Purchases');
+  const customers = parties.filter((i) => i.role !== 'Supplier');
+
+  /**
+   * Get certain number of entries for each month of the count
+   * of years.
+   */
+  for (const months of range(0, years * 12)) {
+    const flow = getFlowConstant(months);
+    const count = Math.ceil(flow * baseCount * (Math.random() * 0.25 + 0.75));
+    const dates = getRandomDates(count, months);
+
+    /**
+     * For each date create a Sales Invoice.
+     */
+
+    for (const date of dates) {
+      const customer = sample(customers);
+
+      const doc = fyo.doc.getNewDoc(ModelNameEnum.SalesInvoice, {
+        date,
+      }) as SalesInvoice;
+
+      await doc.set('party', customer!.name);
+      if (!doc.account) {
+        doc.account = 'Debtors';
+      }
+      /**
+       * Add `numItems` number of items to the invoice.
+       */
+      const numItems = Math.ceil(Math.random() * 5);
+      for (let i = 0; i < numItems; i++) {
+        const item = sample(salesItems);
+        if ((doc.items ?? []).find((i) => i.item === item)) {
+          continue;
+        }
+
+        let quantity = 1;
+
+        /**
+         * Increase quantity depending on the rate.
+         */
+        if (item!.rate < 100 && Math.random() < 0.4) {
+          quantity = Math.ceil(Math.random() * 10);
+        } else if (item!.rate < 1000 && Math.random() < 0.2) {
+          quantity = Math.ceil(Math.random() * 4);
+        } else if (Math.random() < 0.01) {
+          quantity = Math.ceil(Math.random() * 3);
+        }
+
+        const rate = fyo.pesa(item!.rate * flow + 1).clip(0);
+        await doc.append('items', {});
+        await doc.items!.at(-1)!.set({
+          item: item!.name,
+          rate,
+          quantity,
+          account: item!.incomeAccount,
+          amount: rate.mul(quantity),
+          tax: item!.tax,
+          description: item!.description,
+          hsnCode: item!.hsnCode,
+        });
+      }
+
+      invoices.push(doc);
+    }
+  }
+
+  return invoices;
+}
+
+async function getPurchaseInvoices(
+  fyo: Fyo,
+  years: number,
+  salesInvoices: SalesInvoice[]
+): Promise<PurchaseInvoice[]> {
+  return [
+    await getSalesPurchaseInvoices(fyo, salesInvoices),
+    await getNonSalesPurchaseInvoices(fyo, years),
+  ].flat();
+}
+
+async function getSalesPurchaseInvoices(
+  fyo: Fyo,
+  salesInvoices: SalesInvoice[]
+): Promise<PurchaseInvoice[]> {
+  const invoices = [] as PurchaseInvoice[];
+  /**
+   * Group all sales invoices by their YYYY-MM.
+   */
+  const dateGrouped = salesInvoices
+    .map((si) => {
+      const date = DateTime.fromJSDate(si.date as Date);
+      const key = `${date.year}-${String(date.month).padStart(2, '0')}`;
+      return { key, si };
+    })
+    .reduce((acc, item) => {
+      acc[item.key] ??= [];
+      acc[item.key].push(item.si);
+      return acc;
+    }, {} as Record<string, SalesInvoice[]>);
+
+  /**
+   * Sort the YYYY-MM keys in ascending order.
+   */
+  const dates = Object.keys(dateGrouped)
+    .map((k) => ({ key: k, date: new Date(k) }))
+    .sort((a, b) => +a.date - +b.date);
+  const purchaseQty: Record<string, number> = {};
+
+  /**
+   * For each date create a set of Purchase Invoices.
+   */
+  for (const { key, date } of dates) {
+    /**
+     * Group items by name to get the total quantity used in a month.
+     */
+    const itemGrouped = dateGrouped[key].reduce((acc, si) => {
+      for (const item of si.items!) {
+        if (item.item === 'Dry-Cleaning') {
+          continue;
+        }
+
+        acc[item.item as string] ??= 0;
+        acc[item.item as string] += item.quantity as number;
+      }
+
+      return acc;
+    }, {} as Record<string, number>);
+
+    /**
+     * Set order quantity for the first of the month.
+     */
+    Object.keys(itemGrouped).forEach((name) => {
+      const quantity = itemGrouped[name];
+      purchaseQty[name] ??= 0;
+      let prevQty = purchaseQty[name];
+
+      if (prevQty <= quantity) {
+        prevQty = quantity - prevQty;
+      }
+
+      purchaseQty[name] = Math.ceil(prevQty / 10) * 10;
+    });
+
+    const supplierGrouped = Object.keys(itemGrouped).reduce((acc, item) => {
+      const supplier = purchaseItemPartyMap[item];
+      acc[supplier] ??= [];
+      acc[supplier].push(item);
+
+      return acc;
+    }, {} as Record<string, string[]>);
+
+    /**
+     * For each supplier create a Purchase Invoice
+     */
+    for (const supplier in supplierGrouped) {
+      const doc = fyo.doc.getNewDoc(ModelNameEnum.PurchaseInvoice, {
+        date,
+      }) as PurchaseInvoice;
+
+      await doc.set('party', supplier);
+      if (!doc.account) {
+        doc.account = 'Creditors';
+      }
+
+      /**
+       * For each item create a row
+       */
+      for (const item of supplierGrouped[supplier]) {
+        await doc.append('items', {});
+        const quantity = purchaseQty[item];
+        doc.items!.at(-1)!.set({ item, quantity });
+      }
+
+      invoices.push(doc);
+    }
+  }
+
+  return invoices;
+}
+
+async function getNonSalesPurchaseInvoices(
+  fyo: Fyo,
+  years: number
+): Promise<PurchaseInvoice[]> {
+  const purchaseItems = items.filter((i) => i.for !== 'Sales');
+  const itemMap = getMapFromList(purchaseItems, 'name');
+  const periodic: Record<string, number> = {
+    'Marketing - Video': 2,
+    'Social Ads': 1,
+    Electricity: 1,
+    'Office Cleaning': 1,
+    'Office Rent': 1,
+  };
+  const invoices: SalesInvoice[] = [];
+
+  for (const months of range(0, years * 12)) {
+    /**
+     * All purchases on the first of the month.
+     */
+    const temp = DateTime.now().minus({ months });
+    const date = DateTime.local(temp.year, temp.month, 1).toJSDate();
+
+    for (const name in periodic) {
+      if (months % periodic[name] !== 0) {
+        continue;
+      }
+
+      const doc = fyo.doc.getNewDoc(ModelNameEnum.PurchaseInvoice, {
+        date,
+      }) as PurchaseInvoice;
+
+      const party = purchaseItemPartyMap[name];
+      await doc.set('party', party);
+      if (!doc.account) {
+        doc.account = 'Creditors';
+      }
+      await doc.append('items', {});
+      const row = doc.items!.at(-1)!;
+      const item = itemMap[name];
+
+      let quantity = 1;
+      let rate = item.rate;
+      if (name === 'Social Ads') {
+        quantity = Math.ceil(Math.random() * 200);
+      } else if (name !== 'Office Rent') {
+        rate = rate * (Math.random() * 0.4 + 0.8);
+      }
+
+      await row.set({
+        item: item.name,
+        quantity,
+        rate: fyo.pesa(rate).clip(0),
+      });
+
+      invoices.push(doc);
+    }
+  }
+
+  return invoices;
+}
+
+async function generateStaticEntries(fyo: Fyo) {
   await generateItems(fyo);
   await generateParties(fyo);
 }
@@ -43,3 +441,16 @@ async function generateParties(fyo: Fyo) {
     await doc.sync();
   }
 }
+
+async function syncAndSubmit(
+  docs: Doc[],
+  notifier: (count: number, total: number) => void
+) {
+  const total = docs.length;
+  for (const i in docs) {
+    notifier(parseInt(i) + 1, total);
+    const doc = docs[i];
+    await doc.sync();
+    await doc.submit();
+  }
+}
diff --git a/dummy/items.json b/dummy/items.json
index d0d42c6d..98b3d820 100644
--- a/dummy/items.json
+++ b/dummy/items.json
@@ -1 +1 @@
-[{"name": "611 Jeans - PCH", "description": "Peach coloured 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 4499, "hsnCode": 62034990, "for": "Sales"}, {"name": "611 Jeans - SHR", "description": "Shark skin 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 6499, "hsnCode": 62034990, "for": "Sales"}, {"name": "Bominga Shoes", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4999, "hsnCode": 640291, "for": "Sales"}, {"name": "Cryo Gloves", "description": "Keeps hands cool", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 3499, "hsnCode": 611693, "for": "Sales"}, {"name": "Epaulettes - 4POR", "description": "Porcelain epaulettes", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2499, "hsnCode": 62179090, "for": "Sales"}, {"name": "Full Sleeve - BLK", "description": "Black sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 599, "hsnCode": 100820, "for": "Sales"}, {"name": "Full Sleeve - COL", "description": "All color sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 499, "hsnCode": 100820, "for": "Sales"}, {"name": "Jacket - RAW", "description": "Raw baby skinned jackets", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 8999, "hsnCode": 100820, "for": "Sales"}, {"name": "Jade Slippers", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2999, "hsnCode": 640520, "for": "Sales"}, {"name": "Dry-Cleaning", "description": null, "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 69, "hsnCode": 999712, "for": "Sales"}, {"name": "Electricity", "description": "Bzz Bzz", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Utility Expenses", "tax": "GST-0", "rate": 6000, "hsnCode": 271600, "for": "Purchases"}, {"name": "Marketing - Video", "description": "One single video", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 15000, "hsnCode": 998371, "for": "Purchases"}, {"name": "Office Rent", "description": "Rent per day", "unit": "Day", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Office Rent", "tax": "GST-18", "rate": 100000, "hsnCode": 997212, "for": "Purchases"}, {"name": "Office Cleaning", "description": "Cleaning cost per day", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Office Maintenance Expenses", "tax": "GST-18", "rate": 100000, "hsnCode": 998533, "for": "Purchases"}, {"name": "Social Ads", "description": "Cost per click", "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 50, "hsnCode": 99836, "for": "Purchases"}, {"name": "Cool Cloth", "description": "Some real \ud83c\udd92 cloth", "unit": "Meter", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4000, "hsnCode": 59111000, "for": "Both"}]
\ No newline at end of file
+[{"name": "Dry-Cleaning", "description": null, "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 69, "hsnCode": 999712, "for": "Sales"}, {"name": "Electricity", "description": "Bzz Bzz", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Utility Expenses", "tax": "GST-0", "rate": 6000, "hsnCode": 271600, "for": "Purchases"}, {"name": "Marketing - Video", "description": "One single video", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 15000, "hsnCode": 998371, "for": "Purchases"}, {"name": "Office Rent", "description": "Rent per day", "unit": "Day", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Office Rent", "tax": "GST-18", "rate": 100000, "hsnCode": 997212, "for": "Purchases"}, {"name": "Office Cleaning", "description": "Cleaning cost per day", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Office Maintenance Expenses", "tax": "GST-18", "rate": 100000, "hsnCode": 998533, "for": "Purchases"}, {"name": "Social Ads", "description": "Cost per click", "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 50, "hsnCode": 99836, "for": "Purchases"}, {"name": "Cool Cloth", "description": "Some real \ud83c\udd92 cloth", "unit": "Meter", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4000, "hsnCode": 59111000, "for": "Both"}, {"name": "611 Jeans - PCH", "description": "Peach coloured 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 4499, "hsnCode": 62034990, "for": "Both"}, {"name": "611 Jeans - SHR", "description": "Shark skin 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 6499, "hsnCode": 62034990, "for": "Both"}, {"name": "Bominga Shoes", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4999, "hsnCode": 640291, "for": "Both"}, {"name": "Cryo Gloves", "description": "Keeps hands cool", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 3499, "hsnCode": 611693, "for": "Both"}, {"name": "Epaulettes - 4POR", "description": "Porcelain epaulettes", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2499, "hsnCode": 62179090, "for": "Both"}, {"name": "Full Sleeve - BLK", "description": "Black sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 599, "hsnCode": 100820, "for": "Both"}, {"name": "Full Sleeve - COL", "description": "All color sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 499, "hsnCode": 100820, "for": "Both"}, {"name": "Jacket - RAW", "description": "Raw baby skinned jackets", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 8999, "hsnCode": 100820, "for": "Both"}, {"name": "Jade Slippers", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2999, "hsnCode": 640520, "for": "Both"}]
\ No newline at end of file
diff --git a/dummy/parties.json b/dummy/parties.json
index 5f04df76..7ba08c18 100644
--- a/dummy/parties.json
+++ b/dummy/parties.json
@@ -1 +1 @@
-[{"name": "Roy Rolston", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy_rolston@generic_indian.in", "phone": "+91 8085-761809", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Aloysius Albuquerque", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6734-433583", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "James", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "james-679@gmail.com", "phone": "+91 9409-252148", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Mary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9686-432601", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Robert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "robert_827@redis.rs", "phone": "+91 8866-405100", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patricia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patricia_64@gmail.com", "phone": "+91 6199-779289", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "John", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "john.916@generic_indian.in", "phone": "+91 7190-555768", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jennifer", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jennifer.709@generic_indian.in", "phone": "+91 9233-632140", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Michael", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michael.784@yahoo.co.in", "phone": "+91 6561-728159", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Linda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "linda_768@partiesunited.co", "phone": "+91 8655-717226", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "William", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "william-775@gmail.com", "phone": "+91 8255-462112", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elizabeth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elizabeth.763@gmail.com", "phone": "+91 8451-416308", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "David", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "david-88@gmail.com", "phone": "+91 6646-333642", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Barbara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "barbara.714@yahoo.co.in", "phone": "+91 9996-777529", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Richard", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "richard-315@gmail.com", "phone": "+91 6816-661508", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Susan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "susan_795@redis.rs", "phone": "+91 9317-150134", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joseph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joseph.725@gmail.com", "phone": "+91 9743-597180", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jessica", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jessica.913@gmail.com", "phone": "+91 8690-848811", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Thomas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "thomas.821@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sarah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sarah-338@redis.rs", "phone": "+91 8608-462496", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charles", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7122-160573", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Karen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "karen.536@yahoo.co.in", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Christopher", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christopher.38@gmail.com", "phone": "+91 8001-980273", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nancy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nancy@gmail.com", "phone": "+91 7453-772757", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Daniel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "daniel-934@partiesunited.co", "phone": "+91 7718-704011", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lisa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lisa.330@gmail.com", "phone": "+91 6622-345518", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Matthew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "matthew_66@partiesunited.co", "phone": "+91 6218-703147", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Betty", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "betty-510@yahoo.co.in", "phone": "+91 6860-603906", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Anthony", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anthony_229@generic_indian.in", "phone": "+91 8533-030553", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Margaret", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "margaret_28@redis.rs", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Mark", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "mark_721@partiesunited.co", "phone": "+91 7590-436520", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sandra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sandra-425@gmail.com", "phone": "+91 6015-720815", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Donald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donald_821@partiesunited.co", "phone": "+91 6145-759778", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Ashley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ashley_684@redis.rs", "phone": "+91 8799-436202", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Steven", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "steven@yahoo.co.in", "phone": "+91 6761-152125", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kimberly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kimberly-388@redis.rs", "phone": "+91 6352-411349", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Paul", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "paul_181@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emily", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emily_596@generic_indian.in", "phone": "+91 9989-626151", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrew.38@redis.rs", "phone": "+91 7966-700777", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Donna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donna-412@gmail.com", "phone": "+91 9856-353641", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joshua", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joshua.955@redis.rs", "phone": "+91 6038-514242", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Michelle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michelle-582@redis.rs", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Kenneth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kenneth_162@generic_indian.in", "phone": "+91 6175-284068", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dorothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dorothy.997@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kevin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kevin.162@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carol", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carol-967@generic_indian.in", "phone": "+91 8175-539735", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brian-574@partiesunited.co", "phone": "+91 6408-864464", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amanda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amanda-45@redis.rs", "phone": "+91 6665-854328", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "George", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "george@yahoo.co.in", "phone": "+91 7223-035503", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Melissa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "melissa.551@partiesunited.co", "phone": "+91 6464-081038", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Edward", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "edward_852@yahoo.co.in", "phone": "+91 7192-818190", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Deborah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8780-967375", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ronald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ronald@yahoo.co.in", "phone": "+91 8346-532731", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephanie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephanie-233@gmail.com", "phone": "+91 7648-287693", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Timothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "timothy-640@partiesunited.co", "phone": "+91 8930-966620", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rebecca", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9481-932348", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jason", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jason@yahoo.co.in", "phone": "+91 7610-820391", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Sharon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sharon@generic_indian.in", "phone": "+91 8363-472658", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeffrey", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6612-342986", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Laura", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "laura_237@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ryan.14@generic_indian.in", "phone": "+91 9829-797485", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cynthia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cynthia@gmail.com", "phone": "+91 7484-063430", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jacob", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacob-561@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathleen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathleen-858@redis.rs", "phone": "+91 6036-133810", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gary-984@redis.rs", "phone": "+91 7994-524709", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amy_614@redis.rs", "phone": "+91 9025-426780", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nicholas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicholas@partiesunited.co", "phone": "+91 7824-209517", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Shirley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "shirley.562@redis.rs", "phone": "+91 9426-173760", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Eric", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eric-200@yahoo.co.in", "phone": "+91 8251-483966", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Angela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "angela_303@redis.rs", "phone": "+91 6358-368039", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jonathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jonathan_654@gmail.com", "phone": "+91 9121-267798", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Helen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "helen_379@partiesunited.co", "phone": "+91 6041-179352", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephen-30@yahoo.co.in", "phone": "+91 6776-201802", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Anna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anna.448@partiesunited.co", "phone": "+91 7869-863595", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Larry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "larry.397@yahoo.co.in", "phone": "+91 8792-636435", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Brenda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brenda.80@gmail.com", "phone": "+91 9022-343413", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Justin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "justin.813@yahoo.co.in", "phone": "+91 7690-923779", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Pamela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "pamela_579@redis.rs", "phone": "+91 7179-474249", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Scott", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "scott_33@yahoo.co.in", "phone": "+91 9935-153243", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Nicole", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicole_502@partiesunited.co", "phone": "+91 8032-745703", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brandon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brandon-680@redis.rs", "phone": "+91 9232-437897", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emma", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emma.999@yahoo.co.in", "phone": "+91 7288-589962", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Benjamin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "benjamin.48@yahoo.co.in", "phone": "+91 9613-588904", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samantha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samantha-762@redis.rs", "phone": "+91 8466-379168", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samuel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samuel@redis.rs", "phone": "+91 8854-408752", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Katherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "katherine-405@generic_indian.in", "phone": "+91 7309-798133", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Gregory", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gregory-159@yahoo.co.in", "phone": "+91 8826-959138", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christine_485@redis.rs", "phone": "+91 8898-070095", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frank", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frank-704@partiesunited.co", "phone": "+91 9428-163927", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Debra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "debra-377@redis.rs", "phone": "+91 8018-135106", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexander", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexander_788@generic_indian.in", "phone": "+91 8365-096935", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rachel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rachel_514@partiesunited.co", "phone": "+91 9965-186958", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Raymond", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "raymond@generic_indian.in", "phone": "+91 6784-916094", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Catherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "catherine-601@redis.rs", "phone": "+91 8330-882492", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patrick", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patrick-622@yahoo.co.in", "phone": "+91 7594-725819", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carolyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carolyn-466@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jack", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jack-640@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janet", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janet-760@partiesunited.co", "phone": "+91 7252-043072", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dennis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dennis_81@gmail.com", "phone": "+91 9461-535482", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ruth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ruth-611@partiesunited.co", "phone": "+91 8959-614592", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jerry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jerry.518@yahoo.co.in", "phone": "+91 9123-649030", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Maria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "maria.299@redis.rs", "phone": "+91 9687-298902", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Tyler", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "tyler.215@gmail.com", "phone": "+91 6765-553393", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Heather", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "heather-956@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Aaron", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aaron_383@gmail.com", "phone": "+91 6076-015156", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diane", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diane_350@gmail.com", "phone": "+91 7462-322376", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jose-947@generic_indian.in", "phone": "+91 6194-056675", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Virginia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6301-631552", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Adam", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "adam-130@generic_indian.in", "phone": "+91 9800-873022", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julie-333@yahoo.co.in", "phone": "+91 6659-434111", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Henry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "henry@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joyce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joyce_494@partiesunited.co", "phone": "+91 7744-359088", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nathan-933@partiesunited.co", "phone": "+91 9115-768363", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Victoria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "victoria.328@redis.rs", "phone": "+91 6493-123642", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Douglas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "douglas_267@redis.rs", "phone": "+91 6720-749237", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Olivia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "olivia-549@generic_indian.in", "phone": "+91 7797-704174", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Zachary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "zachary-203@generic_indian.in", "phone": "+91 9685-059823", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kelly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kelly-564@redis.rs", "phone": "+91 6234-293587", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Peter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "peter-340@yahoo.co.in", "phone": "+91 8149-678841", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kyle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kyle.260@gmail.com", "phone": "+91 7182-108922", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lauren", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lauren.8@yahoo.co.in", "phone": "+91 8460-088373", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Walter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "walter.907@gmail.com", "phone": "+91 8254-010872", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joan_650@generic_indian.in", "phone": "+91 6003-673443", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ethan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ethan.526@generic_indian.in", "phone": "+91 9442-752228", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Evelyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "evelyn.107@redis.rs", "phone": "+91 9222-443000", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeremy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeremy_209@generic_indian.in", "phone": "+91 9408-935791", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judith_703@redis.rs", "phone": "+91 9995-636649", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Harold", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "harold-414@yahoo.co.in", "phone": "+91 9659-145174", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Megan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "megan@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Keith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "keith@yahoo.co.in", "phone": "+91 8989-391625", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cheryl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cheryl-747@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christian.228@gmail.com", "phone": "+91 9562-383440", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrea", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrea-309@gmail.com", "phone": "+91 6733-480461", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Roger", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roger_565@redis.rs", "phone": "+91 6314-629890", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Hannah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "hannah_364@generic_indian.in", "phone": "+91 7736-658408", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Noah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "noah-946@gmail.com", "phone": "+91 8027-306313", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Martha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9785-077655", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gerald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gerald.354@yahoo.co.in", "phone": "+91 9497-574913", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Jacqueline", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacqueline-382@partiesunited.co", "phone": "+91 7043-234053", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carl_341@partiesunited.co", "phone": "+91 8812-115615", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frances", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frances_355@gmail.com", "phone": "+91 9054-407598", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Terry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6387-710013", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gloria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gloria.799@redis.rs", "phone": "+91 8797-429670", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sean_73@gmail.com", "phone": "+91 8427-861481", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ann", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ann_912@yahoo.co.in", "phone": "+91 9385-716140", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Austin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "austin.678@gmail.com", "phone": "+91 6045-642747", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Teresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7076-371232", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Arthur", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "arthur.822@gmail.com", "phone": "+91 8881-783525", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathryn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathryn-603@gmail.com", "phone": "+91 7932-982026", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lawrence", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lawrence_129@generic_indian.in", "phone": "+91 9812-545509", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sara@yahoo.co.in", "phone": "+91 6009-874805", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jesse", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jesse.78@gmail.com", "phone": "+91 6760-743479", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janice.495@redis.rs", "phone": "+91 7092-191443", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dylan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dylan.30@redis.rs", "phone": "+91 8967-598834", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jean-531@partiesunited.co", "phone": "+91 8169-759257", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bryan-459@redis.rs", "phone": "+91 9647-121952", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alice-175@yahoo.co.in", "phone": "+91 6454-520472", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joe", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joe@yahoo.co.in", "phone": "+91 9638-522193", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Madison", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "madison-518@partiesunited.co", "phone": "+91 7305-596248", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jordan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jordan_10@yahoo.co.in", "phone": "+91 6726-448100", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Doris", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "doris-269@redis.rs", "phone": "+91 9171-162126", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Billy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "billy@generic_indian.in", "phone": "+91 9208-612407", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Abigail", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "abigail.731@generic_indian.in", "phone": "+91 6830-093346", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Bruce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bruce-398@partiesunited.co", "phone": "+91 9435-070909", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6592-024845", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Albert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "albert@yahoo.co.in", "phone": "+91 6406-174202", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judy.987@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Willie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "willie_337@generic_indian.in", "phone": "+91 7520-743677", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Grace", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "grace_297@yahoo.co.in", "phone": "+91 7316-247530", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gabriel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gabriel_526@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Denise", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "denise@gmail.com", "phone": "+91 8133-719930", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Logan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "logan-148@yahoo.co.in", "phone": "+91 9399-697849", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amber", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amber-306@redis.rs", "phone": "+91 7622-921929", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alan-174@redis.rs", "phone": "+91 8924-088014", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marilyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marilyn.188@yahoo.co.in", "phone": "+91 7936-027760", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Juan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "juan_88@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Beverly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "beverly.429@partiesunited.co", "phone": "+91 9319-019163", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Wayne", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "wayne.248@generic_indian.in", "phone": "+91 6307-827364", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Danielle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "danielle.602@partiesunited.co", "phone": "+91 7885-866986", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Roy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy_794@redis.rs", "phone": "+91 8511-570498", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Theresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "theresa_330@yahoo.co.in", "phone": "+91 6394-578237", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ralph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ralph_837@yahoo.co.in", "phone": "+91 9973-097921", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sophia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sophia_430@partiesunited.co", "phone": "+91 9914-756832", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Randy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "randy-187@gmail.com", "phone": "+91 7553-323773", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marie_949@generic_indian.in", "phone": "+91 9584-722241", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Eugene", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eugene_49@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diana", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diana_424@generic_indian.in", "phone": "+91 7682-534386", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Vincent", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "vincent-832@yahoo.co.in", "phone": "+91 9733-825837", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brittany", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brittany-933@generic_indian.in", "phone": "+91 8279-322638", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Russell", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "russell-225@generic_indian.in", "phone": "+91 7289-620267", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Natalie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "natalie_769@generic_indian.in", "phone": "+91 9110-784610", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elijah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elijah@gmail.com", "phone": "+91 9566-594853", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Isabella", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8864-421179", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Louis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "louis_827@yahoo.co.in", "phone": "+91 7326-663215", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charlotte", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charlotte.746@redis.rs", "phone": "+91 6613-120888", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bobby", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bobby-771@yahoo.co.in", "phone": "+91 6805-102693", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rose.459@yahoo.co.in", "phone": "+91 6094-891120", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Philip", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "philip_64@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexis-127@yahoo.co.in", "phone": "+91 6283-621956", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Johnny", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7552-522002", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kayla", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kayla_622@generic_indian.in", "phone": "+91 9442-288182", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janky Office Spaces", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "janky_office_spaces.8@yahoo.co.in", "phone": "+91 6163-603540", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Josf\u00e9\u00f1a's 611s", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "josf\u00e9\u00f1a's.611s-187@redis.rs", "phone": "+91 8049-040228", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Lankness Feet Fomenters", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "lankness.feet.fomenters_920@partiesunited.co", "phone": "+91 6366-746997", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "The Overclothes Company", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "the.overclothes.company_154@partiesunited.co", "phone": "+91 7361-295433", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Adani Electricity Mumbai Limited ", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "adani.electricity.mumbai.limited.-597@redis.rs", "phone": "+91 7651-069128", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Only Fulls", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "only-fulls@gmail.com", "phone": "+91 7179-901187", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Just Epaulettes", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "just.epaulettes_184@gmail.com", "phone": "+91 6562-362537", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Maxwell", "role": "Both", "defaultAccount": null, "currency": "INR", "email": "maxwell@partiesunited.co", "phone": "+91 8157-631915", "address": null, "gst_type": "Unregistered", "gstin": null}]
\ No newline at end of file
+[{"name": "Roy Rolston", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy-rolston.243@generic_indian.in", "phone": "+91 8673-431508", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Aloysius Albuquerque", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aloysius.albuquerque_909@gmail.com", "phone": "+91 6077-213977", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "James", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "james_133@generic_indian.in", "phone": "+91 6612-501211", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Mary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6081-020316", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Robert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "robert_434@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patricia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patricia_100@partiesunited.co", "phone": "+91 8559-301636", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "John", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "john_411@partiesunited.co", "phone": "+91 8025-338366", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jennifer", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jennifer_308@generic_indian.in", "phone": "+91 8011-889773", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Michael", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michael-851@redis.rs", "phone": "+91 9051-544006", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Linda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "linda-316@yahoo.co.in", "phone": "+91 8521-103184", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "William", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "william_825@gmail.com", "phone": "+91 7872-683669", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elizabeth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elizabeth.119@gmail.com", "phone": "+91 8762-458159", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "David", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "david_976@redis.rs", "phone": "+91 8107-285956", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Barbara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "barbara.781@partiesunited.co", "phone": "+91 9315-603377", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Richard", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "richard.37@yahoo.co.in", "phone": "+91 6932-849598", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Susan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "susan.782@redis.rs", "phone": "+91 7802-101844", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joseph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joseph@partiesunited.co", "phone": "+91 7993-701055", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jessica", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jessica-498@gmail.com", "phone": "+91 6288-147387", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Thomas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "thomas-831@yahoo.co.in", "phone": "+91 6150-277307", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sarah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sarah-821@gmail.com", "phone": "+91 7834-468508", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charles", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charles-440@generic_indian.in", "phone": "+91 9652-716987", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Karen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "karen_745@generic_indian.in", "phone": "+91 8031-054884", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christopher", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christopher_856@yahoo.co.in", "phone": "+91 8054-054595", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nancy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nancy_876@partiesunited.co", "phone": "+91 9623-437324", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Daniel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lisa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lisa.763@yahoo.co.in", "phone": "+91 7425-212962", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Matthew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "matthew.769@generic_indian.in", "phone": "+91 7585-335288", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Betty", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "betty.954@generic_indian.in", "phone": "+91 8910-292787", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Anthony", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anthony_135@redis.rs", "phone": "+91 6442-915158", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Margaret", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "margaret@yahoo.co.in", "phone": "+91 9900-176473", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Mark", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "mark-313@redis.rs", "phone": "+91 6425-429890", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Sandra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7184-095331", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Donald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donald@gmail.com", "phone": "+91 8599-995758", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Ashley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ashley.442@generic_indian.in", "phone": "+91 9702-537030", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Steven", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "steven-693@yahoo.co.in", "phone": "+91 9024-337715", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kimberly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kimberly_316@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Paul", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "paul_553@gmail.com", "phone": "+91 8896-498910", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emily", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emily.859@redis.rs", "phone": "+91 9537-954916", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrew.21@partiesunited.co", "phone": "+91 7061-410554", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Donna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donna_209@yahoo.co.in", "phone": "+91 6918-117768", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joshua", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joshua.54@partiesunited.co", "phone": "+91 7997-664425", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Michelle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michelle-558@partiesunited.co", "phone": "+91 7234-792697", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kenneth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kenneth.124@partiesunited.co", "phone": "+91 6388-353257", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dorothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dorothy.722@yahoo.co.in", "phone": "+91 8768-999569", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kevin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kevin.700@partiesunited.co", "phone": "+91 9947-180680", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carol", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carol_967@partiesunited.co", "phone": "+91 7690-935998", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brian.135@generic_indian.in", "phone": "+91 6760-645133", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Amanda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amanda_465@gmail.com", "phone": "+91 9374-006670", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "George", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "george-684@gmail.com", "phone": "+91 7865-482442", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Melissa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "melissa-92@gmail.com", "phone": "+91 9276-351947", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Edward", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "edward-724@redis.rs", "phone": "+91 8878-239777", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Deborah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "deborah-948@gmail.com", "phone": "+91 9971-174980", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ronald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ronald.712@yahoo.co.in", "phone": "+91 8660-547203", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephanie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephanie_503@yahoo.co.in", "phone": "+91 9686-335218", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Timothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "timothy-659@redis.rs", "phone": "+91 9242-666484", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rebecca", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rebecca.909@generic_indian.in", "phone": "+91 6157-734755", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jason", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jason.519@redis.rs", "phone": "+91 7376-163583", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sharon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sharon@partiesunited.co", "phone": "+91 9030-867592", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeffrey", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeffrey.269@redis.rs", "phone": "+91 6155-787954", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Laura", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "laura-507@yahoo.co.in", "phone": "+91 9275-073654", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ryan-197@generic_indian.in", "phone": "+91 6964-549642", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cynthia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cynthia_737@redis.rs", "phone": "+91 7151-704445", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jacob", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacob.131@generic_indian.in", "phone": "+91 6720-918848", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathleen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathleen.509@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gary_422@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amy@partiesunited.co", "phone": "+91 6603-938674", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nicholas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicholas_902@generic_indian.in", "phone": "+91 6916-877233", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Shirley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "shirley.680@yahoo.co.in", "phone": "+91 8031-368297", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Eric", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eric_294@yahoo.co.in", "phone": "+91 8000-105404", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Angela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "angela-786@partiesunited.co", "phone": "+91 6472-464465", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jonathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jonathan_247@gmail.com", "phone": "+91 9606-808217", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Helen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "helen-896@redis.rs", "phone": "+91 9292-092553", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephen_570@redis.rs", "phone": "+91 7075-893154", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Anna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anna-892@partiesunited.co", "phone": "+91 9984-317917", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Larry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6981-350385", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brenda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brenda_857@redis.rs", "phone": "+91 9048-980115", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Justin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "justin_87@partiesunited.co", "phone": "+91 6562-623759", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Pamela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "pamela-143@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Scott", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7065-102356", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nicole", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicole_813@yahoo.co.in", "phone": "+91 6639-036774", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brandon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emma", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emma@generic_indian.in", "phone": "+91 9754-565236", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Benjamin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "benjamin.607@generic_indian.in", "phone": "+91 6050-030214", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samantha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samantha_307@partiesunited.co", "phone": "+91 7580-455682", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samuel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samuel_241@partiesunited.co", "phone": "+91 6069-872786", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Katherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "katherine-577@yahoo.co.in", "phone": "+91 9997-474009", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gregory", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gregory_127@redis.rs", "phone": "+91 7253-710783", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christine@generic_indian.in", "phone": "+91 6293-485105", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frank", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frank_483@generic_indian.in", "phone": "+91 6108-326068", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Debra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "debra.627@redis.rs", "phone": "+91 9828-819615", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexander", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexander-930@generic_indian.in", "phone": "+91 7739-815431", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rachel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rachel-974@generic_indian.in", "phone": "+91 8208-032828", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Raymond", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "raymond@generic_indian.in", "phone": "+91 6157-997059", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Catherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "catherine-558@gmail.com", "phone": "+91 6483-743758", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patrick", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patrick-219@redis.rs", "phone": "+91 9461-091027", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carolyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7096-205664", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jack", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jack_834@yahoo.co.in", "phone": "+91 9824-334265", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janet", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janet.630@yahoo.co.in", "phone": "+91 9343-312052", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dennis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dennis-885@generic_indian.in", "phone": "+91 6595-499139", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ruth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ruth_748@redis.rs", "phone": "+91 6129-548924", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jerry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jerry-737@redis.rs", "phone": "+91 6587-158112", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Maria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8540-576184", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Tyler", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "tyler.608@yahoo.co.in", "phone": "+91 8120-401026", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Heather", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "heather.936@yahoo.co.in", "phone": "+91 7403-810842", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Aaron", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aaron-848@partiesunited.co", "phone": "+91 6903-123806", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diane", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diane_524@yahoo.co.in", "phone": "+91 6848-481723", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7697-063913", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Virginia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Adam", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "adam-315@gmail.com", "phone": "+91 7901-689261", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julie.230@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Henry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "henry@redis.rs", "phone": "+91 9768-025008", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joyce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joyce.11@redis.rs", "phone": "+91 8242-739499", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Nathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nathan@yahoo.co.in", "phone": "+91 8308-038476", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Victoria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "victoria_754@redis.rs", "phone": "+91 8148-203319", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Douglas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "douglas_697@yahoo.co.in", "phone": "+91 8502-237693", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Olivia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "olivia_85@partiesunited.co", "phone": "+91 6223-560874", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Zachary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "zachary_505@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kelly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kelly_210@yahoo.co.in", "phone": "+91 8087-195915", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Peter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "peter.799@yahoo.co.in", "phone": "+91 8125-227555", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kyle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kyle_373@yahoo.co.in", "phone": "+91 7395-383762", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Lauren", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lauren_877@gmail.com", "phone": "+91 9360-951111", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Walter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "walter@gmail.com", "phone": "+91 9514-260980", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joan-490@generic_indian.in", "phone": "+91 8336-845169", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ethan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ethan.413@yahoo.co.in", "phone": "+91 9179-041456", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Evelyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "evelyn-598@redis.rs", "phone": "+91 7981-294172", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeremy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeremy-835@redis.rs", "phone": "+91 9147-220263", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judith.20@yahoo.co.in", "phone": "+91 7251-751246", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Harold", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "harold_551@redis.rs", "phone": "+91 9401-384317", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Megan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "megan.904@generic_indian.in", "phone": "+91 7925-884527", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Keith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "keith_210@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cheryl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cheryl.732@yahoo.co.in", "phone": "+91 9487-572037", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christian_480@yahoo.co.in", "phone": "+91 9411-240949", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrea", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrea@generic_indian.in", "phone": "+91 8727-997312", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Roger", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roger_641@redis.rs", "phone": "+91 7473-818935", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Hannah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "hannah.769@yahoo.co.in", "phone": "+91 6686-668901", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Noah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "noah_207@yahoo.co.in", "phone": "+91 8992-301729", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Martha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "martha-310@yahoo.co.in", "phone": "+91 6313-479933", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gerald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gerald_179@yahoo.co.in", "phone": "+91 9887-686162", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jacqueline", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacqueline@gmail.com", "phone": "+91 8593-840483", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carl.824@redis.rs", "phone": "+91 9097-819761", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frances", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frances_39@partiesunited.co", "phone": "+91 7824-282142", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Terry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "terry.141@gmail.com", "phone": "+91 7348-035379", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Gloria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gloria_30@yahoo.co.in", "phone": "+91 8806-055737", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Sean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sean_95@gmail.com", "phone": "+91 8934-646432", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ann", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ann_288@yahoo.co.in", "phone": "+91 9000-981649", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Austin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9052-505694", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Teresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "teresa@redis.rs", "phone": "+91 8881-147169", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Arthur", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "arthur_297@generic_indian.in", "phone": "+91 7099-547700", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathryn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathryn-111@partiesunited.co", "phone": "+91 8094-478845", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lawrence", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lawrence-786@generic_indian.in", "phone": "+91 6605-548110", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sara_839@generic_indian.in", "phone": "+91 9246-881823", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jesse", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jesse.754@redis.rs", "phone": "+91 9735-507412", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janice.373@yahoo.co.in", "phone": "+91 6024-331463", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dylan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9281-407234", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jean.752@redis.rs", "phone": "+91 9760-343923", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Bryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bryan-366@gmail.com", "phone": "+91 7075-562308", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Alice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alice_184@partiesunited.co", "phone": "+91 9859-541927", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joe", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joe_938@redis.rs", "phone": "+91 8006-110462", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Madison", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "madison-73@generic_indian.in", "phone": "+91 9678-686103", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jordan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jordan_36@generic_indian.in", "phone": "+91 8632-788053", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Doris", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "doris.619@partiesunited.co", "phone": "+91 6587-381586", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Billy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "billy-142@redis.rs", "phone": "+91 9406-093375", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Abigail", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "abigail-990@redis.rs", "phone": "+91 9206-424202", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bruce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bruce-731@yahoo.co.in", "phone": "+91 7316-922695", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julia-342@gmail.com", "phone": "+91 9487-215411", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Albert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9968-538377", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judy_273@partiesunited.co", "phone": "+91 7531-535899", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Willie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "willie.643@yahoo.co.in", "phone": "+91 6099-745727", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Grace", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8615-872677", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gabriel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gabriel-143@partiesunited.co", "phone": "+91 7176-396024", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Denise", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9742-780556", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Logan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "logan-501@partiesunited.co", "phone": "+91 7502-995330", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amber", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amber_656@partiesunited.co", "phone": "+91 6443-649379", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alan.559@partiesunited.co", "phone": "+91 9366-429457", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marilyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marilyn-955@gmail.com", "phone": "+91 7325-781593", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Juan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "juan.265@gmail.com", "phone": "+91 7281-553316", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Beverly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "beverly.942@gmail.com", "phone": "+91 9131-160413", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Wayne", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "wayne_126@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Danielle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "danielle@generic_indian.in", "phone": "+91 7340-384768", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Roy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy_727@gmail.com", "phone": "+91 7704-501835", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Theresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "theresa_105@partiesunited.co", "phone": "+91 9967-448938", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ralph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ralph@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sophia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sophia-673@generic_indian.in", "phone": "+91 8223-607553", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Randy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "randy_860@generic_indian.in", "phone": "+91 6169-701291", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marie-30@gmail.com", "phone": "+91 9268-326999", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Eugene", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eugene.184@partiesunited.co", "phone": "+91 9559-021953", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diana", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diana-382@gmail.com", "phone": "+91 9924-520313", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Vincent", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "vincent@gmail.com", "phone": "+91 8501-753300", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brittany", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brittany-498@redis.rs", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Russell", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "russell-231@generic_indian.in", "phone": "+91 9483-010961", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Natalie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "natalie.274@partiesunited.co", "phone": "+91 9173-621005", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elijah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elijah-297@generic_indian.in", "phone": "+91 6003-986454", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Isabella", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "isabella_744@gmail.com", "phone": "+91 8748-767047", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Louis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "louis.458@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charlotte", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charlotte_854@gmail.com", "phone": "+91 8977-318168", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bobby", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bobby-848@gmail.com", "phone": "+91 7823-275321", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rose-115@yahoo.co.in", "phone": "+91 9256-804668", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Philip", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "philip.671@generic_indian.in", "phone": "+91 9883-666803", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexis.502@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Johnny", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "johnny-539@redis.rs", "phone": "+91 7375-255292", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kayla", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kayla.143@generic_indian.in", "phone": "+91 8955-753462", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Le Socials", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "le-socials_303@partiesunited.co", "phone": "+91 7291-372570", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Janky Office Spaces", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "janky_office_spaces@generic_indian.in", "phone": "+91 6940-107991", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Josf\u00e9\u00f1a's 611s", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "josf\u00e9\u00f1a's_611s.655@partiesunited.co", "phone": "+91 6457-794213", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Lankness Feet Fomenters", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "lankness.feet.fomenters_579@generic_indian.in", "phone": "+91 6656-484318", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "The Overclothes Company", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "the-overclothes-company.136@partiesunited.co", "phone": "+91 7766-798598", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Adani Electricity Mumbai Limited", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "adani-electricity-mumbai-limited_190@redis.rs", "phone": "+91 7465-683036", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Only Fulls", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "only_fulls.358@generic_indian.in", "phone": "+91 6685-388192", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Just Epaulettes", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "just-epaulettes_400@partiesunited.co", "phone": "+91 7847-418151", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Maxwell", "role": "Both", "defaultAccount": null, "currency": "INR", "email": "maxwell-757@partiesunited.co", "phone": "+91 8178-647022", "address": null, "gst_type": "Unregistered", "gstin": null}]
\ No newline at end of file
diff --git a/dummy/tests/testDummy.spec.ts b/dummy/tests/testDummy.spec.ts
index 0971ad81..4a1f37e3 100644
--- a/dummy/tests/testDummy.spec.ts
+++ b/dummy/tests/testDummy.spec.ts
@@ -1,12 +1,14 @@
+import * as assert from 'assert';
 import { DatabaseManager } from 'backend/database/manager';
 import { assertDoesNotThrow } from 'backend/database/tests/helpers';
+import { purchaseItemPartyMap } from 'dummy/helpers';
 import { Fyo } from 'fyo';
 import { DummyAuthDemux } from 'fyo/tests/helpers';
 import 'mocha';
 import { getTestDbPath } from 'tests/helpers';
 import { setupDummyInstance } from '..';
 
-describe('dummy', function () {
+describe.skip('dummy', function () {
   const dbPath = getTestDbPath();
 
   let fyo: Fyo;
@@ -28,5 +30,20 @@ describe('dummy', function () {
     await assertDoesNotThrow(async () => {
       await setupDummyInstance(dbPath, fyo);
     }, 'setup instance failed');
-  });
+
+    for (const item in purchaseItemPartyMap) {
+      assert.strictEqual(
+        await fyo.db.exists('Item', item),
+        true,
+        `not found ${item}`
+      );
+
+      const party = purchaseItemPartyMap[item];
+      assert.strictEqual(
+        await fyo.db.exists('Party', party),
+        true,
+        `not found ${party}`
+      );
+    }
+  }).timeout(120_000);
 });
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 1794b1a4..09d51296 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -156,6 +156,10 @@ function toDocString(value: RawValue, field: Field) {
     return null;
   }
 
+  if (value === undefined) {
+    return null;
+  }
+
   if (typeof value === 'string') {
     return value;
   }
@@ -362,6 +366,10 @@ function toRawString(value: DocValue, field: Field): string | null {
     return null;
   }
 
+  if (value === undefined) {
+    return null;
+  }
+
   if (typeof value === 'string') {
     return value;
   }
diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index 09158cee..87c1bc5f 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -1,6 +1,7 @@
 import { SingleValue } from 'backend/database/types';
 import { Fyo } from 'fyo';
 import { DatabaseDemux } from 'fyo/demux/db';
+import { ValueError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
 import { Field, RawValue, SchemaMap } from 'schemas/types';
 import { getMapFromList } from 'utils';
@@ -208,6 +209,20 @@ export class DatabaseHandler extends DatabaseBase {
    *
    * The query logic for these is in backend/database/bespoke.ts
    */
+
+  async getLastInserted(schemaName: string): Promise<number> {
+    if (this.schemaMap[schemaName]?.naming !== 'autoincrement') {
+      throw new ValueError(
+        `invalid schema, ${schemaName} does not have autoincrement naming`
+      );
+    }
+
+    return (await this.#demux.callBespoke(
+      'getLastInserted',
+      schemaName
+    )) as number;
+  }
+
   async getTopExpenses(fromDate: string, toDate: string): Promise<TopExpenses> {
     return (await this.#demux.callBespoke(
       'getTopExpenses',
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index fd02c0e7..e1890b2b 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -63,6 +63,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   _dirty: boolean = true;
   _notInserted: boolean = true;
 
+  _syncing = false;
   constructor(schema: Schema, data: DocValueMap, fyo: Fyo) {
     super();
     this.fyo = markRaw(fyo);
@@ -117,6 +118,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return !!this.submitted && !!this.cancelled;
   }
 
+  get syncing() {
+    return this._syncing;
+  }
+
   _setValuesWithoutChecks(data: DocValueMap) {
     for (const field of this.schema.fields) {
       const fieldname = field.fieldname;
@@ -628,6 +633,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
   }
 
   async sync(): Promise<Doc> {
+    this._syncing = true;
     await this.trigger('beforeSync');
     let doc;
     if (this.notInserted) {
@@ -638,6 +644,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     this._notInserted = false;
     await this.trigger('afterSync');
     this.fyo.doc.observer.trigger(`sync:${this.schemaName}`, this.name);
+    this._syncing = false;
     return doc;
   }
 
diff --git a/fyo/model/naming.ts b/fyo/model/naming.ts
index 6eba9b07..714657d3 100644
--- a/fyo/model/naming.ts
+++ b/fyo/model/naming.ts
@@ -33,54 +33,33 @@ export async function setName(doc: Doc, fyo: Fyo) {
   }
 
   if (doc.schema.naming === 'autoincrement') {
-    doc.name = await getNextId(doc.schemaName, fyo);
-    return;
+    return (doc.name = await getNextId(doc.schemaName, fyo));
   }
 
-  // Current, per doc number series
-  const numberSeries = doc.numberSeries as string | undefined;
-  if (numberSeries !== undefined) {
-    doc.name = await getSeriesNext(numberSeries, doc.schemaName, fyo);
-    return;
-  }
-
-  if (doc.name) {
-    return;
+  if (doc.numberSeries !== undefined) {
+    return (doc.name = await getSeriesNext(
+      doc.numberSeries as string,
+      doc.schemaName,
+      fyo
+    ));
   }
 
   // name === schemaName for Single
   if (doc.schema.isSingle) {
-    doc.name = doc.schemaName;
-    return;
+    return (doc.name = doc.schemaName);
   }
 
-  // assign a random name by default
-  // override doc to set a name
+  // Assign a random name by default
   if (!doc.name) {
     doc.name = getRandomString();
   }
+
+  return doc.name;
 }
 
-export async function getNextId(schemaName: string, fyo: Fyo) {
-  // get the last inserted row
-  const lastInserted = await getLastInserted(schemaName, fyo);
-  let name = 1;
-  if (lastInserted) {
-    let lastNumber = parseInt(lastInserted.name as string);
-    if (isNaN(lastNumber)) lastNumber = 0;
-    name = lastNumber + 1;
-  }
-  return (name + '').padStart(9, '0');
-}
-
-export async function getLastInserted(schemaName: string, fyo: Fyo) {
-  const lastInserted = await fyo.db.getAll(schemaName, {
-    fields: ['name'],
-    limit: 1,
-    orderBy: 'created',
-    order: 'desc',
-  });
-  return lastInserted && lastInserted.length ? lastInserted[0] : null;
+export async function getNextId(schemaName: string, fyo: Fyo): Promise<string> {
+  const lastInserted = await fyo.db.getLastInserted(schemaName);
+  return String(lastInserted + 1).padStart(9, '0');
 }
 
 export async function getSeriesNext(
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index ba7bb131..f2be03c0 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -13,12 +13,6 @@ export function slug(str: string) {
     .replace(/\s+/g, '');
 }
 
-export function range(n: number) {
-  return Array(n)
-    .fill(null)
-    .map((_, i) => i);
-}
-
 export function unique<T>(list: T[], key = (it: T) => String(it)) {
   const seen: Record<string, boolean> = {};
   return list.filter((item) => {
diff --git a/models/Transactional/Transactional.ts b/models/Transactional/Transactional.ts
index fc0f2dc5..cef4116e 100644
--- a/models/Transactional/Transactional.ts
+++ b/models/Transactional/Transactional.ts
@@ -20,6 +20,8 @@ import { LedgerPosting } from './LedgerPosting';
  */
 
 export abstract class Transactional extends Doc {
+  date?: Date;
+
   get isTransactional() {
     return true;
   }
@@ -27,25 +29,25 @@ export abstract class Transactional extends Doc {
   abstract getPosting(): Promise<LedgerPosting>;
 
   async validate() {
-    super.validate();
+    await super.validate();
     const posting = await this.getPosting();
     posting.validate();
   }
 
   async afterSubmit(): Promise<void> {
-    super.afterSubmit();
+    await super.afterSubmit();
     const posting = await this.getPosting();
     await posting.post();
   }
 
   async afterCancel(): Promise<void> {
-    super.afterCancel();
+    await super.afterCancel();
     const posting = await this.getPosting();
     await posting.postReverse();
   }
 
   async afterDelete(): Promise<void> {
-    super.afterDelete();
+    await super.afterDelete();
     const ledgerEntryIds = (await this.fyo.db.getAll(
       ModelNameEnum.AccountingLedgerEntry,
       {
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index d1675083..e1564129 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -7,6 +7,7 @@ import { Invoice } from '../Invoice/Invoice';
 
 export abstract class InvoiceItem extends Doc {
   account?: string;
+  amount?: Money;
   baseAmount?: Money;
   exchangeRate?: number;
   parentdoc?: Invoice;
diff --git a/models/helpers.ts b/models/helpers.ts
index 0f3103ad..fed50a7b 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -17,7 +17,7 @@ export function getInvoiceActions(
       condition: (doc: Doc) =>
         doc.isSubmitted && !(doc.outstandingAmount as Money).isZero(),
       action: async function makePayment(doc: Doc) {
-        const payment = await fyo.doc.getNewDoc('Payment');
+        const payment = fyo.doc.getNewDoc('Payment');
         payment.once('afterSync', async () => {
           await payment.submit();
         });
diff --git a/models/types.ts b/models/types.ts
index 6d7bb13a..535f314e 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -29,3 +29,5 @@ export enum ModelNameEnum {
   SingleValue = 'SingleValue',
   SystemSettings = 'SystemSettings',
 }
+
+export type ModelName = keyof typeof ModelNameEnum
\ No newline at end of file
diff --git a/src/renderer.ts b/src/renderer.ts
index 51cb3e8c..ed958626 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,5 +1,6 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
+import { DateTime } from 'luxon';
 import { IPC_ACTIONS } from 'utils/messages';
 import { App as VueApp, createApp } from 'vue';
 import App from './App.vue';
@@ -105,3 +106,6 @@ function setOnWindow() {
     window.fyo = fyo;
   }
 }
+
+// @ts-ignore
+window.DateTime = DateTime;

From 22b90cd4247283c543e717448390307f353edc9f Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 11 May 2022 18:06:26 +0530
Subject: [PATCH 105/163] incr: add button to create a demo instance

---
 dummy/helpers.ts               |   6 +-
 dummy/index.ts                 | 190 ++++++++++++++++++---------------
 fyo/model/doc.ts               |   2 +-
 fyo/telemetry/helpers.ts       |  14 ++-
 src/components/Loading.vue     |  25 ++++-
 src/pages/DatabaseSelector.vue | 118 +++++++++++++-------
 src/utils/misc.ts              |   7 +-
 7 files changed, 217 insertions(+), 145 deletions(-)

diff --git a/dummy/helpers.ts b/dummy/helpers.ts
index f8fe6308..462a94b7 100644
--- a/dummy/helpers.ts
+++ b/dummy/helpers.ts
@@ -22,11 +22,11 @@ export const purchaseItemPartyMap: Record<string, string> = Object.keys(
   return acc;
 }, {} as Record<string, string>);
 
+export const flow = [
+  0.15, 0.1, 0.25, 0.1, 0.01, 0.01, 0.01, 0.05, 0, 0.15, 0.2, 0.4,
+];
 export function getFlowConstant(months: number) {
   // Jan to December
-  const flow = [
-    0.15, 0.1, 0.25, 0.1, 0.01, 0.01, 0.01, 0.05, 0, 0.15, 0.2, 0.4,
-  ];
 
   const d = DateTime.now().minus({ months });
   return flow[d.month - 1];
diff --git a/dummy/index.ts b/dummy/index.ts
index c4b07d14..b269b4c6 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -1,4 +1,4 @@
-import { Fyo } from 'fyo';
+import { Fyo, t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { range, sample } from 'lodash';
 import { DateTime } from 'luxon';
@@ -11,6 +11,7 @@ import setupInstance from 'src/setup/setupInstance';
 import { getMapFromList } from 'utils';
 import { getFiscalYear } from 'utils/misc';
 import {
+  flow,
   getFlowConstant,
   getRandomDates,
   purchaseItemPartyMap,
@@ -18,7 +19,7 @@ import {
 import items from './items.json';
 import parties from './parties.json';
 
-type Notifier = (stage: string, count: number, total: number) => void;
+type Notifier = (stage: string, percent: number) => void;
 
 export async function setupDummyInstance(
   dbPath: string,
@@ -27,28 +28,26 @@ export async function setupDummyInstance(
   baseCount: number = 1000,
   notifier?: Notifier
 ) {
-  notifier?.(fyo.t`Setting Up Instance`, 0, 0);
-  await setupInstance(
-    dbPath,
-    {
-      logo: null,
-      companyName: "Flo's Clothes",
-      country: 'India',
-      fullname: 'Lin Florentine',
-      email: 'lin@flosclothes.com',
-      bankName: 'Supreme Bank',
-      currency: 'INR',
-      fiscalYearStart: getFiscalYear('04-01', true),
-      fiscalYearEnd: getFiscalYear('04-01', false),
-      chartOfAccounts: 'India - Chart of Accounts',
-    },
-    fyo
-  );
+  notifier?.(fyo.t`Setting Up Instance`, -1);
+  const options = {
+    logo: null,
+    companyName: "Flo's Clothes",
+    country: 'India',
+    fullname: 'Lin Florentine',
+    email: 'lin@flosclothes.com',
+    bankName: 'Supreme Bank',
+    currency: 'INR',
+    fiscalYearStart: getFiscalYear('04-01', true),
+    fiscalYearEnd: getFiscalYear('04-01', false),
+    chartOfAccounts: 'India - Chart of Accounts',
+  };
+  await setupInstance(dbPath, options, fyo);
 
   years = Math.floor(years);
-  notifier?.(fyo.t`Creating Items and Parties`, 0, 0);
+  notifier?.(fyo.t`Creating Items and Parties`, -1);
   await generateStaticEntries(fyo);
   await generateDynamicEntries(fyo, years, baseCount, notifier);
+  return options.companyName;
 }
 
 /**
@@ -61,29 +60,22 @@ async function generateDynamicEntries(
   baseCount: number,
   notifier?: Notifier
 ) {
-  notifier?.(fyo.t`Getting Sales Invoices`, 0, 0);
-  const salesInvoices = await getSalesInvoices(fyo, years, baseCount);
+  const salesInvoices = await getSalesInvoices(fyo, years, baseCount, notifier);
 
-  notifier?.(fyo.t`Getting Purchase Invoices`, 0, 0);
+  notifier?.(fyo.t`Creating Purchase Invoices`, -1);
   const purchaseInvoices = await getPurchaseInvoices(fyo, years, salesInvoices);
 
-  notifier?.(fyo.t`Getting Journal Entries`, 0, 0);
+  notifier?.(fyo.t`Creating Journal Entries`, -1);
   const journalEntries = await getJournalEntries(fyo, salesInvoices);
-  await syncAndSubmit(journalEntries, (count: number, total: number) =>
-    notifier?.(fyo.t`Syncing Journal Entries`, count, total)
-  );
+  await syncAndSubmit(journalEntries, notifier);
 
   const invoices = ([salesInvoices, purchaseInvoices].flat() as Invoice[]).sort(
     (a, b) => +(a.date as Date) - +(b.date as Date)
   );
-  await syncAndSubmit(invoices, (count: number, total: number) =>
-    notifier?.(fyo.t`Syncing Invoices`, count, total)
-  );
+  await syncAndSubmit(invoices, notifier);
 
   const payments = await getPayments(fyo, invoices);
-  await syncAndSubmit(payments, (count: number, total: number) =>
-    notifier?.(fyo.t`Syncing Payments`, count, total)
-  );
+  await syncAndSubmit(payments, notifier);
 }
 
 async function getJournalEntries(fyo: Fyo, salesInvoices: SalesInvoice[]) {
@@ -178,7 +170,12 @@ async function getPayments(fyo: Fyo, invoices: Invoice[]) {
   return payments;
 }
 
-async function getSalesInvoices(fyo: Fyo, years: number, baseCount: number) {
+async function getSalesInvoices(
+  fyo: Fyo,
+  years: number,
+  baseCount: number,
+  notifier?: Notifier
+) {
   const invoices: SalesInvoice[] = [];
   const salesItems = items.filter((i) => i.for !== 'Purchases');
   const customers = parties.filter((i) => i.role !== 'Supplier');
@@ -187,65 +184,73 @@ async function getSalesInvoices(fyo: Fyo, years: number, baseCount: number) {
    * Get certain number of entries for each month of the count
    * of years.
    */
+  let dates: Date[] = [];
   for (const months of range(0, years * 12)) {
     const flow = getFlowConstant(months);
     const count = Math.ceil(flow * baseCount * (Math.random() * 0.25 + 0.75));
-    const dates = getRandomDates(count, months);
+    dates = dates.concat(getRandomDates(count, months));
+  }
 
-    /**
-     * For each date create a Sales Invoice.
-     */
+  /**
+   * For each date create a Sales Invoice.
+   */
 
-    for (const date of dates) {
-      const customer = sample(customers);
+  for (const d in dates) {
+    const date = dates[d];
 
-      const doc = fyo.doc.getNewDoc(ModelNameEnum.SalesInvoice, {
-        date,
-      }) as SalesInvoice;
+    notifier?.(
+      `Creating Sales Invoices, ${d} out of ${dates.length}`,
+      parseInt(d) / dates.length
+    );
+    const customer = sample(customers);
 
-      await doc.set('party', customer!.name);
-      if (!doc.account) {
-        doc.account = 'Debtors';
-      }
-      /**
-       * Add `numItems` number of items to the invoice.
-       */
-      const numItems = Math.ceil(Math.random() * 5);
-      for (let i = 0; i < numItems; i++) {
-        const item = sample(salesItems);
-        if ((doc.items ?? []).find((i) => i.item === item)) {
-          continue;
-        }
+    const doc = fyo.doc.getNewDoc(ModelNameEnum.SalesInvoice, {
+      date,
+    }) as SalesInvoice;
 
-        let quantity = 1;
-
-        /**
-         * Increase quantity depending on the rate.
-         */
-        if (item!.rate < 100 && Math.random() < 0.4) {
-          quantity = Math.ceil(Math.random() * 10);
-        } else if (item!.rate < 1000 && Math.random() < 0.2) {
-          quantity = Math.ceil(Math.random() * 4);
-        } else if (Math.random() < 0.01) {
-          quantity = Math.ceil(Math.random() * 3);
-        }
-
-        const rate = fyo.pesa(item!.rate * flow + 1).clip(0);
-        await doc.append('items', {});
-        await doc.items!.at(-1)!.set({
-          item: item!.name,
-          rate,
-          quantity,
-          account: item!.incomeAccount,
-          amount: rate.mul(quantity),
-          tax: item!.tax,
-          description: item!.description,
-          hsnCode: item!.hsnCode,
-        });
-      }
-
-      invoices.push(doc);
+    await doc.set('party', customer!.name);
+    if (!doc.account) {
+      doc.account = 'Debtors';
     }
+    /**
+     * Add `numItems` number of items to the invoice.
+     */
+    const numItems = Math.ceil(Math.random() * 5);
+    for (let i = 0; i < numItems; i++) {
+      const item = sample(salesItems);
+      if ((doc.items ?? []).find((i) => i.item === item)) {
+        continue;
+      }
+
+      let quantity = 1;
+
+      /**
+       * Increase quantity depending on the rate.
+       */
+      if (item!.rate < 100 && Math.random() < 0.4) {
+        quantity = Math.ceil(Math.random() * 10);
+      } else if (item!.rate < 1000 && Math.random() < 0.2) {
+        quantity = Math.ceil(Math.random() * 4);
+      } else if (Math.random() < 0.01) {
+        quantity = Math.ceil(Math.random() * 3);
+      }
+
+      const fc = flow[date.getMonth()];
+      const rate = fyo.pesa(item!.rate * (fc + 1)).clip(0);
+      await doc.append('items', {});
+      await doc.items!.at(-1)!.set({
+        item: item!.name,
+        rate,
+        quantity,
+        account: item!.incomeAccount,
+        amount: rate.mul(quantity),
+        tax: item!.tax,
+        description: item!.description,
+        hsnCode: item!.hsnCode,
+      });
+    }
+
+    invoices.push(doc);
   }
 
   return invoices;
@@ -442,14 +447,21 @@ async function generateParties(fyo: Fyo) {
   }
 }
 
-async function syncAndSubmit(
-  docs: Doc[],
-  notifier: (count: number, total: number) => void
-) {
+async function syncAndSubmit(docs: Doc[], notifier?: Notifier) {
+  const nameMap: Record<string, string> = {
+    [ModelNameEnum.PurchaseInvoice]: t`Invoices`,
+    [ModelNameEnum.SalesInvoice]: t`Invoices`,
+    [ModelNameEnum.Payment]: t`Payments`,
+    [ModelNameEnum.JournalEntry]: t`Journal Entries`,
+  };
+
   const total = docs.length;
   for (const i in docs) {
-    notifier(parseInt(i) + 1, total);
     const doc = docs[i];
+    notifier?.(
+      `Syncing ${nameMap[doc.schemaName]}, ${i} out of ${total}`,
+      parseInt(i) / total
+    );
     await doc.sync();
     await doc.submit();
   }
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index e1890b2b..e5073771 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -523,7 +523,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     if (dbValues && docModified !== dbModified) {
       throw new ConflictError(
         this.fyo
-          .t`Document ${this.schemaName} ${this.name} has been modified after loading` +
+          .t`${this.schema.label} ${this.name} has been modified after loading` +
           ` ${dbModified}, ${docModified}`
       );
     }
diff --git a/fyo/telemetry/helpers.ts b/fyo/telemetry/helpers.ts
index 42c63981..967bf522 100644
--- a/fyo/telemetry/helpers.ts
+++ b/fyo/telemetry/helpers.ts
@@ -62,7 +62,7 @@ export function getInstanceId(fyo: Fyo): UniqueId {
   const file = files.find((f) => f.companyName === companyName);
 
   if (file === undefined) {
-    return addNewFile(companyName, files, fyo);
+    return addNewFile(companyName, fyo, files);
   }
 
   if (file.id === undefined) {
@@ -72,14 +72,18 @@ export function getInstanceId(fyo: Fyo): UniqueId {
   return file.id;
 }
 
-function addNewFile(
+export function addNewFile(
   companyName: string,
-  files: ConfigFile[],
-  fyo: Fyo
+  fyo: Fyo,
+  files?: ConfigFile[],
+  dbPath?: string
 ): UniqueId {
+  files ??= fyo.config.get(ConfigKeys.Files, []) as ConfigFile[];
+  dbPath ??= fyo.config.get(ConfigKeys.LastSelectedFilePath, '') as string;
+
   const newFile: ConfigFile = {
     companyName,
-    dbPath: fyo.config.get(ConfigKeys.LastSelectedFilePath, '') as string,
+    dbPath,
     id: getId(),
   };
 
diff --git a/src/components/Loading.vue b/src/components/Loading.vue
index 706db914..0daa46cc 100644
--- a/src/components/Loading.vue
+++ b/src/components/Loading.vue
@@ -1,9 +1,10 @@
 <template>
   <div
     class="absolute bottom-0 flex justify-end pb-6 pr-6"
-    style="width: calc(100% - 12rem)"
+    :style="{ width: fullWidth ? '100%' : 'calc(100% - 12rem)' }"
     v-if="open && !close"
   >
+    <!-- Loading Continer -->
     <div
       class="
         text-gray-900
@@ -16,16 +17,28 @@
         bg-white
         rounded-lg
       "
-      v-if="true"
     >
-      <p class="text-base text-gray-600 pb-2" v-if="message.length">{{ message }}</p>
+      <!-- Message -->
+      <p class="text-base text-gray-600 pb-2" v-if="message?.length">
+        {{ message }}
+      </p>
+
+      <!-- Loading Bar Container -->
       <div class="w-full flex flex-row items-center">
-        <div class="w-full bg-gray-200 h-3 mr-2 rounded">
+        <!-- Loading Bar BG -->
+        <div
+          class="w-full h-3 mr-2 rounded"
+          :class="percent >= 0 ? 'bg-gray-200' : 'bg-gray-300'"
+        >
+          <!-- Loading Bar -->
           <div
+            v-if="percent >= 0"
             class="h-3 rounded bg-blue-400"
             :style="{ width: `${percent * 100}%` }"
           ></div>
         </div>
+
+        <!-- Close Icon -->
         <feather-icon
           name="x"
           class="
@@ -48,12 +61,16 @@ export default {
     open: { type: Boolean, default: false },
     percent: { type: Number, default: 0.5 },
     message: { type: String, default: '' },
+    fullWidth: { type: Boolean, default: false },
   },
   data() {
     return {
       close: false,
     };
   },
+  mounted() {
+    window.l = this;
+  },
   methods: {
     closeToast() {
       this.close = true;
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 85716f62..4d115528 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -28,16 +28,8 @@
       <!-- New File (Blue Icon) -->
       <div
         @click="newDatabase"
-        class="
-          px-6
-          h-18
-          flex flex-row
-          items-center
-          cursor-pointer
-          gap-4
-          p-2
-          hover:bg-gray-100
-        "
+        class="px-6 h-18 flex flex-row items-center gap-4 p-2"
+        :class="creatingDemo ? '' : 'hover:bg-gray-100 cursor-pointer'"
       >
         <div class="w-8 h-8 rounded-full bg-blue-500 relative flex-center">
           <feather-icon name="plus" class="text-white w-5 h-5" />
@@ -56,16 +48,8 @@
       <!-- Existing File (Green Icon) -->
       <div
         @click="existingDatabase"
-        class="
-          px-6
-          h-18
-          flex flex-row
-          items-center
-          cursor-pointer
-          gap-4
-          p-2
-          hover:bg-gray-100
-        "
+        class="px-6 h-18 flex flex-row items-center gap-4 p-2"
+        :class="creatingDemo ? '' : 'hover:bg-gray-100 cursor-pointer'"
       >
         <div class="w-8 h-8 rounded-full bg-green-500 relative flex-center">
           <feather-icon name="upload" class="w-4 h-4 text-white" />
@@ -84,15 +68,8 @@
       <!-- File List -->
       <div class="overflow-scroll" style="max-height: 340px">
         <div
-          class="
-            h-18
-            px-6
-            flex
-            gap-4
-            items-center
-            hover:bg-gray-100
-            cursor-pointer
-          "
+          class="h-18 px-6 flex gap-4 items-center"
+          :class="creatingDemo ? '' : 'hover:bg-gray-100 cursor-pointer'"
           v-for="(file, i) in files"
           :key="file.dbPath"
           @click="selectFile(file)"
@@ -127,20 +104,43 @@
 
       <!-- Language Selector -->
       <div
-        class="w-full flex justify-end absolute px-6 py-6"
+        class="w-full flex justify-between items-center absolute px-6 py-6"
         style="top: 100%; transform: translateY(-100%)"
       >
-        <LanguageSelector class="w-40" />
+        <Button
+          class="text-sm w-40"
+          @click="createDemo"
+          :disabled="creatingDemo"
+          >{{ creatingDemo ? t`Please Wait` : t`Create Demo` }}</Button
+        >
+
+        <LanguageSelector
+          v-show="!creatingDemo"
+          class="w-40 bg-gray-100 rounded-md"
+          input-class="text-sm bg-transparent"
+        />
       </div>
     </div>
+    <Loading
+      v-if="creatingDemo"
+      :open="creatingDemo"
+      :full-width="true"
+      :percent="creationPercent"
+      :message="creationMessage"
+    />
   </div>
 </template>
 <script>
+import { setupDummyInstance } from 'dummy';
 import { ipcRenderer } from 'electron';
 import fs from 'fs';
+import { ConfigKeys } from 'fyo/core/types';
+import { addNewFile } from 'fyo/telemetry/helpers';
 import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
+import Button from 'src/components/Button.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
+import Loading from 'src/components/Loading.vue';
 import WindowControls from 'src/components/WindowControls.vue';
 import { fyo } from 'src/initFyo';
 import { getSavePath } from 'src/utils/ipcCalls';
@@ -151,16 +151,51 @@ export default {
   emits: ['file-selected'],
   data() {
     return {
+      creationMessage: '',
+      creationPercent: 0,
+      creatingDemo: false,
       loadingDatabase: false,
-      fileSelectedFrom: null,
       files: [],
     };
   },
   mounted() {
     this.setFiles();
-    window.ds = this;
+
+    if (fyo.store.isDevelopment) {
+      window.ds = this;
+    }
   },
   methods: {
+    async createDemo() {
+      const { filePath, canceled } = await getSavePath('demo', 'db');
+      if (canceled || !filePath) {
+        return;
+      }
+
+      this.creatingDemo = true;
+
+      const companyName = await setupDummyInstance(
+        filePath,
+        fyo,
+        1,
+        1000,
+        (message, percent) => {
+          this.creationMessage = message;
+          this.creationPercent = percent;
+        }
+      );
+
+      addNewFile(
+        companyName,
+        fyo,
+        fyo.config.get(ConfigKeys.Files, []),
+        filePath
+      );
+      fyo.purgeCache();
+      this.setFiles();
+
+      this.creatingDemo = false;
+    },
     setFiles() {
       const files = cloneDeep(fyo.config.get('files', []));
       this.files = files.filter(({ dbPath }) => fs.existsSync(dbPath));
@@ -171,7 +206,10 @@ export default {
       }
     },
     async newDatabase() {
-      this.fileSelectedFrom = 'New File';
+      if (this.creatingDemo) {
+        return;
+      }
+
       const { filePath, canceled } = await getSavePath('books', 'db');
       if (canceled || !filePath) {
         return;
@@ -180,7 +218,10 @@ export default {
       this.connectToDatabase(filePath, true);
     },
     async existingDatabase() {
-      this.fileSelectedFrom = 'Existing File';
+      if (this.creatingDemo) {
+        return;
+      }
+
       const filePath = (
         await ipcRenderer.invoke(IPC_ACTIONS.GET_OPEN_FILEPATH, {
           title: this.t`Select file`,
@@ -191,7 +232,10 @@ export default {
       this.connectToDatabase(filePath);
     },
     async selectFile(file) {
-      this.fileSelectedFrom = file;
+      if (this.creatingDemo) {
+        return;
+      }
+
       await this.connectToDatabase(file.dbPath);
     },
     async connectToDatabase(filePath, isNew) {
@@ -207,6 +251,6 @@ export default {
       this.$emit('file-selected', filePath, !!isNew);
     },
   },
-  components: { LanguageSelector, WindowControls },
+  components: { LanguageSelector, WindowControls, Button, Loading },
 };
 </script>
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 28cefb0e..b24ab88b 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -68,16 +68,11 @@ export function incrementOpenCount() {
 export async function startTelemetry() {
   fyo.telemetry.interestingDocs = [
     ModelNameEnum.Payment,
-    ModelNameEnum.PaymentFor,
     ModelNameEnum.SalesInvoice,
-    ModelNameEnum.SalesInvoiceItem,
     ModelNameEnum.PurchaseInvoice,
-    ModelNameEnum.PurchaseInvoiceItem,
     ModelNameEnum.JournalEntry,
-    ModelNameEnum.JournalEntryAccount,
     ModelNameEnum.Party,
-    ModelNameEnum.Account,
-    ModelNameEnum.Tax,
+    ModelNameEnum.Item,
   ];
   await fyo.telemetry.start();
 }

From 86c48899595680126373f0020516596a5a00f335 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 12 May 2022 11:22:25 +0530
Subject: [PATCH 106/163] incr: add list pagination

---
 .../baseModels/JournalEntry/JournalEntry.ts   |  11 +-
 models/baseModels/Payment/Payment.ts          |   4 +-
 .../PurchaseInvoice/PurchaseInvoice.ts        |   2 +-
 .../baseModels/SalesInvoice/SalesInvoice.ts   |   2 +-
 src/pages/ListView/List.vue                   | 155 ++++++++++++++----
 5 files changed, 131 insertions(+), 43 deletions(-)

diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index 7a9e16d1..d53f8c57 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -49,7 +49,7 @@ export class JournalEntry extends Transactional {
     return {
       formRoute: (name) => `/edit/JournalEntry/${name}`,
       columns: [
-        'date',
+        'name',
         {
           label: t`Status`,
           fieldtype: 'Select',
@@ -72,14 +72,7 @@ export class JournalEntry extends Transactional {
             };
           },
         },
-        {
-          label: t`Entry ID`,
-          fieldtype: 'Data',
-          fieldname: 'name',
-          getValue(doc) {
-            return doc.name as string;
-          },
-        },
+        'date',
         'entryType',
         'referenceNumber',
       ],
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 9232f163..2bceac5d 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -442,7 +442,7 @@ export class Payment extends Transactional {
   static getListViewSettings(fyo: Fyo): ListViewSettings {
     return {
       columns: [
-        'party',
+        'name',
         {
           label: t`Status`,
           fieldname: 'status',
@@ -465,7 +465,7 @@ export class Payment extends Transactional {
             };
           },
         },
-        'paymentType',
+        'party',
         'date',
         'amount',
       ],
diff --git a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
index b1d586d4..df76ebd6 100644
--- a/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
+++ b/models/baseModels/PurchaseInvoice/PurchaseInvoice.ts
@@ -36,9 +36,9 @@ export class PurchaseInvoice extends Invoice {
     return {
       formRoute: (name) => `/edit/PurchaseInvoice/${name}`,
       columns: [
-        'party',
         'name',
         getTransactionStatusColumn(),
+        'party',
         'date',
         'grandTotal',
         'outstandingAmount',
diff --git a/models/baseModels/SalesInvoice/SalesInvoice.ts b/models/baseModels/SalesInvoice/SalesInvoice.ts
index 180e48cc..c5b27317 100644
--- a/models/baseModels/SalesInvoice/SalesInvoice.ts
+++ b/models/baseModels/SalesInvoice/SalesInvoice.ts
@@ -35,9 +35,9 @@ export class SalesInvoice extends Invoice {
     return {
       formRoute: (name) => `/edit/SalesInvoice/${name}`,
       columns: [
-        'party',
         'name',
         getTransactionStatusColumn(),
+        'party',
         'date',
         'grandTotal',
         'outstandingAmount',
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index d17baf94..f48f2ae5 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="mx-4 pb-16 text-base flex flex-col overflow-y-hidden">
+  <div class="mx-4 text-base flex flex-col overflow-y-hidden">
     <!-- Title Row -->
-    <div class="flex">
-      <div class="py-4 mr-3 w-7" v-if="hasImage" />
+    <div class="flex items-center">
+      <p class="w-8 text-right mr-4 text-gray-700">#</p>
       <Row
-        class="flex-1 text-gray-700"
+        class="flex-1 text-gray-700 border-none"
         :columnCount="columns.length"
         gap="1rem"
       >
@@ -22,34 +22,118 @@
         </div>
       </Row>
     </div>
+    <hr />
 
     <!-- Data Rows -->
     <div class="overflow-y-auto" v-if="data.length !== 0">
-      <div class="flex hover:bg-gray-100" v-for="doc in data" :key="doc.name">
-        <div class="w-7 py-4 mr-3" v-if="hasImage">
-          <Avatar :imageURL="doc.image" :label="doc.name" />
+      <div
+        v-for="(doc, i) in data.slice((pageNo - 1) * count, pageNo * count)"
+        :key="doc.name"
+      >
+        <!-- Row Content -->
+        <div class="flex hover:bg-gray-100 items-center">
+          <p class="w-8 text-right mr-4 text-gray-900">
+            {{ i + 1 + (pageNo - 1) * count }}
+          </p>
+          <Row
+            gap="1rem"
+            class="cursor-pointer text-gray-900 flex-1 border-none"
+            @click="openForm(doc)"
+            :columnCount="columns.length"
+          >
+            <ListCell
+              v-for="column in columns"
+              :key="column.label"
+              :class="{
+                'text-right': ['Float', 'Currency'].includes(column.fieldtype),
+              }"
+              :doc="doc"
+              :column="column"
+            ></ListCell>
+          </Row>
         </div>
-        <Row
-          gap="1rem"
-          class="cursor-pointer text-gray-900 flex-1"
-          @click="openForm(doc)"
-          :columnCount="columns.length"
+        <hr v-if="i !== count - 1" />
+      </div>
+    </div>
+
+    <!-- Pagination Footer -->
+    <hr v-if="data.length > 20" />
+    <div
+      v-if="data.length > 20"
+      class="my-3 grid grid-cols-3 text-gray-800 text-sm select-none"
+    >
+      <!-- Length Display -->
+      <div class="justify-self-start">
+        {{
+          `${(pageNo - 1) * count + 1} - ${Math.min(
+            pageNo * count,
+            data.length
+          )}`
+        }}
+      </div>
+
+      <!-- Pagination Selector -->
+      <div class="flex gap-1 items-center justify-self-center">
+        <feather-icon
+          name="chevron-left"
+          class="w-4 h-4"
+          :class="
+            pageNo > 1 ? 'text-gray-600 cursor-pointer' : 'text-transparent'
+          "
+          @click="pageNo = Math.max(1, pageNo - 1)"
+        />
+        <div class="flex gap-1 bg-gray-100 rounded">
+          <input
+            type="number"
+            class="
+              w-6
+              text-right
+              outline-none
+              bg-transparent
+              focus:text-gray-900
+            "
+            :value="pageNo"
+            @change="setPageNo"
+            @input="setPageNo"
+            min="1"
+            :max="maxPages"
+          />
+          <p class="text-gray-600">/</p>
+          <p class="w-5">
+            {{ maxPages }}
+          </p>
+        </div>
+        <feather-icon
+          name="chevron-right"
+          class="w-4 h-4"
+          :class="
+            pageNo < maxPages
+              ? 'text-gray-600 cursor-pointer'
+              : 'text-transparent'
+          "
+          @click="pageNo = Math.min(maxPages, pageNo + 1)"
+        />
+      </div>
+
+      <!-- Count Selector -->
+      <div class="border rounded flex justify-self-end">
+        <button
+          v-for="c in allowedCounts"
+          :key="c + '-count'"
+          @click="setCount(c)"
+          class="w-9"
+          :class="count === c ? 'bg-gray-200' : ''"
         >
-          <ListCell
-            v-for="column in columns"
-            :key="column.label"
-            :class="{
-              'text-right': ['Float', 'Currency'].includes(column.fieldtype),
-            }"
-            :doc="doc"
-            :column="column"
-          ></ListCell>
-        </Row>
+          {{ c }}
+        </button>
       </div>
     </div>
 
     <!-- Empty State -->
-    <div v-else class="flex flex-col items-center justify-center my-auto">
+    <div
+      v-if="!data?.length"
+      class="flex flex-col items-center justify-center my-auto"
+    >
       <img src="@/assets/img/list-empty-state.svg" alt="" class="w-24" />
       <p class="my-3 text-gray-800">{{ t`No entries found` }}</p>
       <Button type="primary" class="text-white" @click="$emit('makeNewDoc')">
@@ -59,7 +143,6 @@
   </div>
 </template>
 <script>
-import Avatar from 'src/components/Avatar';
 import Button from 'src/components/Button';
 import Row from 'src/components/Row';
 import { fyo } from 'src/initFyo';
@@ -73,7 +156,6 @@ export default {
   components: {
     Row,
     ListCell,
-    Avatar,
     Button,
   },
   watch: {
@@ -87,11 +169,16 @@ export default {
   },
   data() {
     return {
+      pageNo: 1,
+      count: 20,
+      allowedCounts: [20, 100, 500],
       data: [],
     };
   },
-  mounted() {},
   computed: {
+    maxPages() {
+      return Math.ceil(this.data.length / this.count);
+    },
     columns() {
       let columns = this.listConfig?.columns ?? [];
 
@@ -110,15 +197,23 @@ export default {
         })
         .filter(Boolean);
     },
-    hasImage() {
-      return !!fyo.getField(this.schemaName, 'image');
-    },
   },
   async mounted() {
     await this.updateData();
     this.setUpdateListeners();
   },
   methods: {
+    setPageNo({ target: { value } }) {
+      value = parseInt(value);
+      if (isNaN(value)) {
+        return;
+      }
+      this.pageNo = Math.min(Math.max(1, value), this.maxPages);
+    },
+    setCount(count) {
+      this.pageNo = 1;
+      this.count = count;
+    },
     setUpdateListeners() {
       const listener = (name) => {
         this.updateData();
@@ -152,7 +247,7 @@ export default {
       this.data = await fyo.db.getAll(this.schemaName, {
         fields: ['*'],
         filters,
-        orderBy: 'created',
+        orderBy: 'modified',
       });
     },
   },

From 1e88c5511f3a252ef7122f59c5695410d11534e7 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 12 May 2022 15:34:37 +0530
Subject: [PATCH 107/163] incr: add GeneralLedger business logic

---
 META.md                                |   2 +-
 fyo/core/dbHandler.ts                  |   2 +-
 reports/GeneralLedger/GeneralLedger.js |  97 -----
 reports/GeneralLedger/GeneralLedger.ts | 484 +++++++++++++++++++++++++
 reports/GeneralLedger/viewConfig.js    | 153 --------
 reports/README.md                      |   6 +
 reports/Report.ts                      |  72 ++++
 reports/index.ts                       |   2 +
 reports/types.ts                       |  15 +-
 src/renderer.ts                        |   4 +-
 10 files changed, 578 insertions(+), 259 deletions(-)
 delete mode 100644 reports/GeneralLedger/GeneralLedger.js
 create mode 100644 reports/GeneralLedger/GeneralLedger.ts
 delete mode 100644 reports/GeneralLedger/viewConfig.js
 create mode 100644 reports/README.md
 create mode 100644 reports/Report.ts
 create mode 100644 reports/index.ts

diff --git a/META.md b/META.md
index f0fd65be..df58d2c7 100644
--- a/META.md
+++ b/META.md
@@ -51,7 +51,7 @@ individual ones, check the `README.md` in those subdirectories:
 | `build`        | _server_   | Build specific files not used unless building the project                                                                  |
 | `translations` | _server_   | Collection of csv files containing translations                                                                            |
 | `src`          | _client_   | Code that mainly deals with the view layer (all `.vue` are stored here)                                                    |
-| `reports`      | _client_   | Collection of logic code and view layer config files for displaying reports.                                               |
+| `reports`      | _client\*_ | Collection of logic code and view layer config files for displaying reports.                                               |
 | `models`       | _client\*_ | Collection of `Model.ts` files that manage the data and some business logic on the client side.                            |
 | `fyo`          | _client\*_ | Code for the underlying library that manages the client side                                                               |
 | `utils`        | _agnostic_ | Collection of code used by either sides.                                                                                   |
diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index 87c1bc5f..9a725684 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -122,7 +122,7 @@ export class DatabaseHandler extends DatabaseBase {
   async getAllRaw(
     schemaName: string,
     options: GetAllOptions = {}
-  ): Promise<DocValueMap[]> {
+  ): Promise<RawValueMap[]> {
     const all = await this.#getAll(schemaName, options);
     this.observer.trigger(`getAllRaw:${schemaName}`, options);
     return all;
diff --git a/reports/GeneralLedger/GeneralLedger.js b/reports/GeneralLedger/GeneralLedger.js
deleted file mode 100644
index 35cee083..00000000
--- a/reports/GeneralLedger/GeneralLedger.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import { fyo } from 'src/initFyo';
-
-class GeneralLedger {
-  async run(params) {
-    const filters = {};
-    if (params.account) filters.account = params.account;
-    if (params.party) filters.party = params.party;
-    if (params.referenceType !== 'All')
-      filters.referenceType = params.referenceType;
-    if (params.referenceName) filters.referenceName = params.referenceName;
-    if (params.toDate || params.fromDate) {
-      filters.date = [];
-      if (params.toDate) filters.date.push('<=', params.toDate);
-      if (params.fromDate) filters.date.push('>=', params.fromDate);
-    }
-
-    let data = (
-      await fyo.db.getAll({
-        doctype: 'AccountingLedgerEntry',
-        fields: [
-          'date',
-          'account',
-          'party',
-          'referenceType',
-          'referenceName',
-          'debit',
-          'credit',
-          'reverted',
-        ],
-        filters: filters,
-      })
-    )
-      .filter((d) => !d.reverted || (d.reverted && params.reverted))
-      .map((row) => {
-        row.debit = row.debit.float;
-        row.credit = row.credit.float;
-
-        return row;
-      });
-
-    return this.appendOpeningEntry(data);
-  }
-
-  appendOpeningEntry(data) {
-    let glEntries = [];
-    let balance = 0,
-      debitTotal = 0,
-      creditTotal = 0;
-
-    glEntries.push({
-      date: '',
-      account: { template: '<b>Opening</b>' },
-      party: '',
-      debit: 0,
-      credit: 0,
-      balance: 0,
-      referenceType: '',
-      referenceName: '',
-    });
-    for (let entry of data) {
-      balance += entry.debit > 0 ? entry.debit : -entry.credit;
-      debitTotal += entry.debit;
-      creditTotal += entry.credit;
-      entry.balance = balance;
-      if (entry.debit === 0) {
-        entry.debit = '';
-      }
-      if (entry.credit === 0) {
-        entry.credit = '';
-      }
-      glEntries.push(entry);
-    }
-    glEntries.push({
-      date: '',
-      account: { template: '<b>Total</b>' },
-      party: '',
-      debit: debitTotal,
-      credit: creditTotal,
-      balance: balance,
-      referenceType: '',
-      referenceName: '',
-    });
-    glEntries.push({
-      date: '',
-      account: { template: '<b>Closing</b>' },
-      party: '',
-      debit: debitTotal,
-      credit: creditTotal,
-      balance: balance,
-      referenceType: '',
-      referenceName: '',
-    });
-    return glEntries;
-  }
-}
-
-export default GeneralLedger;
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
new file mode 100644
index 00000000..0ffaac7f
--- /dev/null
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -0,0 +1,484 @@
+import { Fyo, t } from 'fyo';
+import { Action } from 'fyo/model/types';
+import { isPesa } from 'fyo/utils';
+import { DateTime } from 'luxon';
+import { ModelNameEnum } from 'models/types';
+import Money from 'pesa/dist/types/src/money';
+import { Report } from 'reports/Report';
+import { ColumnField, ReportData } from 'reports/types';
+import { Field, FieldTypeEnum, RawValue } from 'schemas/types';
+import { QueryFilter } from 'utils/db/types';
+
+interface RawLedgerEntry {
+  name: string;
+  account: string;
+  date: string;
+  debit: string;
+  credit: string;
+  referenceType: string;
+  referenceName: string;
+  party: string;
+  reverted: number;
+  reverts: string;
+  [key: string]: RawValue;
+}
+
+interface LedgerEntry {
+  name: number;
+  account: string;
+  date: Date | null;
+  debit: Money | null;
+  credit: Money | null;
+  balance: Money | null;
+  referenceType: string;
+  referenceName: string;
+  party: string;
+  reverted: boolean;
+  reverts: string;
+}
+
+type GroupedMap = Map<string, LedgerEntry[]>;
+
+export class GeneralLedger extends Report {
+  static title = t`General Ledger`;
+  static reportName = 'general-ledger';
+
+  ascending!: boolean;
+  groupBy!: 'none' | 'party' | 'account' | 'referenceName';
+  _rawData: LedgerEntry[] = [];
+
+  constructor(fyo: Fyo) {
+    super(fyo);
+
+    if (!this.toField) {
+      this.toField = DateTime.now().toISODate();
+      this.fromField = DateTime.now().minus({ years: 1 }).toISODate();
+    }
+  }
+
+  async setReportData(filter?: string) {
+    if (filter !== 'grouped' || this._rawData.length === 0) {
+      console.time('_setRawData');
+      await this._setRawData();
+      console.timeEnd('_setRawData');
+    }
+
+    console.time('_getGroupedMap');
+    const map = this._getGroupedMap();
+    console.timeEnd('_getGroupedMap');
+
+    console.time('_getTotalsAndSetBalance');
+    const { totalDebit, totalCredit } = this._getTotalsAndSetBalance(map);
+    console.timeEnd('_getTotalsAndSetBalance');
+
+    console.time('_consolidateEntries');
+    const consolidated = this._consolidateEntries(map);
+    console.timeEnd('_consolidateEntries');
+
+    /**
+     * Push a blank row if last row isn't blank
+     */
+    if (consolidated.at(-1)!.name !== -3) {
+      this._pushBlankEntry(consolidated);
+    }
+
+    /**
+     * Set the closing row
+     */
+    consolidated.push({
+      name: -2, // Bold
+      account: t`Closing`,
+      date: null,
+      debit: totalDebit,
+      credit: totalCredit,
+      balance: totalDebit.sub(totalCredit),
+      referenceType: '',
+      referenceName: '',
+      party: '',
+      reverted: false,
+      reverts: '',
+    });
+
+    console.time('_convertEntriesToReportData');
+    this.reportData = this._convertEntriesToReportData(consolidated);
+    console.timeEnd('_convertEntriesToReportData');
+  }
+
+  _convertEntriesToReportData(entries: LedgerEntry[]): ReportData {
+    const reportData = [];
+    const fieldnames = this.columns.map((f) => f.fieldname);
+    for (const entry of entries) {
+      const row = this._getRowFromEntry(entry, fieldnames);
+      reportData.push(row);
+    }
+
+    return reportData;
+  }
+
+  _getRowFromEntry(entry: LedgerEntry, fieldnames: string[]) {
+    if (entry.name === -3) {
+      return Array(fieldnames.length).fill({ value: '' });
+    }
+
+    const row = [];
+    for (const n of fieldnames) {
+      let value = entry[n as keyof LedgerEntry];
+      if (value === null || value === undefined) {
+        row.push({ value: '' });
+        continue;
+      }
+
+      let align = 'left';
+      if (value instanceof Date) {
+        value = this.fyo.format(value, FieldTypeEnum.Date);
+      }
+
+      if (isPesa(value)) {
+        align = 'right';
+        value = this.fyo.format(value, FieldTypeEnum.Currency);
+      }
+
+      if (typeof value === 'boolean' && n === 'reverted' && value) {
+        value = t`Reverted`;
+      }
+
+      row.push({
+        italics: entry.name === -1,
+        bold: entry.name === -2,
+        value,
+        align,
+      });
+    }
+
+    return row;
+  }
+
+  _consolidateEntries(map: GroupedMap) {
+    const entries: LedgerEntry[] = [];
+    for (const key of map.keys()) {
+      entries.push(...map.get(key)!);
+
+      /**
+       * Add blank row for spacing if groupBy
+       */
+      if (this.groupBy !== 'none') {
+        this._pushBlankEntry(entries);
+      }
+    }
+
+    return entries;
+  }
+
+  _pushBlankEntry(entries: LedgerEntry[]) {
+    entries.push({
+      name: -3, // Empty
+      account: '',
+      date: null,
+      debit: null,
+      credit: null,
+      balance: null,
+      referenceType: '',
+      referenceName: '',
+      party: '',
+      reverted: false,
+      reverts: '',
+    });
+  }
+
+  _getTotalsAndSetBalance(map: GroupedMap) {
+    let totalDebit = this.fyo.pesa(0);
+    let totalCredit = this.fyo.pesa(0);
+
+    for (const key of map.keys()) {
+      let balance = this.fyo.pesa(0);
+      let debit = this.fyo.pesa(0);
+      let credit = this.fyo.pesa(0);
+
+      for (const entry of map.get(key)!) {
+        debit = debit.add(entry.debit!);
+        credit = credit.add(entry.credit!);
+
+        const diff = entry.debit!.sub(entry.credit!);
+        balance = balance.add(diff);
+        entry.balance = balance;
+      }
+
+      /**
+       * Total row incase groupBy is used
+       */
+      if (this.groupBy !== 'none') {
+        map.get(key)?.push({
+          name: -1, // Italics
+          account: t`Total`,
+          date: null,
+          debit,
+          credit,
+          balance: debit.sub(credit),
+          referenceType: '',
+          referenceName: '',
+          party: '',
+          reverted: false,
+          reverts: '',
+        });
+      }
+
+      /**
+       * Total debit and credit for the final row
+       */
+      totalDebit = totalDebit.add(debit);
+      totalCredit = totalCredit.add(credit);
+    }
+
+    return { totalDebit, totalCredit };
+  }
+
+  _getGroupedMap(): GroupedMap {
+    let groupBy: keyof LedgerEntry = 'referenceName';
+    if (this.groupBy !== 'none') {
+      groupBy = this.groupBy;
+    }
+
+    /**
+     * Sort rows by ascending or descending
+     */
+    this._rawData.sort((a, b) => {
+      if (this.ascending) {
+        return a.name - b.name;
+      }
+
+      return b.name - a.name;
+    });
+
+    /**
+     * Map remembers the order of insertion
+     * ∴ presorting maintains grouping order
+     */
+    const map: GroupedMap = new Map();
+    for (const entry of this._rawData) {
+      const groupingKey = entry[groupBy];
+      if (!map.has(groupingKey)) {
+        map.set(groupingKey, []);
+      }
+
+      map.get(groupingKey)!.push(entry);
+    }
+
+    return map;
+  }
+
+  async _setRawData() {
+    const fields = [
+      'name',
+      'account',
+      'date',
+      'debit',
+      'credit',
+      'referenceType',
+      'referenceName',
+      'party',
+      'reverted',
+      'reverts',
+    ];
+
+    const filters = this._getFilters();
+    const entries = (await this.fyo.db.getAllRaw(
+      ModelNameEnum.AccountingLedgerEntry,
+      {
+        fields,
+        filters,
+      }
+    )) as RawLedgerEntry[];
+
+    this._rawData = entries.map((entry) => {
+      return {
+        name: parseInt(entry.name),
+        account: entry.account,
+        date: new Date(entry.date),
+        debit: this.fyo.pesa(entry.debit),
+        credit: this.fyo.pesa(entry.credit),
+        balance: this.fyo.pesa(0),
+        referenceType: entry.referenceType,
+        referenceName: entry.referenceName,
+        party: entry.party,
+        reverted: Boolean(entry.reverted),
+        reverts: entry.reverts,
+      } as LedgerEntry;
+    });
+  }
+
+  _getFilters(): QueryFilter {
+    const filters: QueryFilter = {};
+    const stringFilters = ['account', 'party', 'referenceName'];
+
+    for (const sf in stringFilters) {
+      const value = this[sf];
+      if (value === undefined) {
+        continue;
+      }
+
+      filters[sf] = value as string;
+    }
+
+    if (this.referenceType !== 'All') {
+      filters.referenceType = this.referenceType as string;
+    }
+
+    if (this.toDate) {
+      filters.date ??= [];
+      (filters.date as string[]).push('<=', this.toDate as string);
+    }
+
+    if (this.fromDate) {
+      filters.date ??= [];
+      (filters.date as string[]).push('>=', this.fromDate as string);
+    }
+
+    if (!this.reverted) {
+      filters.reverted = false;
+    }
+
+    return filters;
+  }
+
+  getFilters() {
+    return [
+      {
+        fieldtype: 'Select',
+        options: [
+          { label: t`All`, value: 'All' },
+          { label: t`Sales Invoices`, value: 'SalesInvoice' },
+          { label: t`Purchase Invoices`, value: 'PurchaseInvoice' },
+          { label: t`Payments`, value: 'Payment' },
+          { label: t`Journal Entries`, value: 'JournalEntry' },
+        ],
+
+        label: t`Reference Type`,
+        fieldname: 'referenceType',
+        placeholder: t`Reference Type`,
+        default: 'All',
+      },
+      {
+        fieldtype: 'DynamicLink',
+        placeholder: t`Reference Name`,
+        references: 'referenceType',
+        label: t`Reference Name`,
+        fieldname: 'referenceName',
+      },
+      {
+        fieldtype: 'Link',
+        target: 'Account',
+        placeholder: t`Account`,
+        label: t`Account`,
+        fieldname: 'account',
+      },
+      {
+        fieldtype: 'Link',
+        target: 'Party',
+        label: t`Party`,
+        placeholder: t`Party`,
+        fieldname: 'party',
+      },
+      {
+        fieldtype: 'Date',
+        placeholder: t`From Date`,
+        label: t`From Date`,
+        fieldname: 'fromDate',
+      },
+      {
+        fieldtype: 'Date',
+        placeholder: t`To Date`,
+        label: t`To Date`,
+        fieldname: 'toDate',
+      },
+      {
+        fieldtype: 'Check',
+        default: false,
+        label: t`Cancelled`,
+        fieldname: 'reverted',
+      },
+      {
+        fieldtype: 'Check',
+        default: false,
+        label: t`Ascending`,
+        fieldname: 'ascending',
+      },
+      {
+        fieldtype: 'Check',
+        default: 'none',
+        label: t`Group By`,
+        fieldname: 'groupBy',
+        options: [
+          { label: t`None`, value: 'none' },
+          { label: t`Party`, value: 'party' },
+          { label: t`Account`, value: 'account' },
+          { label: t`Reference`, value: 'referenceName' },
+        ],
+      },
+    ] as Field[];
+  }
+
+  getColumns(): ColumnField[] {
+    let columns = [
+      {
+        label: t`Account`,
+        fieldtype: 'Link',
+        fieldname: 'account',
+        width: 1.5,
+      },
+      {
+        label: t`Date`,
+        fieldtype: 'Date',
+        fieldname: 'date',
+        width: 0.75,
+      },
+      {
+        label: t`Debit`,
+        fieldtype: 'Currency',
+        fieldname: 'debit',
+        width: 1.25,
+      },
+      {
+        label: t`Credit`,
+        fieldtype: 'Currency',
+        fieldname: 'credit',
+        width: 1.25,
+      },
+      {
+        label: t`Balance`,
+        fieldtype: 'Currency',
+        fieldname: 'balance',
+        width: 1.25,
+      },
+      {
+        label: t`Reference Type`,
+        fieldtype: 'Data',
+        fieldname: 'referenceType',
+      },
+      {
+        label: t`Reference Name`,
+        fieldtype: 'Data',
+        fieldname: 'referenceName',
+      },
+      {
+        label: t`Party`,
+        fieldtype: 'Link',
+        fieldname: 'party',
+      },
+      {
+        label: t`Reverted`,
+        fieldtype: 'Check',
+        fieldname: 'reverted',
+      },
+    ] as ColumnField[];
+
+    if (!this.reverted) {
+      columns = columns.filter((f) => f.fieldname !== 'reverted');
+    }
+
+    return columns;
+  }
+
+  getActions(): Action[] {
+    return [];
+  }
+}
diff --git a/reports/GeneralLedger/viewConfig.js b/reports/GeneralLedger/viewConfig.js
deleted file mode 100644
index 09adff14..00000000
--- a/reports/GeneralLedger/viewConfig.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import { t } from 'fyo';
-import Avatar from 'src/components/Avatar.vue';
-import { fyo } from 'src/initFyo';
-import getCommonExportActions from '../commonExporter';
-
-export function getPartyWithAvatar(partyName) {
-  return {
-    data() {
-      return {
-        imageURL: null,
-        label: null,
-      };
-    },
-    components: {
-      Avatar,
-    },
-    async mounted() {
-      const p = await fyo.db.get('Party', partyName);
-      this.imageURL = p.image;
-      this.label = partyName;
-    },
-    template: `
-      <div class="flex items-center" v-if="label">
-        <Avatar class="flex-shrink-0" :imageURL="imageURL" :label="label" size="sm" />
-        <span class="ml-2 truncate">{{ label }}</span>
-      </div>
-    `,
-  };
-}
-
-let title = t`General Ledger`;
-
-const viewConfig = {
-  title,
-  filterFields: [
-    {
-      fieldtype: 'Select',
-      options: [
-        { label: t`All References`, value: 'All' },
-        { label: t`Invoices`, value: 'SalesInvoice' },
-        { label: t`Bills`, value: 'PurchaseInvoice' },
-        { label: t`Payment`, value: 'Payment' },
-        { label: t`Journal Entry`, value: 'JournalEntry' },
-      ],
-      size: 'small',
-      label: t`Reference Type`,
-      fieldname: 'referenceType',
-      placeholder: t`Reference Type`,
-      default: 'All',
-    },
-    {
-      fieldtype: 'DynamicLink',
-      size: 'small',
-      placeholder: t`Reference Name`,
-      references: 'referenceType',
-      label: t`Reference Name`,
-      fieldname: 'referenceName',
-    },
-    {
-      fieldtype: 'Link',
-      target: 'Account',
-      size: 'small',
-      placeholder: t`Account`,
-      label: t`Account`,
-      fieldname: 'account',
-    },
-    {
-      fieldtype: 'Link',
-      target: 'Party',
-      label: t`Party`,
-      size: 'small',
-      placeholder: t`Party`,
-      fieldname: 'party',
-    },
-    {
-      fieldtype: 'Date',
-      size: 'small',
-      placeholder: t`From Date`,
-      label: t`From Date`,
-      fieldname: 'fromDate',
-    },
-    {
-      fieldtype: 'Date',
-      size: 'small',
-      placeholder: t`To Date`,
-      label: t`To Date`,
-      fieldname: 'toDate',
-    },
-    {
-      fieldtype: 'Check',
-      size: 'small',
-      default: 0,
-      label: t`Cancelled`,
-      fieldname: 'reverted',
-    },
-  ],
-  method: 'general-ledger',
-  actions: getCommonExportActions('general-ledger'),
-  getColumns() {
-    return [
-      {
-        label: t`Account`,
-        fieldtype: 'Link',
-        fieldname: 'account',
-        width: 1.5,
-      },
-      {
-        label: t`Date`,
-        fieldtype: 'Date',
-        fieldname: 'date',
-        width: 0.75,
-      },
-      {
-        label: t`Debit`,
-        fieldtype: 'Currency',
-        fieldname: 'debit',
-        width: 1.25,
-      },
-      {
-        label: t`Credit`,
-        fieldtype: 'Currency',
-        fieldname: 'credit',
-        width: 1.25,
-      },
-      {
-        label: t`Balance`,
-        fieldtype: 'Currency',
-        fieldname: 'balance',
-        width: 1.25,
-      },
-      {
-        label: t`Reference Type`,
-        fieldtype: 'Data',
-        fieldname: 'referenceType',
-      },
-      {
-        label: t`Reference Name`,
-        fieldtype: 'Data',
-        fieldname: 'referenceName',
-      },
-      {
-        label: t`Party`,
-        fieldtype: 'Link',
-        fieldname: 'party',
-        component(cellValue) {
-          return getPartyWithAvatar(cellValue);
-        },
-      },
-    ];
-  },
-};
-
-export default viewConfig;
diff --git a/reports/README.md b/reports/README.md
new file mode 100644
index 00000000..483d3009
--- /dev/null
+++ b/reports/README.md
@@ -0,0 +1,6 @@
+# Reports
+
+Reports are a view of stored data, the code here doesn't alter any data.
+
+All reports should extend the `Report` class in `reports/Report.ts`, depending
+on the report it may have custom `.vue` files.
diff --git a/reports/Report.ts b/reports/Report.ts
new file mode 100644
index 00000000..6fada474
--- /dev/null
+++ b/reports/Report.ts
@@ -0,0 +1,72 @@
+import { Fyo } from 'fyo';
+import { Action } from 'fyo/model/types';
+import Observable from 'fyo/utils/observable';
+import { Field, RawValue } from 'schemas/types';
+import { getIsNullOrUndef } from 'utils';
+import { ColumnField, ReportData } from './types';
+
+export abstract class Report extends Observable<RawValue> {
+  static title: string;
+  static reportName: string;
+
+  fyo: Fyo;
+  columns: ColumnField[];
+  filters: Field[];
+  reportData: ReportData;
+
+  abstract getActions(): Action[];
+  abstract getFilters(): Field[];
+
+  constructor(fyo: Fyo) {
+    super();
+    this.fyo = fyo;
+    this.reportData = [];
+    this.filters = this.getFilters();
+    this.columns = this.getColumns();
+    this.initializeFilters();
+  }
+
+  get filterMap() {
+    const filterMap: Record<string, RawValue> = {};
+    for (const { fieldname } of this.filters) {
+      const value = this.get(fieldname);
+      if (getIsNullOrUndef(value)) {
+        continue;
+      }
+
+      filterMap[fieldname] = value;
+    }
+
+    return filterMap;
+  }
+
+  async set(key: string, value: RawValue) {
+    const field = this.filters.find((f) => f.fieldname === key);
+    if (field === undefined || value === undefined) {
+      return;
+    }
+
+    const prevValue = this[key];
+    if (prevValue === value) {
+      return;
+    }
+
+    this[key] = value;
+    this.columns = this.getColumns();
+    await this.setReportData(key);
+  }
+
+  initializeFilters() {
+    for (const field of this.filters) {
+      if (!field.default) {
+        this[field.fieldname] = undefined;
+        continue;
+      }
+
+      this[field.fieldname] = field.default;
+    }
+  }
+
+  abstract getColumns(): ColumnField[];
+  abstract setReportData(filter?: string): Promise<void>;
+}
diff --git a/reports/index.ts b/reports/index.ts
new file mode 100644
index 00000000..d642dcc8
--- /dev/null
+++ b/reports/index.ts
@@ -0,0 +1,2 @@
+import { GeneralLedger } from './GeneralLedger/GeneralLedger';
+export { GeneralLedger };
diff --git a/reports/types.ts b/reports/types.ts
index 830c73ef..8c85141e 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -1,14 +1,19 @@
 import { AccountRootType } from 'models/baseModels/Account/types';
+import { BaseField } from 'schemas/types';
 
 export type ExportExtension = 'csv' | 'json';
 
-export interface ReportData {
-  rows: unknown[];
-  columns: unknown[];
+export interface ReportCell {
+  bold?: boolean;
+  italics?: boolean;
+  align?: 'left' | 'right' | 'center';
+  value: string;
 }
 
-export abstract class Report {
-  abstract run(filters: Record<string, unknown>): ReportData;
+export type ReportRow = ReportCell[];
+export type ReportData = ReportRow[];
+export interface ColumnField extends BaseField {
+  width?: number;
 }
 
 export type BalanceType = 'Credit' | 'Debit';
diff --git a/src/renderer.ts b/src/renderer.ts
index ed958626..a7cbcb6c 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,6 +1,6 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
-import { DateTime } from 'luxon';
+import { GeneralLedger } from 'reports';
 import { IPC_ACTIONS } from 'utils/messages';
 import { App as VueApp, createApp } from 'vue';
 import App from './App.vue';
@@ -108,4 +108,4 @@ function setOnWindow() {
 }
 
 // @ts-ignore
-window.DateTime = DateTime;
+window.GL = GeneralLedger;

From c95473c6b050475aced1c088f18f9bc8c848cbf8 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 12 May 2022 16:02:12 +0530
Subject: [PATCH 108/163] incr: speed things up by like 20x or somthn

---
 reports/GeneralLedger/GeneralLedger.ts | 58 ++++++++++----------------
 1 file changed, 22 insertions(+), 36 deletions(-)

diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 0ffaac7f..71187800 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -1,9 +1,7 @@
 import { Fyo, t } from 'fyo';
 import { Action } from 'fyo/model/types';
-import { isPesa } from 'fyo/utils';
 import { DateTime } from 'luxon';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
 import { Report } from 'reports/Report';
 import { ColumnField, ReportData } from 'reports/types';
 import { Field, FieldTypeEnum, RawValue } from 'schemas/types';
@@ -27,9 +25,9 @@ interface LedgerEntry {
   name: number;
   account: string;
   date: Date | null;
-  debit: Money | null;
-  credit: Money | null;
-  balance: Money | null;
+  debit: number | null;
+  credit: number | null;
+  balance: number | null;
   referenceType: string;
   referenceName: string;
   party: string;
@@ -58,22 +56,12 @@ export class GeneralLedger extends Report {
 
   async setReportData(filter?: string) {
     if (filter !== 'grouped' || this._rawData.length === 0) {
-      console.time('_setRawData');
       await this._setRawData();
-      console.timeEnd('_setRawData');
     }
 
-    console.time('_getGroupedMap');
     const map = this._getGroupedMap();
-    console.timeEnd('_getGroupedMap');
-
-    console.time('_getTotalsAndSetBalance');
     const { totalDebit, totalCredit } = this._getTotalsAndSetBalance(map);
-    console.timeEnd('_getTotalsAndSetBalance');
-
-    console.time('_consolidateEntries');
     const consolidated = this._consolidateEntries(map);
-    console.timeEnd('_consolidateEntries');
 
     /**
      * Push a blank row if last row isn't blank
@@ -91,7 +79,7 @@ export class GeneralLedger extends Report {
       date: null,
       debit: totalDebit,
       credit: totalCredit,
-      balance: totalDebit.sub(totalCredit),
+      balance: totalDebit - totalCredit,
       referenceType: '',
       referenceName: '',
       party: '',
@@ -99,9 +87,7 @@ export class GeneralLedger extends Report {
       reverts: '',
     });
 
-    console.time('_convertEntriesToReportData');
     this.reportData = this._convertEntriesToReportData(consolidated);
-    console.timeEnd('_convertEntriesToReportData');
   }
 
   _convertEntriesToReportData(entries: LedgerEntry[]): ReportData {
@@ -133,7 +119,7 @@ export class GeneralLedger extends Report {
         value = this.fyo.format(value, FieldTypeEnum.Date);
       }
 
-      if (isPesa(value)) {
+      if (typeof value === 'number') {
         align = 'right';
         value = this.fyo.format(value, FieldTypeEnum.Currency);
       }
@@ -186,20 +172,20 @@ export class GeneralLedger extends Report {
   }
 
   _getTotalsAndSetBalance(map: GroupedMap) {
-    let totalDebit = this.fyo.pesa(0);
-    let totalCredit = this.fyo.pesa(0);
+    let totalDebit = 0;
+    let totalCredit = 0;
 
     for (const key of map.keys()) {
-      let balance = this.fyo.pesa(0);
-      let debit = this.fyo.pesa(0);
-      let credit = this.fyo.pesa(0);
+      let balance = 0;
+      let debit = 0;
+      let credit = 0;
 
       for (const entry of map.get(key)!) {
-        debit = debit.add(entry.debit!);
-        credit = credit.add(entry.credit!);
+        debit += entry.debit!;
+        credit += entry.credit!;
 
-        const diff = entry.debit!.sub(entry.credit!);
-        balance = balance.add(diff);
+        const diff = entry.debit! - entry.credit!;
+        balance += diff;
         entry.balance = balance;
       }
 
@@ -213,7 +199,7 @@ export class GeneralLedger extends Report {
           date: null,
           debit,
           credit,
-          balance: debit.sub(credit),
+          balance: debit - credit,
           referenceType: '',
           referenceName: '',
           party: '',
@@ -225,8 +211,8 @@ export class GeneralLedger extends Report {
       /**
        * Total debit and credit for the final row
        */
-      totalDebit = totalDebit.add(debit);
-      totalCredit = totalCredit.add(credit);
+      totalDebit += debit;
+      totalCredit += credit;
     }
 
     return { totalDebit, totalCredit };
@@ -280,7 +266,7 @@ export class GeneralLedger extends Report {
       'reverts',
     ];
 
-    const filters = this._getFilters();
+    const filters = this._getQueryFilters();
     const entries = (await this.fyo.db.getAllRaw(
       ModelNameEnum.AccountingLedgerEntry,
       {
@@ -294,9 +280,9 @@ export class GeneralLedger extends Report {
         name: parseInt(entry.name),
         account: entry.account,
         date: new Date(entry.date),
-        debit: this.fyo.pesa(entry.debit),
-        credit: this.fyo.pesa(entry.credit),
-        balance: this.fyo.pesa(0),
+        debit: parseFloat(entry.debit),
+        credit: parseFloat(entry.credit),
+        balance: 0,
         referenceType: entry.referenceType,
         referenceName: entry.referenceName,
         party: entry.party,
@@ -306,7 +292,7 @@ export class GeneralLedger extends Report {
     });
   }
 
-  _getFilters(): QueryFilter {
+  _getQueryFilters(): QueryFilter {
     const filters: QueryFilter = {};
     const stringFilters = ['account', 'party', 'referenceName'];
 

From cc493e9fb19e469e515e93ae0324231328c99571 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 12 May 2022 20:29:56 +0530
Subject: [PATCH 109/163] incr: start rewriting reports - list type report eg
 GL almost done

---
 reports/GeneralLedger/GeneralLedger.ts | 120 +++---
 reports/index.ts                       |   2 +-
 reports/types.ts                       |   2 +
 src/components/Controls/Link.vue       |   2 +-
 src/pages/Report.vue                   | 537 +++++++------------------
 src/renderer.ts                        |   4 -
 src/router.ts                          |   4 +-
 src/utils/sidebarConfig.ts             |   8 +-
 utils/index.ts                         |  19 +
 9 files changed, 240 insertions(+), 458 deletions(-)

diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 71187800..437984cd 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -22,6 +22,7 @@ interface RawLedgerEntry {
 }
 
 interface LedgerEntry {
+  index?: string;
   name: number;
   account: string;
   date: Date | null;
@@ -49,8 +50,8 @@ export class GeneralLedger extends Report {
     super(fyo);
 
     if (!this.toField) {
-      this.toField = DateTime.now().toISODate();
-      this.fromField = DateTime.now().minus({ years: 1 }).toISODate();
+      this.toDate = DateTime.now().toISODate();
+      this.fromDate = DateTime.now().minus({ years: 1 }).toISODate();
     }
   }
 
@@ -60,13 +61,14 @@ export class GeneralLedger extends Report {
     }
 
     const map = this._getGroupedMap();
+    this._setIndexOnEntries(map);
     const { totalDebit, totalCredit } = this._getTotalsAndSetBalance(map);
     const consolidated = this._consolidateEntries(map);
 
     /**
      * Push a blank row if last row isn't blank
      */
-    if (consolidated.at(-1)!.name !== -3) {
+    if (consolidated.at(-1)?.name !== -3) {
       this._pushBlankEntry(consolidated);
     }
 
@@ -90,42 +92,52 @@ export class GeneralLedger extends Report {
     this.reportData = this._convertEntriesToReportData(consolidated);
   }
 
+  _setIndexOnEntries(map: GroupedMap) {
+    let i = 1;
+    for (const key of map.keys()) {
+      for (const entry of map.get(key)!) {
+        entry.index = String(i);
+        i = i + 1;
+      }
+    }
+  }
+
   _convertEntriesToReportData(entries: LedgerEntry[]): ReportData {
     const reportData = [];
-    const fieldnames = this.columns.map((f) => f.fieldname);
     for (const entry of entries) {
-      const row = this._getRowFromEntry(entry, fieldnames);
+      const row = this._getRowFromEntry(entry, this.columns);
       reportData.push(row);
     }
 
     return reportData;
   }
 
-  _getRowFromEntry(entry: LedgerEntry, fieldnames: string[]) {
+  _getRowFromEntry(entry: LedgerEntry, columns: ColumnField[]) {
     if (entry.name === -3) {
-      return Array(fieldnames.length).fill({ value: '' });
+      return Array(columns.length).fill({ value: '' });
     }
 
     const row = [];
-    for (const n of fieldnames) {
-      let value = entry[n as keyof LedgerEntry];
+    for (const col of columns) {
+      const align = col.align ?? 'left';
+      const width = col.width ?? 1;
+      const fieldname = col.fieldname;
+
+      let value = entry[fieldname as keyof LedgerEntry];
       if (value === null || value === undefined) {
-        row.push({ value: '' });
-        continue;
+        value = '';
       }
 
-      let align = 'left';
       if (value instanceof Date) {
         value = this.fyo.format(value, FieldTypeEnum.Date);
       }
 
-      if (typeof value === 'number') {
-        align = 'right';
+      if (typeof value === 'number' && fieldname !== 'index') {
         value = this.fyo.format(value, FieldTypeEnum.Currency);
       }
 
-      if (typeof value === 'boolean' && n === 'reverted' && value) {
-        value = t`Reverted`;
+      if (typeof value === 'boolean' && fieldname === 'reverted') {
+        value = value ? t`Reverted` : '';
       }
 
       row.push({
@@ -133,6 +145,7 @@ export class GeneralLedger extends Report {
         bold: entry.name === -2,
         value,
         align,
+        width,
       });
     }
 
@@ -266,7 +279,7 @@ export class GeneralLedger extends Report {
       'reverts',
     ];
 
-    const filters = this._getQueryFilters();
+    const filters = {} ?? this._getQueryFilters();
     const entries = (await this.fyo.db.getAllRaw(
       ModelNameEnum.AccountingLedgerEntry,
       {
@@ -338,16 +351,16 @@ export class GeneralLedger extends Report {
           { label: t`Journal Entries`, value: 'JournalEntry' },
         ],
 
-        label: t`Reference Type`,
+        label: t`Ref Type`,
         fieldname: 'referenceType',
-        placeholder: t`Reference Type`,
+        placeholder: t`Ref Type`,
         default: 'All',
       },
       {
         fieldtype: 'DynamicLink',
-        placeholder: t`Reference Name`,
+        label: t`Ref Name`,
         references: 'referenceType',
-        label: t`Reference Name`,
+        placeholder: t`Ref Name`,
         fieldname: 'referenceName',
       },
       {
@@ -377,19 +390,7 @@ export class GeneralLedger extends Report {
         fieldname: 'toDate',
       },
       {
-        fieldtype: 'Check',
-        default: false,
-        label: t`Cancelled`,
-        fieldname: 'reverted',
-      },
-      {
-        fieldtype: 'Check',
-        default: false,
-        label: t`Ascending`,
-        fieldname: 'ascending',
-      },
-      {
-        fieldtype: 'Check',
+        fieldtype: 'Select',
         default: 'none',
         label: t`Group By`,
         fieldname: 'groupBy',
@@ -400,11 +401,30 @@ export class GeneralLedger extends Report {
           { label: t`Reference`, value: 'referenceName' },
         ],
       },
+      {
+        fieldtype: 'Check',
+        default: false,
+        label: t`Include Cancelled`,
+        fieldname: 'reverted',
+      },
+      {
+        fieldtype: 'Check',
+        default: false,
+        label: t`Ascending Order`,
+        fieldname: 'ascending',
+      },
     ] as Field[];
   }
 
   getColumns(): ColumnField[] {
     let columns = [
+      {
+        label: t`#`,
+        fieldtype: 'Int',
+        fieldname: 'index',
+        align: 'right',
+        width: 0.5,
+      },
       {
         label: t`Account`,
         fieldtype: 'Link',
@@ -415,41 +435,43 @@ export class GeneralLedger extends Report {
         label: t`Date`,
         fieldtype: 'Date',
         fieldname: 'date',
-        width: 0.75,
       },
       {
         label: t`Debit`,
         fieldtype: 'Currency',
         fieldname: 'debit',
+        align: 'right',
         width: 1.25,
       },
       {
         label: t`Credit`,
         fieldtype: 'Currency',
         fieldname: 'credit',
+        align: 'right',
         width: 1.25,
       },
       {
         label: t`Balance`,
         fieldtype: 'Currency',
         fieldname: 'balance',
+        align: 'right',
         width: 1.25,
       },
-      {
-        label: t`Reference Type`,
-        fieldtype: 'Data',
-        fieldname: 'referenceType',
-      },
-      {
-        label: t`Reference Name`,
-        fieldtype: 'Data',
-        fieldname: 'referenceName',
-      },
       {
         label: t`Party`,
         fieldtype: 'Link',
         fieldname: 'party',
       },
+      {
+        label: t`Ref Name`,
+        fieldtype: 'Data',
+        fieldname: 'referenceName',
+      },
+      {
+        label: t`Ref Type`,
+        fieldtype: 'Data',
+        fieldname: 'referenceType',
+      },
       {
         label: t`Reverted`,
         fieldtype: 'Check',
@@ -467,4 +489,12 @@ export class GeneralLedger extends Report {
   getActions(): Action[] {
     return [];
   }
+
+  /**
+   * TODO: Order by date and then the number
+   * TODO: Something is wrong with dummy data, there are entries from 2022 Dec
+   * TODO: Add pagination
+   * TODO: Always visible scrollbar
+   * TODO: Extract out list view report to a different component
+   */
 }
diff --git a/reports/index.ts b/reports/index.ts
index d642dcc8..9a7b3036 100644
--- a/reports/index.ts
+++ b/reports/index.ts
@@ -1,2 +1,2 @@
 import { GeneralLedger } from './GeneralLedger/GeneralLedger';
-export { GeneralLedger };
+export const reports = { GeneralLedger };
diff --git a/reports/types.ts b/reports/types.ts
index 8c85141e..0a18d650 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -7,12 +7,14 @@ export interface ReportCell {
   bold?: boolean;
   italics?: boolean;
   align?: 'left' | 'right' | 'center';
+  width?: number;
   value: string;
 }
 
 export type ReportRow = ReportCell[];
 export type ReportData = ReportRow[];
 export interface ColumnField extends BaseField {
+  align?: 'left' | 'right' | 'center';
   width?: number;
 }
 
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 6c3bc56d..9c064ec6 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -134,7 +134,7 @@ export default {
     },
     async getFilters() {
       const { schemaName, fieldname } = this.df;
-      const getFilters = fyo.models[schemaName].filters[fieldname];
+      const getFilters = fyo.models[schemaName]?.filters?.[fieldname];
 
       if (getFilters === undefined) {
         return {};
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index be290698..8c620771 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -1,6 +1,7 @@
 <template>
-  <div class="flex flex-col max-w-full">
-    <PageHeader :title="report.title">
+  <div class="flex flex-col w-full h-full">
+    <PageHeader :title="title">
+      <!-- 
       <DropdownWithActions
         v-for="group of actionGroups"
         :key="group.label"
@@ -11,428 +12,164 @@
         {{ group.label }}
       </DropdownWithActions>
       <DropdownWithActions :actions="actions" />
+
+     -->
     </PageHeader>
-    <div class="flex px-8 mt-2 text-base" v-if="report.filterFields">
-      <div
-        class="w-40 ml-2 first:ml-0"
-        :class="
-          df.fieldtype === 'Check' &&
-          'flex justify-between items-center bg-gray-100 px-2 rounded'
-        "
-        v-for="df in report.filterFields"
-        :key="df.fieldname"
-      >
-        <div v-if="df.fieldtype === 'Check'" class="text-sm mr-2">
-          {{ df.label }}
-        </div>
-        <FormControl
-          size="small"
-          input-class="bg-gray-100"
-          :df="df"
-          :value="filters[df.fieldname]"
-          @change="(value) => onFilterChange(df, value)"
-        />
-      </div>
+
+    <!-- Filters -->
+    <div v-if="report" class="mx-4 grid grid-cols-5 gap-2">
+      <FormControl
+        v-for="field in report.filters"
+        :show-label="field.fieldtype === 'Check'"
+        :key="field.fieldname + '-filter'"
+        class="bg-gray-100 rounded"
+        :class="field.fieldtype === 'Check' ? 'flex pl-3' : ''"
+        input-class="bg-transparent px-3 py-2 text-base"
+        :df="field"
+        :value="report.get(field.fieldname)"
+        :read-only="loading"
+        @change="async (value) => await report.set(field.fieldname, value)"
+      />
     </div>
-    <div class="px-8 mt-4">
-      <div>
-        <div ref="header" class="overflow-hidden">
-          <Row gap="2rem" :grid-template-columns="gridTemplateColumns">
-            <div
-              class="py-4 text-base truncate"
-              :class="[
-                getColumnAlignClass(column),
-                loading ? 'text-gray-100' : 'text-gray-600',
-              ]"
-              v-for="column in columns"
-              :key="column.label"
-            >
-              <span :class="{ 'bg-gray-100': loading }">
-                {{ column.label }}
-              </span>
-            </div>
-          </Row>
-        </div>
-        <WithScroll
-          @scroll="onBodyScroll"
-          class="flex-1 overflow-auto"
-          :style="`height: ${height}`"
-        >
-          <Row
-            v-show="row.isShown"
-            v-for="(row, i) in rows.slice(sliceIndex.from, sliceIndex.to)"
-            :key="i"
-            gap="2rem"
-            :grid-template-columns="gridTemplateColumns"
-          >
-            <div
-              class="py-4 text-base overflow-scroll no-scrollbar"
-              :class="getCellClasses(row, column)"
-              v-for="column in columns"
-              :key="column.label"
-              @click="toggleChildren(row, i)"
-            >
-              <div class="inline-flex">
-                <feather-icon
-                  v-if="row.isBranch && !row.isLeaf && column === columns[0]"
-                  class="flex-shrink-0 w-4 h-4 mr-2"
-                  :name="row.expanded ? 'chevron-down' : 'chevron-right'"
-                />
-                <span class="truncate" :class="{ 'bg-gray-100': loading }">
-                  <component
-                    :is="cellComponent(row[column.fieldname], column)"
-                  />
-                </span>
-              </div>
-            </div>
-          </Row>
-        </WithScroll>
+
+    <!-- Report Outer Container -->
+    <div
+      v-if="report"
+      class="mx-4 mt-4 overflow-x-scroll inline-block overflow-y-hidden"
+    >
+      <div class="inline-block">
+        <!-- Title Row -->
         <div
-          v-if="usePagination"
-          class="flex w-full justify-center mt-2.5 text-base"
+          class="flex items-center border-b"
+          :style="{ height: `${hconst}px` }"
+          ref="titleRow"
         >
-          <div class="flex justify-center items-center gap-1 text-gray-800">
-            <feather-icon
-              name="chevron-left"
-              class="text-gray-600 w-4 h-4 cursor-pointer"
-              v-show="pageNo > 1"
-              @click="pageNo -= 1"
-            />
-            <div class="w-4 h-4" v-show="pageNo <= 1" />
-            <div class="flex gap-1 bg-gray-100 rounded pr-2">
-              <input
-                type="number"
-                class="
-                  w-6
-                  text-right
-                  outline-none
-                  bg-transparent
-                  focus:text-gray-900
-                "
-                v-model="pageNo"
-                min="1"
-                max="maxPages"
-              />
-              <p class="text-gray-600">/</p>
-              <p class="w-5">{{ maxPages }}</p>
+          <p
+            v-for="(col, c) in report.columns"
+            :key="c + '-col'"
+            :style="getCellStyle(col, c)"
+            class="
+              text-gray-600 text-base
+              px-3
+              flex-shrink-0
+              overflow-x-scroll
+              whitespace-nowrap
+            "
+          >
+            {{ col.label }}
+          </p>
+        </div>
+
+        <!-- Report Rows Continer -->
+        <div
+          class="overflow-y-scroll"
+          :style="{ height: `${hconst * maxRows + 5}px` }"
+        >
+          <!-- Report Rows -->
+          <div
+            v-for="(row, r) in report.reportData"
+            :key="r + '-row'"
+            class="border-b flex items-center"
+            :style="{ height: `${hconst}px` }"
+          >
+            <!-- Report Cell -->
+            <div
+              v-for="(cell, c) in row"
+              :key="`${c}-${r}-cell`"
+              :style="getCellStyle(cell, c)"
+              class="
+                text-gray-900 text-base
+                px-3
+                flex-shrink-0
+                overflow-x-scroll
+                whitespace-nowrap
+              "
+            >
+              {{ cell.value }}
             </div>
-            <div class="w-4 h-4" v-show="pageNo >= maxPages" />
-            <feather-icon
-              name="chevron-right"
-              class="text-gray-600 w-4 h-4 cursor-pointer"
-              v-show="pageNo < maxPages"
-              @click="pageNo += 1"
-            />
           </div>
         </div>
       </div>
     </div>
+    <div class="h-10 mx-4 mb-4 p-2 bg-red-100 text-base border-t">
+      add pagination here
+    </div>
   </div>
 </template>
 <script>
-import { getReportData } from 'reports/index';
-import reportViewConfig from 'reports/view';
-import Button from 'src/components/Button';
+import { reports } from 'reports';
 import FormControl from 'src/components/Controls/FormControl.vue';
-import DropdownWithActions from 'src/components/DropdownWithActions.vue';
-import FeatherIcon from 'src/components/FeatherIcon.vue';
-import PageHeader from 'src/components/PageHeader';
-import Row from 'src/components/Row';
-import WithScroll from 'src/components/WithScroll';
+import PageHeader from 'src/components/PageHeader.vue';
 import { fyo } from 'src/initFyo';
-import { h, markRaw, nextTick } from 'vue';
+import { defineComponent } from 'vue';
 
-export default {
-  name: 'Report',
-  props: ['reportName', 'defaultFilters'],
-  components: {
-    PageHeader,
-    Button,
-    Row,
-    FormControl,
-    WithScroll,
-    DropdownWithActions,
-    FeatherIcon,
-  },
-  provide() {
-    return {
-      doc: this.filters,
-    };
+export default defineComponent({
+  props: {
+    reportName: String,
   },
   data() {
-    let filters = {};
-    for (let df of reportViewConfig[this.reportName].filterFields) {
-      filters[df.fieldname] = null;
-    }
-
     return {
-      loading: true,
-      filters,
-      pageNo: 1,
-      pageLen: 25,
-      reportData: {
-        rows: [],
-        columns: [],
-      },
+      wconst: 8,
+      hconst: 48,
+      loading: false,
+      report: null,
     };
   },
-  async activated() {
-    this.reportData.columns = this.report.getColumns({ filters: this.filters });
-    await this.setDefaultFilters();
-    await this.fetchReportData();
+  components: { PageHeader, FormControl },
+  async mounted() {
+    await this.setReportData();
   },
-  methods: {
-    onBodyScroll({ scrollLeft }) {
-      nextTick(() => {
-        this.$refs.header.scrollLeft = scrollLeft;
-      });
-    },
-    async fetchReportData() {
-      let data = await getReportData(this.report.method, this.filters);
-
-      let rows;
-      if (data.rows) {
-        rows = data.rows;
-      } else {
-        rows = data;
-      }
-
-      this.reportData.columns = markRaw(
-        this.report.getColumns({
-          filters: this.filters,
-          data,
-        })
-      );
-
-      if (!rows) {
-        rows = [];
-      }
-
-      this.reportData.rows = markRaw(this.addTreeMeta(rows));
-      this.loading = false;
-    },
-
-    addTreeMeta(rows) {
-      return rows.map((row) => {
-        if ('indent' in row) {
-          row.isBranch = true;
-          row.expanded = true;
-          row.isLeaf = !row.isGroup;
-        }
-        row.isShown = true;
-        return row;
-      });
-    },
-
-    toggleChildren(row, rowIndex) {
-      if (!row.isBranch) return;
-
-      let flag;
-      if (row.expanded) {
-        row.expanded = false;
-        flag = false;
-      } else {
-        row.expanded = true;
-        flag = true;
-      }
-
-      let _rows = this.rows.slice(rowIndex + 1);
-      for (let _row of _rows) {
-        if (row.isBranch && _row.indent > row.indent) {
-          _row.expanded = flag;
-          _row.isShown = flag;
-          continue;
-        }
-        break;
-      }
-    },
-
-    onFilterChange(df, value) {
-      this.filters[df.fieldname] = value;
-      this.fetchReportData();
-    },
-
-    async resetFilters() {
-      await this.setDefaultFilters();
-      await this.fetchReportData();
-    },
-
-    async setDefaultFilters() {
-      for (let df of this.report.filterFields) {
-        let defaultValue = null;
-        if (df.default) {
-          if (typeof df.default === 'function') {
-            defaultValue = await df.default();
-          } else {
-            defaultValue = df.default;
-          }
-        }
-        this.filters[df.fieldname] = defaultValue;
-      }
-
-      if (this.defaultFilters) {
-        Object.assign(this.filters, this.defaultFilters);
-      }
-    },
-
-    cellComponent(cellValue, column) {
-      if (typeof cellValue === 'object') {
-        // cellValue has a component definition
-        return cellValue;
-      }
-      if (column.component) {
-        // column has a component definition
-        return column.component(cellValue, column);
-      }
-
-      // default cell component
-      let formattedValue =
-        cellValue != null && cellValue !== ''
-          ? fyo.format(cellValue, column)
-          : '';
-      return {
-        render() {
-          return h('span', formattedValue);
-        },
-      };
-    },
-
-    getColumnAlignClass(column) {
-      return {
-        'text-right': ['Int', 'Float', 'Currency'].includes(column.fieldtype),
-      };
-    },
-
-    getCellClasses(row, column) {
-      let padding = ['pl-0', 'pl-6', 'pl-12', 'pl-18', 'pl-20'];
-      let treeCellClasses;
-      if (row.isBranch && column === this.columns[0]) {
-        treeCellClasses = [
-          padding[row.indent],
-          'hover:bg-gray-100 cursor-pointer',
-        ];
-      }
-      return [
-        this.getColumnAlignClass(column),
-        treeCellClasses,
-        this.loading ? 'text-gray-100' : 'text-gray-900',
-      ];
-    },
-    getReportData() {
-      return { rows: this.rows, columns: this.columns, filters: this.filters };
-    },
-    getCurriedAction(action) {
-      return (...args) => action(this.getReportData, ...args);
-    },
+  async activated() {
+    await this.setReportData();
+    if (fyo.store.isDevelopment) {
+      window.rep = this;
+    }
   },
   computed: {
-    usePagination() {
-      return (
-        this.reportName === 'general-ledger' && this.rows.length > this.pageLen
-      );
+    maxRows() {
+      return 18 - Math.ceil(this.report.filters.length / 5);
     },
-    height() {
-      if (this.usePagination && this.platform === 'Windows') {
-        return 'calc(100vh - 14.5rem)';
-      } else if (this.usePagination) {
-        return 'calc(100vh - 13rem)';
-      }
-
-      return 'calc(100vh - 12rem)';
-    },
-    sliceIndex() {
-      if (!this.usePagination) {
-        return {
-          from: 0,
-          to: this.rows.length,
-        };
-      }
-      return {
-        from: (this.pageNo - 1) * this.pageLen,
-        to: this.pageNo * this.pageLen,
-      };
-    },
-    maxPages() {
-      return Math.ceil(this.rows.length / this.pageLen);
-    },
-    actions() {
-      return [
-        ...(this.report.actions
-          ?.filter((action) => !action.group)
-          .map((action) =>
-            Object.assign({}, action, {
-              action: this.getCurriedAction(action.action),
-            })
-          ) ?? []),
-        {
-          label: this.t`Reset Filters`,
-          action: this.resetFilters,
-        },
-      ];
-    },
-    actionGroups() {
-      const groups =
-        this.report.actions
-          ?.filter((action) => action.group)
-          .reduce((acc, action) => {
-            acc[action.group] ??= { type: action.type, actions: [] };
-            const actionWithoutGroup = Object.assign({}, action);
-            actionWithoutGroup.action = this.getCurriedAction(action.action);
-            delete actionWithoutGroup.group;
-            acc[action.group].actions.push(actionWithoutGroup);
-            return acc;
-          }, {}) ?? {};
-
-      return Object.keys(groups).map((label) => ({ label, ...groups[label] }));
-    },
-    columns() {
-      return this.loading
-        ? this.blankStateData.columns
-        : this.reportData.columns;
-    },
-    rows() {
-      return this.loading ? this.blankStateData.rows : this.reportData.rows;
-    },
-    blankStateData() {
-      let columns = Array.from(new Array(6)).map((v, i) => {
-        return {
-          fieldtype: 'Data',
-          fieldname: `Test ${i + 1}`,
-          label: `Test ${i + 1}`,
-        };
-      });
-      let rows = Array.from(new Array(14)).map(() => {
-        return columns.reduce((obj, col) => {
-          obj[col.fieldname] = 'Test Data ' + col.fieldname;
-          obj.isShown = true;
-          return obj;
-        }, {});
-      });
-      return {
-        columns,
-        rows,
-      };
-    },
-    report() {
-      return reportViewConfig[this.reportName];
-    },
-    columnWidth() {
-      return 'minmax(7rem, 1fr)';
-    },
-    gridTemplateColumns() {
-      return this.columns
-        .map((col) => {
-          let multiplier = col.width;
-          if (!multiplier) {
-            multiplier = 1;
-          }
-          let minWidth = `${7 * multiplier}rem`;
-          let maxWidth = `${9 * multiplier}rem`;
-
-          return `minmax(${minWidth}, ${maxWidth})`;
-        })
-        .join(' ');
+    title() {
+      return reports[this.reportName]?.title ?? t`Report`;
     },
   },
-};
+  methods: {
+    getCellStyle(cell, i) {
+      const styles = {};
+      const width = cell.width ?? 1;
+      const align = cell.align ?? 'left';
+
+      styles['width'] = `${width * this.wconst}rem`;
+      styles['text-align'] = align;
+
+      if (cell.bold) {
+        styles['font-weight'] = 'bold';
+      }
+
+      if (cell.italics) {
+        styles['font-style'] = 'italic';
+      }
+
+      if (i === 0) {
+        styles['padding-left'] = '0px';
+      }
+
+      if (i === this.report.columns.length - 1) {
+        styles['padding-right'] = '0px';
+      }
+
+      return styles;
+    },
+    async setReportData() {
+      const Report = reports[this.reportName];
+      if (this.report === null) {
+        this.report = new Report(fyo);
+      }
+
+      if (!this.report.reportData.length) {
+        await this.report.setReportData();
+      }
+    },
+  },
+});
 </script>
diff --git a/src/renderer.ts b/src/renderer.ts
index a7cbcb6c..51cb3e8c 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,6 +1,5 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
-import { GeneralLedger } from 'reports';
 import { IPC_ACTIONS } from 'utils/messages';
 import { App as VueApp, createApp } from 'vue';
 import App from './App.vue';
@@ -106,6 +105,3 @@ function setOnWindow() {
     window.fyo = fyo;
   }
 }
-
-// @ts-ignore
-window.GL = GeneralLedger;
diff --git a/src/router.ts b/src/router.ts
index c15a3440..9fc48c6a 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -8,7 +8,7 @@ import JournalEntryForm from 'src/pages/JournalEntryForm.vue';
 import ListView from 'src/pages/ListView/ListView.vue';
 import PrintView from 'src/pages/PrintView/PrintView.vue';
 import QuickEditForm from 'src/pages/QuickEditForm.vue';
-// import Report from 'src/pages/Report.vue';
+import Report from 'src/pages/Report.vue';
 import Settings from 'src/pages/Settings/Settings.vue';
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
 import { fyo } from './initFyo';
@@ -87,14 +87,12 @@ const routes: RouteRecordRaw[] = [
     component: PrintView,
     props: true,
   },
-  /*
   {
     path: '/report/:reportName',
     name: 'Report',
     component: Report,
     props: true,
   },
-  */
   {
     path: '/chart-of-accounts',
     name: 'Chart Of Accounts',
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index cd8fa1af..6a7b6634 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -132,18 +132,18 @@ function getCompleteSidebar(): SidebarConfig {
         },
       ],
     },
-    /*
     {
       label: t`Reports`,
       name: t`reports`,
       icon: 'reports',
-      route: '/report/general-ledger',
+      route: '/report/GeneralLedger',
       items: [
         {
           label: t`General Ledger`,
           name: 'general-ledger',
-          route: '/report/general-ledger',
+          route: '/report/GeneralLedger',
         },
+        /*
         {
           label: t`Profit And Loss`,
           name: 'profit-and-loss',
@@ -171,9 +171,9 @@ function getCompleteSidebar(): SidebarConfig {
           route: '/report/gstr-2',
           hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
         },
+        */
       ],
     },
-    */
     {
       label: t`Setup`,
       name: t`setup`,
diff --git a/utils/index.ts b/utils/index.ts
index 9ee0bbfc..d6cd52a4 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -104,3 +104,22 @@ export function invertMap(map: Record<string, string>): Record<string, string> {
 
   return inverted;
 }
+
+export function time<K, T>(func: (...args: K[]) => T, ...args: K[]): T {
+  const name = func.name;
+  console.time(name);
+  const stuff = func(...args);
+  console.timeEnd(name);
+  return stuff;
+}
+
+export async function timeAsync<K, T>(
+  func: (...args: K[]) => Promise<T>,
+  ...args: K[]
+): Promise<T> {
+  const name = func.name;
+  console.time(name);
+  const stuff = await func(...args);
+  console.timeEnd(name);
+  return stuff;
+}

From 6a2475d9b8244c29b857aaa49bff36f77cff5891 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 13 May 2022 12:19:08 +0530
Subject: [PATCH 110/163] incr: shift pagination outside - create listreport
 component - add pagination to listreport

---
 src/components/Paginator.vue         | 135 +++++++++++++++++++++++++++
 src/components/Report/ListReport.vue | 119 +++++++++++++++++++++++
 src/pages/ListView/List.vue          | 118 +++++------------------
 src/pages/Report.vue                 |  98 +------------------
 4 files changed, 281 insertions(+), 189 deletions(-)
 create mode 100644 src/components/Paginator.vue
 create mode 100644 src/components/Report/ListReport.vue

diff --git a/src/components/Paginator.vue b/src/components/Paginator.vue
new file mode 100644
index 00000000..c94b1093
--- /dev/null
+++ b/src/components/Paginator.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="my-3 grid grid-cols-3 text-gray-800 text-sm select-none">
+    <!-- Length Display -->
+    <div class="justify-self-start">
+      {{
+        `${(pageNo - 1) * count + 1} - ${Math.min(pageNo * count, itemCount)}`
+      }}
+    </div>
+
+    <!-- Pagination Selector -->
+    <div class="flex gap-1 items-center justify-self-center">
+      <feather-icon
+        name="chevron-left"
+        class="w-4 h-4"
+        :class="
+          pageNo > 1 ? 'text-gray-600 cursor-pointer' : 'text-transparent'
+        "
+        @click="() => setPageNo(Math.max(1, pageNo - 1))"
+      />
+      <div class="flex gap-1 bg-gray-100 rounded">
+        <input
+          type="number"
+          class="w-6 text-right outline-none bg-transparent focus:text-gray-900"
+          :value="pageNo"
+          @change="(e) => setPageNo(e.target.value)"
+          @input="(e) => setPageNo(e.target.value)"
+          min="1"
+          :max="maxPages"
+        />
+        <p class="text-gray-600">/</p>
+        <p class="w-5">
+          {{ maxPages }}
+        </p>
+      </div>
+      <feather-icon
+        name="chevron-right"
+        class="w-4 h-4"
+        :class="
+          pageNo < maxPages
+            ? 'text-gray-600 cursor-pointer'
+            : 'text-transparent'
+        "
+        @click="() => setPageNo(Math.min(maxPages, pageNo + 1))"
+      />
+    </div>
+
+    <!-- Count Selector -->
+    <div
+      class="border rounded flex justify-self-end"
+      v-if="filteredCounts.length"
+    >
+      <template v-for="c in filteredCounts" :key="c + '-count'">
+        <button
+          @click="setCount(c)"
+          class="w-9"
+          :class="
+            count === c || (count === itemCount && c === -1)
+              ? 'bg-gray-200'
+              : ''
+          "
+        >
+          {{ c === -1 ? t`All` : c }}
+        </button>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  emits: ['index-change'],
+  props: {
+    itemCount: { type: Number, default: 0 },
+    allowedCounts: { type: Array, default: () => [20, 100, 500, -1] },
+  },
+  data() {
+    return {
+      pageNo: 1,
+      count: 0,
+    };
+  },
+  mounted() {
+    this.count = this.allowedCounts[0];
+    this.emitIndices();
+  },
+  computed: {
+    maxPages() {
+      return Math.ceil(this.itemCount / this.count);
+    },
+    filteredCounts() {
+      return this.allowedCounts.filter(this.filterCount);
+    },
+  },
+  methods: {
+    filterCount(count) {
+      if (count !== -1 && this.itemCount < count) {
+        return false;
+      }
+
+      if (count === -1 && this.itemCount < this.allowedCounts[0]) {
+        return false;
+      }
+
+      return true;
+    },
+    setPageNo(value) {
+      value = parseInt(value);
+      if (isNaN(value)) {
+        return;
+      }
+
+      this.pageNo = Math.min(Math.max(1, value), this.maxPages);
+      this.emitIndices();
+    },
+    setCount(count) {
+      this.pageNo = 1;
+      if (count === -1) {
+        count = this.itemCount;
+      }
+      this.count = count;
+      this.emitIndices();
+    },
+    emitIndices() {
+      const indices = this.getSliceIndices();
+      this.$emit('index-change', indices);
+    },
+    getSliceIndices() {
+      const start = (this.pageNo - 1) * this.count;
+      const end = this.pageNo * this.count;
+      return { start, end };
+    },
+  },
+});
+</script>
diff --git a/src/components/Report/ListReport.vue b/src/components/Report/ListReport.vue
new file mode 100644
index 00000000..bc9dcf8c
--- /dev/null
+++ b/src/components/Report/ListReport.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <!-- Report Outer Container -->
+    <div class="overflow-x-scroll">
+      <div class="inline-block">
+        <!-- Title Row -->
+        <div
+          class="flex items-center border-b"
+          :style="{ height: `${hconst}px` }"
+          ref="titleRow"
+        >
+          <p
+            v-for="(col, c) in report.columns"
+            :key="c + '-col'"
+            :style="getCellStyle(col, c)"
+            class="
+              text-gray-600 text-base
+              px-3
+              flex-shrink-0
+              overflow-x-scroll
+              whitespace-nowrap
+            "
+          >
+            {{ col.label }}
+          </p>
+        </div>
+
+        <!-- Report Rows Container -->
+        <div class="overflow-y-scroll">
+          <!-- :style="{ height: `${hconst * maxRows + 5}px` }" -->
+          <!-- Report Rows -->
+          <div
+            v-for="(row, r) in report.reportData.slice(pageStart, pageEnd)"
+            :key="r + '-row'"
+            class="border-b flex items-center"
+            :style="{ height: `${hconst}px` }"
+          >
+            <!-- Report Cell -->
+            <div
+              v-for="(cell, c) in row"
+              :key="`${c}-${r}-cell`"
+              :style="getCellStyle(cell, c)"
+              class="
+                text-gray-900 text-base
+                px-3
+                flex-shrink-0
+                overflow-x-scroll
+                whitespace-nowrap
+              "
+            >
+              {{ cell.value }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- Pagination Footer -->
+    <div class="mt-auto">
+      <hr />
+      <Paginator
+        :item-count="report?.reportData?.length ?? 0"
+        @index-change="setPageIndices"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import { Report } from 'reports/Report';
+import { defineComponent } from 'vue';
+import Paginator from '../Paginator.vue';
+
+export default defineComponent({
+  props: {
+    report: Report,
+  },
+  data() {
+    return {
+      wconst: 8,
+      hconst: 48,
+      loading: false,
+      pageStart: 0,
+      pageEnd: 0,
+    };
+  },
+  computed: {
+    maxRows() {
+      return 18 - Math.ceil(this.report.filters.length / 5);
+    },
+  },
+  methods: {
+    setPageIndices({ start, end }) {
+      this.pageStart = start;
+      this.pageEnd = end;
+    },
+    getCellStyle(cell, i) {
+      const styles = {};
+      const width = cell.width ?? 1;
+      const align = cell.align ?? 'left';
+      styles['width'] = `${width * this.wconst}rem`;
+      styles['text-align'] = align;
+      if (cell.bold) {
+        styles['font-weight'] = 'bold';
+      }
+      if (cell.italics) {
+        styles['font-style'] = 'italic';
+      }
+      if (i === 0) {
+        styles['padding-left'] = '0px';
+      }
+      if (i === this.report.columns.length - 1) {
+        styles['padding-right'] = '0px';
+      }
+      return styles;
+    },
+  },
+  components: { Paginator },
+});
+</script>
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index f48f2ae5..dd03cf83 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -25,15 +25,12 @@
     <hr />
 
     <!-- Data Rows -->
-    <div class="overflow-y-auto" v-if="data.length !== 0">
-      <div
-        v-for="(doc, i) in data.slice((pageNo - 1) * count, pageNo * count)"
-        :key="doc.name"
-      >
+    <div class="overflow-y-auto" v-if="dataSlice.length !== 0">
+      <div v-for="(doc, i) in dataSlice" :key="doc.name">
         <!-- Row Content -->
         <div class="flex hover:bg-gray-100 items-center">
           <p class="w-8 text-right mr-4 text-gray-900">
-            {{ i + 1 + (pageNo - 1) * count }}
+            {{ i + pageStart + 1 }}
           </p>
           <Row
             gap="1rem"
@@ -52,81 +49,14 @@
             ></ListCell>
           </Row>
         </div>
-        <hr v-if="i !== count - 1" />
+        <hr v-if="i !== dataSlice.length - 1" />
       </div>
     </div>
 
     <!-- Pagination Footer -->
-    <hr v-if="data.length > 20" />
-    <div
-      v-if="data.length > 20"
-      class="my-3 grid grid-cols-3 text-gray-800 text-sm select-none"
-    >
-      <!-- Length Display -->
-      <div class="justify-self-start">
-        {{
-          `${(pageNo - 1) * count + 1} - ${Math.min(
-            pageNo * count,
-            data.length
-          )}`
-        }}
-      </div>
-
-      <!-- Pagination Selector -->
-      <div class="flex gap-1 items-center justify-self-center">
-        <feather-icon
-          name="chevron-left"
-          class="w-4 h-4"
-          :class="
-            pageNo > 1 ? 'text-gray-600 cursor-pointer' : 'text-transparent'
-          "
-          @click="pageNo = Math.max(1, pageNo - 1)"
-        />
-        <div class="flex gap-1 bg-gray-100 rounded">
-          <input
-            type="number"
-            class="
-              w-6
-              text-right
-              outline-none
-              bg-transparent
-              focus:text-gray-900
-            "
-            :value="pageNo"
-            @change="setPageNo"
-            @input="setPageNo"
-            min="1"
-            :max="maxPages"
-          />
-          <p class="text-gray-600">/</p>
-          <p class="w-5">
-            {{ maxPages }}
-          </p>
-        </div>
-        <feather-icon
-          name="chevron-right"
-          class="w-4 h-4"
-          :class="
-            pageNo < maxPages
-              ? 'text-gray-600 cursor-pointer'
-              : 'text-transparent'
-          "
-          @click="pageNo = Math.min(maxPages, pageNo + 1)"
-        />
-      </div>
-
-      <!-- Count Selector -->
-      <div class="border rounded flex justify-self-end">
-        <button
-          v-for="c in allowedCounts"
-          :key="c + '-count'"
-          @click="setCount(c)"
-          class="w-9"
-          :class="count === c ? 'bg-gray-200' : ''"
-        >
-          {{ c }}
-        </button>
-      </div>
+    <div class="mt-auto">
+      <hr />
+      <Paginator :item-count="data.length" @index-change="setPageIndices" />
     </div>
 
     <!-- Empty State -->
@@ -144,12 +74,14 @@
 </template>
 <script>
 import Button from 'src/components/Button';
+import Paginator from 'src/components/Paginator.vue';
 import Row from 'src/components/Row';
 import { fyo } from 'src/initFyo';
 import { openQuickEdit, routeTo } from 'src/utils/ui';
+import { defineComponent } from 'vue';
 import ListCell from './ListCell';
 
-export default {
+export default defineComponent({
   name: 'List',
   props: { listConfig: Object, filters: Object, schemaName: String },
   emits: ['makeNewDoc'],
@@ -157,6 +89,7 @@ export default {
     Row,
     ListCell,
     Button,
+    Paginator,
   },
   watch: {
     schemaName(oldValue, newValue) {
@@ -169,15 +102,17 @@ export default {
   },
   data() {
     return {
-      pageNo: 1,
-      count: 20,
-      allowedCounts: [20, 100, 500],
       data: [],
+      pageStart: 0,
+      pageEnd: 0,
     };
   },
   computed: {
-    maxPages() {
-      return Math.ceil(this.data.length / this.count);
+    dataSlice() {
+      return this.data.slice(this.pageStart, this.pageEnd);
+    },
+    count() {
+      return this.pageEnd - this.pageStart + 1;
     },
     columns() {
       let columns = this.listConfig?.columns ?? [];
@@ -203,19 +138,12 @@ export default {
     this.setUpdateListeners();
   },
   methods: {
-    setPageNo({ target: { value } }) {
-      value = parseInt(value);
-      if (isNaN(value)) {
-        return;
-      }
-      this.pageNo = Math.min(Math.max(1, value), this.maxPages);
-    },
-    setCount(count) {
-      this.pageNo = 1;
-      this.count = count;
+    setPageIndices({ start, end }) {
+      this.pageStart = start;
+      this.pageEnd = end;
     },
     setUpdateListeners() {
-      const listener = (name) => {
+      const listener = () => {
         this.updateData();
       };
 
@@ -251,5 +179,5 @@ export default {
       });
     },
   },
-};
+});
 </script>
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 8c620771..d6e05c27 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -32,74 +32,15 @@
       />
     </div>
 
-    <!-- Report Outer Container -->
-    <div
-      v-if="report"
-      class="mx-4 mt-4 overflow-x-scroll inline-block overflow-y-hidden"
-    >
-      <div class="inline-block">
-        <!-- Title Row -->
-        <div
-          class="flex items-center border-b"
-          :style="{ height: `${hconst}px` }"
-          ref="titleRow"
-        >
-          <p
-            v-for="(col, c) in report.columns"
-            :key="c + '-col'"
-            :style="getCellStyle(col, c)"
-            class="
-              text-gray-600 text-base
-              px-3
-              flex-shrink-0
-              overflow-x-scroll
-              whitespace-nowrap
-            "
-          >
-            {{ col.label }}
-          </p>
-        </div>
-
-        <!-- Report Rows Continer -->
-        <div
-          class="overflow-y-scroll"
-          :style="{ height: `${hconst * maxRows + 5}px` }"
-        >
-          <!-- Report Rows -->
-          <div
-            v-for="(row, r) in report.reportData"
-            :key="r + '-row'"
-            class="border-b flex items-center"
-            :style="{ height: `${hconst}px` }"
-          >
-            <!-- Report Cell -->
-            <div
-              v-for="(cell, c) in row"
-              :key="`${c}-${r}-cell`"
-              :style="getCellStyle(cell, c)"
-              class="
-                text-gray-900 text-base
-                px-3
-                flex-shrink-0
-                overflow-x-scroll
-                whitespace-nowrap
-              "
-            >
-              {{ cell.value }}
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="h-10 mx-4 mb-4 p-2 bg-red-100 text-base border-t">
-      add pagination here
-    </div>
+    <!-- Report Body -->
+    <ListReport v-if="report" :report="report" class="mx-4 mt-4" />
   </div>
 </template>
 <script>
 import { reports } from 'reports';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import PageHeader from 'src/components/PageHeader.vue';
+import ListReport from 'src/components/Report/ListReport.vue';
 import { fyo } from 'src/initFyo';
 import { defineComponent } from 'vue';
 
@@ -109,13 +50,11 @@ export default defineComponent({
   },
   data() {
     return {
-      wconst: 8,
-      hconst: 48,
       loading: false,
       report: null,
     };
   },
-  components: { PageHeader, FormControl },
+  components: { PageHeader, FormControl, ListReport },
   async mounted() {
     await this.setReportData();
   },
@@ -126,40 +65,11 @@ export default defineComponent({
     }
   },
   computed: {
-    maxRows() {
-      return 18 - Math.ceil(this.report.filters.length / 5);
-    },
     title() {
       return reports[this.reportName]?.title ?? t`Report`;
     },
   },
   methods: {
-    getCellStyle(cell, i) {
-      const styles = {};
-      const width = cell.width ?? 1;
-      const align = cell.align ?? 'left';
-
-      styles['width'] = `${width * this.wconst}rem`;
-      styles['text-align'] = align;
-
-      if (cell.bold) {
-        styles['font-weight'] = 'bold';
-      }
-
-      if (cell.italics) {
-        styles['font-style'] = 'italic';
-      }
-
-      if (i === 0) {
-        styles['padding-left'] = '0px';
-      }
-
-      if (i === this.report.columns.length - 1) {
-        styles['padding-right'] = '0px';
-      }
-
-      return styles;
-    },
     async setReportData() {
       const Report = reports[this.reportName];
       if (this.report === null) {

From 5188f28c0d69b724bfb287fa256337cc52a1d4be Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 13 May 2022 15:31:05 +0530
Subject: [PATCH 111/163] fix: list display, minor UI fixes

---
 reports/GeneralLedger/GeneralLedger.ts |  4 +-
 src/components/Report/ListReport.vue   | 64 +++++++++++++-------------
 src/pages/ChartOfAccounts.vue          |  4 +-
 src/pages/DataImport.vue               |  4 +-
 src/pages/Desk.vue                     |  2 +-
 src/styles/index.css                   |  8 ++++
 6 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 437984cd..c37c4740 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -279,7 +279,7 @@ export class GeneralLedger extends Report {
       'reverts',
     ];
 
-    const filters = {} ?? this._getQueryFilters();
+    const filters = this._getQueryFilters();
     const entries = (await this.fyo.db.getAllRaw(
       ModelNameEnum.AccountingLedgerEntry,
       {
@@ -493,8 +493,6 @@ export class GeneralLedger extends Report {
   /**
    * TODO: Order by date and then the number
    * TODO: Something is wrong with dummy data, there are entries from 2022 Dec
-   * TODO: Add pagination
    * TODO: Always visible scrollbar
-   * TODO: Extract out list view report to a different component
    */
 }
diff --git a/src/components/Report/ListReport.vue b/src/components/Report/ListReport.vue
index bc9dcf8c..b20da728 100644
--- a/src/components/Report/ListReport.vue
+++ b/src/components/Report/ListReport.vue
@@ -1,9 +1,9 @@
 <template>
-  <div>
+  <div class="overflow-hidden flex flex-col h-full">
     <!-- Report Outer Container -->
-    <div class="overflow-x-scroll">
+    <div class="overflow-x-scroll overflow-y-hidden">
+      <!-- Title Row -->
       <div class="inline-block">
-        <!-- Title Row -->
         <div
           class="flex items-center border-b"
           :style="{ height: `${hconst}px` }"
@@ -24,39 +24,43 @@
             {{ col.label }}
           </p>
         </div>
+      </div>
 
-        <!-- Report Rows Container -->
-        <div class="overflow-y-scroll">
-          <!-- :style="{ height: `${hconst * maxRows + 5}px` }" -->
-          <!-- Report Rows -->
+      <!-- Report Rows Container -->
+      <div
+        class="overflow-y-scroll inline-block"
+        style="height: calc(100% - 49px)"
+      >
+        <!-- Report Rows -->
+        <div
+          v-for="(row, r) in report.reportData.slice(pageStart, pageEnd)"
+          :key="r + '-row'"
+          class="flex items-center"
+          :style="{ height: `${hconst}px` }"
+          :class="r !== pageEnd - 1 ? 'border-b' : ''"
+        >
+          <!-- Report Cell -->
           <div
-            v-for="(row, r) in report.reportData.slice(pageStart, pageEnd)"
-            :key="r + '-row'"
-            class="border-b flex items-center"
-            :style="{ height: `${hconst}px` }"
+            v-for="(cell, c) in row"
+            :key="`${c}-${r}-cell`"
+            :style="getCellStyle(cell, c)"
+            class="
+              text-gray-900 text-base
+              px-3
+              flex-shrink-0
+              overflow-x-scroll
+              whitespace-nowrap
+            "
           >
-            <!-- Report Cell -->
-            <div
-              v-for="(cell, c) in row"
-              :key="`${c}-${r}-cell`"
-              :style="getCellStyle(cell, c)"
-              class="
-                text-gray-900 text-base
-                px-3
-                flex-shrink-0
-                overflow-x-scroll
-                whitespace-nowrap
-              "
-            >
-              {{ cell.value }}
-            </div>
+            {{ cell.value }}
           </div>
         </div>
+        <!-- </div> -->
       </div>
     </div>
 
     <!-- Pagination Footer -->
-    <div class="mt-auto">
+    <div class="mt-auto flex-shrink-0">
       <hr />
       <Paginator
         :item-count="report?.reportData?.length ?? 0"
@@ -78,16 +82,10 @@ export default defineComponent({
     return {
       wconst: 8,
       hconst: 48,
-      loading: false,
       pageStart: 0,
       pageEnd: 0,
     };
   },
-  computed: {
-    maxRows() {
-      return 18 - Math.ceil(this.report.filters.length / 5);
-    },
-  },
   methods: {
     setPageIndices({ start, end }) {
       this.pageStart = start;
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 0a32ae76..db342347 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="flex flex-col overflow-y-hidden">
+  <div class="flex flex-col h-full">
     <PageHeader :title="t`Chart of Accounts`" />
 
     <!-- Chart of Accounts -->
-    <div class="flex-1 flex flex-col px-8 overflow-y-auto" v-if="root">
+    <div class="flex-1 flex flex-col mx-4 overflow-y-auto mb-4" v-if="root">
       <!-- Chart of Accounts Indented List -->
       <template v-for="account in allAccounts" :key="account.name">
         <!-- Account List Item -->
diff --git a/src/pages/DataImport.vue b/src/pages/DataImport.vue
index 986bfcbb..28b4b06a 100644
--- a/src/pages/DataImport.vue
+++ b/src/pages/DataImport.vue
@@ -16,7 +16,7 @@
     </PageHeader>
 
     <div
-      class="flex px-8 mt-2 text-base w-full flex-col gap-8"
+      class="flex px-4 mt-2 text-base w-full flex-col gap-8"
       v-if="!complete"
     >
       <!-- Type selector -->
@@ -444,7 +444,7 @@ export default {
         label: this.t`Import Type`,
         fieldtype: 'AutoComplete',
         placeholder: this.t`Import Type`,
-        options: Object.keys(this.labelSchemaNameMap)
+        options: Object.keys(this.labelSchemaNameMap),
       };
     },
     labelSchemaNameMap() {
diff --git a/src/pages/Desk.vue b/src/pages/Desk.vue
index 7ae46b26..52076bf9 100644
--- a/src/pages/Desk.vue
+++ b/src/pages/Desk.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex overflow-hidden">
     <Sidebar
-      class="w-48 flex-shrink-0"
+      class="w-sidebar flex-shrink-0"
       @change-db-file="$emit('change-db-file')"
     />
     <div class="flex flex-1 overflow-y-hidden bg-white">
diff --git a/src/styles/index.css b/src/styles/index.css
index b08537db..345ab652 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -56,3 +56,11 @@ html {
 .w-600 {
   width: 600px;
 }
+
+.w-sidebar {
+  width: 12rem;
+}
+
+.w-desk {
+  width: calc(100vw - 12rem);
+}

From fa063b719a153be4cc5c39736f5d73c28c468353 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 13 May 2022 16:50:48 +0530
Subject: [PATCH 112/163] incr: persistent scroll bars

---
 src/components/Paginator.vue         |  8 ++--
 src/components/Report/ListReport.vue | 56 ++++++++++++++--------------
 src/components/WithScroll.vue        |  8 ++--
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/components/Paginator.vue b/src/components/Paginator.vue
index c94b1093..a2f15bd5 100644
--- a/src/components/Paginator.vue
+++ b/src/components/Paginator.vue
@@ -20,7 +20,7 @@
       <div class="flex gap-1 bg-gray-100 rounded">
         <input
           type="number"
-          class="w-6 text-right outline-none bg-transparent focus:text-gray-900"
+          class="w-7 text-right outline-none bg-transparent focus:text-gray-900"
           :value="pageNo"
           @change="(e) => setPageNo(e.target.value)"
           @input="(e) => setPageNo(e.target.value)"
@@ -28,7 +28,7 @@
           :max="maxPages"
         />
         <p class="text-gray-600">/</p>
-        <p class="w-5">
+        <p class="w-7">
           {{ maxPages }}
         </p>
       </div>
@@ -46,7 +46,7 @@
 
     <!-- Count Selector -->
     <div
-      class="border rounded flex justify-self-end"
+      class="border border-gray-100 rounded flex justify-self-end"
       v-if="filteredCounts.length"
     >
       <template v-for="c in filteredCounts" :key="c + '-count'">
@@ -55,7 +55,7 @@
           class="w-9"
           :class="
             count === c || (count === itemCount && c === -1)
-              ? 'bg-gray-200'
+              ? 'bg-gray-100'
               : ''
           "
         >
diff --git a/src/components/Report/ListReport.vue b/src/components/Report/ListReport.vue
index b20da728..dcaaabd5 100644
--- a/src/components/Report/ListReport.vue
+++ b/src/components/Report/ListReport.vue
@@ -1,41 +1,39 @@
 <template>
   <div class="overflow-hidden flex flex-col h-full">
     <!-- Report Outer Container -->
-    <div class="overflow-x-scroll overflow-y-hidden">
-      <!-- Title Row -->
-      <div class="inline-block">
+    <div class="overflow-hidden">
+      <!--Title Row -->
+      <div
+        class="w-full overflow-x-hidden flex items-center border-b"
+        ref="titlerow"
+        :style="{ height: `${hconst}px`, paddingRight: '8px' }"
+      >
         <div
-          class="flex items-center border-b"
-          :style="{ height: `${hconst}px` }"
-          ref="titleRow"
+          v-for="(col, c) in report.columns"
+          :key="c + '-col'"
+          :style="getCellStyle(col, c)"
+          class="
+            text-gray-600 text-base
+            px-3
+            flex-shrink-0
+            overflow-x-scroll
+            whitespace-nowrap
+          "
         >
-          <p
-            v-for="(col, c) in report.columns"
-            :key="c + '-col'"
-            :style="getCellStyle(col, c)"
-            class="
-              text-gray-600 text-base
-              px-3
-              flex-shrink-0
-              overflow-x-scroll
-              whitespace-nowrap
-            "
-          >
-            {{ col.label }}
-          </p>
+          {{ col.label }}
         </div>
       </div>
 
-      <!-- Report Rows Container -->
-      <div
-        class="overflow-y-scroll inline-block"
+      <WithScroll
+        class="overflow-auto w-full"
         style="height: calc(100% - 49px)"
+        @scroll="scroll"
       >
         <!-- Report Rows -->
         <div
           v-for="(row, r) in report.reportData.slice(pageStart, pageEnd)"
           :key="r + '-row'"
-          class="flex items-center"
+          class="flex items-center w-max"
           :style="{ height: `${hconst}px` }"
           :class="r !== pageEnd - 1 ? 'border-b' : ''"
         >
@@ -55,8 +53,8 @@
             {{ cell.value }}
           </div>
         </div>
-        <!-- </div> -->
-      </div>
+      </WithScroll>
+      <!-- Report Rows Container -->
     </div>
 
     <!-- Pagination Footer -->
@@ -73,6 +71,7 @@
 import { Report } from 'reports/Report';
 import { defineComponent } from 'vue';
 import Paginator from '../Paginator.vue';
+import WithScroll from '../WithScroll.vue';
 
 export default defineComponent({
   props: {
@@ -87,6 +86,9 @@ export default defineComponent({
     };
   },
   methods: {
+    scroll({ scrollLeft }) {
+      this.$refs.titlerow.scrollLeft = scrollLeft;
+    },
     setPageIndices({ start, end }) {
       this.pageStart = start;
       this.pageEnd = end;
@@ -112,6 +114,6 @@ export default defineComponent({
       return styles;
     },
   },
-  components: { Paginator },
+  components: { Paginator, WithScroll },
 });
 </script>
diff --git a/src/components/WithScroll.vue b/src/components/WithScroll.vue
index bb4dade1..24ce2e41 100644
--- a/src/components/WithScroll.vue
+++ b/src/components/WithScroll.vue
@@ -22,19 +22,17 @@ export default {
   },
 };
 </script>
+
 <style>
-.scroll-container {
-  height: calc(100vh - 12rem);
-}
 .scroll-container::-webkit-scrollbar {
   width: 8px;
   height: 8px;
 }
 .scroll-container::-webkit-scrollbar-thumb {
-  background-color: theme('colors.gray.200');
+  background-color: theme('colors.gray.100');
 }
 .scroll-container::-webkit-scrollbar-thumb:hover {
-  background-color: theme('colors.gray.300');
+  background-color: theme('colors.gray.200');
 }
 .scroll-container::-webkit-scrollbar-track {
   background-color: white;

From 64d1f13e42a1d9992bd464db7cf89cba365f07f5 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 13 May 2022 17:28:42 +0530
Subject: [PATCH 113/163] incr: button for db delete

---
 main/registerIpcMainActionListeners.ts |  4 +++
 src/pages/DatabaseSelector.vue         | 50 ++++++++++++++++++++++++--
 src/utils/ipcCalls.ts                  |  6 +++-
 utils/messages.ts                      |  1 +
 4 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 06606c5c..0bb4759d 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -116,6 +116,10 @@ export default function registerIpcMainActionListeners(main: Main) {
     return app.getVersion();
   });
 
+  ipcMain.handle(IPC_ACTIONS.DELETE_FILE, async (_, filePath) => {
+    await fs.unlink(filePath);
+  });
+
   /**
    * Database Related Actions
    */
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 4d115528..15390542 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -98,6 +98,21 @@
               {{ file.modified }}
             </p>
           </div>
+          <button
+            class="
+              ml-auto
+              p-2
+              hover:bg-red-200
+              rounded-full
+              w-8
+              h-8
+              text-gray-600
+              hover:text-red-400
+            "
+            @click.stop="() => deleteDb(i)"
+          >
+            <feather-icon name="x" class="w-4 h-4" />
+          </button>
         </div>
       </div>
       <hr v-if="files?.length" />
@@ -134,16 +149,19 @@
 import { setupDummyInstance } from 'dummy';
 import { ipcRenderer } from 'electron';
 import fs from 'fs';
+import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
 import { addNewFile } from 'fyo/telemetry/helpers';
 import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
 import Button from 'src/components/Button.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
+import FeatherIcon from 'src/components/FeatherIcon.vue';
 import Loading from 'src/components/Loading.vue';
 import WindowControls from 'src/components/WindowControls.vue';
 import { fyo } from 'src/initFyo';
-import { getSavePath } from 'src/utils/ipcCalls';
+import { deleteDb, getSavePath } from 'src/utils/ipcCalls';
+import { showMessageDialog } from 'src/utils/ui';
 import { IPC_ACTIONS } from 'utils/messages';
 
 export default {
@@ -166,6 +184,28 @@ export default {
     }
   },
   methods: {
+    async deleteDb(i) {
+      const file = this.files[i];
+      const vm = this;
+
+      await showMessageDialog({
+        message: t`Delete ${file.companyName}?`,
+        detail: t`Database file: ${file.dbPath}`,
+        buttons: [
+          {
+            label: this.t`Yes`,
+            async action() {
+              await deleteDb(file.dbPath);
+              vm.setFiles();
+            },
+          },
+          {
+            label: this.t`No`,
+            action() {},
+          },
+        ],
+      });
+    },
     async createDemo() {
       const { filePath, canceled } = await getSavePath('demo', 'db');
       if (canceled || !filePath) {
@@ -251,6 +291,12 @@ export default {
       this.$emit('file-selected', filePath, !!isNew);
     },
   },
-  components: { LanguageSelector, WindowControls, Button, Loading },
+  components: {
+    LanguageSelector,
+    WindowControls,
+    Button,
+    Loading,
+    FeatherIcon,
+  },
 };
 </script>
diff --git a/src/utils/ipcCalls.ts b/src/utils/ipcCalls.ts
index 5b2813f6..cfc1becc 100644
--- a/src/utils/ipcCalls.ts
+++ b/src/utils/ipcCalls.ts
@@ -9,10 +9,14 @@ import { WindowAction } from './types';
 import { showToast } from './ui';
 
 export async function checkForUpdates(force = false) {
-  ipcRenderer.invoke(IPC_ACTIONS.CHECK_FOR_UPDATES, force);
+  await ipcRenderer.invoke(IPC_ACTIONS.CHECK_FOR_UPDATES, force);
   await setLanguageMap();
 }
 
+export async function deleteDb(filePath: string) {
+  await ipcRenderer.invoke(IPC_ACTIONS.DELETE_FILE, filePath);
+}
+
 export async function saveData(data: string, savePath: string) {
   await ipcRenderer.invoke(IPC_ACTIONS.SAVE_DATA, data, savePath);
 }
diff --git a/utils/messages.ts b/utils/messages.ts
index eff418a6..ba215949 100644
--- a/utils/messages.ts
+++ b/utils/messages.ts
@@ -26,6 +26,7 @@ export enum IPC_ACTIONS {
   GET_FILE = 'get-file',
   GET_CREDS = 'get-creds',
   GET_VERSION = 'get-version',
+  DELETE_FILE = 'delete-file',
   // Database messages
   DB_CREATE = 'db-create',
   DB_CONNECT = 'db-connect',

From 3cdba15b81ce4ddbf66c71d0306ea9cde6645074 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 13 May 2022 19:21:26 +0530
Subject: [PATCH 114/163] fix: dynamic link ref - gl ordering - report
 filtering - dummy dates - few other things

---
 dummy/helpers.ts                        |  2 +-
 dummy/index.ts                          | 18 ++++++----
 reports/GeneralLedger/GeneralLedger.ts  | 44 ++++++++++++++-----------
 reports/Report.ts                       |  9 +++--
 schemas/app/AccountingLedgerEntry.json  |  2 +-
 schemas/types.ts                        |  2 ++
 src/components/Controls/DynamicLink.vue | 20 +++++++++--
 src/components/Controls/Link.vue        |  7 ++--
 src/components/Dropdown.vue             |  6 +++-
 src/pages/DatabaseSelector.vue          | 24 ++++++++++++--
 src/pages/Report.vue                    |  6 ++++
 utils/index.ts                          |  4 ++-
 12 files changed, 106 insertions(+), 38 deletions(-)

diff --git a/dummy/helpers.ts b/dummy/helpers.ts
index 462a94b7..2012d801 100644
--- a/dummy/helpers.ts
+++ b/dummy/helpers.ts
@@ -40,7 +40,7 @@ export function getRandomDates(count: number, months: number): Date[] {
   let endDate = DateTime.now();
   if (months !== 0) {
     const back = endDate.minus({ months });
-    endDate = DateTime.local(endDate.year, back.month, back.daysInMonth);
+    endDate = DateTime.local(back.year, back.month, back.daysInMonth);
   }
 
   const dates: Date[] = [];
diff --git a/dummy/index.ts b/dummy/index.ts
index b269b4c6..7eff9882 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -170,6 +170,17 @@ async function getPayments(fyo: Fyo, invoices: Invoice[]) {
   return payments;
 }
 
+function getSalesInvoiceDates(years: number, baseCount: number): Date[] {
+  const dates: Date[] = [];
+  for (const months of range(0, years * 12)) {
+    const flow = getFlowConstant(months);
+    const count = Math.ceil(flow * baseCount * (Math.random() * 0.25 + 0.75));
+    dates.push(...getRandomDates(count, months));
+  }
+
+  return dates;
+}
+
 async function getSalesInvoices(
   fyo: Fyo,
   years: number,
@@ -184,12 +195,7 @@ async function getSalesInvoices(
    * Get certain number of entries for each month of the count
    * of years.
    */
-  let dates: Date[] = [];
-  for (const months of range(0, years * 12)) {
-    const flow = getFlowConstant(months);
-    const count = Math.ceil(flow * baseCount * (Math.random() * 0.25 + 0.75));
-    dates = dates.concat(getRandomDates(count, months));
-  }
+  const dates = getSalesInvoiceDates(years, baseCount);
 
   /**
    * For each date create a Sales Invoice.
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index c37c4740..f26d0104 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -3,7 +3,7 @@ import { Action } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { ModelNameEnum } from 'models/types';
 import { Report } from 'reports/Report';
-import { ColumnField, ReportData } from 'reports/types';
+import { ColumnField, ReportData, ReportRow } from 'reports/types';
 import { Field, FieldTypeEnum, RawValue } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 
@@ -56,11 +56,13 @@ export class GeneralLedger extends Report {
   }
 
   async setReportData(filter?: string) {
+    let sort = true;
     if (filter !== 'grouped' || this._rawData.length === 0) {
       await this._setRawData();
+      sort = false;
     }
 
-    const map = this._getGroupedMap();
+    const map = this._getGroupedMap(sort);
     this._setIndexOnEntries(map);
     const { totalDebit, totalCredit } = this._getTotalsAndSetBalance(map);
     const consolidated = this._consolidateEntries(map);
@@ -112,12 +114,15 @@ export class GeneralLedger extends Report {
     return reportData;
   }
 
-  _getRowFromEntry(entry: LedgerEntry, columns: ColumnField[]) {
+  _getRowFromEntry(entry: LedgerEntry, columns: ColumnField[]): ReportRow {
     if (entry.name === -3) {
-      return Array(columns.length).fill({ value: '' });
+      return columns.map((c) => ({
+        value: '',
+        width: c.width ?? 1,
+      })) as ReportRow;
     }
 
-    const row = [];
+    const row: ReportRow = [];
     for (const col of columns) {
       const align = col.align ?? 'left';
       const width = col.width ?? 1;
@@ -138,6 +143,8 @@ export class GeneralLedger extends Report {
 
       if (typeof value === 'boolean' && fieldname === 'reverted') {
         value = value ? t`Reverted` : '';
+      } else {
+        value = String(value);
       }
 
       row.push({
@@ -231,7 +238,7 @@ export class GeneralLedger extends Report {
     return { totalDebit, totalCredit };
   }
 
-  _getGroupedMap(): GroupedMap {
+  _getGroupedMap(sort: boolean): GroupedMap {
     let groupBy: keyof LedgerEntry = 'referenceName';
     if (this.groupBy !== 'none') {
       groupBy = this.groupBy;
@@ -240,13 +247,15 @@ export class GeneralLedger extends Report {
     /**
      * Sort rows by ascending or descending
      */
-    this._rawData.sort((a, b) => {
-      if (this.ascending) {
-        return a.name - b.name;
-      }
+    if (sort) {
+      this._rawData.sort((a, b) => {
+        if (this.ascending) {
+          return +a.date! - +b.date!;
+        }
 
-      return b.name - a.name;
-    });
+        return +b.date! - +a.date!;
+      });
+    }
 
     /**
      * Map remembers the order of insertion
@@ -285,6 +294,8 @@ export class GeneralLedger extends Report {
       {
         fields,
         filters,
+        orderBy: 'date',
+        order: this.ascending ? 'asc' : 'desc',
       }
     )) as RawLedgerEntry[];
 
@@ -309,7 +320,7 @@ export class GeneralLedger extends Report {
     const filters: QueryFilter = {};
     const stringFilters = ['account', 'party', 'referenceName'];
 
-    for (const sf in stringFilters) {
+    for (const sf of stringFilters) {
       const value = this[sf];
       if (value === undefined) {
         continue;
@@ -361,6 +372,7 @@ export class GeneralLedger extends Report {
         label: t`Ref Name`,
         references: 'referenceType',
         placeholder: t`Ref Name`,
+        emptyMessage: t`Change Ref Type`,
         fieldname: 'referenceName',
       },
       {
@@ -489,10 +501,4 @@ export class GeneralLedger extends Report {
   getActions(): Action[] {
     return [];
   }
-
-  /**
-   * TODO: Order by date and then the number
-   * TODO: Something is wrong with dummy data, there are entries from 2022 Dec
-   * TODO: Always visible scrollbar
-   */
 }
diff --git a/reports/Report.ts b/reports/Report.ts
index 6fada474..243d511f 100644
--- a/reports/Report.ts
+++ b/reports/Report.ts
@@ -42,7 +42,7 @@ export abstract class Report extends Observable<RawValue> {
 
   async set(key: string, value: RawValue) {
     const field = this.filters.find((f) => f.fieldname === key);
-    if (field === undefined || value === undefined) {
+    if (field === undefined) {
       return;
     }
 
@@ -51,7 +51,12 @@ export abstract class Report extends Observable<RawValue> {
       return;
     }
 
-    this[key] = value;
+    if (getIsNullOrUndef(value)) {
+      delete this[key];
+    } else {
+      this[key] = value;
+    }
+
     this.columns = this.getColumns();
     await this.setReportData(key);
   }
diff --git a/schemas/app/AccountingLedgerEntry.json b/schemas/app/AccountingLedgerEntry.json
index f59f8141..5c59ab65 100644
--- a/schemas/app/AccountingLedgerEntry.json
+++ b/schemas/app/AccountingLedgerEntry.json
@@ -8,7 +8,7 @@
     {
       "fieldname": "date",
       "label": "Date",
-      "fieldtype": "Date",
+      "fieldtype": "Datetime",
       "readOnly": true
     },
     {
diff --git a/schemas/types.ts b/schemas/types.ts
index c75f2278..113232d1 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -42,6 +42,7 @@ export interface OptionField extends BaseField {
     | FieldTypeEnum.AutoComplete
     | FieldTypeEnum.Color;
   options: SelectOption[];
+  emptyMessage?: string;
   allowCustom?: boolean;
 }
 
@@ -52,6 +53,7 @@ export interface TargetField extends BaseField {
 
 export interface DynamicLinkField extends BaseField {
   fieldtype: FieldTypeEnum.DynamicLink;
+  emptyMessage?: string;
   references: string;            // Reference to an option field that links to schema
 }
 
diff --git a/src/components/Controls/DynamicLink.vue b/src/components/Controls/DynamicLink.vue
index bbd80669..08fc88ec 100644
--- a/src/components/Controls/DynamicLink.vue
+++ b/src/components/Controls/DynamicLink.vue
@@ -1,8 +1,10 @@
 <script>
+import { fyo } from 'src/initFyo';
 import Link from './Link.vue';
 export default {
   name: 'DynamicLink',
   props: ['target'],
+  inject: ['report'],
   extends: Link,
   created() {
     const watchKey = `doc.${this.df.references}`;
@@ -17,11 +19,25 @@ export default {
   },
   methods: {
     getTargetSchemaName() {
-      if (!this.doc || !this.df.references) {
+      const references = this.df.references;
+      if (!references) {
         return null;
       }
 
-      return this.doc[this.df.references];
+      let schemaName = this.doc?.[references];
+      if (!schemaName) {
+        schemaName = this.report?.[references];
+      }
+
+      if (!schemaName) {
+        return null;
+      }
+
+      if (!fyo.schemaMap[schemaName]) {
+        return null;
+      }
+
+      return schemaName;
     },
   },
 };
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index 9c064ec6..d5aafe37 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -77,8 +77,11 @@ export default {
           .map(({ item }) => item);
       }
 
-      options = options.concat(this.getCreateNewOption());
-      if (options.length === 0) {
+      if (this.doc) {
+        options = options.concat(this.getCreateNewOption());
+      }
+
+      if (options.length === 0 && !this.df.emptyMessage) {
         return [
           {
             component: markRaw({
diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 4bdc1b2b..b6a9dae7 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -172,6 +172,10 @@ export default {
         return this.t`Empty`;
       }
 
+      if (this.df.emptyMessage) {
+        return this.df.emptyMessage;
+      }
+
       const { schemaName, fieldname } = this.df;
       const emptyMessage = fyo.models[schemaName]?.emptyMessages[fieldname]?.(
         this.doc
@@ -207,7 +211,7 @@ export default {
         let item = this.items[this.highlightedIndex];
         await this.selectItem(item);
       } else if (this.items.length === 1) {
-        await this.selectItem(this.items[0])
+        await this.selectItem(this.items[0]);
       }
     },
     highlightItemUp() {
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 15390542..66f2d38d 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -152,7 +152,6 @@ import fs from 'fs';
 import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
 import { addNewFile } from 'fyo/telemetry/helpers';
-import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
 import Button from 'src/components/Button.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
@@ -237,8 +236,7 @@ export default {
       this.creatingDemo = false;
     },
     setFiles() {
-      const files = cloneDeep(fyo.config.get('files', []));
-      this.files = files.filter(({ dbPath }) => fs.existsSync(dbPath));
+      this.files = setAndGetCleanedConfigFiles();
 
       for (const file of this.files) {
         const stats = fs.statSync(file.dbPath);
@@ -299,4 +297,24 @@ export default {
     FeatherIcon,
   },
 };
+
+function setAndGetCleanedConfigFiles() {
+  const files = fyo.config
+    .get('files', [])
+    .filter(({ dbPath }) => fs.existsSync(dbPath));
+
+  const deduper = [];
+  const deduped = files.filter(({ companyName, dbPath }) => {
+    const key = `${companyName}-${dbPath}`;
+    if (deduper.includes(key)) {
+      return false;
+    }
+
+    deduper.push(key);
+    return true;
+  });
+
+  fyo.config.set(ConfigKeys.Files, deduped);
+  return deduped;
+}
 </script>
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index d6e05c27..41e93c6f 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -37,6 +37,7 @@
   </div>
 </template>
 <script>
+import { computed } from '@vue/reactivity';
 import { reports } from 'reports';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import PageHeader from 'src/components/PageHeader.vue';
@@ -54,6 +55,11 @@ export default defineComponent({
       report: null,
     };
   },
+  provide() {
+    return {
+      report: computed(() => this.report),
+    };
+  },
   components: { PageHeader, FormControl, ListReport },
   async mounted() {
     await this.setReportData();
diff --git a/utils/index.ts b/utils/index.ts
index d6cd52a4..029a38f7 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -24,7 +24,9 @@ export function getValueMapFromList<T, K extends keyof T, V extends keyof T>(
 }
 
 export function getRandomString(): string {
-  return Math.random().toString(36).slice(2, 8);
+  const randomNumber = Math.random().toString(36).slice(2, 8);
+  const currentTime = Date.now().toString(36);
+  return `${randomNumber}-${currentTime}`;
 }
 
 export async function sleep(durationMilliseconds: number = 1000) {

From bf01fa032773555ab0b2c2a65cc3827ab1d5d430 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sat, 14 May 2022 14:16:05 +0530
Subject: [PATCH 115/163] incr: shift report commonalities to LedgerReport -
 start with Profit and Loss

---
 models/helpers.ts                       |  21 ++
 reports/GeneralLedger/GeneralLedger.ts  | 130 +-------
 reports/LedgerReport.ts                 |  98 ++++++
 reports/ProfitAndLoss/ProfitAndLoss.ts  | 409 ++++++++++++++++++------
 reports/ProfitAndLoss/viewConfig.js     |  71 ----
 reports/Report.ts                       |  12 +-
 reports/types.ts                        |  33 +-
 src/components/Controls/DynamicLink.vue |   4 +-
 src/pages/ChartOfAccounts.vue           |  20 +-
 src/pages/Dashboard/Dashboard.vue       |  13 +-
 src/pages/Report.vue                    |   7 +-
 src/renderer.ts                         |   3 +
 12 files changed, 514 insertions(+), 307 deletions(-)
 create mode 100644 reports/LedgerReport.ts
 delete mode 100644 reports/ProfitAndLoss/viewConfig.js

diff --git a/models/helpers.ts b/models/helpers.ts
index fed50a7b..8e9d6577 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -5,6 +5,10 @@ import { NotFoundError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
 import Money from 'pesa/dist/types/src/money';
 import { Router } from 'vue-router';
+import {
+  AccountRootType,
+  AccountRootTypeEnum,
+} from './baseModels/Account/types';
 import { InvoiceStatus, ModelNameEnum } from './types';
 
 export function getInvoiceActions(
@@ -169,3 +173,20 @@ export async function getExchangeRate({
 
   return exchangeRate;
 }
+
+export function isCredit(rootType: AccountRootType) {
+  switch (rootType) {
+    case AccountRootTypeEnum.Asset:
+      return false;
+    case AccountRootTypeEnum.Liability:
+      return true;
+    case AccountRootTypeEnum.Equity:
+      return true;
+    case AccountRootTypeEnum.Expense:
+      return false;
+    case AccountRootTypeEnum.Income:
+      return true;
+    default:
+      return true;
+  }
+}
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index f26d0104..4c2e3f87 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -1,44 +1,18 @@
 import { Fyo, t } from 'fyo';
 import { Action } from 'fyo/model/types';
 import { DateTime } from 'luxon';
-import { ModelNameEnum } from 'models/types';
-import { Report } from 'reports/Report';
-import { ColumnField, ReportData, ReportRow } from 'reports/types';
-import { Field, FieldTypeEnum, RawValue } from 'schemas/types';
+import { LedgerReport } from 'reports/LedgerReport';
+import {
+  ColumnField,
+  GroupedMap,
+  LedgerEntry,
+  ReportData,
+  ReportRow,
+} from 'reports/types';
+import { Field, FieldTypeEnum } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 
-interface RawLedgerEntry {
-  name: string;
-  account: string;
-  date: string;
-  debit: string;
-  credit: string;
-  referenceType: string;
-  referenceName: string;
-  party: string;
-  reverted: number;
-  reverts: string;
-  [key: string]: RawValue;
-}
-
-interface LedgerEntry {
-  index?: string;
-  name: number;
-  account: string;
-  date: Date | null;
-  debit: number | null;
-  credit: number | null;
-  balance: number | null;
-  referenceType: string;
-  referenceName: string;
-  party: string;
-  reverted: boolean;
-  reverts: string;
-}
-
-type GroupedMap = Map<string, LedgerEntry[]>;
-
-export class GeneralLedger extends Report {
+export class GeneralLedger extends LedgerReport {
   static title = t`General Ledger`;
   static reportName = 'general-ledger';
 
@@ -48,8 +22,10 @@ export class GeneralLedger extends Report {
 
   constructor(fyo: Fyo) {
     super(fyo);
+  }
 
-    if (!this.toField) {
+  async setDefaultFilters() {
+    if (!this.toDate) {
       this.toDate = DateTime.now().toISODate();
       this.fromDate = DateTime.now().minus({ years: 1 }).toISODate();
     }
@@ -238,85 +214,7 @@ export class GeneralLedger extends Report {
     return { totalDebit, totalCredit };
   }
 
-  _getGroupedMap(sort: boolean): GroupedMap {
-    let groupBy: keyof LedgerEntry = 'referenceName';
-    if (this.groupBy !== 'none') {
-      groupBy = this.groupBy;
-    }
-
-    /**
-     * Sort rows by ascending or descending
-     */
-    if (sort) {
-      this._rawData.sort((a, b) => {
-        if (this.ascending) {
-          return +a.date! - +b.date!;
-        }
-
-        return +b.date! - +a.date!;
-      });
-    }
-
-    /**
-     * Map remembers the order of insertion
-     * ∴ presorting maintains grouping order
-     */
-    const map: GroupedMap = new Map();
-    for (const entry of this._rawData) {
-      const groupingKey = entry[groupBy];
-      if (!map.has(groupingKey)) {
-        map.set(groupingKey, []);
-      }
-
-      map.get(groupingKey)!.push(entry);
-    }
-
-    return map;
-  }
-
-  async _setRawData() {
-    const fields = [
-      'name',
-      'account',
-      'date',
-      'debit',
-      'credit',
-      'referenceType',
-      'referenceName',
-      'party',
-      'reverted',
-      'reverts',
-    ];
-
-    const filters = this._getQueryFilters();
-    const entries = (await this.fyo.db.getAllRaw(
-      ModelNameEnum.AccountingLedgerEntry,
-      {
-        fields,
-        filters,
-        orderBy: 'date',
-        order: this.ascending ? 'asc' : 'desc',
-      }
-    )) as RawLedgerEntry[];
-
-    this._rawData = entries.map((entry) => {
-      return {
-        name: parseInt(entry.name),
-        account: entry.account,
-        date: new Date(entry.date),
-        debit: parseFloat(entry.debit),
-        credit: parseFloat(entry.credit),
-        balance: 0,
-        referenceType: entry.referenceType,
-        referenceName: entry.referenceName,
-        party: entry.party,
-        reverted: Boolean(entry.reverted),
-        reverts: entry.reverts,
-      } as LedgerEntry;
-    });
-  }
-
-  _getQueryFilters(): QueryFilter {
+  async _getQueryFilters(): Promise<QueryFilter> {
     const filters: QueryFilter = {};
     const stringFilters = ['account', 'party', 'referenceName'];
 
diff --git a/reports/LedgerReport.ts b/reports/LedgerReport.ts
new file mode 100644
index 00000000..822f2582
--- /dev/null
+++ b/reports/LedgerReport.ts
@@ -0,0 +1,98 @@
+import { t } from 'fyo';
+import { ModelNameEnum } from 'models/types';
+import { Report } from 'reports/Report';
+import { GroupedMap, LedgerEntry, RawLedgerEntry } from 'reports/types';
+import { QueryFilter } from 'utils/db/types';
+
+type GroupByKey = 'account' | 'party' | 'referenceName';
+
+export abstract class LedgerReport extends Report {
+  static title = t`General Ledger`;
+  static reportName = 'general-ledger';
+
+  _rawData: LedgerEntry[] = [];
+
+  _getGroupByKey() {
+    let groupBy: GroupByKey = 'referenceName';
+    if (this.groupBy && this.groupBy !== 'none') {
+      groupBy = this.groupBy as GroupByKey;
+    }
+    return groupBy;
+  }
+
+  _getGroupedMap(sort: boolean, groupBy?: GroupByKey): GroupedMap {
+    groupBy ??= this._getGroupByKey();
+    /**
+     * Sort rows by ascending or descending
+     */
+    if (sort) {
+      this._rawData.sort((a, b) => {
+        if (this.ascending) {
+          return +a.date! - +b.date!;
+        }
+
+        return +b.date! - +a.date!;
+      });
+    }
+
+    /**
+     * Map remembers the order of insertion
+     * ∴ presorting maintains grouping order
+     */
+    const map: GroupedMap = new Map();
+    for (const entry of this._rawData) {
+      const groupingKey = entry[groupBy];
+      if (!map.has(groupingKey)) {
+        map.set(groupingKey, []);
+      }
+
+      map.get(groupingKey)!.push(entry);
+    }
+
+    return map;
+  }
+
+  async _setRawData() {
+    const fields = [
+      'name',
+      'account',
+      'date',
+      'debit',
+      'credit',
+      'referenceType',
+      'referenceName',
+      'party',
+      'reverted',
+      'reverts',
+    ];
+
+    const filters = await this._getQueryFilters();
+    const entries = (await this.fyo.db.getAllRaw(
+      ModelNameEnum.AccountingLedgerEntry,
+      {
+        fields,
+        filters,
+        orderBy: 'date',
+        order: this.ascending ? 'asc' : 'desc',
+      }
+    )) as RawLedgerEntry[];
+
+    this._rawData = entries.map((entry) => {
+      return {
+        name: parseInt(entry.name),
+        account: entry.account,
+        date: new Date(entry.date),
+        debit: parseFloat(entry.debit),
+        credit: parseFloat(entry.credit),
+        balance: 0,
+        referenceType: entry.referenceType,
+        referenceName: entry.referenceName,
+        party: entry.party,
+        reverted: Boolean(entry.reverted),
+        reverts: entry.reverts,
+      } as LedgerEntry;
+    });
+  }
+
+  abstract _getQueryFilters(): Promise<QueryFilter>;
+}
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index c7509276..3b2d0cc3 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -1,107 +1,334 @@
-import { Fyo } from 'fyo';
-import { unique } from 'fyo/utils';
-import { FinancialStatements } from 'reports/FinancialStatements/financialStatements';
-import { FinancialStatementOptions } from 'reports/types';
+import { Fyo, t } from 'fyo';
+import { Action } from 'fyo/model/types';
+import { DateTime } from 'luxon';
+import { AccountRootType } from 'models/baseModels/Account/types';
+import { isCredit } from 'models/helpers';
+import { ModelNameEnum } from 'models/types';
+import { LedgerReport } from 'reports/LedgerReport';
+import {
+  ColumnField,
+  GroupedMap,
+  LedgerEntry,
+  Periodicity,
+} from 'reports/types';
+import { Field } from 'schemas/types';
+import { fyo } from 'src/initFyo';
+import { getMapFromList } from 'utils';
+import { QueryFilter } from 'utils/db/types';
 
-interface Row {
-  indent?: number;
-  account: string | { template: string };
-  isGroup?: boolean;
-  [key: string]: unknown;
-}
+type DateRange = { fromDate: DateTime; toDate: DateTime };
+type ValueMap = Map<DateRange, number>;
+type AccountNameValueMapMap = Map<string, ValueMap>;
+type BasedOn = 'Fiscal Year' | 'Date Range';
+type Account = { name: string; rootType: AccountRootType; isGroup: boolean };
+
+export class ProfitAndLoss extends LedgerReport {
+  static title = t`Profit And Loss`;
+  static reportName = 'profit-and-loss';
+
+  toDate?: string;
+  count?: number;
+  fromYear?: number;
+  toYear?: number;
+  singleColumn: boolean = false;
+  periodicity: Periodicity = 'Monthly';
+  basedOn: BasedOn = 'Fiscal Year';
+
+  _rawData: LedgerEntry[] = [];
+
+  accountMap?: Record<string, Account>;
 
-export default class ProfitAndLoss {
-  fyo: Fyo;
   constructor(fyo: Fyo) {
-    this.fyo = fyo;
+    super(fyo);
   }
 
-  async run(options: FinancialStatementOptions) {
-    const { fromDate, toDate, periodicity } = options;
-    const fs = new FinancialStatements(this.fyo);
-    const income = await fs.getData({
-      rootType: 'Income',
-      balanceMustBe: 'Credit',
-      fromDate,
-      toDate,
-      periodicity,
-    });
+  async setDefaultFilters(): Promise<void> {
+    if (this.basedOn === 'Date Range' && !this.toDate) {
+      this.toDate = DateTime.now().toISODate();
+      this.count = 1;
+    }
 
-    const expense = await fs.getData({
-      rootType: 'Expense',
-      balanceMustBe: 'Debit',
-      fromDate,
-      toDate,
-      periodicity,
-    });
+    if (this.basedOn === 'Fiscal Year' && !this.toYear) {
+      this.toYear = DateTime.now().year;
+      this.fromYear = this.toYear - 1;
+    }
+  }
 
-    const incomeAccount = income.totalRow.account as string;
-    const incomeTotalRow = {
-      ...income.totalRow,
-      account: {
-        template: `<span class="font-semibold">${incomeAccount}</span>`,
-      },
-    };
+  async setReportData(filter?: string) {
+    let sort = true;
+    if (
+      this._rawData.length === 0 &&
+      !['periodicity', 'singleColumn'].includes(filter!)
+    ) {
+      await this._setRawData();
+      sort = false;
+    }
 
-    const expenseAccount = expense.totalRow.account as string;
-    const expenseTotalRow = {
-      ...expense.totalRow,
-      account: {
-        template: `<span class="font-semibold">${expenseAccount}</span>`,
-      },
-    };
+    const map = this._getGroupedMap(sort, 'account');
+    const rangeGroupedMap = await this._getGroupedByDateRanges(map);
+    /**
+     * TODO: Get account tree  from accountMap
+     * TODO: Create Grid from rangeGroupedMap and tree
+     */
+  }
 
-    let rows = [
-      ...income.accounts,
-      incomeTotalRow,
-      {
-        account: {
-          template: '<span>&nbsp;</span>',
-        },
-        isGroup: true,
-      },
-      ...expense.accounts,
-      expenseTotalRow,
-      {
-        account: {
-          template: '<span>&nbsp;</span>',
-        },
-        isGroup: true,
-      },
-    ] as Row[];
+  async _getGroupedByDateRanges(
+    map: GroupedMap
+  ): Promise<AccountNameValueMapMap> {
+    const dateRanges = await this._getDateRanges();
+    const accountValueMap: AccountNameValueMapMap = new Map();
+    const accountMap = await this._getAccountMap();
 
-    rows = rows.map((row) => {
-      if (row.indent === 0) {
-        row.account = {
-          template: `<span class="font-semibold">${row.account}</span>`,
-        };
-      }
-      return row;
-    });
-
-    const columns = unique([...income.periodList, ...expense.periodList]);
-
-    const profitRow: Row = {
-      account: 'Total Profit',
-    };
-
-    for (const column of columns) {
-      const incomeAmount =
-        (income.totalRow[column] as number | undefined) ?? 0.0;
-      const expenseAmount =
-        (expense.totalRow[column] as number | undefined) ?? 0.0;
-
-      profitRow[column] = incomeAmount - expenseAmount;
-
-      rows.forEach((row) => {
-        if (!row.isGroup) {
-          row[column] = row[column] || 0.0;
+    for (const account of map.keys()) {
+      const valueMap: ValueMap = new Map();
+      for (const entry of map.get(account)!) {
+        const key = this._getRangeMapKey(entry, dateRanges);
+        if (valueMap === null) {
+          continue;
         }
+
+        const totalBalance = valueMap.get(key!) ?? 0;
+        const balance = (entry.debit ?? 0) - (entry.credit ?? 0);
+        const rootType = accountMap[entry.account].rootType;
+
+        if (isCredit(rootType)) {
+          valueMap.set(key!, totalBalance - balance);
+        } else {
+          valueMap.set(key!, totalBalance + balance);
+        }
+      }
+      accountValueMap.set(account, valueMap);
+    }
+
+    return accountValueMap;
+  }
+
+  async _getAccountMap() {
+    if (this.accountMap) {
+      return this.accountMap;
+    }
+
+    const accountList: Account[] = (
+      await this.fyo.db.getAllRaw('Account', {
+        fields: ['name', 'rootType', 'isGroup'],
+      })
+    ).map((rv) => ({
+      name: rv.name as string,
+      rootType: rv.rootType as AccountRootType,
+      isGroup: Boolean(rv.isGroup),
+    }));
+
+    this.accountMap = getMapFromList(accountList, 'name');
+    return this.accountMap;
+  }
+
+  _getRangeMapKey(
+    entry: LedgerEntry,
+    dateRanges: DateRange[]
+  ): DateRange | null {
+    const entryDate = +DateTime.fromISO(
+      entry.date!.toISOString().split('T')[0]
+    );
+
+    for (const dr of dateRanges) {
+      if (entryDate <= +dr.toDate && entryDate > +dr.fromDate) {
+        return dr;
+      }
+    }
+
+    return null;
+  }
+
+  async _getDateRanges(): Promise<DateRange[]> {
+    const endpoints = await this._getFromAndToDates();
+    const fromDate = DateTime.fromISO(endpoints.fromDate);
+    const toDate = DateTime.fromISO(endpoints.toDate);
+
+    if (this.singleColumn) {
+      return [
+        {
+          toDate,
+          fromDate,
+        },
+      ];
+    }
+
+    const months: number = monthsMap[this.periodicity];
+    const dateRanges: DateRange[] = [
+      { toDate, fromDate: toDate.minus({ months }) },
+    ];
+
+    let count = this.count ?? 1;
+    if (this.basedOn === 'Fiscal Year') {
+      count = Math.ceil(((this.toYear! - this.fromYear!) * 12) / months);
+    }
+
+    for (let i = 1; i < count; i++) {
+      const lastRange = dateRanges.at(-1)!;
+      dateRanges.push({
+        toDate: lastRange.fromDate,
+        fromDate: lastRange.fromDate.minus({ months }),
       });
     }
 
-    rows.push(profitRow);
-
-    return { rows, columns };
+    return dateRanges;
   }
+
+  async _getFromAndToDates() {
+    let toDate: string;
+    let fromDate: string;
+
+    if (this.basedOn === 'Date Range') {
+      toDate = this.toDate!;
+      const months = monthsMap[this.periodicity] * Math.max(this.count ?? 1, 1);
+      fromDate = DateTime.fromISO(toDate).minus({ months }).toISODate();
+    } else {
+      const fy = await getFiscalEndpoints(this.toYear!, this.fromYear!);
+      toDate = fy.toDate;
+      fromDate = fy.fromDate;
+    }
+
+    return { fromDate, toDate };
+  }
+
+  async _getQueryFilters(): Promise<QueryFilter> {
+    const filters: QueryFilter = {};
+    const { fromDate, toDate } = await this._getFromAndToDates();
+
+    const dateFilter: string[] = [];
+    dateFilter.push('<=', toDate);
+    dateFilter.push('>=', fromDate);
+
+    filters.date = dateFilter;
+    filters.reverted = false;
+    return filters;
+  }
+
+  getFilters() {
+    const periodNameMap: Record<Periodicity, string> = {
+      Monthly: t`Months`,
+      Quarterly: t`Quarters`,
+      'Half Yearly': t`Half Years`,
+      Yearly: t`Years`,
+    };
+
+    const filters = [
+      {
+        fieldtype: 'Select',
+        options: [
+          { label: t`Monthly`, value: 'Monthly' },
+          { label: t`Quarterly`, value: 'Quarterly' },
+          { label: t`Half Yearly`, value: 'Half Yearly' },
+          { label: t`Yearly`, value: 'Yearly' },
+        ],
+        default: 'Monthly',
+        label: t`Periodicity`,
+        fieldname: 'periodicity',
+      },
+      {
+        fieldtype: 'Select',
+        options: [
+          { label: t`Fiscal Year`, value: 'Fiscal Year' },
+          { label: t`Date Range`, value: 'Date Range' },
+        ],
+        default: 'Fiscal Year',
+        label: t`Based On`,
+        fieldname: 'basedOn',
+      },
+      {
+        fieldtype: 'Check',
+        default: false,
+        label: t`Single Column`,
+        fieldname: 'singleColumn',
+      },
+    ] as Field[];
+
+    if (this.basedOn === 'Date Range') {
+      return [
+        ...filters,
+        {
+          fieldtype: 'Date',
+          fieldname: 'toDate',
+          placeholder: t`To Date`,
+          label: t`To Date`,
+          required: true,
+        },
+        {
+          fieldtype: 'Int',
+          fieldname: 'count',
+          placeholder: t`Number of ${periodNameMap[this.periodicity]}`,
+          label: t`Number of ${periodNameMap[this.periodicity]}`,
+          required: true,
+        },
+      ] as Field[];
+    }
+
+    const thisYear = DateTime.local().year;
+    return [
+      ...filters,
+      {
+        fieldtype: 'Date',
+        fieldname: 'fromYear',
+        placeholder: t`From Date`,
+        label: t`From Date`,
+        default: thisYear - 1,
+        required: true,
+      },
+      {
+        fieldtype: 'Date',
+        fieldname: 'toYear',
+        placeholder: t`To Year`,
+        label: t`To Year`,
+        default: thisYear,
+        required: true,
+      },
+    ] as Field[];
+  }
+
+  getColumns(): ColumnField[] {
+    const columns = [] as ColumnField[];
+
+    return columns;
+  }
+
+  getActions(): Action[] {
+    return [];
+  }
+
+  metaFilters: string[] = ['basedOn'];
 }
+
+async function getFiscalEndpoints(toYear: number, fromYear: number) {
+  const fys = (await fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'fiscalYearStart'
+  )) as Date;
+  const fye = (await fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'fiscalYearEnd'
+  )) as Date;
+
+  /**
+   * Get the month and the day, and
+   * prepend with the passed year.
+   */
+
+  const fromDate = [
+    fromYear,
+    fys.toISOString().split('T')[0].split('-').slice(1),
+  ].join('-');
+
+  const toDate = [
+    toYear,
+    fye.toISOString().split('T')[0].split('-').slice(1),
+  ].join('-');
+
+  return { fromDate, toDate };
+}
+
+const monthsMap: Record<Periodicity, number> = {
+  Monthly: 1,
+  Quarterly: 3,
+  'Half Yearly': 6,
+  Yearly: 12,
+};
diff --git a/reports/ProfitAndLoss/viewConfig.js b/reports/ProfitAndLoss/viewConfig.js
deleted file mode 100644
index 962c33f9..00000000
--- a/reports/ProfitAndLoss/viewConfig.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import { t } from 'fyo';
-import { fyo } from 'src/initFyo';
-import getCommonExportActions from '../commonExporter';
-
-const title = t`Profit and Loss`;
-
-const periodicityMap = {
-  Monthly: t`Monthly`,
-  Quarterly: t`Quarterly`,
-  'Half Yearly': t`Half Yearly`,
-  Yearly: t`Yearly`,
-};
-export default {
-  title: title,
-  method: 'profit-and-loss',
-  treeView: true,
-  filterFields: [
-    {
-      fieldtype: 'Date',
-      fieldname: 'fromDate',
-      size: 'small',
-      placeholder: t`From Date`,
-      label: t`From Date`,
-      required: 1,
-      default: async () => {
-        return (await fyo.getSingle('AccountingSettings')).fiscalYearStart;
-      },
-    },
-    {
-      fieldtype: 'Date',
-      fieldname: 'toDate',
-      size: 'small',
-      placeholder: t`To Date`,
-      label: t`To Date`,
-      required: 1,
-      default: async () => {
-        return (await fyo.getSingle('AccountingSettings')).fiscalYearEnd;
-      },
-    },
-    {
-      fieldtype: 'Select',
-      size: 'small',
-      options: Object.keys(periodicityMap),
-      map: periodicityMap,
-      default: 'Monthly',
-      label: t`Periodicity`,
-      placeholder: t`Select Period...`,
-      fieldname: 'periodicity',
-    },
-  ],
-  actions: getCommonExportActions('profit-and-loss'),
-  getColumns({ data }) {
-    const columns = [
-      { label: t`Account`, fieldtype: 'Data', fieldname: 'account', width: 2 },
-    ];
-
-    if (data && data.columns) {
-      const currencyColumns = data.columns;
-      const columnDefs = currencyColumns.map((name) => ({
-        label: name,
-        fieldname: name,
-        fieldtype: 'Currency',
-        width: 1,
-      }));
-
-      columns.push(...columnDefs);
-    }
-
-    return columns;
-  },
-};
diff --git a/reports/Report.ts b/reports/Report.ts
index 243d511f..5cbcd55f 100644
--- a/reports/Report.ts
+++ b/reports/Report.ts
@@ -14,9 +14,6 @@ export abstract class Report extends Observable<RawValue> {
   filters: Field[];
   reportData: ReportData;
 
-  abstract getActions(): Action[];
-  abstract getFilters(): Field[];
-
   constructor(fyo: Fyo) {
     super();
     this.fyo = fyo;
@@ -57,7 +54,9 @@ export abstract class Report extends Observable<RawValue> {
       this[key] = value;
     }
 
+    this.filters = this.getFilters();
     this.columns = this.getColumns();
+    await this.setDefaultFilters();
     await this.setReportData(key);
   }
 
@@ -72,6 +71,13 @@ export abstract class Report extends Observable<RawValue> {
     }
   }
 
+  /**
+   * Should first check if filter value is set
+   * and update only if it is not set.
+   */
+  async setDefaultFilters() {}
+  abstract getActions(): Action[];
+  abstract getFilters(): Field[];
   abstract getColumns(): ColumnField[];
   abstract setReportData(filter?: string): Promise<void>;
 }
diff --git a/reports/types.ts b/reports/types.ts
index 0a18d650..c7e82176 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -1,5 +1,5 @@
 import { AccountRootType } from 'models/baseModels/Account/types';
-import { BaseField } from 'schemas/types';
+import { BaseField, RawValue } from 'schemas/types';
 
 export type ExportExtension = 'csv' | 'json';
 
@@ -28,3 +28,34 @@ export interface FinancialStatementOptions {
   periodicity?: Periodicity;
   accumulateValues?: boolean;
 }
+
+export interface RawLedgerEntry {
+  name: string;
+  account: string;
+  date: string;
+  debit: string;
+  credit: string;
+  referenceType: string;
+  referenceName: string;
+  party: string;
+  reverted: number;
+  reverts: string;
+  [key: string]: RawValue;
+}
+
+export interface LedgerEntry {
+  index?: string;
+  name: number;
+  account: string;
+  date: Date | null;
+  debit: number | null;
+  credit: number | null;
+  balance: number | null;
+  referenceType: string;
+  referenceName: string;
+  party: string;
+  reverted: boolean;
+  reverts: string;
+}
+
+export type GroupedMap = Map<string, LedgerEntry[]>;
\ No newline at end of file
diff --git a/src/components/Controls/DynamicLink.vue b/src/components/Controls/DynamicLink.vue
index 08fc88ec..742ab698 100644
--- a/src/components/Controls/DynamicLink.vue
+++ b/src/components/Controls/DynamicLink.vue
@@ -4,7 +4,9 @@ import Link from './Link.vue';
 export default {
   name: 'DynamicLink',
   props: ['target'],
-  inject: ['report'],
+  inject: {
+    report: { default: null },
+  },
   extends: Link,
   created() {
     const watchKey = `doc.${this.df.references}`;
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index db342347..e50d8426 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -127,7 +127,7 @@
 </template>
 <script>
 import { t } from 'fyo';
-import { AccountRootTypeEnum } from 'models/baseModels/Account/types';
+import { isCredit } from 'models/helpers';
 import { ModelNameEnum } from 'models/types';
 import PageHeader from 'src/components/PageHeader';
 import { fyo } from 'src/initFyo';
@@ -154,24 +154,8 @@ export default {
     }
   },
   methods: {
-    isCredit(rootType) {
-      switch (rootType) {
-        case AccountRootTypeEnum.Asset:
-          return false;
-        case AccountRootTypeEnum.Liability:
-          return true;
-        case AccountRootTypeEnum.Equity:
-          return true;
-        case AccountRootTypeEnum.Expense:
-          return false;
-        case AccountRootTypeEnum.Income:
-          return true;
-        default:
-          return true;
-      }
-    },
     getBalanceString(account) {
-      const suffix = this.isCredit(account.rootType) ? t`Cr.` : t`Dr.`;
+      const suffix = isCredit(account.rootType) ? t`Cr.` : t`Dr.`;
       return `${fyo.format(account.balance, 'Currency')} ${suffix}`;
     },
     async fetchAccounts() {
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index ac27809b..d6467d29 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="flex flex-col">
     <PageHeader :title="t`Dashboard`" />
+
     <div class="mx-4 overflow-y-scroll no-scrollbar">
+      <!-- 
       <Cashflow class="mt-5" />
       <hr class="border-t mt-10" />
       <UnpaidInvoices class="mt-10 ml-4 mr-4" />
@@ -10,25 +12,28 @@
         <ProfitAndLoss class="w-1/2" />
         <Expenses class="w-1/2" />
       </div>
+       -->
     </div>
   </div>
 </template>
 
 <script>
 import PageHeader from 'src/components/PageHeader';
-import Cashflow from './Cashflow';
-import Expenses from './Expenses';
-import ProfitAndLoss from './ProfitAndLoss';
-import UnpaidInvoices from './UnpaidInvoices';
+// import Cashflow from './Cashflow';
+// import Expenses from './Expenses';
+// import ProfitAndLoss from './ProfitAndLoss';
+// import UnpaidInvoices from './UnpaidInvoices';
 
 export default {
   name: 'Dashboard',
   components: {
     PageHeader,
+    /*
     Cashflow,
     UnpaidInvoices,
     ProfitAndLoss,
     Expenses,
+    */
   },
 };
 </script>
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index 41e93c6f..f84c3842 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -20,11 +20,12 @@
     <div v-if="report" class="mx-4 grid grid-cols-5 gap-2">
       <FormControl
         v-for="field in report.filters"
+        size="small"
         :show-label="field.fieldtype === 'Check'"
         :key="field.fieldname + '-filter'"
         class="bg-gray-100 rounded"
-        :class="field.fieldtype === 'Check' ? 'flex pl-3' : ''"
-        input-class="bg-transparent px-3 py-2 text-base"
+        :class="field.fieldtype === 'Check' ? 'flex pl-2' : ''"
+        input-class="bg-transparent text-sm"
         :df="field"
         :value="report.get(field.fieldname)"
         :read-only="loading"
@@ -85,6 +86,8 @@ export default defineComponent({
       if (!this.report.reportData.length) {
         await this.report.setReportData();
       }
+
+      await this.report.setDefaultFilters();
     },
   },
 });
diff --git a/src/renderer.ts b/src/renderer.ts
index 51cb3e8c..5caae725 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,5 +1,6 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
+import { DateTime } from 'luxon';
 import { IPC_ACTIONS } from 'utils/messages';
 import { App as VueApp, createApp } from 'vue';
 import App from './App.vue';
@@ -103,5 +104,7 @@ function setOnWindow() {
     window.router = router;
     // @ts-ignore
     window.fyo = fyo;
+    // @ts-ignore
+    window.DateTime = DateTime;
   }
 }

From 6c350f097423695c179b88322003bbd8f5b0fa9c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Sun, 15 May 2022 17:43:31 +0530
Subject: [PATCH 116/163] incr: add tree making functions to PNL

---
 reports/ProfitAndLoss/ProfitAndLoss.ts | 197 ++++++++++++++++++++++---
 1 file changed, 179 insertions(+), 18 deletions(-)

diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index 3b2d0cc3..8b55d40c 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -1,7 +1,11 @@
-import { Fyo, t } from 'fyo';
+import { t } from 'fyo';
 import { Action } from 'fyo/model/types';
+import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
-import { AccountRootType } from 'models/baseModels/Account/types';
+import {
+  AccountRootType,
+  AccountRootTypeEnum,
+} from 'models/baseModels/Account/types';
 import { isCredit } from 'models/helpers';
 import { ModelNameEnum } from 'models/types';
 import { LedgerReport } from 'reports/LedgerReport';
@@ -20,7 +24,25 @@ type DateRange = { fromDate: DateTime; toDate: DateTime };
 type ValueMap = Map<DateRange, number>;
 type AccountNameValueMapMap = Map<string, ValueMap>;
 type BasedOn = 'Fiscal Year' | 'Date Range';
-type Account = { name: string; rootType: AccountRootType; isGroup: boolean };
+
+interface Account {
+  name: string;
+  rootType: AccountRootType;
+  isGroup: boolean;
+  parentAccount: string | null;
+}
+
+interface AccountTreeNode extends Account {
+  children?: AccountTreeNode[];
+  valueMap?: ValueMap;
+  prune?: boolean;
+}
+type AccountTree = Record<string, AccountTreeNode>;
+
+const PNL_ROOT_TYPES: AccountRootType[] = [
+  AccountRootTypeEnum.Income,
+  AccountRootTypeEnum.Expense,
+];
 
 export class ProfitAndLoss extends LedgerReport {
   static title = t`Profit And Loss`;
@@ -32,25 +54,21 @@ export class ProfitAndLoss extends LedgerReport {
   toYear?: number;
   singleColumn: boolean = false;
   periodicity: Periodicity = 'Monthly';
-  basedOn: BasedOn = 'Fiscal Year';
+  basedOn: BasedOn = 'Date Range';
 
   _rawData: LedgerEntry[] = [];
 
   accountMap?: Record<string, Account>;
 
-  constructor(fyo: Fyo) {
-    super(fyo);
-  }
-
   async setDefaultFilters(): Promise<void> {
     if (this.basedOn === 'Date Range' && !this.toDate) {
       this.toDate = DateTime.now().toISODate();
-      this.count = 1;
+      this.count = 3;
     }
 
     if (this.basedOn === 'Fiscal Year' && !this.toYear) {
-      this.toYear = DateTime.now().year;
-      this.fromYear = this.toYear - 1;
+      this.fromYear = DateTime.now().year;
+      this.toYear = this.fromYear + 1;
     }
   }
 
@@ -66,12 +84,30 @@ export class ProfitAndLoss extends LedgerReport {
 
     const map = this._getGroupedMap(sort, 'account');
     const rangeGroupedMap = await this._getGroupedByDateRanges(map);
+    const accountTree = await this._getAccountTree(rangeGroupedMap);
+
+    for (const name of Object.keys(accountTree)) {
+      const { rootType } = accountTree[name];
+      if (PNL_ROOT_TYPES.includes(rootType)) {
+        continue;
+      }
+
+      delete accountTree[name];
+    }
     /**
-     * TODO: Get account tree  from accountMap
      * TODO: Create Grid from rangeGroupedMap and tree
      */
   }
 
+  async temp() {
+    await this.setDefaultFilters();
+    await this._setRawData();
+    const map = this._getGroupedMap(false, 'account');
+    const rangeGroupedMap = await this._getGroupedByDateRanges(map);
+    const accountTree = await this._getAccountTree(rangeGroupedMap);
+    return accountTree;
+  }
+
   async _getGroupedByDateRanges(
     map: GroupedMap
   ): Promise<AccountNameValueMapMap> {
@@ -83,7 +119,7 @@ export class ProfitAndLoss extends LedgerReport {
       const valueMap: ValueMap = new Map();
       for (const entry of map.get(account)!) {
         const key = this._getRangeMapKey(entry, dateRanges);
-        if (valueMap === null) {
+        if (key === null) {
           continue;
         }
 
@@ -103,6 +139,18 @@ export class ProfitAndLoss extends LedgerReport {
     return accountValueMap;
   }
 
+  async _getAccountTree(rangeGroupedMap: AccountNameValueMapMap) {
+    const accountTree = cloneDeep(await this._getAccountMap()) as AccountTree;
+
+    setPruneFlagOnAccountTreeNodes(accountTree);
+    setValueMapOnAccountTreeNodes(accountTree, rangeGroupedMap);
+    setChildrenOnAccountTreeNodes(accountTree);
+    deleteNonRootAccountTreeNodes(accountTree);
+    pruneAccountTree(accountTree);
+
+    return accountTree;
+  }
+
   async _getAccountMap() {
     if (this.accountMap) {
       return this.accountMap;
@@ -110,12 +158,13 @@ export class ProfitAndLoss extends LedgerReport {
 
     const accountList: Account[] = (
       await this.fyo.db.getAllRaw('Account', {
-        fields: ['name', 'rootType', 'isGroup'],
+        fields: ['name', 'rootType', 'isGroup', 'parentAccount'],
       })
     ).map((rv) => ({
       name: rv.name as string,
       rootType: rv.rootType as AccountRootType,
       isGroup: Boolean(rv.isGroup),
+      parentAccount: rv.parentAccount as string | null,
     }));
 
     this.accountMap = getMapFromList(accountList, 'name');
@@ -126,12 +175,15 @@ export class ProfitAndLoss extends LedgerReport {
     entry: LedgerEntry,
     dateRanges: DateRange[]
   ): DateRange | null {
-    const entryDate = +DateTime.fromISO(
+    const entryDate = DateTime.fromISO(
       entry.date!.toISOString().split('T')[0]
-    );
+    ).toMillis();
 
     for (const dr of dateRanges) {
-      if (entryDate <= +dr.toDate && entryDate > +dr.fromDate) {
+      const toDate = dr.toDate.toMillis();
+      const fromDate = dr.fromDate.toMillis();
+
+      if (entryDate <= toDate && entryDate > fromDate) {
         return dr;
       }
     }
@@ -231,7 +283,7 @@ export class ProfitAndLoss extends LedgerReport {
           { label: t`Fiscal Year`, value: 'Fiscal Year' },
           { label: t`Date Range`, value: 'Date Range' },
         ],
-        default: 'Fiscal Year',
+        default: 'Date Range',
         label: t`Based On`,
         fieldname: 'basedOn',
       },
@@ -332,3 +384,112 @@ const monthsMap: Record<Periodicity, number> = {
   'Half Yearly': 6,
   Yearly: 12,
 };
+
+function setPruneFlagOnAccountTreeNodes(accountTree: AccountTree) {
+  for (const account of Object.values(accountTree)) {
+    account.prune = true;
+  }
+}
+
+function setValueMapOnAccountTreeNodes(
+  accountTree: AccountTree,
+  rangeGroupedMap: AccountNameValueMapMap
+) {
+  for (const name of rangeGroupedMap.keys()) {
+    const valueMap = rangeGroupedMap.get(name)!;
+    accountTree[name].valueMap = valueMap;
+    accountTree[name].prune = false;
+
+    /**
+     * Set the update the parent account values recursively
+     * also prevent pruning of the parent accounts.
+     */
+    let parentAccountName: string | null = accountTree[name].parentAccount;
+    let parentValueMap = valueMap;
+
+    while (parentAccountName !== null) {
+      const update = updateParentAccountWithChildValues(
+        accountTree,
+        parentAccountName,
+        parentValueMap
+      );
+
+      parentAccountName = update.parentAccountName;
+      parentValueMap = update.parentValueMap;
+    }
+  }
+}
+
+function updateParentAccountWithChildValues(
+  accountTree: AccountTree,
+  parentAccountName: string,
+  parentValueMap: ValueMap
+): {
+  parentAccountName: string | null;
+  parentValueMap: ValueMap;
+} {
+  const parentAccount = accountTree[parentAccountName];
+  parentAccount.prune = false;
+  parentAccount.valueMap ??= new Map();
+
+  for (const key of parentValueMap.keys()) {
+    const value = parentAccount.valueMap!.get(key) ?? 0;
+    parentAccount.valueMap!.set(key, value + parentValueMap.get(key)!);
+  }
+
+  return {
+    parentAccountName: parentAccount.parentAccount,
+    parentValueMap: parentAccount.valueMap!,
+  };
+}
+
+function setChildrenOnAccountTreeNodes(accountTree: AccountTree) {
+  const parentNodes: Set<string> = new Set();
+
+  for (const name of Object.keys(accountTree)) {
+    const ac = accountTree[name];
+    if (!ac.parentAccount) {
+      continue;
+    }
+
+    accountTree[ac.parentAccount].children ??= [];
+    accountTree[ac.parentAccount].children!.push(ac!);
+
+    parentNodes.add(ac.parentAccount);
+  }
+}
+
+function deleteNonRootAccountTreeNodes(accountTree: AccountTree) {
+  for (const name of Object.keys(accountTree)) {
+    const ac = accountTree[name];
+    if (!ac.parentAccount) {
+      continue;
+    }
+
+    delete accountTree[name];
+  }
+}
+
+function pruneAccountTree(accountTree: AccountTree) {
+  for (const root of Object.keys(accountTree)) {
+    if (accountTree[root].prune) {
+      delete accountTree[root];
+    }
+  }
+
+  for (const root of Object.keys(accountTree)) {
+    accountTree[root].children = getPrunedChildren(accountTree[root].children!);
+  }
+}
+
+function getPrunedChildren(children: AccountTreeNode[]): AccountTreeNode[] {
+  return children.filter((child) => {
+    if (child.children) {
+      child.children = getPrunedChildren(child.children);
+    }
+
+    return !child.prune;
+  });
+}
+
+function convertAccountTreeToAccountList() {}

From ad22005cc227b63548d11e7e2b6785291e5b5bba Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 16 May 2022 00:18:57 +0530
Subject: [PATCH 117/163] incr: get PNL to display - needs a few more fixes

---
 reports/GeneralLedger/GeneralLedger.ts |  18 ++-
 reports/ProfitAndLoss/ProfitAndLoss.ts | 190 +++++++++++++++++--------
 reports/Report.ts                      |  37 +++--
 reports/index.ts                       |   4 +-
 src/pages/Report.vue                   |   8 +-
 src/renderer.ts                        |   3 +
 src/utils/sidebarConfig.ts             |   4 +-
 7 files changed, 168 insertions(+), 96 deletions(-)

diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 4c2e3f87..8461073f 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -1,6 +1,7 @@
 import { Fyo, t } from 'fyo';
 import { Action } from 'fyo/model/types';
 import { DateTime } from 'luxon';
+import { ModelNameEnum } from 'models/types';
 import { LedgerReport } from 'reports/LedgerReport';
 import {
   ColumnField,
@@ -12,12 +13,21 @@ import {
 import { Field, FieldTypeEnum } from 'schemas/types';
 import { QueryFilter } from 'utils/db/types';
 
+type ReferenceType =
+  | ModelNameEnum.SalesInvoice
+  | ModelNameEnum.PurchaseInvoice
+  | ModelNameEnum.Payment
+  | ModelNameEnum.JournalEntry
+  | 'All';
+
 export class GeneralLedger extends LedgerReport {
   static title = t`General Ledger`;
   static reportName = 'general-ledger';
 
-  ascending!: boolean;
-  groupBy!: 'none' | 'party' | 'account' | 'referenceName';
+  ascending: boolean = false;
+  reverted: boolean = false;
+  referenceType: ReferenceType = 'All';
+  groupBy: 'none' | 'party' | 'account' | 'referenceName' = 'none';
   _rawData: LedgerEntry[] = [];
 
   constructor(fyo: Fyo) {
@@ -263,7 +273,6 @@ export class GeneralLedger extends LedgerReport {
         label: t`Ref Type`,
         fieldname: 'referenceType',
         placeholder: t`Ref Type`,
-        default: 'All',
       },
       {
         fieldtype: 'DynamicLink',
@@ -301,7 +310,6 @@ export class GeneralLedger extends LedgerReport {
       },
       {
         fieldtype: 'Select',
-        default: 'none',
         label: t`Group By`,
         fieldname: 'groupBy',
         options: [
@@ -313,13 +321,11 @@ export class GeneralLedger extends LedgerReport {
       },
       {
         fieldtype: 'Check',
-        default: false,
         label: t`Include Cancelled`,
         fieldname: 'reverted',
       },
       {
         fieldtype: 'Check',
-        default: false,
         label: t`Ascending Order`,
         fieldname: 'ascending',
       },
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index 8b55d40c..44cdfa39 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
 import {
   AccountRootType,
-  AccountRootTypeEnum,
+  AccountRootTypeEnum
 } from 'models/baseModels/Account/types';
 import { isCredit } from 'models/helpers';
 import { ModelNameEnum } from 'models/types';
@@ -14,6 +14,9 @@ import {
   GroupedMap,
   LedgerEntry,
   Periodicity,
+  ReportCell,
+  ReportData,
+  ReportRow
 } from 'reports/types';
 import { Field } from 'schemas/types';
 import { fyo } from 'src/initFyo';
@@ -32,24 +35,33 @@ interface Account {
   parentAccount: string | null;
 }
 
+type AccountTree = Record<string, AccountTreeNode>;
 interface AccountTreeNode extends Account {
   children?: AccountTreeNode[];
   valueMap?: ValueMap;
   prune?: boolean;
 }
-type AccountTree = Record<string, AccountTreeNode>;
+
+type AccountList = AccountListNode[];
+interface AccountListNode extends Account {
+  valueMap?: ValueMap;
+  level?: number;
+}
 
 const PNL_ROOT_TYPES: AccountRootType[] = [
   AccountRootTypeEnum.Income,
   AccountRootTypeEnum.Expense,
 ];
 
+const ACC_NAME_WIDTH = 1.5;
+const ACC_BAL_WIDTH = 1;
+
 export class ProfitAndLoss extends LedgerReport {
   static title = t`Profit And Loss`;
   static reportName = 'profit-and-loss';
 
   toDate?: string;
-  count?: number;
+  count: number = 3;
   fromYear?: number;
   toYear?: number;
   singleColumn: boolean = false;
@@ -63,7 +75,6 @@ export class ProfitAndLoss extends LedgerReport {
   async setDefaultFilters(): Promise<void> {
     if (this.basedOn === 'Date Range' && !this.toDate) {
       this.toDate = DateTime.now().toISODate();
-      this.count = 3;
     }
 
     if (this.basedOn === 'Fiscal Year' && !this.toYear) {
@@ -73,16 +84,8 @@ export class ProfitAndLoss extends LedgerReport {
   }
 
   async setReportData(filter?: string) {
-    let sort = true;
-    if (
-      this._rawData.length === 0 &&
-      !['periodicity', 'singleColumn'].includes(filter!)
-    ) {
-      await this._setRawData();
-      sort = false;
-    }
-
-    const map = this._getGroupedMap(sort, 'account');
+    await this._setRawData();
+    const map = this._getGroupedMap(true, 'account');
     const rangeGroupedMap = await this._getGroupedByDateRanges(map);
     const accountTree = await this._getAccountTree(rangeGroupedMap);
 
@@ -94,18 +97,28 @@ export class ProfitAndLoss extends LedgerReport {
 
       delete accountTree[name];
     }
-    /**
-     * TODO: Create Grid from rangeGroupedMap and tree
-     */
+
+    const accountList = convertAccountTreeToAccountList(accountTree);
+    this.reportData = this.getReportDataFromAccountList(accountList);
   }
 
-  async temp() {
-    await this.setDefaultFilters();
-    await this._setRawData();
-    const map = this._getGroupedMap(false, 'account');
-    const rangeGroupedMap = await this._getGroupedByDateRanges(map);
-    const accountTree = await this._getAccountTree(rangeGroupedMap);
-    return accountTree;
+  getReportDataFromAccountList(accountList: AccountList): ReportData {
+    const dateKeys = [...accountList[0].valueMap!.keys()].sort(
+      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
+    );
+
+    return accountList.map((al) => {
+      const nameCell = { value: al.name, align: 'left', width: ACC_NAME_WIDTH };
+      const balanceCells = dateKeys.map(
+        (k) =>
+          ({
+            value: this.fyo.format(al.valueMap?.get(k)!, 'Currency'),
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          } as ReportCell)
+      );
+      return [nameCell, balanceCells].flat() as ReportRow;
+    });
   }
 
   async _getGroupedByDateRanges(
@@ -256,7 +269,7 @@ export class ProfitAndLoss extends LedgerReport {
     return filters;
   }
 
-  getFilters() {
+  getFilters(): Field[] {
     const periodNameMap: Record<Periodicity, string> = {
       Monthly: t`Months`,
       Quarterly: t`Quarters`,
@@ -265,6 +278,15 @@ export class ProfitAndLoss extends LedgerReport {
     };
 
     const filters = [
+      {
+        fieldtype: 'Select',
+        options: [
+          { label: t`Fiscal Year`, value: 'Fiscal Year' },
+          { label: t`Date Range`, value: 'Date Range' },
+        ],
+        label: t`Based On`,
+        fieldname: 'basedOn',
+      },
       {
         fieldtype: 'Select',
         options: [
@@ -273,31 +295,31 @@ export class ProfitAndLoss extends LedgerReport {
           { label: t`Half Yearly`, value: 'Half Yearly' },
           { label: t`Yearly`, value: 'Yearly' },
         ],
-        default: 'Monthly',
         label: t`Periodicity`,
         fieldname: 'periodicity',
       },
+      ,
+    ] as Field[];
+
+    let dateFilters = [
       {
-        fieldtype: 'Select',
-        options: [
-          { label: t`Fiscal Year`, value: 'Fiscal Year' },
-          { label: t`Date Range`, value: 'Date Range' },
-        ],
-        default: 'Date Range',
-        label: t`Based On`,
-        fieldname: 'basedOn',
+        fieldtype: 'Date',
+        fieldname: 'fromYear',
+        placeholder: t`From Date`,
+        label: t`From Date`,
+        required: true,
       },
       {
-        fieldtype: 'Check',
-        default: false,
-        label: t`Single Column`,
-        fieldname: 'singleColumn',
+        fieldtype: 'Date',
+        fieldname: 'toYear',
+        placeholder: t`To Year`,
+        label: t`To Year`,
+        required: true,
       },
     ] as Field[];
 
     if (this.basedOn === 'Date Range') {
-      return [
-        ...filters,
+      dateFilters = [
         {
           fieldtype: 'Date',
           fieldname: 'toDate',
@@ -308,6 +330,7 @@ export class ProfitAndLoss extends LedgerReport {
         {
           fieldtype: 'Int',
           fieldname: 'count',
+          minvalue: 1,
           placeholder: t`Number of ${periodNameMap[this.periodicity]}`,
           label: t`Number of ${periodNameMap[this.periodicity]}`,
           required: true,
@@ -315,32 +338,43 @@ export class ProfitAndLoss extends LedgerReport {
       ] as Field[];
     }
 
-    const thisYear = DateTime.local().year;
     return [
-      ...filters,
+      filters,
+      dateFilters,
       {
-        fieldtype: 'Date',
-        fieldname: 'fromYear',
-        placeholder: t`From Date`,
-        label: t`From Date`,
-        default: thisYear - 1,
-        required: true,
-      },
-      {
-        fieldtype: 'Date',
-        fieldname: 'toYear',
-        placeholder: t`To Year`,
-        label: t`To Year`,
-        default: thisYear,
-        required: true,
-      },
-    ] as Field[];
+        fieldtype: 'Check',
+        label: t`Single Column`,
+        fieldname: 'singleColumn',
+      } as Field,
+    ].flat();
   }
 
-  getColumns(): ColumnField[] {
-    const columns = [] as ColumnField[];
+  async getColumns(): Promise<ColumnField[]> {
+    const columns = [
+      {
+        label: t`Account`,
+        fieldtype: 'Link',
+        fieldname: 'account',
+        align: 'left',
+        width: ACC_NAME_WIDTH,
+      },
+    ] as ColumnField[];
 
-    return columns;
+    const dateRanges = await this._getDateRanges();
+    const dateColumns = dateRanges
+      .sort((a, b) => b.toDate.toMillis() - a.toDate.toMillis())
+      .map(
+        (d) =>
+          ({
+            label: this.fyo.format(d.toDate.toJSDate(), 'Date'),
+            fieldtype: 'Data',
+            fieldname: 'toDate',
+            align: 'right',
+            width: ACC_BAL_WIDTH,
+          } as ColumnField)
+      );
+
+    return [columns, dateColumns].flat();
   }
 
   getActions(): Action[] {
@@ -492,4 +526,36 @@ function getPrunedChildren(children: AccountTreeNode[]): AccountTreeNode[] {
   });
 }
 
-function convertAccountTreeToAccountList() {}
+function convertAccountTreeToAccountList(
+  accountTree: AccountTree
+): AccountList {
+  const accountList: AccountList = [];
+
+  for (const rootNode of Object.values(accountTree)) {
+    pushToAccountList(rootNode, accountList, 0);
+  }
+
+  return accountList;
+}
+
+function pushToAccountList(
+  accountTreeNode: AccountTreeNode,
+  accountList: AccountList,
+  level: number
+) {
+  accountList.push({
+    name: accountTreeNode.name,
+    rootType: accountTreeNode.rootType,
+    isGroup: accountTreeNode.isGroup,
+    parentAccount: accountTreeNode.parentAccount,
+    valueMap: accountTreeNode.valueMap,
+    level,
+  });
+
+  const children = accountTreeNode.children ?? [];
+  const childLevel = level + 1;
+
+  for (const childNode of children) {
+    pushToAccountList(childNode, accountList, childLevel);
+  }
+}
diff --git a/reports/Report.ts b/reports/Report.ts
index 5cbcd55f..a7ac4748 100644
--- a/reports/Report.ts
+++ b/reports/Report.ts
@@ -10,17 +10,25 @@ export abstract class Report extends Observable<RawValue> {
   static reportName: string;
 
   fyo: Fyo;
-  columns: ColumnField[];
-  filters: Field[];
+  columns: ColumnField[] = [];
+  filters: Field[] = [];
   reportData: ReportData;
 
   constructor(fyo: Fyo) {
     super();
     this.fyo = fyo;
     this.reportData = [];
-    this.filters = this.getFilters();
-    this.columns = this.getColumns();
-    this.initializeFilters();
+  }
+
+  async initialize() {
+    /**
+     * Not in constructor cause possibly async.
+     */
+
+    await this.setDefaultFilters();
+    this.filters = await this.getFilters();
+    this.columns = await this.getColumns();
+    await this.setReportData();
   }
 
   get filterMap() {
@@ -54,30 +62,19 @@ export abstract class Report extends Observable<RawValue> {
       this[key] = value;
     }
 
-    this.filters = this.getFilters();
-    this.columns = this.getColumns();
+    this.filters = await this.getFilters();
+    this.columns = await this.getColumns();
     await this.setDefaultFilters();
     await this.setReportData(key);
   }
 
-  initializeFilters() {
-    for (const field of this.filters) {
-      if (!field.default) {
-        this[field.fieldname] = undefined;
-        continue;
-      }
-
-      this[field.fieldname] = field.default;
-    }
-  }
-
   /**
    * Should first check if filter value is set
    * and update only if it is not set.
    */
   async setDefaultFilters() {}
   abstract getActions(): Action[];
-  abstract getFilters(): Field[];
-  abstract getColumns(): ColumnField[];
+  abstract getFilters(): Field[] | Promise<Field[]>;
+  abstract getColumns(): ColumnField[] | Promise<ColumnField[]>;
   abstract setReportData(filter?: string): Promise<void>;
 }
diff --git a/reports/index.ts b/reports/index.ts
index 9a7b3036..ec8f6e84 100644
--- a/reports/index.ts
+++ b/reports/index.ts
@@ -1,2 +1,4 @@
 import { GeneralLedger } from './GeneralLedger/GeneralLedger';
-export const reports = { GeneralLedger };
+import { ProfitAndLoss } from './ProfitAndLoss/ProfitAndLoss';
+
+export const reports = { GeneralLedger, ProfitAndLoss };
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index f84c3842..c049ae47 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -39,6 +39,7 @@
 </template>
 <script>
 import { computed } from '@vue/reactivity';
+import { t } from 'fyo';
 import { reports } from 'reports';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import PageHeader from 'src/components/PageHeader.vue';
@@ -62,9 +63,6 @@ export default defineComponent({
     };
   },
   components: { PageHeader, FormControl, ListReport },
-  async mounted() {
-    await this.setReportData();
-  },
   async activated() {
     await this.setReportData();
     if (fyo.store.isDevelopment) {
@@ -79,15 +77,15 @@ export default defineComponent({
   methods: {
     async setReportData() {
       const Report = reports[this.reportName];
+
       if (this.report === null) {
         this.report = new Report(fyo);
+        await this.report.initialize();
       }
 
       if (!this.report.reportData.length) {
         await this.report.setReportData();
       }
-
-      await this.report.setDefaultFilters();
     },
   },
 });
diff --git a/src/renderer.ts b/src/renderer.ts
index 5caae725..1a58d3fc 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,6 +1,7 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
 import { DateTime } from 'luxon';
+import { ProfitAndLoss } from 'reports/ProfitAndLoss/ProfitAndLoss';
 import { IPC_ACTIONS } from 'utils/messages';
 import { App as VueApp, createApp } from 'vue';
 import App from './App.vue';
@@ -106,5 +107,7 @@ function setOnWindow() {
     window.fyo = fyo;
     // @ts-ignore
     window.DateTime = DateTime;
+    // @ts-ignore
+    window.pnl = new ProfitAndLoss(fyo);
   }
 }
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 6a7b6634..48dc83fc 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -143,12 +143,12 @@ function getCompleteSidebar(): SidebarConfig {
           name: 'general-ledger',
           route: '/report/GeneralLedger',
         },
-        /*
         {
           label: t`Profit And Loss`,
           name: 'profit-and-loss',
-          route: '/report/profit-and-loss',
+          route: '/report/ProfitAndLoss',
         },
+        /*
         {
           label: t`Balance Sheet`,
           name: 'balance-sheet',

From 79650d6c8e4e3f7a8d0afb14dec53c97d623568e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 16 May 2022 12:24:58 +0530
Subject: [PATCH 118/163] incr: add indentation support, format PNL

---
 reports/GeneralLedger/GeneralLedger.ts |  18 +-
 reports/ProfitAndLoss/ProfitAndLoss.ts | 261 ++++++++++++++++++++++---
 reports/Report.ts                      |   1 +
 reports/types.ts                       |  13 +-
 src/components/Report/ListReport.vue   |  88 +++++++--
 src/pages/Report.vue                   |   2 +-
 6 files changed, 321 insertions(+), 62 deletions(-)

diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 8461073f..ae279aab 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -23,6 +23,7 @@ type ReferenceType =
 export class GeneralLedger extends LedgerReport {
   static title = t`General Ledger`;
   static reportName = 'general-ledger';
+  usePagination: boolean = true;
 
   ascending: boolean = false;
   reverted: boolean = false;
@@ -102,19 +103,23 @@ export class GeneralLedger extends LedgerReport {
 
   _getRowFromEntry(entry: LedgerEntry, columns: ColumnField[]): ReportRow {
     if (entry.name === -3) {
-      return columns.map((c) => ({
-        value: '',
-        width: c.width ?? 1,
-      })) as ReportRow;
+      return {
+        cells: columns.map((c) => ({
+          rawValue: '',
+          value: '',
+          width: c.width ?? 1,
+        })),
+      };
     }
 
-    const row: ReportRow = [];
+    const row: ReportRow = { cells: [] };
     for (const col of columns) {
       const align = col.align ?? 'left';
       const width = col.width ?? 1;
       const fieldname = col.fieldname;
 
       let value = entry[fieldname as keyof LedgerEntry];
+      const rawValue = value;
       if (value === null || value === undefined) {
         value = '';
       }
@@ -133,10 +138,11 @@ export class GeneralLedger extends LedgerReport {
         value = String(value);
       }
 
-      row.push({
+      row.cells.push({
         italics: entry.name === -1,
         bold: entry.name === -2,
         value,
+        rawValue,
         align,
         width,
       });
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index 44cdfa39..19a95d73 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -35,6 +35,13 @@ interface Account {
   parentAccount: string | null;
 }
 
+interface TreeNode {
+  name: string;
+  children?: TreeNode[];
+}
+
+type Tree = Record<string, TreeNode>;
+
 type AccountTree = Record<string, AccountTreeNode>;
 interface AccountTreeNode extends Account {
   children?: AccountTreeNode[];
@@ -53,7 +60,7 @@ const PNL_ROOT_TYPES: AccountRootType[] = [
   AccountRootTypeEnum.Expense,
 ];
 
-const ACC_NAME_WIDTH = 1.5;
+const ACC_NAME_WIDTH = 2;
 const ACC_BAL_WIDTH = 1;
 
 export class ProfitAndLoss extends LedgerReport {
@@ -65,6 +72,7 @@ export class ProfitAndLoss extends LedgerReport {
   fromYear?: number;
   toYear?: number;
   singleColumn: boolean = false;
+  hideGroupBalance: boolean = false;
   periodicity: Periodicity = 'Monthly';
   basedOn: BasedOn = 'Date Range';
 
@@ -98,29 +106,204 @@ export class ProfitAndLoss extends LedgerReport {
       delete accountTree[name];
     }
 
-    const accountList = convertAccountTreeToAccountList(accountTree);
-    this.reportData = this.getReportDataFromAccountList(accountList);
+    const rootNodeList = Object.values(accountTree);
+    const incomeTree = {
+      [AccountRootTypeEnum.Income]: rootNodeList.find(
+        (n) => n.rootType === AccountRootTypeEnum.Income
+      )!,
+    };
+    const expenseTree = {
+      [AccountRootTypeEnum.Expense]: rootNodeList.find(
+        (n) => n.rootType === AccountRootTypeEnum.Expense
+      )!,
+    };
+
+    const incomeList = convertAccountTreeToAccountList(incomeTree);
+    const expenseList = convertAccountTreeToAccountList(expenseTree);
+    const incomeRows = this.getPnlRowsFromAccountList(incomeList);
+    const expenseRows = this.getPnlRowsFromAccountList(expenseList);
+    this.reportData = await this.getReportDataFromRows(
+      incomeRows,
+      expenseRows,
+      incomeTree,
+      expenseTree
+    );
   }
 
-  getReportDataFromAccountList(accountList: AccountList): ReportData {
-    const dateKeys = [...accountList[0].valueMap!.keys()].sort(
-      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
+  async getReportDataFromRows(
+    incomeRows: ReportData,
+    expenseRows: ReportData,
+    incomeTree: AccountTree,
+    expenseTree: AccountTree
+  ): Promise<ReportData> {
+    const totalIncome = await this.getTotalNode(
+      incomeTree,
+      t`Total Income (Credit)`
+    );
+    const totalExpense = await this.getTotalNode(
+      expenseTree,
+      t`Total Expense (Debit)`
     );
 
-    return accountList.map((al) => {
-      const nameCell = { value: al.name, align: 'left', width: ACC_NAME_WIDTH };
-      const balanceCells = dateKeys.map(
-        (k) =>
+    const totalValueMap = new Map();
+    for (const key of totalIncome.valueMap!.keys()) {
+      const income = totalIncome.valueMap!.get(key)!;
+      const expense = totalExpense.valueMap!.get(key)!;
+      totalValueMap.set(key, income - expense);
+    }
+
+    const totalProfit = {
+      name: t`Total Profit`,
+      valueMap: totalValueMap,
+      level: 0,
+    } as AccountListNode;
+
+    const dateKeys = this.getSortedDateKeys(totalValueMap);
+    const totalIncomeRow = this.getRowFromAccountListNode(
+      totalIncome,
+      dateKeys
+    );
+    const totalExpenseRow = this.getRowFromAccountListNode(
+      totalExpense,
+      dateKeys
+    );
+
+    const totalProfitRow = this.getRowFromAccountListNode(
+      totalProfit,
+      dateKeys
+    );
+    totalProfitRow.cells.forEach((c) => {
+      c.bold = true;
+      if (typeof c.rawValue !== 'number') {
+        return;
+      }
+
+      if (c.rawValue > 0) {
+        c.color = 'green';
+      } else if (c.rawValue < 0) {
+        c.color = 'red';
+      }
+    });
+
+    const emptyRow = await this.getEmptyRow();
+
+    return [
+      incomeRows,
+      totalIncomeRow,
+      emptyRow,
+      expenseRows,
+      totalExpenseRow,
+      emptyRow,
+      emptyRow,
+      totalProfitRow,
+    ].flat() as ReportData;
+  }
+
+  async getEmptyRow(): Promise<ReportRow> {
+    const columns = await this.getColumns();
+    return {
+      cells: columns.map(
+        (c) =>
           ({
-            value: this.fyo.format(al.valueMap?.get(k)!, 'Currency'),
-            align: 'right',
-            width: ACC_BAL_WIDTH,
+            value: '',
+            rawValue: '',
+            width: c.width,
+            align: 'left',
           } as ReportCell)
-      );
-      return [nameCell, balanceCells].flat() as ReportRow;
+      ),
+    };
+  }
+
+  async getTotalNode(
+    accountTree: AccountTree,
+    name: string
+  ): Promise<AccountListNode> {
+    const leafNodes = getListOfLeafNodes(accountTree) as AccountTreeNode[];
+    let keys: DateRange[] | undefined = undefined;
+
+    /**
+     * Keys need to be from the nodes cause they are ref keys.
+     */
+    for (const node of leafNodes) {
+      const drs = [...(node?.valueMap?.keys() ?? [])];
+      if (!drs || !drs.length) {
+        continue;
+      }
+
+      keys = drs;
+      if (keys && keys.length) {
+        break;
+      }
+    }
+
+    if (!keys || !keys.length) {
+      keys = await this._getDateRanges();
+    }
+
+    const totalMap = leafNodes.reduce((acc, node) => {
+      for (const key of keys!) {
+        const bal = acc.get(key) ?? 0;
+        const val = node.valueMap?.get(key) ?? 0;
+        acc.set(key, bal + val);
+      }
+
+      return acc;
+    }, new Map() as ValueMap);
+
+    return { name, valueMap: totalMap, level: 0 } as AccountListNode;
+  }
+
+  getPnlRowsFromAccountList(accountList: AccountList): ReportData {
+    const dateKeys = this.getSortedDateKeys(accountList[0].valueMap!);
+
+    return accountList.map((al) => {
+      return this.getRowFromAccountListNode(al, dateKeys);
     });
   }
 
+  getSortedDateKeys(valueMap: ValueMap) {
+    return [...valueMap.keys()].sort(
+      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
+    );
+  }
+
+  getRowFromAccountListNode(al: AccountListNode, dateKeys: DateRange[]) {
+    const nameCell = {
+      value: al.name,
+      rawValue: al.name,
+      align: 'left',
+      width: ACC_NAME_WIDTH,
+      bold: !al.level,
+      italics: al.isGroup,
+      indent: al.level ?? 0,
+    } as ReportCell;
+
+    const balanceCells = dateKeys.map((k) => {
+      const rawValue = al.valueMap?.get(k) ?? 0;
+      let value = this.fyo.format(rawValue, 'Currency');
+      if (this.hideGroupBalance && al.isGroup) {
+        value = '';
+      }
+
+      return {
+        rawValue,
+        value,
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      } as ReportCell;
+    });
+
+    return {
+      cells: [nameCell, balanceCells].flat(),
+      level: al.level,
+      isGroup: !!al.isGroup,
+      folded: false,
+      foldedBelow: false,
+    } as ReportRow;
+  }
+
+  // async getTotalProfitNode()
+
   async _getGroupedByDateRanges(
     map: GroupedMap
   ): Promise<AccountNameValueMapMap> {
@@ -346,6 +529,11 @@ export class ProfitAndLoss extends LedgerReport {
         label: t`Single Column`,
         fieldname: 'singleColumn',
       } as Field,
+      {
+        fieldtype: 'Check',
+        label: t`Hide Group Balance`,
+        fieldname: 'hideGroupBalance',
+      } as Field,
     ].flat();
   }
 
@@ -439,17 +627,13 @@ function setValueMapOnAccountTreeNodes(
      * also prevent pruning of the parent accounts.
      */
     let parentAccountName: string | null = accountTree[name].parentAccount;
-    let parentValueMap = valueMap;
 
     while (parentAccountName !== null) {
-      const update = updateParentAccountWithChildValues(
+      parentAccountName = updateParentAccountWithChildValues(
         accountTree,
         parentAccountName,
-        parentValueMap
+        valueMap
       );
-
-      parentAccountName = update.parentAccountName;
-      parentValueMap = update.parentValueMap;
     }
   }
 }
@@ -457,24 +641,18 @@ function setValueMapOnAccountTreeNodes(
 function updateParentAccountWithChildValues(
   accountTree: AccountTree,
   parentAccountName: string,
-  parentValueMap: ValueMap
-): {
-  parentAccountName: string | null;
-  parentValueMap: ValueMap;
-} {
+  valueMap: ValueMap
+): string {
   const parentAccount = accountTree[parentAccountName];
   parentAccount.prune = false;
   parentAccount.valueMap ??= new Map();
 
-  for (const key of parentValueMap.keys()) {
+  for (const key of valueMap.keys()) {
     const value = parentAccount.valueMap!.get(key) ?? 0;
-    parentAccount.valueMap!.set(key, value + parentValueMap.get(key)!);
+    parentAccount.valueMap!.set(key, value + valueMap.get(key)!);
   }
 
-  return {
-    parentAccountName: parentAccount.parentAccount,
-    parentValueMap: parentAccount.valueMap!,
-  };
+  return parentAccount.parentAccount!;
 }
 
 function setChildrenOnAccountTreeNodes(accountTree: AccountTree) {
@@ -559,3 +737,22 @@ function pushToAccountList(
     pushToAccountList(childNode, accountList, childLevel);
   }
 }
+
+function getListOfLeafNodes(tree: Tree): TreeNode[] {
+  const nonGroupChildren: TreeNode[] = [];
+  for (const node of Object.values(tree)) {
+    const groupChildren = node.children ?? [];
+
+    while (groupChildren.length) {
+      const child = groupChildren.shift()!;
+      if (!child?.children?.length) {
+        nonGroupChildren.push(child);
+        continue;
+      }
+
+      groupChildren.unshift(...(child.children ?? []));
+    }
+  }
+
+  return nonGroupChildren;
+}
diff --git a/reports/Report.ts b/reports/Report.ts
index a7ac4748..05085b87 100644
--- a/reports/Report.ts
+++ b/reports/Report.ts
@@ -13,6 +13,7 @@ export abstract class Report extends Observable<RawValue> {
   columns: ColumnField[] = [];
   filters: Field[] = [];
   reportData: ReportData;
+  usePagination: boolean = false;
 
   constructor(fyo: Fyo) {
     super();
diff --git a/reports/types.ts b/reports/types.ts
index c7e82176..ad0b5f97 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -9,9 +9,18 @@ export interface ReportCell {
   align?: 'left' | 'right' | 'center';
   width?: number;
   value: string;
+  rawValue: RawValue | undefined | Date;
+  indent?: number;
+  color?: 'red' | 'green';
 }
 
-export type ReportRow = ReportCell[];
+export interface ReportRow {
+  cells: ReportCell[];
+  level?: number;
+  isGroup?: boolean;
+  folded?: boolean;
+  foldedBelow?: boolean;
+}
 export type ReportData = ReportRow[];
 export interface ColumnField extends BaseField {
   align?: 'left' | 'right' | 'center';
@@ -58,4 +67,4 @@ export interface LedgerEntry {
   reverts: string;
 }
 
-export type GroupedMap = Map<string, LedgerEntry[]>;
\ No newline at end of file
+export type GroupedMap = Map<string, LedgerEntry[]>;
diff --git a/src/components/Report/ListReport.vue b/src/components/Report/ListReport.vue
index dcaaabd5..ccbb16bf 100644
--- a/src/components/Report/ListReport.vue
+++ b/src/components/Report/ListReport.vue
@@ -30,41 +30,47 @@
         @scroll="scroll"
       >
         <!-- Report Rows -->
-        <div
-          v-for="(row, r) in report.reportData.slice(pageStart, pageEnd)"
-          :key="r + '-row'"
-          class="flex items-center w-max"
-          :style="{ height: `${hconst}px` }"
-          :class="r !== pageEnd - 1 ? 'border-b' : ''"
-        >
-          <!-- Report Cell -->
+        <template v-for="(row, r) in dataSlice" :key="r + '-row'">
           <div
-            v-for="(cell, c) in row"
-            :key="`${c}-${r}-cell`"
-            :style="getCellStyle(cell, c)"
-            class="
-              text-gray-900 text-base
-              px-3
-              flex-shrink-0
-              overflow-x-scroll
-              whitespace-nowrap
-            "
+            v-if="!row.folded"
+            class="flex items-center w-max"
+            :style="{ height: `${hconst}px` }"
+            :class="[
+              r !== pageEnd - 1 ? 'border-b' : '',
+              row.isGroup ? 'hover:bg-gray-100 cursor-pointer' : '',
+            ]"
+            @click="() => onRowClick(row, r)"
           >
-            {{ cell.value }}
+            <!-- Report Cell -->
+            <div
+              v-for="(cell, c) in row.cells"
+              :key="`${c}-${r}-cell`"
+              :style="getCellStyle(cell, c)"
+              class="
+                text-gray-900 text-base
+                px-3
+                flex-shrink-0
+                overflow-x-scroll
+                whitespace-nowrap
+              "
+            >
+              {{ cell.value }}
+            </div>
           </div>
-        </div>
+        </template>
       </WithScroll>
       <!-- Report Rows Container -->
     </div>
 
     <!-- Pagination Footer -->
-    <div class="mt-auto flex-shrink-0">
+    <div class="mt-auto flex-shrink-0" v-if="report.usePagination">
       <hr />
       <Paginator
         :item-count="report?.reportData?.length ?? 0"
         @index-change="setPageIndices"
       />
     </div>
+    <div v-else class="h-4" />
   </div>
 </template>
 <script>
@@ -85,6 +91,15 @@ export default defineComponent({
       pageEnd: 0,
     };
   },
+  computed: {
+    dataSlice() {
+      if (this.report?.usePagination) {
+        return this.report.reportData.slice(this.pageStart, this.pageEnd);
+      }
+
+      return this.report.reportData;
+    },
+  },
   methods: {
     scroll({ scrollLeft }) {
       this.$refs.titlerow.scrollLeft = scrollLeft;
@@ -93,24 +108,55 @@ export default defineComponent({
       this.pageStart = start;
       this.pageEnd = end;
     },
+    onRowClick(clickedRow, r) {
+      if (!clickedRow.isGroup) {
+        return;
+      }
+
+      r += 1;
+      clickedRow.foldedBelow = !clickedRow.foldedBelow;
+      const folded = clickedRow.foldedBelow;
+      let row = this.dataSlice[r];
+
+      while (row && row.level > clickedRow.level) {
+        row.folded = folded;
+        r += 1;
+        row = this.dataSlice[r];
+      }
+    },
     getCellStyle(cell, i) {
       const styles = {};
       const width = cell.width ?? 1;
       const align = cell.align ?? 'left';
       styles['width'] = `${width * this.wconst}rem`;
       styles['text-align'] = align;
+
       if (cell.bold) {
         styles['font-weight'] = 'bold';
       }
+
       if (cell.italics) {
         styles['font-style'] = 'italic';
       }
+
       if (i === 0) {
         styles['padding-left'] = '0px';
       }
+
       if (i === this.report.columns.length - 1) {
         styles['padding-right'] = '0px';
       }
+
+      if (cell.indent) {
+        styles['padding-left'] = `${cell.indent * 2}rem`;
+      }
+
+      if (cell.color === 'red') {
+        styles['color'] = '#e53e3e';
+      } else if (cell.color === 'green') {
+        styles['color'] = '#38a169';
+      }
+
       return styles;
     },
   },
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index c049ae47..c7e1baae 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -24,7 +24,7 @@
         :show-label="field.fieldtype === 'Check'"
         :key="field.fieldname + '-filter'"
         class="bg-gray-100 rounded"
-        :class="field.fieldtype === 'Check' ? 'flex pl-2' : ''"
+        :class="field.fieldtype === 'Check' ? 'flex pl-2 py-1' : ''"
         input-class="bg-transparent text-sm"
         :df="field"
         :value="report.get(field.fieldname)"

From d65b04de4c099c0ece5bccee343dcef30cc2a34b Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 16 May 2022 13:19:01 +0530
Subject: [PATCH 119/163] incr: complete PNL report

---
 reports/ProfitAndLoss/ProfitAndLoss.ts | 162 +++++++++++--------------
 reports/Report.ts                      |   2 +-
 schemas/core/SystemSettings.json       |   6 +-
 src/components/Controls/Base.vue       |   4 +-
 4 files changed, 78 insertions(+), 96 deletions(-)

diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index 19a95d73..5a3bf614 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -26,7 +26,7 @@ import { QueryFilter } from 'utils/db/types';
 type DateRange = { fromDate: DateTime; toDate: DateTime };
 type ValueMap = Map<DateRange, number>;
 type AccountNameValueMapMap = Map<string, ValueMap>;
-type BasedOn = 'Fiscal Year' | 'Date Range';
+type BasedOn = 'Fiscal Year' | 'Until Date';
 
 interface Account {
   name: string;
@@ -74,14 +74,20 @@ export class ProfitAndLoss extends LedgerReport {
   singleColumn: boolean = false;
   hideGroupBalance: boolean = false;
   periodicity: Periodicity = 'Monthly';
-  basedOn: BasedOn = 'Date Range';
+  basedOn: BasedOn = 'Until Date';
 
   _rawData: LedgerEntry[] = [];
+  _dateRanges?: DateRange[];
 
   accountMap?: Record<string, Account>;
 
+  async initialize(): Promise<void> {
+    await super.initialize();
+    await this._setDateRanges();
+  }
+
   async setDefaultFilters(): Promise<void> {
-    if (this.basedOn === 'Date Range' && !this.toDate) {
+    if (this.basedOn === 'Until Date' && !this.toDate) {
       this.toDate = DateTime.now().toISODate();
     }
 
@@ -89,6 +95,12 @@ export class ProfitAndLoss extends LedgerReport {
       this.fromYear = DateTime.now().year;
       this.toYear = this.fromYear + 1;
     }
+
+    await this._setDateRanges();
+  }
+
+  async _setDateRanges() {
+    this._dateRanges = await this._getDateRanges();
   }
 
   async setReportData(filter?: string) {
@@ -147,8 +159,8 @@ export class ProfitAndLoss extends LedgerReport {
 
     const totalValueMap = new Map();
     for (const key of totalIncome.valueMap!.keys()) {
-      const income = totalIncome.valueMap!.get(key)!;
-      const expense = totalExpense.valueMap!.get(key)!;
+      const income = totalIncome.valueMap!.get(key) ?? 0;
+      const expense = totalExpense.valueMap!.get(key) ?? 0;
       totalValueMap.set(key, income - expense);
     }
 
@@ -158,20 +170,10 @@ export class ProfitAndLoss extends LedgerReport {
       level: 0,
     } as AccountListNode;
 
-    const dateKeys = this.getSortedDateKeys(totalValueMap);
-    const totalIncomeRow = this.getRowFromAccountListNode(
-      totalIncome,
-      dateKeys
-    );
-    const totalExpenseRow = this.getRowFromAccountListNode(
-      totalExpense,
-      dateKeys
-    );
+    const totalIncomeRow = this.getRowFromAccountListNode(totalIncome);
+    const totalExpenseRow = this.getRowFromAccountListNode(totalExpense);
 
-    const totalProfitRow = this.getRowFromAccountListNode(
-      totalProfit,
-      dateKeys
-    );
+    const totalProfitRow = this.getRowFromAccountListNode(totalProfit);
     totalProfitRow.cells.forEach((c) => {
       c.bold = true;
       if (typeof c.rawValue !== 'number') {
@@ -219,29 +221,9 @@ export class ProfitAndLoss extends LedgerReport {
     name: string
   ): Promise<AccountListNode> {
     const leafNodes = getListOfLeafNodes(accountTree) as AccountTreeNode[];
-    let keys: DateRange[] | undefined = undefined;
-
-    /**
-     * Keys need to be from the nodes cause they are ref keys.
-     */
-    for (const node of leafNodes) {
-      const drs = [...(node?.valueMap?.keys() ?? [])];
-      if (!drs || !drs.length) {
-        continue;
-      }
-
-      keys = drs;
-      if (keys && keys.length) {
-        break;
-      }
-    }
-
-    if (!keys || !keys.length) {
-      keys = await this._getDateRanges();
-    }
 
     const totalMap = leafNodes.reduce((acc, node) => {
-      for (const key of keys!) {
+      for (const key of this._dateRanges!) {
         const bal = acc.get(key) ?? 0;
         const val = node.valueMap?.get(key) ?? 0;
         acc.set(key, bal + val);
@@ -254,20 +236,12 @@ export class ProfitAndLoss extends LedgerReport {
   }
 
   getPnlRowsFromAccountList(accountList: AccountList): ReportData {
-    const dateKeys = this.getSortedDateKeys(accountList[0].valueMap!);
-
     return accountList.map((al) => {
-      return this.getRowFromAccountListNode(al, dateKeys);
+      return this.getRowFromAccountListNode(al);
     });
   }
 
-  getSortedDateKeys(valueMap: ValueMap) {
-    return [...valueMap.keys()].sort(
-      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
-    );
-  }
-
-  getRowFromAccountListNode(al: AccountListNode, dateKeys: DateRange[]) {
+  getRowFromAccountListNode(al: AccountListNode) {
     const nameCell = {
       value: al.name,
       rawValue: al.name,
@@ -278,7 +252,7 @@ export class ProfitAndLoss extends LedgerReport {
       indent: al.level ?? 0,
     } as ReportCell;
 
-    const balanceCells = dateKeys.map((k) => {
+    const balanceCells = this._dateRanges!.map((k) => {
       const rawValue = al.valueMap?.get(k) ?? 0;
       let value = this.fyo.format(rawValue, 'Currency');
       if (this.hideGroupBalance && al.isGroup) {
@@ -302,19 +276,20 @@ export class ProfitAndLoss extends LedgerReport {
     } as ReportRow;
   }
 
-  // async getTotalProfitNode()
-
   async _getGroupedByDateRanges(
     map: GroupedMap
   ): Promise<AccountNameValueMapMap> {
-    const dateRanges = await this._getDateRanges();
     const accountValueMap: AccountNameValueMapMap = new Map();
     const accountMap = await this._getAccountMap();
 
     for (const account of map.keys()) {
       const valueMap: ValueMap = new Map();
+
+      /**
+       * Set Balance for every DateRange key
+       */
       for (const entry of map.get(account)!) {
-        const key = this._getRangeMapKey(entry, dateRanges);
+        const key = this._getRangeMapKey(entry);
         if (key === null) {
           continue;
         }
@@ -367,15 +342,12 @@ export class ProfitAndLoss extends LedgerReport {
     return this.accountMap;
   }
 
-  _getRangeMapKey(
-    entry: LedgerEntry,
-    dateRanges: DateRange[]
-  ): DateRange | null {
+  _getRangeMapKey(entry: LedgerEntry): DateRange | null {
     const entryDate = DateTime.fromISO(
       entry.date!.toISOString().split('T')[0]
     ).toMillis();
 
-    for (const dr of dateRanges) {
+    for (const dr of this._dateRanges!) {
       const toDate = dr.toDate.toMillis();
       const fromDate = dr.fromDate.toMillis();
 
@@ -419,14 +391,14 @@ export class ProfitAndLoss extends LedgerReport {
       });
     }
 
-    return dateRanges;
+    return dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
   }
 
   async _getFromAndToDates() {
     let toDate: string;
     let fromDate: string;
 
-    if (this.basedOn === 'Date Range') {
+    if (this.basedOn === 'Until Date') {
       toDate = this.toDate!;
       const months = monthsMap[this.periodicity] * Math.max(this.count ?? 1, 1);
       fromDate = DateTime.fromISO(toDate).minus({ months }).toISODate();
@@ -465,7 +437,7 @@ export class ProfitAndLoss extends LedgerReport {
         fieldtype: 'Select',
         options: [
           { label: t`Fiscal Year`, value: 'Fiscal Year' },
-          { label: t`Date Range`, value: 'Date Range' },
+          { label: t`Until Date`, value: 'Until Date' },
         ],
         label: t`Based On`,
         fieldname: 'basedOn',
@@ -486,22 +458,24 @@ export class ProfitAndLoss extends LedgerReport {
 
     let dateFilters = [
       {
-        fieldtype: 'Date',
-        fieldname: 'fromYear',
-        placeholder: t`From Date`,
-        label: t`From Date`,
-        required: true,
-      },
-      {
-        fieldtype: 'Date',
+        fieldtype: 'Int',
         fieldname: 'toYear',
         placeholder: t`To Year`,
         label: t`To Year`,
+        minvalue: 2000,
+        required: true,
+      },
+      {
+        fieldtype: 'Int',
+        fieldname: 'fromYear',
+        placeholder: t`From Year`,
+        label: t`From Year`,
+        minvalue: 2000,
         required: true,
       },
     ] as Field[];
 
-    if (this.basedOn === 'Date Range') {
+    if (this.basedOn === 'Until Date') {
       dateFilters = [
         {
           fieldtype: 'Date',
@@ -537,7 +511,7 @@ export class ProfitAndLoss extends LedgerReport {
     ].flat();
   }
 
-  async getColumns(): Promise<ColumnField[]> {
+  getColumns(): ColumnField[] {
     const columns = [
       {
         label: t`Account`,
@@ -548,19 +522,18 @@ export class ProfitAndLoss extends LedgerReport {
       },
     ] as ColumnField[];
 
-    const dateRanges = await this._getDateRanges();
-    const dateColumns = dateRanges
-      .sort((a, b) => b.toDate.toMillis() - a.toDate.toMillis())
-      .map(
-        (d) =>
-          ({
-            label: this.fyo.format(d.toDate.toJSDate(), 'Date'),
-            fieldtype: 'Data',
-            fieldname: 'toDate',
-            align: 'right',
-            width: ACC_BAL_WIDTH,
-          } as ColumnField)
-      );
+    const dateColumns = this._dateRanges!.sort(
+      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
+    ).map(
+      (d) =>
+        ({
+          label: this.fyo.format(d.toDate.toJSDate(), 'Date'),
+          fieldtype: 'Data',
+          fieldname: 'toDate',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        } as ColumnField)
+    );
 
     return [columns, dateColumns].flat();
   }
@@ -590,12 +563,13 @@ async function getFiscalEndpoints(toYear: number, fromYear: number) {
   const fromDate = [
     fromYear,
     fys.toISOString().split('T')[0].split('-').slice(1),
-  ].join('-');
+  ]
+    .flat()
+    .join('-');
 
-  const toDate = [
-    toYear,
-    fye.toISOString().split('T')[0].split('-').slice(1),
-  ].join('-');
+  const toDate = [toYear, fye.toISOString().split('T')[0].split('-').slice(1)]
+    .flat()
+    .join('-');
 
   return { fromDate, toDate };
 }
@@ -710,6 +684,10 @@ function convertAccountTreeToAccountList(
   const accountList: AccountList = [];
 
   for (const rootNode of Object.values(accountTree)) {
+    if (!rootNode) {
+      continue;
+    }
+
     pushToAccountList(rootNode, accountList, 0);
   }
 
@@ -741,6 +719,10 @@ function pushToAccountList(
 function getListOfLeafNodes(tree: Tree): TreeNode[] {
   const nonGroupChildren: TreeNode[] = [];
   for (const node of Object.values(tree)) {
+    if (!node) {
+      continue;
+    }
+
     const groupChildren = node.children ?? [];
 
     while (groupChildren.length) {
diff --git a/reports/Report.ts b/reports/Report.ts
index 05085b87..60a3de6d 100644
--- a/reports/Report.ts
+++ b/reports/Report.ts
@@ -63,9 +63,9 @@ export abstract class Report extends Observable<RawValue> {
       this[key] = value;
     }
 
+    await this.setDefaultFilters();
     this.filters = await this.getFilters();
     this.columns = await this.getColumns();
-    await this.setDefaultFilters();
     await this.setReportData(key);
   }
 
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 8a111be4..9931c053 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -57,15 +57,15 @@
       "fieldtype": "Int",
       "default": 2,
       "required": true,
-      "minValue": 0,
-      "maxValue": 9,
+      "minvalue": 0,
+      "maxvalue": 9,
       "description": "Sets how many digits are shown after the decimal point."
     },
     {
       "fieldname": "internalPrecision",
       "label": "Internal Precision",
       "fieldtype": "Int",
-      "minValue": 0,
+      "minvalue": 0,
       "default": 11,
       "description": "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies."
     },
diff --git a/src/components/Controls/Base.vue b/src/components/Controls/Base.vue
index ee5300cf..1c95b03c 100644
--- a/src/components/Controls/Base.vue
+++ b/src/components/Controls/Base.vue
@@ -11,8 +11,8 @@
       :value="value"
       :placeholder="inputPlaceholder"
       :readonly="isReadOnly"
-      :max="df.maxValue"
-      :min="df.minValue"
+      :max="df.maxvalue"
+      :min="df.minvalue"
       @blur="(e) => triggerChange(e.target.value)"
       @focus="(e) => $emit('focus', e)"
       @input="(e) => $emit('input', e)"

From 06b5ac4f902eaf1b37e4e274c574094a6be42aa1 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 16 May 2022 15:40:35 +0530
Subject: [PATCH 120/163] incr: do BalanceSheet (smthn wrng)

---
 fyo/utils/format.ts                    |   2 +-
 reports/AccountReport.ts               | 617 ++++++++++++++++++++++
 reports/BalanceSheet/BalanceSheet.ts   | 147 ++++--
 reports/BalanceSheet/viewConfig.js     |  56 --
 reports/GeneralLedger/GeneralLedger.ts |   1 +
 reports/ProfitAndLoss/ProfitAndLoss.ts | 694 ++-----------------------
 reports/index.js                       |  40 --
 reports/index.ts                       |   3 +-
 reports/types.ts                       |  38 ++
 src/utils/sidebarConfig.ts             |   4 +-
 10 files changed, 797 insertions(+), 805 deletions(-)
 create mode 100644 reports/AccountReport.ts
 delete mode 100644 reports/BalanceSheet/viewConfig.js
 delete mode 100644 reports/index.js

diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index 2acc6b45..edf49ae4 100644
--- a/fyo/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -91,7 +91,7 @@ function formatCurrency(
 function formatNumber(value: DocValue, fyo: Fyo): string {
   const numberFormatter = getNumberFormatter(fyo);
   if (typeof value === 'number') {
-    return numberFormatter.format(value);
+    value = fyo.pesa(value.toFixed(20));
   }
 
   if ((value as Money).round) {
diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
new file mode 100644
index 00000000..0d8e2bc6
--- /dev/null
+++ b/reports/AccountReport.ts
@@ -0,0 +1,617 @@
+import { t } from 'fyo';
+import { Action } from 'fyo/model/types';
+import { cloneDeep } from 'lodash';
+import { DateTime } from 'luxon';
+import { AccountRootType } from 'models/baseModels/Account/types';
+import { isCredit } from 'models/helpers';
+import { ModelNameEnum } from 'models/types';
+import { LedgerReport } from 'reports/LedgerReport';
+import {
+  Account,
+  AccountList,
+  AccountListNode,
+  AccountNameValueMapMap,
+  AccountTree,
+  AccountTreeNode,
+  BasedOn,
+  ColumnField,
+  DateRange,
+  GroupedMap,
+  LedgerEntry,
+  Periodicity,
+  ReportCell,
+  ReportData,
+  ReportRow,
+  Tree,
+  TreeNode,
+  ValueMap,
+} from 'reports/types';
+import { Field } from 'schemas/types';
+import { fyo } from 'src/initFyo';
+import { getMapFromList } from 'utils';
+import { QueryFilter } from 'utils/db/types';
+
+const ACC_NAME_WIDTH = 2;
+const ACC_BAL_WIDTH = 1;
+
+export abstract class AccountReport extends LedgerReport {
+  toDate?: string;
+  count: number = 3;
+  fromYear?: number;
+  toYear?: number;
+  consolidateColumns: boolean = false;
+  hideGroupBalance: boolean = false;
+  periodicity: Periodicity = 'Monthly';
+  basedOn: BasedOn = 'Until Date';
+
+  _rawData: LedgerEntry[] = [];
+  _dateRanges?: DateRange[];
+
+  accountMap?: Record<string, Account>;
+  abstract get rootTypes(): AccountRootType[];
+
+  async initialize(): Promise<void> {
+    await super.initialize();
+    await this._setDateRanges();
+  }
+
+  async setDefaultFilters(): Promise<void> {
+    if (this.basedOn === 'Until Date' && !this.toDate) {
+      this.toDate = DateTime.now().toISODate();
+    }
+
+    if (this.basedOn === 'Fiscal Year' && !this.toYear) {
+      this.fromYear = DateTime.now().year;
+      this.toYear = this.fromYear + 1;
+    }
+
+    await this._setDateRanges();
+  }
+
+  async _setDateRanges() {
+    this._dateRanges = await this._getDateRanges();
+  }
+
+  getRootNode(
+    rootType: AccountRootType,
+    accountTree: AccountTree
+  ): AccountTreeNode | undefined {
+    const rootNodeList = Object.values(accountTree);
+    return rootNodeList.find((n) => n.rootType === rootType);
+  }
+
+  getEmptyRow(): ReportRow {
+    const columns = this.getColumns();
+    return {
+      isEmpty: true,
+      cells: columns.map(
+        (c) =>
+          ({
+            value: '',
+            rawValue: '',
+            width: c.width,
+            align: 'left',
+          } as ReportCell)
+      ),
+    };
+  }
+
+  async getTotalNode(
+    rootNode: AccountTreeNode,
+    name: string
+  ): Promise<AccountListNode> {
+    const accountTree = { [rootNode.name]: rootNode };
+    const leafNodes = getListOfLeafNodes(accountTree) as AccountTreeNode[];
+
+    const totalMap = leafNodes.reduce((acc, node) => {
+      for (const key of this._dateRanges!) {
+        const bal = acc.get(key) ?? 0;
+        const val = node.valueMap?.get(key) ?? 0;
+        acc.set(key, bal + val);
+      }
+
+      return acc;
+    }, new Map() as ValueMap);
+
+    return { name, valueMap: totalMap, level: 0 } as AccountListNode;
+  }
+
+  getReportRowsFromAccountList(accountList: AccountList): ReportData {
+    return accountList.map((al) => {
+      return this.getRowFromAccountListNode(al);
+    });
+  }
+
+  getRowFromAccountListNode(al: AccountListNode) {
+    const nameCell = {
+      value: al.name,
+      rawValue: al.name,
+      align: 'left',
+      width: ACC_NAME_WIDTH,
+      bold: !al.level,
+      italics: al.isGroup,
+      indent: al.level ?? 0,
+    } as ReportCell;
+
+    const balanceCells = this._dateRanges!.map((k) => {
+      const rawValue = al.valueMap?.get(k) ?? 0;
+      let value = this.fyo.format(rawValue, 'Currency');
+      if (this.hideGroupBalance && al.isGroup) {
+        value = '';
+      }
+
+      return {
+        rawValue,
+        value,
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      } as ReportCell;
+    });
+
+    return {
+      cells: [nameCell, balanceCells].flat(),
+      level: al.level,
+      isGroup: !!al.isGroup,
+      folded: false,
+      foldedBelow: false,
+    } as ReportRow;
+  }
+
+  async _getGroupedByDateRanges(
+    map: GroupedMap
+  ): Promise<AccountNameValueMapMap> {
+    const accountValueMap: AccountNameValueMapMap = new Map();
+    const accountMap = await this._getAccountMap();
+
+    for (const account of map.keys()) {
+      const valueMap: ValueMap = new Map();
+
+      /**
+       * Set Balance for every DateRange key
+       */
+      for (const entry of map.get(account)!) {
+        const key = this._getRangeMapKey(entry);
+        if (key === null) {
+          continue;
+        }
+
+        const totalBalance = valueMap.get(key!) ?? 0;
+        const balance = (entry.debit ?? 0) - (entry.credit ?? 0);
+        const rootType = accountMap[entry.account].rootType;
+
+        if (isCredit(rootType)) {
+          valueMap.set(key!, totalBalance - balance);
+        } else {
+          valueMap.set(key!, totalBalance + balance);
+        }
+      }
+      accountValueMap.set(account, valueMap);
+    }
+
+    return accountValueMap;
+  }
+
+  async _getAccountTree(rangeGroupedMap: AccountNameValueMapMap) {
+    const accountTree = cloneDeep(await this._getAccountMap()) as AccountTree;
+
+    setPruneFlagOnAccountTreeNodes(accountTree);
+    setValueMapOnAccountTreeNodes(accountTree, rangeGroupedMap);
+    setChildrenOnAccountTreeNodes(accountTree);
+    deleteNonRootAccountTreeNodes(accountTree);
+    pruneAccountTree(accountTree);
+
+    return accountTree;
+  }
+
+  async _getAccountMap() {
+    if (this.accountMap) {
+      return this.accountMap;
+    }
+
+    const accountList: Account[] = (
+      await this.fyo.db.getAllRaw('Account', {
+        fields: ['name', 'rootType', 'isGroup', 'parentAccount'],
+      })
+    ).map((rv) => ({
+      name: rv.name as string,
+      rootType: rv.rootType as AccountRootType,
+      isGroup: Boolean(rv.isGroup),
+      parentAccount: rv.parentAccount as string | null,
+    }));
+
+    this.accountMap = getMapFromList(accountList, 'name');
+    return this.accountMap;
+  }
+
+  _getRangeMapKey(entry: LedgerEntry): DateRange | null {
+    const entryDate = DateTime.fromISO(
+      entry.date!.toISOString().split('T')[0]
+    ).toMillis();
+
+    for (const dr of this._dateRanges!) {
+      const toDate = dr.toDate.toMillis();
+      const fromDate = dr.fromDate.toMillis();
+
+      if (entryDate <= toDate && entryDate > fromDate) {
+        return dr;
+      }
+    }
+
+    return null;
+  }
+
+  async _getDateRanges(): Promise<DateRange[]> {
+    const endpoints = await this._getFromAndToDates();
+    const fromDate = DateTime.fromISO(endpoints.fromDate);
+    const toDate = DateTime.fromISO(endpoints.toDate);
+
+    if (this.consolidateColumns) {
+      return [
+        {
+          toDate,
+          fromDate,
+        },
+      ];
+    }
+
+    const months: number = monthsMap[this.periodicity];
+    const dateRanges: DateRange[] = [
+      { toDate, fromDate: toDate.minus({ months }) },
+    ];
+
+    let count = this.count ?? 1;
+    if (this.basedOn === 'Fiscal Year') {
+      count = Math.ceil(((this.toYear! - this.fromYear!) * 12) / months);
+    }
+
+    for (let i = 1; i < count; i++) {
+      const lastRange = dateRanges.at(-1)!;
+      dateRanges.push({
+        toDate: lastRange.fromDate,
+        fromDate: lastRange.fromDate.minus({ months }),
+      });
+    }
+
+    return dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
+  }
+
+  async _getFromAndToDates() {
+    let toDate: string;
+    let fromDate: string;
+
+    if (this.basedOn === 'Until Date') {
+      toDate = this.toDate!;
+      const months = monthsMap[this.periodicity] * Math.max(this.count ?? 1, 1);
+      fromDate = DateTime.fromISO(toDate).minus({ months }).toISODate();
+    } else {
+      const fy = await getFiscalEndpoints(this.toYear!, this.fromYear!);
+      toDate = fy.toDate;
+      fromDate = fy.fromDate;
+    }
+
+    return { fromDate, toDate };
+  }
+
+  async _getQueryFilters(): Promise<QueryFilter> {
+    const filters: QueryFilter = {};
+    const { fromDate, toDate } = await this._getFromAndToDates();
+
+    const dateFilter: string[] = [];
+    dateFilter.push('<=', toDate);
+    dateFilter.push('>=', fromDate);
+
+    filters.date = dateFilter;
+    filters.reverted = false;
+    return filters;
+  }
+
+  getFilters(): Field[] {
+    const periodNameMap: Record<Periodicity, string> = {
+      Monthly: t`Months`,
+      Quarterly: t`Quarters`,
+      'Half Yearly': t`Half Years`,
+      Yearly: t`Years`,
+    };
+
+    const filters = [
+      {
+        fieldtype: 'Select',
+        options: [
+          { label: t`Fiscal Year`, value: 'Fiscal Year' },
+          { label: t`Until Date`, value: 'Until Date' },
+        ],
+        label: t`Based On`,
+        fieldname: 'basedOn',
+      },
+      {
+        fieldtype: 'Select',
+        options: [
+          { label: t`Monthly`, value: 'Monthly' },
+          { label: t`Quarterly`, value: 'Quarterly' },
+          { label: t`Half Yearly`, value: 'Half Yearly' },
+          { label: t`Yearly`, value: 'Yearly' },
+        ],
+        label: t`Periodicity`,
+        fieldname: 'periodicity',
+      },
+      ,
+    ] as Field[];
+
+    let dateFilters = [
+      {
+        fieldtype: 'Int',
+        fieldname: 'toYear',
+        placeholder: t`To Year`,
+        label: t`To Year`,
+        minvalue: 2000,
+        required: true,
+      },
+      {
+        fieldtype: 'Int',
+        fieldname: 'fromYear',
+        placeholder: t`From Year`,
+        label: t`From Year`,
+        minvalue: 2000,
+        required: true,
+      },
+    ] as Field[];
+
+    if (this.basedOn === 'Until Date') {
+      dateFilters = [
+        {
+          fieldtype: 'Date',
+          fieldname: 'toDate',
+          placeholder: t`To Date`,
+          label: t`To Date`,
+          required: true,
+        },
+        {
+          fieldtype: 'Int',
+          fieldname: 'count',
+          minvalue: 1,
+          placeholder: t`Number of ${periodNameMap[this.periodicity]}`,
+          label: t`Number of ${periodNameMap[this.periodicity]}`,
+          required: true,
+        },
+      ] as Field[];
+    }
+
+    return [
+      filters,
+      dateFilters,
+      {
+        fieldtype: 'Check',
+        label: t`Consolidate Columns`,
+        fieldname: 'consolidateColumns',
+      } as Field,
+      {
+        fieldtype: 'Check',
+        label: t`Hide Group Balance`,
+        fieldname: 'hideGroupBalance',
+      } as Field,
+    ].flat();
+  }
+
+  getColumns(): ColumnField[] {
+    const columns = [
+      {
+        label: t`Account`,
+        fieldtype: 'Link',
+        fieldname: 'account',
+        align: 'left',
+        width: ACC_NAME_WIDTH,
+      },
+    ] as ColumnField[];
+
+    const dateColumns = this._dateRanges!.sort(
+      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
+    ).map(
+      (d) =>
+        ({
+          label: this.fyo.format(d.toDate.toJSDate(), 'Date'),
+          fieldtype: 'Data',
+          fieldname: 'toDate',
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        } as ColumnField)
+    );
+
+    return [columns, dateColumns].flat();
+  }
+
+  getActions(): Action[] {
+    return [];
+  }
+
+  metaFilters: string[] = ['basedOn'];
+}
+
+async function getFiscalEndpoints(toYear: number, fromYear: number) {
+  const fys = (await fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'fiscalYearStart'
+  )) as Date;
+  const fye = (await fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'fiscalYearEnd'
+  )) as Date;
+
+  /**
+   * Get the month and the day, and
+   * prepend with the passed year.
+   */
+
+  const fromDate = [
+    fromYear,
+    fys.toISOString().split('T')[0].split('-').slice(1),
+  ]
+    .flat()
+    .join('-');
+
+  const toDate = [toYear, fye.toISOString().split('T')[0].split('-').slice(1)]
+    .flat()
+    .join('-');
+
+  return { fromDate, toDate };
+}
+
+const monthsMap: Record<Periodicity, number> = {
+  Monthly: 1,
+  Quarterly: 3,
+  'Half Yearly': 6,
+  Yearly: 12,
+};
+
+function setPruneFlagOnAccountTreeNodes(accountTree: AccountTree) {
+  for (const account of Object.values(accountTree)) {
+    account.prune = true;
+  }
+}
+
+function setValueMapOnAccountTreeNodes(
+  accountTree: AccountTree,
+  rangeGroupedMap: AccountNameValueMapMap
+) {
+  for (const name of rangeGroupedMap.keys()) {
+    const valueMap = rangeGroupedMap.get(name)!;
+    accountTree[name].valueMap = valueMap;
+    accountTree[name].prune = false;
+
+    /**
+     * Set the update the parent account values recursively
+     * also prevent pruning of the parent accounts.
+     */
+    let parentAccountName: string | null = accountTree[name].parentAccount;
+
+    while (parentAccountName !== null) {
+      parentAccountName = updateParentAccountWithChildValues(
+        accountTree,
+        parentAccountName,
+        valueMap
+      );
+    }
+  }
+}
+
+function updateParentAccountWithChildValues(
+  accountTree: AccountTree,
+  parentAccountName: string,
+  valueMap: ValueMap
+): string {
+  const parentAccount = accountTree[parentAccountName];
+  parentAccount.prune = false;
+  parentAccount.valueMap ??= new Map();
+
+  for (const key of valueMap.keys()) {
+    const value = parentAccount.valueMap!.get(key) ?? 0;
+    parentAccount.valueMap!.set(key, value + valueMap.get(key)!);
+  }
+
+  return parentAccount.parentAccount!;
+}
+
+function setChildrenOnAccountTreeNodes(accountTree: AccountTree) {
+  const parentNodes: Set<string> = new Set();
+
+  for (const name of Object.keys(accountTree)) {
+    const ac = accountTree[name];
+    if (!ac.parentAccount) {
+      continue;
+    }
+
+    accountTree[ac.parentAccount].children ??= [];
+    accountTree[ac.parentAccount].children!.push(ac!);
+
+    parentNodes.add(ac.parentAccount);
+  }
+}
+
+function deleteNonRootAccountTreeNodes(accountTree: AccountTree) {
+  for (const name of Object.keys(accountTree)) {
+    const ac = accountTree[name];
+    if (!ac.parentAccount) {
+      continue;
+    }
+
+    delete accountTree[name];
+  }
+}
+
+function pruneAccountTree(accountTree: AccountTree) {
+  for (const root of Object.keys(accountTree)) {
+    if (accountTree[root].prune) {
+      delete accountTree[root];
+    }
+  }
+
+  for (const root of Object.keys(accountTree)) {
+    accountTree[root].children = getPrunedChildren(accountTree[root].children!);
+  }
+}
+
+function getPrunedChildren(children: AccountTreeNode[]): AccountTreeNode[] {
+  return children.filter((child) => {
+    if (child.children) {
+      child.children = getPrunedChildren(child.children);
+    }
+
+    return !child.prune;
+  });
+}
+
+export function convertAccountRootNodeToAccountList(
+  rootNode: AccountTreeNode
+): AccountList {
+  if (!rootNode) {
+    return [];
+  }
+
+  const accountList: AccountList = [];
+  pushToAccountList(rootNode, accountList, 0);
+  return accountList;
+}
+
+function pushToAccountList(
+  accountTreeNode: AccountTreeNode,
+  accountList: AccountList,
+  level: number
+) {
+  accountList.push({
+    name: accountTreeNode.name,
+    rootType: accountTreeNode.rootType,
+    isGroup: accountTreeNode.isGroup,
+    parentAccount: accountTreeNode.parentAccount,
+    valueMap: accountTreeNode.valueMap,
+    level,
+  });
+
+  const children = accountTreeNode.children ?? [];
+  const childLevel = level + 1;
+
+  for (const childNode of children) {
+    pushToAccountList(childNode, accountList, childLevel);
+  }
+}
+
+function getListOfLeafNodes(tree: Tree): TreeNode[] {
+  const nonGroupChildren: TreeNode[] = [];
+  for (const node of Object.values(tree)) {
+    if (!node) {
+      continue;
+    }
+
+    const groupChildren = node.children ?? [];
+
+    while (groupChildren.length) {
+      const child = groupChildren.shift()!;
+      if (!child?.children?.length) {
+        nonGroupChildren.push(child);
+        continue;
+      }
+
+      groupChildren.unshift(...(child.children ?? []));
+    }
+  }
+
+  return nonGroupChildren;
+}
diff --git a/reports/BalanceSheet/BalanceSheet.ts b/reports/BalanceSheet/BalanceSheet.ts
index 02431843..e87ac040 100644
--- a/reports/BalanceSheet/BalanceSheet.ts
+++ b/reports/BalanceSheet/BalanceSheet.ts
@@ -1,59 +1,106 @@
-import { Fyo } from 'fyo';
-import { unique } from 'fyo/utils';
-import { FinancialStatements } from 'reports/FinancialStatements/financialStatements';
-import { FinancialStatementOptions } from 'reports/types';
+import { t } from 'fyo';
+import {
+  AccountRootType,
+  AccountRootTypeEnum,
+} from 'models/baseModels/Account/types';
+import {
+  AccountReport,
+  convertAccountRootNodeToAccountList,
+} from 'reports/AccountReport';
+import { AccountTreeNode, ReportData } from 'reports/types';
+import { getMapFromList } from 'utils';
 
-class BalanceSheet {
-  async run(options: FinancialStatementOptions, fyo: Fyo) {
-    const { fromDate, toDate, periodicity } = options;
-    const fs = new FinancialStatements(fyo);
-    const asset = await fs.getData({
-      rootType: 'Asset',
-      balanceMustBe: 'Debit',
-      fromDate,
-      toDate,
-      periodicity,
-      accumulateValues: true,
-    });
+type RootTypeRow = {
+  rootType: AccountRootType;
+  rootNode: AccountTreeNode;
+  rows: ReportData;
+};
 
-    const liability = await fs.getData({
-      rootType: 'Liability',
-      balanceMustBe: 'Credit',
-      fromDate,
-      toDate,
-      periodicity,
-      accumulateValues: true,
-    });
+export class BalanceSheet extends AccountReport {
+  static title = t`Balance Sheet`;
+  static reportName = 'balance-sheet';
 
-    const equity = await fs.getData({
-      rootType: 'Equity',
-      balanceMustBe: 'Credit',
-      fromDate,
-      toDate,
-      periodicity,
-      accumulateValues: true,
-    });
+  get rootTypes(): AccountRootType[] {
+    return [
+      AccountRootTypeEnum.Asset,
+      AccountRootTypeEnum.Liability,
+      AccountRootTypeEnum.Equity,
+    ];
+  }
 
-    const rows = [
-      ...asset.accounts,
-      asset.totalRow,
-      [],
-      ...liability.accounts,
-      liability.totalRow,
-      [],
-      ...equity.accounts,
-      equity.totalRow,
-      [],
+  async setReportData(filter?: string) {
+    if (filter !== 'hideGroupBalance') {
+      await this._setRawData();
+    }
+
+    const map = this._getGroupedMap(true, 'account');
+    const rangeGroupedMap = await this._getGroupedByDateRanges(map);
+    const accountTree = await this._getAccountTree(rangeGroupedMap);
+
+    for (const name of Object.keys(accountTree)) {
+      const { rootType } = accountTree[name];
+      if (this.rootTypes.includes(rootType)) {
+        continue;
+      }
+
+      delete accountTree[name];
+    }
+
+    const rootTypeRows: RootTypeRow[] = this.rootTypes
+      .map((rootType) => {
+        const rootNode = this.getRootNode(rootType, accountTree)!;
+        const rootList = convertAccountRootNodeToAccountList(rootNode);
+        return {
+          rootType,
+          rootNode,
+          rows: this.getReportRowsFromAccountList(rootList),
+        };
+      })
+      .filter((row) => !!row.rootNode);
+
+    this.reportData = await this.getReportDataFromRows(
+      getMapFromList(rootTypeRows, 'rootType')
+    );
+  }
+
+  async getReportDataFromRows(
+    rootTypeRows: Record<AccountRootType, RootTypeRow | undefined>
+  ): Promise<ReportData> {
+    const typeNameList = [
+      {
+        rootType: AccountRootTypeEnum.Asset,
+        totalName: t`Total Asset (Debit)`,
+      },
+      {
+        rootType: AccountRootTypeEnum.Liability,
+        totalName: t`Total Liability (Credit)`,
+      },
+      {
+        rootType: AccountRootTypeEnum.Equity,
+        totalName: t`Total Equity (Credit)`,
+      },
     ];
 
-    const columns = unique([
-      ...asset.periodList,
-      ...liability.periodList,
-      ...equity.periodList,
-    ]);
+    const reportData: ReportData = [];
+    const emptyRow = this.getEmptyRow();
+    for (const { rootType, totalName } of typeNameList) {
+      const row = rootTypeRows[rootType];
+      if (!row) {
+        continue;
+      }
 
-    return { rows, columns };
+      const totalNode = await this.getTotalNode(row.rootNode, totalName);
+      const totalRow = this.getRowFromAccountListNode(totalNode);
+
+      reportData.push(...row.rows);
+      reportData.push(totalRow);
+      reportData.push(emptyRow);
+    }
+
+    if (reportData.at(-1)?.isEmpty) {
+      reportData.pop();
+    }
+
+    return reportData;
   }
 }
-
-export default BalanceSheet;
diff --git a/reports/BalanceSheet/viewConfig.js b/reports/BalanceSheet/viewConfig.js
deleted file mode 100644
index 3d573002..00000000
--- a/reports/BalanceSheet/viewConfig.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { t } from 'fyo';
-import getCommonExportActions from '../commonExporter';
-import { fyo } from 'src/initFyo';
-
-const periodicityMap = {
-  Monthly: t`Monthly`,
-  Quarterly: t`Quarterly`,
-  'Half Yearly': t`Half Yearly`,
-  Yearly: t`Yearly`,
-};
-export default {
-  title: t`Balance Sheet`,
-  method: 'balance-sheet',
-  filterFields: [
-    {
-      fieldtype: 'Date',
-      fieldname: 'toDate',
-      size: 'small',
-      placeholder: t`To Date`,
-      label: t`To Date`,
-      required: 1,
-      default: async () => {
-        return (await fyo.doc.getSingle('AccountingSettings')).fiscalYearEnd;
-      },
-    },
-    {
-      fieldtype: 'Select',
-      placeholder: t`Select Period`,
-      size: 'small',
-      options: Object.keys(periodicityMap),
-      map: periodicityMap,
-      label: t`Periodicity`,
-      fieldname: 'periodicity',
-      default: 'Monthly',
-    },
-  ],
-  actions: getCommonExportActions('balance-sheet'),
-  getColumns({ data }) {
-    const columns = [
-      { label: t`Account`, fieldtype: 'Data', fieldname: 'account', width: 2 },
-    ];
-
-    if (data && data.columns) {
-      const currencyColumns = data.columns;
-      const columnDefs = currencyColumns.map((name) => ({
-        label: name,
-        fieldname: name,
-        fieldtype: 'Currency',
-      }));
-
-      columns.push(...columnDefs);
-    }
-
-    return columns;
-  },
-};
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index ae279aab..a5dd6d2b 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -104,6 +104,7 @@ export class GeneralLedger extends LedgerReport {
   _getRowFromEntry(entry: LedgerEntry, columns: ColumnField[]): ReportRow {
     if (entry.name === -3) {
       return {
+        isEmpty: true,
         cells: columns.map((c) => ({
           rawValue: '',
           value: '',
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index 5a3bf614..83376cb2 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -1,159 +1,80 @@
 import { t } from 'fyo';
-import { Action } from 'fyo/model/types';
-import { cloneDeep } from 'lodash';
-import { DateTime } from 'luxon';
 import {
   AccountRootType,
-  AccountRootTypeEnum
+  AccountRootTypeEnum,
 } from 'models/baseModels/Account/types';
-import { isCredit } from 'models/helpers';
-import { ModelNameEnum } from 'models/types';
-import { LedgerReport } from 'reports/LedgerReport';
 import {
-  ColumnField,
-  GroupedMap,
-  LedgerEntry,
-  Periodicity,
-  ReportCell,
-  ReportData,
-  ReportRow
-} from 'reports/types';
-import { Field } from 'schemas/types';
-import { fyo } from 'src/initFyo';
-import { getMapFromList } from 'utils';
-import { QueryFilter } from 'utils/db/types';
+  AccountReport,
+  convertAccountRootNodeToAccountList,
+} from 'reports/AccountReport';
+import { AccountListNode, AccountTreeNode, ReportData } from 'reports/types';
 
-type DateRange = { fromDate: DateTime; toDate: DateTime };
-type ValueMap = Map<DateRange, number>;
-type AccountNameValueMapMap = Map<string, ValueMap>;
-type BasedOn = 'Fiscal Year' | 'Until Date';
-
-interface Account {
-  name: string;
-  rootType: AccountRootType;
-  isGroup: boolean;
-  parentAccount: string | null;
-}
-
-interface TreeNode {
-  name: string;
-  children?: TreeNode[];
-}
-
-type Tree = Record<string, TreeNode>;
-
-type AccountTree = Record<string, AccountTreeNode>;
-interface AccountTreeNode extends Account {
-  children?: AccountTreeNode[];
-  valueMap?: ValueMap;
-  prune?: boolean;
-}
-
-type AccountList = AccountListNode[];
-interface AccountListNode extends Account {
-  valueMap?: ValueMap;
-  level?: number;
-}
-
-const PNL_ROOT_TYPES: AccountRootType[] = [
-  AccountRootTypeEnum.Income,
-  AccountRootTypeEnum.Expense,
-];
-
-const ACC_NAME_WIDTH = 2;
-const ACC_BAL_WIDTH = 1;
-
-export class ProfitAndLoss extends LedgerReport {
+export class ProfitAndLoss extends AccountReport {
   static title = t`Profit And Loss`;
   static reportName = 'profit-and-loss';
 
-  toDate?: string;
-  count: number = 3;
-  fromYear?: number;
-  toYear?: number;
-  singleColumn: boolean = false;
-  hideGroupBalance: boolean = false;
-  periodicity: Periodicity = 'Monthly';
-  basedOn: BasedOn = 'Until Date';
-
-  _rawData: LedgerEntry[] = [];
-  _dateRanges?: DateRange[];
-
-  accountMap?: Record<string, Account>;
-
-  async initialize(): Promise<void> {
-    await super.initialize();
-    await this._setDateRanges();
-  }
-
-  async setDefaultFilters(): Promise<void> {
-    if (this.basedOn === 'Until Date' && !this.toDate) {
-      this.toDate = DateTime.now().toISODate();
-    }
-
-    if (this.basedOn === 'Fiscal Year' && !this.toYear) {
-      this.fromYear = DateTime.now().year;
-      this.toYear = this.fromYear + 1;
-    }
-
-    await this._setDateRanges();
-  }
-
-  async _setDateRanges() {
-    this._dateRanges = await this._getDateRanges();
+  get rootTypes(): AccountRootType[] {
+    return [AccountRootTypeEnum.Income, AccountRootTypeEnum.Expense];
   }
 
   async setReportData(filter?: string) {
-    await this._setRawData();
+    if (filter !== 'hideGroupBalance') {
+      await this._setRawData();
+    }
+
     const map = this._getGroupedMap(true, 'account');
     const rangeGroupedMap = await this._getGroupedByDateRanges(map);
     const accountTree = await this._getAccountTree(rangeGroupedMap);
 
     for (const name of Object.keys(accountTree)) {
       const { rootType } = accountTree[name];
-      if (PNL_ROOT_TYPES.includes(rootType)) {
+      if (this.rootTypes.includes(rootType)) {
         continue;
       }
 
       delete accountTree[name];
     }
 
-    const rootNodeList = Object.values(accountTree);
-    const incomeTree = {
-      [AccountRootTypeEnum.Income]: rootNodeList.find(
-        (n) => n.rootType === AccountRootTypeEnum.Income
-      )!,
-    };
-    const expenseTree = {
-      [AccountRootTypeEnum.Expense]: rootNodeList.find(
-        (n) => n.rootType === AccountRootTypeEnum.Expense
-      )!,
-    };
+    /**
+     * Income Rows
+     */
+    const incomeRoot = this.getRootNode(
+      AccountRootTypeEnum.Income,
+      accountTree
+    )!;
+    const incomeList = convertAccountRootNodeToAccountList(incomeRoot);
+    const incomeRows = this.getReportRowsFromAccountList(incomeList);
+
+    /**
+     * Expense Rows
+     */
+    const expenseRoot = this.getRootNode(
+      AccountRootTypeEnum.Expense,
+      accountTree
+    )!;
+    const expenseList = convertAccountRootNodeToAccountList(expenseRoot);
+    const expenseRows = this.getReportRowsFromAccountList(expenseList);
 
-    const incomeList = convertAccountTreeToAccountList(incomeTree);
-    const expenseList = convertAccountTreeToAccountList(expenseTree);
-    const incomeRows = this.getPnlRowsFromAccountList(incomeList);
-    const expenseRows = this.getPnlRowsFromAccountList(expenseList);
     this.reportData = await this.getReportDataFromRows(
       incomeRows,
       expenseRows,
-      incomeTree,
-      expenseTree
+      incomeRoot,
+      expenseRoot
     );
   }
 
   async getReportDataFromRows(
     incomeRows: ReportData,
     expenseRows: ReportData,
-    incomeTree: AccountTree,
-    expenseTree: AccountTree
+    incomeRoot: AccountTreeNode,
+    expenseRoot: AccountTreeNode
   ): Promise<ReportData> {
     const totalIncome = await this.getTotalNode(
-      incomeTree,
+      incomeRoot,
       t`Total Income (Credit)`
     );
     const totalExpense = await this.getTotalNode(
-      expenseTree,
+      expenseRoot,
       t`Total Expense (Debit)`
     );
 
@@ -187,7 +108,7 @@ export class ProfitAndLoss extends LedgerReport {
       }
     });
 
-    const emptyRow = await this.getEmptyRow();
+    const emptyRow = this.getEmptyRow();
 
     return [
       incomeRows,
@@ -200,541 +121,4 @@ export class ProfitAndLoss extends LedgerReport {
       totalProfitRow,
     ].flat() as ReportData;
   }
-
-  async getEmptyRow(): Promise<ReportRow> {
-    const columns = await this.getColumns();
-    return {
-      cells: columns.map(
-        (c) =>
-          ({
-            value: '',
-            rawValue: '',
-            width: c.width,
-            align: 'left',
-          } as ReportCell)
-      ),
-    };
-  }
-
-  async getTotalNode(
-    accountTree: AccountTree,
-    name: string
-  ): Promise<AccountListNode> {
-    const leafNodes = getListOfLeafNodes(accountTree) as AccountTreeNode[];
-
-    const totalMap = leafNodes.reduce((acc, node) => {
-      for (const key of this._dateRanges!) {
-        const bal = acc.get(key) ?? 0;
-        const val = node.valueMap?.get(key) ?? 0;
-        acc.set(key, bal + val);
-      }
-
-      return acc;
-    }, new Map() as ValueMap);
-
-    return { name, valueMap: totalMap, level: 0 } as AccountListNode;
-  }
-
-  getPnlRowsFromAccountList(accountList: AccountList): ReportData {
-    return accountList.map((al) => {
-      return this.getRowFromAccountListNode(al);
-    });
-  }
-
-  getRowFromAccountListNode(al: AccountListNode) {
-    const nameCell = {
-      value: al.name,
-      rawValue: al.name,
-      align: 'left',
-      width: ACC_NAME_WIDTH,
-      bold: !al.level,
-      italics: al.isGroup,
-      indent: al.level ?? 0,
-    } as ReportCell;
-
-    const balanceCells = this._dateRanges!.map((k) => {
-      const rawValue = al.valueMap?.get(k) ?? 0;
-      let value = this.fyo.format(rawValue, 'Currency');
-      if (this.hideGroupBalance && al.isGroup) {
-        value = '';
-      }
-
-      return {
-        rawValue,
-        value,
-        align: 'right',
-        width: ACC_BAL_WIDTH,
-      } as ReportCell;
-    });
-
-    return {
-      cells: [nameCell, balanceCells].flat(),
-      level: al.level,
-      isGroup: !!al.isGroup,
-      folded: false,
-      foldedBelow: false,
-    } as ReportRow;
-  }
-
-  async _getGroupedByDateRanges(
-    map: GroupedMap
-  ): Promise<AccountNameValueMapMap> {
-    const accountValueMap: AccountNameValueMapMap = new Map();
-    const accountMap = await this._getAccountMap();
-
-    for (const account of map.keys()) {
-      const valueMap: ValueMap = new Map();
-
-      /**
-       * Set Balance for every DateRange key
-       */
-      for (const entry of map.get(account)!) {
-        const key = this._getRangeMapKey(entry);
-        if (key === null) {
-          continue;
-        }
-
-        const totalBalance = valueMap.get(key!) ?? 0;
-        const balance = (entry.debit ?? 0) - (entry.credit ?? 0);
-        const rootType = accountMap[entry.account].rootType;
-
-        if (isCredit(rootType)) {
-          valueMap.set(key!, totalBalance - balance);
-        } else {
-          valueMap.set(key!, totalBalance + balance);
-        }
-      }
-      accountValueMap.set(account, valueMap);
-    }
-
-    return accountValueMap;
-  }
-
-  async _getAccountTree(rangeGroupedMap: AccountNameValueMapMap) {
-    const accountTree = cloneDeep(await this._getAccountMap()) as AccountTree;
-
-    setPruneFlagOnAccountTreeNodes(accountTree);
-    setValueMapOnAccountTreeNodes(accountTree, rangeGroupedMap);
-    setChildrenOnAccountTreeNodes(accountTree);
-    deleteNonRootAccountTreeNodes(accountTree);
-    pruneAccountTree(accountTree);
-
-    return accountTree;
-  }
-
-  async _getAccountMap() {
-    if (this.accountMap) {
-      return this.accountMap;
-    }
-
-    const accountList: Account[] = (
-      await this.fyo.db.getAllRaw('Account', {
-        fields: ['name', 'rootType', 'isGroup', 'parentAccount'],
-      })
-    ).map((rv) => ({
-      name: rv.name as string,
-      rootType: rv.rootType as AccountRootType,
-      isGroup: Boolean(rv.isGroup),
-      parentAccount: rv.parentAccount as string | null,
-    }));
-
-    this.accountMap = getMapFromList(accountList, 'name');
-    return this.accountMap;
-  }
-
-  _getRangeMapKey(entry: LedgerEntry): DateRange | null {
-    const entryDate = DateTime.fromISO(
-      entry.date!.toISOString().split('T')[0]
-    ).toMillis();
-
-    for (const dr of this._dateRanges!) {
-      const toDate = dr.toDate.toMillis();
-      const fromDate = dr.fromDate.toMillis();
-
-      if (entryDate <= toDate && entryDate > fromDate) {
-        return dr;
-      }
-    }
-
-    return null;
-  }
-
-  async _getDateRanges(): Promise<DateRange[]> {
-    const endpoints = await this._getFromAndToDates();
-    const fromDate = DateTime.fromISO(endpoints.fromDate);
-    const toDate = DateTime.fromISO(endpoints.toDate);
-
-    if (this.singleColumn) {
-      return [
-        {
-          toDate,
-          fromDate,
-        },
-      ];
-    }
-
-    const months: number = monthsMap[this.periodicity];
-    const dateRanges: DateRange[] = [
-      { toDate, fromDate: toDate.minus({ months }) },
-    ];
-
-    let count = this.count ?? 1;
-    if (this.basedOn === 'Fiscal Year') {
-      count = Math.ceil(((this.toYear! - this.fromYear!) * 12) / months);
-    }
-
-    for (let i = 1; i < count; i++) {
-      const lastRange = dateRanges.at(-1)!;
-      dateRanges.push({
-        toDate: lastRange.fromDate,
-        fromDate: lastRange.fromDate.minus({ months }),
-      });
-    }
-
-    return dateRanges.sort((b, a) => b.toDate.toMillis() - a.toDate.toMillis());
-  }
-
-  async _getFromAndToDates() {
-    let toDate: string;
-    let fromDate: string;
-
-    if (this.basedOn === 'Until Date') {
-      toDate = this.toDate!;
-      const months = monthsMap[this.periodicity] * Math.max(this.count ?? 1, 1);
-      fromDate = DateTime.fromISO(toDate).minus({ months }).toISODate();
-    } else {
-      const fy = await getFiscalEndpoints(this.toYear!, this.fromYear!);
-      toDate = fy.toDate;
-      fromDate = fy.fromDate;
-    }
-
-    return { fromDate, toDate };
-  }
-
-  async _getQueryFilters(): Promise<QueryFilter> {
-    const filters: QueryFilter = {};
-    const { fromDate, toDate } = await this._getFromAndToDates();
-
-    const dateFilter: string[] = [];
-    dateFilter.push('<=', toDate);
-    dateFilter.push('>=', fromDate);
-
-    filters.date = dateFilter;
-    filters.reverted = false;
-    return filters;
-  }
-
-  getFilters(): Field[] {
-    const periodNameMap: Record<Periodicity, string> = {
-      Monthly: t`Months`,
-      Quarterly: t`Quarters`,
-      'Half Yearly': t`Half Years`,
-      Yearly: t`Years`,
-    };
-
-    const filters = [
-      {
-        fieldtype: 'Select',
-        options: [
-          { label: t`Fiscal Year`, value: 'Fiscal Year' },
-          { label: t`Until Date`, value: 'Until Date' },
-        ],
-        label: t`Based On`,
-        fieldname: 'basedOn',
-      },
-      {
-        fieldtype: 'Select',
-        options: [
-          { label: t`Monthly`, value: 'Monthly' },
-          { label: t`Quarterly`, value: 'Quarterly' },
-          { label: t`Half Yearly`, value: 'Half Yearly' },
-          { label: t`Yearly`, value: 'Yearly' },
-        ],
-        label: t`Periodicity`,
-        fieldname: 'periodicity',
-      },
-      ,
-    ] as Field[];
-
-    let dateFilters = [
-      {
-        fieldtype: 'Int',
-        fieldname: 'toYear',
-        placeholder: t`To Year`,
-        label: t`To Year`,
-        minvalue: 2000,
-        required: true,
-      },
-      {
-        fieldtype: 'Int',
-        fieldname: 'fromYear',
-        placeholder: t`From Year`,
-        label: t`From Year`,
-        minvalue: 2000,
-        required: true,
-      },
-    ] as Field[];
-
-    if (this.basedOn === 'Until Date') {
-      dateFilters = [
-        {
-          fieldtype: 'Date',
-          fieldname: 'toDate',
-          placeholder: t`To Date`,
-          label: t`To Date`,
-          required: true,
-        },
-        {
-          fieldtype: 'Int',
-          fieldname: 'count',
-          minvalue: 1,
-          placeholder: t`Number of ${periodNameMap[this.periodicity]}`,
-          label: t`Number of ${periodNameMap[this.periodicity]}`,
-          required: true,
-        },
-      ] as Field[];
-    }
-
-    return [
-      filters,
-      dateFilters,
-      {
-        fieldtype: 'Check',
-        label: t`Single Column`,
-        fieldname: 'singleColumn',
-      } as Field,
-      {
-        fieldtype: 'Check',
-        label: t`Hide Group Balance`,
-        fieldname: 'hideGroupBalance',
-      } as Field,
-    ].flat();
-  }
-
-  getColumns(): ColumnField[] {
-    const columns = [
-      {
-        label: t`Account`,
-        fieldtype: 'Link',
-        fieldname: 'account',
-        align: 'left',
-        width: ACC_NAME_WIDTH,
-      },
-    ] as ColumnField[];
-
-    const dateColumns = this._dateRanges!.sort(
-      (a, b) => b.toDate.toMillis() - a.toDate.toMillis()
-    ).map(
-      (d) =>
-        ({
-          label: this.fyo.format(d.toDate.toJSDate(), 'Date'),
-          fieldtype: 'Data',
-          fieldname: 'toDate',
-          align: 'right',
-          width: ACC_BAL_WIDTH,
-        } as ColumnField)
-    );
-
-    return [columns, dateColumns].flat();
-  }
-
-  getActions(): Action[] {
-    return [];
-  }
-
-  metaFilters: string[] = ['basedOn'];
-}
-
-async function getFiscalEndpoints(toYear: number, fromYear: number) {
-  const fys = (await fyo.getValue(
-    ModelNameEnum.AccountingSettings,
-    'fiscalYearStart'
-  )) as Date;
-  const fye = (await fyo.getValue(
-    ModelNameEnum.AccountingSettings,
-    'fiscalYearEnd'
-  )) as Date;
-
-  /**
-   * Get the month and the day, and
-   * prepend with the passed year.
-   */
-
-  const fromDate = [
-    fromYear,
-    fys.toISOString().split('T')[0].split('-').slice(1),
-  ]
-    .flat()
-    .join('-');
-
-  const toDate = [toYear, fye.toISOString().split('T')[0].split('-').slice(1)]
-    .flat()
-    .join('-');
-
-  return { fromDate, toDate };
-}
-
-const monthsMap: Record<Periodicity, number> = {
-  Monthly: 1,
-  Quarterly: 3,
-  'Half Yearly': 6,
-  Yearly: 12,
-};
-
-function setPruneFlagOnAccountTreeNodes(accountTree: AccountTree) {
-  for (const account of Object.values(accountTree)) {
-    account.prune = true;
-  }
-}
-
-function setValueMapOnAccountTreeNodes(
-  accountTree: AccountTree,
-  rangeGroupedMap: AccountNameValueMapMap
-) {
-  for (const name of rangeGroupedMap.keys()) {
-    const valueMap = rangeGroupedMap.get(name)!;
-    accountTree[name].valueMap = valueMap;
-    accountTree[name].prune = false;
-
-    /**
-     * Set the update the parent account values recursively
-     * also prevent pruning of the parent accounts.
-     */
-    let parentAccountName: string | null = accountTree[name].parentAccount;
-
-    while (parentAccountName !== null) {
-      parentAccountName = updateParentAccountWithChildValues(
-        accountTree,
-        parentAccountName,
-        valueMap
-      );
-    }
-  }
-}
-
-function updateParentAccountWithChildValues(
-  accountTree: AccountTree,
-  parentAccountName: string,
-  valueMap: ValueMap
-): string {
-  const parentAccount = accountTree[parentAccountName];
-  parentAccount.prune = false;
-  parentAccount.valueMap ??= new Map();
-
-  for (const key of valueMap.keys()) {
-    const value = parentAccount.valueMap!.get(key) ?? 0;
-    parentAccount.valueMap!.set(key, value + valueMap.get(key)!);
-  }
-
-  return parentAccount.parentAccount!;
-}
-
-function setChildrenOnAccountTreeNodes(accountTree: AccountTree) {
-  const parentNodes: Set<string> = new Set();
-
-  for (const name of Object.keys(accountTree)) {
-    const ac = accountTree[name];
-    if (!ac.parentAccount) {
-      continue;
-    }
-
-    accountTree[ac.parentAccount].children ??= [];
-    accountTree[ac.parentAccount].children!.push(ac!);
-
-    parentNodes.add(ac.parentAccount);
-  }
-}
-
-function deleteNonRootAccountTreeNodes(accountTree: AccountTree) {
-  for (const name of Object.keys(accountTree)) {
-    const ac = accountTree[name];
-    if (!ac.parentAccount) {
-      continue;
-    }
-
-    delete accountTree[name];
-  }
-}
-
-function pruneAccountTree(accountTree: AccountTree) {
-  for (const root of Object.keys(accountTree)) {
-    if (accountTree[root].prune) {
-      delete accountTree[root];
-    }
-  }
-
-  for (const root of Object.keys(accountTree)) {
-    accountTree[root].children = getPrunedChildren(accountTree[root].children!);
-  }
-}
-
-function getPrunedChildren(children: AccountTreeNode[]): AccountTreeNode[] {
-  return children.filter((child) => {
-    if (child.children) {
-      child.children = getPrunedChildren(child.children);
-    }
-
-    return !child.prune;
-  });
-}
-
-function convertAccountTreeToAccountList(
-  accountTree: AccountTree
-): AccountList {
-  const accountList: AccountList = [];
-
-  for (const rootNode of Object.values(accountTree)) {
-    if (!rootNode) {
-      continue;
-    }
-
-    pushToAccountList(rootNode, accountList, 0);
-  }
-
-  return accountList;
-}
-
-function pushToAccountList(
-  accountTreeNode: AccountTreeNode,
-  accountList: AccountList,
-  level: number
-) {
-  accountList.push({
-    name: accountTreeNode.name,
-    rootType: accountTreeNode.rootType,
-    isGroup: accountTreeNode.isGroup,
-    parentAccount: accountTreeNode.parentAccount,
-    valueMap: accountTreeNode.valueMap,
-    level,
-  });
-
-  const children = accountTreeNode.children ?? [];
-  const childLevel = level + 1;
-
-  for (const childNode of children) {
-    pushToAccountList(childNode, accountList, childLevel);
-  }
-}
-
-function getListOfLeafNodes(tree: Tree): TreeNode[] {
-  const nonGroupChildren: TreeNode[] = [];
-  for (const node of Object.values(tree)) {
-    if (!node) {
-      continue;
-    }
-
-    const groupChildren = node.children ?? [];
-
-    while (groupChildren.length) {
-      const child = groupChildren.shift()!;
-      if (!child?.children?.length) {
-        nonGroupChildren.push(child);
-        continue;
-      }
-
-      groupChildren.unshift(...(child.children ?? []));
-    }
-  }
-
-  return nonGroupChildren;
 }
diff --git a/reports/index.js b/reports/index.js
deleted file mode 100644
index 2f6be6fe..00000000
--- a/reports/index.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-import AccountsReceivablePayable from './AccountsReceivablePayable/AccountsReceivablePayable';
-import BalanceSheet from './BalanceSheet/BalanceSheet';
-import BankReconciliation from './BankReconciliation/BankReconciliation';
-import GeneralLedger from './GeneralLedger/GeneralLedger';
-import GSTR1 from './GoodsAndServiceTax/GSTR1';
-import GSTR2 from './GoodsAndServiceTax/GSTR2';
-import ProfitAndLoss from './ProfitAndLoss/ProfitAndLoss';
-import PurchaseRegister from './PurchaseRegister/PurchaseRegister';
-import SalesRegister from './SalesRegister/SalesRegister';
-import TrialBalance from './TrialBalance/TrialBalance';
-
-export function getReportData(method, filters) {
-  const reports = {
-    'general-ledger': GeneralLedger,
-    'profit-and-loss': ProfitAndLoss,
-    'balance-sheet': BalanceSheet,
-    'trial-balance': TrialBalance,
-    'gstr-1': GSTR1,
-    'gstr-2': GSTR2,
-    'sales-register': SalesRegister,
-    'purchase-register': PurchaseRegister,
-    'bank-reconciliation': BankReconciliation,
-  };
-
-  if (method === 'accounts-receivable') {
-    return new AccountsReceivablePayable().run('Receivable', filters);
-  }
-
-  if (method === 'accounts-payable') {
-    return new AccountsReceivablePayable().run('Payable', filters);
-  }
-
-  const ReportClass = reports[method];
-  return new ReportClass().run(filters);
-}
-*/
-export function getReportData(method, filters) {
-  return { rows: [], columns: [] };
-}
diff --git a/reports/index.ts b/reports/index.ts
index ec8f6e84..97a80101 100644
--- a/reports/index.ts
+++ b/reports/index.ts
@@ -1,4 +1,5 @@
+import { BalanceSheet } from './BalanceSheet/BalanceSheet';
 import { GeneralLedger } from './GeneralLedger/GeneralLedger';
 import { ProfitAndLoss } from './ProfitAndLoss/ProfitAndLoss';
 
-export const reports = { GeneralLedger, ProfitAndLoss };
+export const reports = { GeneralLedger, ProfitAndLoss, BalanceSheet };
diff --git a/reports/types.ts b/reports/types.ts
index ad0b5f97..866d79d3 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import { AccountRootType } from 'models/baseModels/Account/types';
 import { BaseField, RawValue } from 'schemas/types';
 
@@ -18,6 +19,7 @@ export interface ReportRow {
   cells: ReportCell[];
   level?: number;
   isGroup?: boolean;
+  isEmpty?: boolean;
   folded?: boolean;
   foldedBelow?: boolean;
 }
@@ -68,3 +70,39 @@ export interface LedgerEntry {
 }
 
 export type GroupedMap = Map<string, LedgerEntry[]>;
+
+export type DateRange = { fromDate: DateTime; toDate: DateTime };
+export type ValueMap = Map<DateRange, number>;
+
+export interface Account {
+  name: string;
+  rootType: AccountRootType;
+  isGroup: boolean;
+  parentAccount: string | null;
+}
+
+export type AccountTree = Record<string, AccountTreeNode>;
+export interface AccountTreeNode extends Account {
+  children?: AccountTreeNode[];
+  valueMap?: ValueMap;
+  prune?: boolean;
+}
+
+export type AccountList = AccountListNode[];
+export interface AccountListNode extends Account {
+  valueMap?: ValueMap;
+  level?: number;
+}
+
+export type AccountNameValueMapMap = Map<string, ValueMap>;
+export type BasedOn = 'Fiscal Year' | 'Until Date';
+
+
+export interface TreeNode {
+  name: string;
+  children?: TreeNode[];
+}
+
+export type Tree = Record<string, TreeNode>;
+
+
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 48dc83fc..6deacba3 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -148,12 +148,12 @@ function getCompleteSidebar(): SidebarConfig {
           name: 'profit-and-loss',
           route: '/report/ProfitAndLoss',
         },
-        /*
         {
           label: t`Balance Sheet`,
           name: 'balance-sheet',
-          route: '/report/balance-sheet',
+          route: '/report/BalanceSheet',
         },
+        /*
         {
           label: t`Trial Balance`,
           name: 'trial-balance',

From 63c2eace33ba5eca05cd9d9bbb69cf8407028530 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 16 May 2022 18:31:58 +0530
Subject: [PATCH 121/163] incr: add the TrialBalance report

---
 reports/AccountReport.ts               |  46 ++--
 reports/BalanceSheet/BalanceSheet.ts   |  10 +-
 reports/ProfitAndLoss/ProfitAndLoss.ts |  18 +-
 reports/TrialBalance/TrialBalance.ts   | 291 +++++++++++++++++++++++++
 reports/index.ts                       |   8 +-
 reports/types.ts                       |   9 +-
 src/renderer.ts                        |   3 -
 src/utils/sidebarConfig.ts             |   4 +-
 8 files changed, 342 insertions(+), 47 deletions(-)
 create mode 100644 reports/TrialBalance/TrialBalance.ts

diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index 0d8e2bc6..b3ee0a03 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -31,8 +31,8 @@ import { fyo } from 'src/initFyo';
 import { getMapFromList } from 'utils';
 import { QueryFilter } from 'utils/db/types';
 
-const ACC_NAME_WIDTH = 2;
-const ACC_BAL_WIDTH = 1;
+export const ACC_NAME_WIDTH = 2;
+export const ACC_BAL_WIDTH = 1;
 
 export abstract class AccountReport extends LedgerReport {
   toDate?: string;
@@ -40,7 +40,7 @@ export abstract class AccountReport extends LedgerReport {
   fromYear?: number;
   toYear?: number;
   consolidateColumns: boolean = false;
-  hideGroupBalance: boolean = false;
+  hideGroupAmounts: boolean = false;
   periodicity: Periodicity = 'Monthly';
   basedOn: BasedOn = 'Until Date';
 
@@ -48,12 +48,6 @@ export abstract class AccountReport extends LedgerReport {
   _dateRanges?: DateRange[];
 
   accountMap?: Record<string, Account>;
-  abstract get rootTypes(): AccountRootType[];
-
-  async initialize(): Promise<void> {
-    await super.initialize();
-    await this._setDateRanges();
-  }
 
   async setDefaultFilters(): Promise<void> {
     if (this.basedOn === 'Until Date' && !this.toDate) {
@@ -105,9 +99,9 @@ export abstract class AccountReport extends LedgerReport {
 
     const totalMap = leafNodes.reduce((acc, node) => {
       for (const key of this._dateRanges!) {
-        const bal = acc.get(key) ?? 0;
-        const val = node.valueMap?.get(key) ?? 0;
-        acc.set(key, bal + val);
+        const bal = acc.get(key)?.balance ?? 0;
+        const val = node.valueMap?.get(key)?.balance ?? 0;
+        acc.set(key, { balance: bal + val });
       }
 
       return acc;
@@ -134,9 +128,9 @@ export abstract class AccountReport extends LedgerReport {
     } as ReportCell;
 
     const balanceCells = this._dateRanges!.map((k) => {
-      const rawValue = al.valueMap?.get(k) ?? 0;
+      const rawValue = al.valueMap?.get(k)?.balance ?? 0;
       let value = this.fyo.format(rawValue, 'Currency');
-      if (this.hideGroupBalance && al.isGroup) {
+      if (this.hideGroupAmounts && al.isGroup) {
         value = '';
       }
 
@@ -175,14 +169,14 @@ export abstract class AccountReport extends LedgerReport {
           continue;
         }
 
-        const totalBalance = valueMap.get(key!) ?? 0;
+        const totalBalance = valueMap.get(key!)?.balance ?? 0;
         const balance = (entry.debit ?? 0) - (entry.credit ?? 0);
         const rootType = accountMap[entry.account].rootType;
 
         if (isCredit(rootType)) {
-          valueMap.set(key!, totalBalance - balance);
+          valueMap.set(key!, { balance: totalBalance - balance });
         } else {
-          valueMap.set(key!, totalBalance + balance);
+          valueMap.set(key!, { balance: totalBalance + balance });
         }
       }
       accountValueMap.set(account, valueMap);
@@ -232,7 +226,7 @@ export abstract class AccountReport extends LedgerReport {
       const toDate = dr.toDate.toMillis();
       const fromDate = dr.fromDate.toMillis();
 
-      if (entryDate <= toDate && entryDate > fromDate) {
+      if (fromDate < entryDate && entryDate <= toDate) {
         return dr;
       }
     }
@@ -386,8 +380,8 @@ export abstract class AccountReport extends LedgerReport {
       } as Field,
       {
         fieldtype: 'Check',
-        label: t`Hide Group Balance`,
-        fieldname: 'hideGroupBalance',
+        label: t`Hide Group Amounts`,
+        fieldname: 'hideGroupAmounts',
       } as Field,
     ].flat();
   }
@@ -426,7 +420,7 @@ export abstract class AccountReport extends LedgerReport {
   metaFilters: string[] = ['basedOn'];
 }
 
-async function getFiscalEndpoints(toYear: number, fromYear: number) {
+export async function getFiscalEndpoints(toYear: number, fromYear: number) {
   const fys = (await fyo.getValue(
     ModelNameEnum.AccountingSettings,
     'fiscalYearStart'
@@ -503,8 +497,14 @@ function updateParentAccountWithChildValues(
   parentAccount.valueMap ??= new Map();
 
   for (const key of valueMap.keys()) {
-    const value = parentAccount.valueMap!.get(key) ?? 0;
-    parentAccount.valueMap!.set(key, value + valueMap.get(key)!);
+    const value = parentAccount.valueMap!.get(key);
+    const childValue = valueMap.get(key);
+    const map: Record<string, number> = {};
+
+    for (const key of Object.keys(childValue!)) {
+      map[key] = (value?.[key] ?? 0) + (childValue?.[key] ?? 0);
+    }
+    parentAccount.valueMap!.set(key, map);
   }
 
   return parentAccount.parentAccount!;
diff --git a/reports/BalanceSheet/BalanceSheet.ts b/reports/BalanceSheet/BalanceSheet.ts
index e87ac040..bd704b7a 100644
--- a/reports/BalanceSheet/BalanceSheet.ts
+++ b/reports/BalanceSheet/BalanceSheet.ts
@@ -7,15 +7,9 @@ import {
   AccountReport,
   convertAccountRootNodeToAccountList,
 } from 'reports/AccountReport';
-import { AccountTreeNode, ReportData } from 'reports/types';
+import { ReportData, RootTypeRow } from 'reports/types';
 import { getMapFromList } from 'utils';
 
-type RootTypeRow = {
-  rootType: AccountRootType;
-  rootNode: AccountTreeNode;
-  rows: ReportData;
-};
-
 export class BalanceSheet extends AccountReport {
   static title = t`Balance Sheet`;
   static reportName = 'balance-sheet';
@@ -29,7 +23,7 @@ export class BalanceSheet extends AccountReport {
   }
 
   async setReportData(filter?: string) {
-    if (filter !== 'hideGroupBalance') {
+    if (filter !== 'hideGroupAmounts') {
       await this._setRawData();
     }
 
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index 83376cb2..e4965624 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -7,7 +7,12 @@ import {
   AccountReport,
   convertAccountRootNodeToAccountList,
 } from 'reports/AccountReport';
-import { AccountListNode, AccountTreeNode, ReportData } from 'reports/types';
+import {
+  AccountListNode,
+  AccountTreeNode,
+  ReportData,
+  ValueMap,
+} from 'reports/types';
 
 export class ProfitAndLoss extends AccountReport {
   static title = t`Profit And Loss`;
@@ -18,7 +23,7 @@ export class ProfitAndLoss extends AccountReport {
   }
 
   async setReportData(filter?: string) {
-    if (filter !== 'hideGroupBalance') {
+    if (filter !== 'hideGroupAmounts') {
       await this._setRawData();
     }
 
@@ -78,11 +83,11 @@ export class ProfitAndLoss extends AccountReport {
       t`Total Expense (Debit)`
     );
 
-    const totalValueMap = new Map();
+    const totalValueMap: ValueMap = new Map();
     for (const key of totalIncome.valueMap!.keys()) {
-      const income = totalIncome.valueMap!.get(key) ?? 0;
-      const expense = totalExpense.valueMap!.get(key) ?? 0;
-      totalValueMap.set(key, income - expense);
+      const income = totalIncome.valueMap!.get(key)?.balance ?? 0;
+      const expense = totalExpense.valueMap!.get(key)?.balance ?? 0;
+      totalValueMap.set(key, { balance: income - expense });
     }
 
     const totalProfit = {
@@ -117,7 +122,6 @@ export class ProfitAndLoss extends AccountReport {
       expenseRows,
       totalExpenseRow,
       emptyRow,
-      emptyRow,
       totalProfitRow,
     ].flat() as ReportData;
   }
diff --git a/reports/TrialBalance/TrialBalance.ts b/reports/TrialBalance/TrialBalance.ts
new file mode 100644
index 00000000..9dc9ab54
--- /dev/null
+++ b/reports/TrialBalance/TrialBalance.ts
@@ -0,0 +1,291 @@
+import { t } from 'fyo';
+import { Action } from 'fyo/model/types';
+import { ValueError } from 'fyo/utils/errors';
+import { DateTime } from 'luxon';
+import {
+  AccountRootType,
+  AccountRootTypeEnum,
+} from 'models/baseModels/Account/types';
+import {
+  AccountReport,
+  ACC_BAL_WIDTH,
+  ACC_NAME_WIDTH,
+  convertAccountRootNodeToAccountList,
+  getFiscalEndpoints,
+} from 'reports/AccountReport';
+import {
+  Account,
+  AccountListNode,
+  AccountNameValueMapMap,
+  ColumnField,
+  DateRange,
+  GroupedMap,
+  LedgerEntry,
+  ReportCell,
+  ReportData,
+  ReportRow,
+  RootTypeRow,
+  ValueMap,
+} from 'reports/types';
+import { Field } from 'schemas/types';
+import { QueryFilter } from 'utils/db/types';
+
+export class TrialBalance extends AccountReport {
+  static title = t`Trial Balance`;
+  static reportName = 'trial-balance';
+
+  fromDate?: string;
+  toDate?: string;
+  hideGroupAmounts: boolean = false;
+
+  _rawData: LedgerEntry[] = [];
+  _dateRanges?: DateRange[];
+
+  accountMap?: Record<string, Account>;
+
+  get rootTypes(): AccountRootType[] {
+    return [
+      AccountRootTypeEnum.Asset,
+      AccountRootTypeEnum.Liability,
+      AccountRootTypeEnum.Income,
+      AccountRootTypeEnum.Expense,
+      AccountRootTypeEnum.Equity,
+    ];
+  }
+
+  async setReportData(filter?: string) {
+    if (filter !== 'hideGroupAmounts') {
+      await this._setRawData();
+    }
+
+    const map = this._getGroupedMap(true, 'account');
+    const rangeGroupedMap = await this._getGroupedByDateRanges(map);
+    const accountTree = await this._getAccountTree(rangeGroupedMap);
+
+    const rootTypeRows: RootTypeRow[] = this.rootTypes
+      .map((rootType) => {
+        const rootNode = this.getRootNode(rootType, accountTree)!;
+        const rootList = convertAccountRootNodeToAccountList(rootNode);
+        return {
+          rootType,
+          rootNode,
+          rows: this.getReportRowsFromAccountList(rootList),
+        };
+      })
+      .filter((row) => !!row.rootNode);
+
+    this.reportData = await this.getReportDataFromRows(rootTypeRows);
+  }
+
+  async getReportDataFromRows(
+    rootTypeRows: RootTypeRow[]
+  ): Promise<ReportData> {
+    const reportData = rootTypeRows.reduce((reportData, r) => {
+      reportData.push(...r.rows);
+      reportData.push(this.getEmptyRow());
+      return reportData;
+    }, [] as ReportData);
+
+    reportData.pop();
+
+    return reportData;
+  }
+
+  async _getGroupedByDateRanges(
+    map: GroupedMap
+  ): Promise<AccountNameValueMapMap> {
+    const accountValueMap: AccountNameValueMapMap = new Map();
+
+    for (const account of map.keys()) {
+      const valueMap: ValueMap = new Map();
+
+      /**
+       * Set Balance for every DateRange key
+       */
+      for (const entry of map.get(account)!) {
+        const key = this._getRangeMapKey(entry);
+        if (key === null) {
+          throw new ValueError(
+            `invalid entry in trial balance ${entry.date?.toISOString()}`
+          );
+        }
+
+        const map = valueMap.get(key!);
+        const totalCredit = map?.credit ?? 0;
+        const totalDebit = map?.debit ?? 0;
+
+        valueMap.set(key, {
+          credit: totalCredit + (entry.credit ?? 0),
+          debit: totalDebit + (entry.debit ?? 0),
+        });
+      }
+
+      accountValueMap.set(account, valueMap);
+    }
+
+    return accountValueMap;
+  }
+
+  async _getDateRanges(): Promise<DateRange[]> {
+    if (!this.toDate || !this.fromDate) {
+      await this.setDefaultFilters();
+    }
+
+    const toDate = DateTime.fromISO(this.toDate!);
+    const fromDate = DateTime.fromISO(this.fromDate!);
+
+    return [
+      {
+        fromDate: DateTime.fromISO('0001-01-01'),
+        toDate: fromDate,
+      },
+      { fromDate, toDate },
+      {
+        fromDate: toDate,
+        toDate: DateTime.fromISO('9999-12-31'),
+      },
+    ];
+  }
+
+  getRowFromAccountListNode(al: AccountListNode) {
+    const nameCell = {
+      value: al.name,
+      rawValue: al.name,
+      align: 'left',
+      width: ACC_NAME_WIDTH,
+      bold: !al.level,
+      italics: al.isGroup,
+      indent: al.level ?? 0,
+    } as ReportCell;
+
+    const balanceCells = this._dateRanges!.map((k) => {
+      const map = al.valueMap?.get(k);
+      const hide = this.hideGroupAmounts && al.isGroup;
+
+      return [
+        {
+          rawValue: map?.debit ?? 0,
+          value: hide ? '' : this.fyo.format(map?.debit ?? 0, 'Currency'),
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        },
+        {
+          rawValue: map?.credit ?? 0,
+          value: hide ? '' : this.fyo.format(map?.credit ?? 0, 'Currency'),
+          align: 'right',
+          width: ACC_BAL_WIDTH,
+        } as ReportCell,
+      ];
+    });
+
+    return {
+      cells: [nameCell, balanceCells].flat(2),
+      level: al.level,
+      isGroup: !!al.isGroup,
+      folded: false,
+      foldedBelow: false,
+    } as ReportRow;
+  }
+
+  async _getQueryFilters(): Promise<QueryFilter> {
+    const filters: QueryFilter = {};
+    filters.reverted = false;
+    return filters;
+  }
+
+  async setDefaultFilters(): Promise<void> {
+    if (!this.toDate || !this.fromDate) {
+      const { year } = DateTime.now();
+      const endpoints = await getFiscalEndpoints(year + 1, year);
+
+      this.fromDate = endpoints.fromDate;
+      this.toDate = DateTime.fromISO(endpoints.toDate)
+        .minus({ days: 1 })
+        .toISODate();
+    }
+
+    await this._setDateRanges();
+  }
+
+  getFilters(): Field[] {
+    return [
+      {
+        fieldtype: 'Date',
+        fieldname: 'fromDate',
+        placeholder: t`From Date`,
+        label: t`From Date`,
+        required: true,
+      },
+      {
+        fieldtype: 'Date',
+        fieldname: 'toDate',
+        placeholder: t`To Date`,
+        label: t`To Date`,
+        required: true,
+      },
+      {
+        fieldtype: 'Check',
+        label: t`Hide Group Amounts`,
+        fieldname: 'hideGroupAmounts',
+      } as Field,
+    ] as Field[];
+  }
+
+  getColumns(): ColumnField[] {
+    return [
+      {
+        label: t`Account`,
+        fieldtype: 'Link',
+        fieldname: 'account',
+        align: 'left',
+        width: ACC_NAME_WIDTH,
+      },
+      {
+        label: t`Opening (Dr)`,
+        fieldtype: 'Data',
+        fieldname: 'openingDebit',
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      },
+      {
+        label: t`Opening (Cr)`,
+        fieldtype: 'Data',
+        fieldname: 'openingCredit',
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      },
+      {
+        label: t`Debit`,
+        fieldtype: 'Data',
+        fieldname: 'debit',
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      },
+      {
+        label: t`Credit`,
+        fieldtype: 'Data',
+        fieldname: 'credit',
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      },
+      {
+        label: t`Closing (Dr)`,
+        fieldtype: 'Data',
+        fieldname: 'closingDebit',
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      },
+      {
+        label: t`Closing (Cr)`,
+        fieldtype: 'Data',
+        fieldname: 'closingCredit',
+        align: 'right',
+        width: ACC_BAL_WIDTH,
+      },
+    ] as ColumnField[];
+  }
+
+  getActions(): Action[] {
+    return [];
+  }
+}
diff --git a/reports/index.ts b/reports/index.ts
index 97a80101..1b4cf056 100644
--- a/reports/index.ts
+++ b/reports/index.ts
@@ -1,5 +1,11 @@
 import { BalanceSheet } from './BalanceSheet/BalanceSheet';
 import { GeneralLedger } from './GeneralLedger/GeneralLedger';
 import { ProfitAndLoss } from './ProfitAndLoss/ProfitAndLoss';
+import { TrialBalance } from './TrialBalance/TrialBalance';
 
-export const reports = { GeneralLedger, ProfitAndLoss, BalanceSheet };
+export const reports = {
+  GeneralLedger,
+  ProfitAndLoss,
+  BalanceSheet,
+  TrialBalance,
+};
diff --git a/reports/types.ts b/reports/types.ts
index 866d79d3..92548bb2 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -72,7 +72,7 @@ export interface LedgerEntry {
 export type GroupedMap = Map<string, LedgerEntry[]>;
 
 export type DateRange = { fromDate: DateTime; toDate: DateTime };
-export type ValueMap = Map<DateRange, number>;
+export type ValueMap = Map<DateRange, Record<string, number>>;
 
 export interface Account {
   name: string;
@@ -97,7 +97,6 @@ export interface AccountListNode extends Account {
 export type AccountNameValueMapMap = Map<string, ValueMap>;
 export type BasedOn = 'Fiscal Year' | 'Until Date';
 
-
 export interface TreeNode {
   name: string;
   children?: TreeNode[];
@@ -105,4 +104,8 @@ export interface TreeNode {
 
 export type Tree = Record<string, TreeNode>;
 
-
+export type RootTypeRow = {
+  rootType: AccountRootType;
+  rootNode: AccountTreeNode;
+  rows: ReportData;
+};
\ No newline at end of file
diff --git a/src/renderer.ts b/src/renderer.ts
index 1a58d3fc..5caae725 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,7 +1,6 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
 import { DateTime } from 'luxon';
-import { ProfitAndLoss } from 'reports/ProfitAndLoss/ProfitAndLoss';
 import { IPC_ACTIONS } from 'utils/messages';
 import { App as VueApp, createApp } from 'vue';
 import App from './App.vue';
@@ -107,7 +106,5 @@ function setOnWindow() {
     window.fyo = fyo;
     // @ts-ignore
     window.DateTime = DateTime;
-    // @ts-ignore
-    window.pnl = new ProfitAndLoss(fyo);
   }
 }
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 6deacba3..7885db56 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -153,12 +153,12 @@ function getCompleteSidebar(): SidebarConfig {
           name: 'balance-sheet',
           route: '/report/BalanceSheet',
         },
-        /*
         {
           label: t`Trial Balance`,
           name: 'trial-balance',
-          route: '/report/trial-balance',
+          route: '/report/TrialBalance',
         },
+        /*
         {
           label: t`GSTR1`,
           name: 'gstr1',

From ebb42c28eadd18a928f59021a03a956167c1f9a5 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 16 May 2022 21:40:15 +0530
Subject: [PATCH 122/163] incr: get unpaid invoices to display

---
 reports/AccountReport.ts               |  2 +-
 reports/TrialBalance/TrialBalance.js   | 22 --------
 reports/TrialBalance/viewConfig.js     | 65 -----------------------
 src/pages/Dashboard/Dashboard.vue      |  9 ++--
 src/pages/Dashboard/UnpaidInvoices.vue | 72 +++++++++++++++-----------
 src/utils/misc.ts                      | 27 +++++-----
 6 files changed, 61 insertions(+), 136 deletions(-)
 delete mode 100644 reports/TrialBalance/TrialBalance.js
 delete mode 100644 reports/TrialBalance/viewConfig.js

diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index b3ee0a03..1084608d 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -32,7 +32,7 @@ import { getMapFromList } from 'utils';
 import { QueryFilter } from 'utils/db/types';
 
 export const ACC_NAME_WIDTH = 2;
-export const ACC_BAL_WIDTH = 1;
+export const ACC_BAL_WIDTH = 1.25;
 
 export abstract class AccountReport extends LedgerReport {
   toDate?: string;
diff --git a/reports/TrialBalance/TrialBalance.js b/reports/TrialBalance/TrialBalance.js
deleted file mode 100644
index f9f6dce5..00000000
--- a/reports/TrialBalance/TrialBalance.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { getTrialBalance } from '../helpers/financialStatements';
-
-export default class TrialBalance {
-  async run({ fromDate, toDate }) {
-    if (!fromDate && !toDate) {
-      return { rows: [] };
-    }
-    const promises = ['Asset', 'Expense', 'Income', 'Liability', 'Equity'].map(
-      (rootType) => {
-        return getTrialBalance({ rootType, fromDate, toDate });
-      }
-    );
-
-    const values = await Promise.all(promises);
-    let rows = values.reduce((acc, curr) => {
-      return [...acc, ...curr];
-    }, []);
-
-    rows = rows.filter((r) => r.debit !== 0 || r.credit !== 0);
-    return { rows };
-  }
-}
diff --git a/reports/TrialBalance/viewConfig.js b/reports/TrialBalance/viewConfig.js
deleted file mode 100644
index 7502d1bb..00000000
--- a/reports/TrialBalance/viewConfig.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { t } from 'fyo';
-import { fyo } from 'src/initFyo';
-import getCommonExportActions from '../commonExporter';
-
-const title = t`Trial Balance`;
-
-export default {
-  title: title,
-  method: 'trial-balance',
-  treeView: true,
-  filterFields: [
-    {
-      fieldtype: 'Date',
-      fieldname: 'fromDate',
-      label: t`From Date`,
-      size: 'small',
-      placeholder: t`From Date`,
-      required: 1,
-      default: async () => {
-        return (await fyo.getSingle('AccountingSettings')).fiscalYearStart;
-      },
-    },
-    {
-      fieldtype: 'Date',
-      size: 'small',
-      placeholder: t`To Date`,
-      fieldname: 'toDate',
-      label: t`To Date`,
-      required: 1,
-      default: async () => {
-        return (await fyo.getSingle('AccountingSettings')).fiscalYearEnd;
-      },
-    },
-  ],
-  actions: getCommonExportActions('trial-balance'),
-  getColumns() {
-    const columns = [
-      { label: t`Account`, fieldtype: 'Data', fieldname: 'account', width: 2 },
-      {
-        label: t`Opening (Dr)`,
-        fieldtype: 'Currency',
-        fieldname: 'openingDebit',
-      },
-      {
-        label: t`Opening (Cr)`,
-        fieldtype: 'Currency',
-        fieldname: 'openingCredit',
-      },
-      { label: t`Debit`, fieldtype: 'Currency', fieldname: 'debit' },
-      { label: t`Credit`, fieldtype: 'Currency', fieldname: 'credit' },
-      {
-        label: t`Closing (Dr)`,
-        fieldtype: 'Currency',
-        fieldname: 'closingDebit',
-      },
-      {
-        label: t`Closing (Cr)`,
-        fieldtype: 'Currency',
-        fieldname: 'closingCredit',
-      },
-    ];
-
-    return columns;
-  },
-};
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index d6467d29..c073ee10 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -6,7 +6,10 @@
       <!-- 
       <Cashflow class="mt-5" />
       <hr class="border-t mt-10" />
-      <UnpaidInvoices class="mt-10 ml-4 mr-4" />
+      -->
+
+      <UnpaidInvoices class="mt-10" />
+      <!--
       <hr class="border-t mt-10" />
       <div class="flex justify-between mx-auto mt-10 ml-4 mr-4 gap-10">
         <ProfitAndLoss class="w-1/2" />
@@ -22,15 +25,15 @@ import PageHeader from 'src/components/PageHeader';
 // import Cashflow from './Cashflow';
 // import Expenses from './Expenses';
 // import ProfitAndLoss from './ProfitAndLoss';
-// import UnpaidInvoices from './UnpaidInvoices';
+import UnpaidInvoices from './UnpaidInvoices';
 
 export default {
   name: 'Dashboard',
   components: {
     PageHeader,
+    UnpaidInvoices,
     /*
     Cashflow,
-    UnpaidInvoices,
     ProfitAndLoss,
     Expenses,
     */
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index e154e69a..d2a1c4dc 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -1,15 +1,16 @@
 <template>
   <div class="flex justify-between gap-10">
     <div
-      class="w-1/2 flex flex-col justify-between"
+      class="flex-col justify-between flex-1"
       v-for="invoice in invoices"
       :key="invoice.title"
     >
+      <!-- Title and Period Selector -->
       <SectionHeader>
         <template #title>{{ invoice.title }}</template>
         <template #action>
           <PeriodSelector
-            v-if="invoice.hasData"
+            v-if="invoice.count"
             :value="$data[invoice.periodKey]"
             @change="(value) => ($data[invoice.periodKey] = value)"
           />
@@ -23,32 +24,40 @@
           </Button>
         </template>
       </SectionHeader>
+
+      <!-- Widget Body -->
       <div>
+        <!-- Paid & Unpaid Amounts -->
         <div class="mt-6 flex justify-between">
+          <!-- Paid -->
           <div
             class="text-sm bold"
-            :class="{ 'bg-gray-200 text-gray-200 rounded': !invoice.hasData }"
+            :class="{ 'bg-gray-200 text-gray-200 rounded': !invoice.count }"
           >
             {{ fyo.format(invoice.paid, 'Currency') }}
-            <span :class="{ 'text-gray-900': invoice.hasData }">{{
+            <span :class="{ 'text-gray-900': invoice.count }">{{
               t`Paid`
             }}</span>
           </div>
+
+          <!-- Unpaid -->
           <div
             class="text-sm"
-            :class="{ 'bg-gray-200 text-gray-200 rounded': !invoice.hasData }"
+            :class="{ 'bg-gray-200 text-gray-200 rounded': !invoice.count }"
           >
             {{ fyo.format(invoice.unpaid, 'Currency') }}
-            <span :class="{ 'text-gray-900': invoice.hasData }">{{
+            <span :class="{ 'text-gray-900': invoice.count }">{{
               t`Unpaid`
             }}</span>
           </div>
         </div>
+
+        <!-- Widget Bar -->
         <div class="mt-2 relative rounded overflow-hidden">
           <div
             class="w-full h-4"
             :class="
-              invoice.hasData && invoice.color == 'blue'
+              invoice.count && invoice.color == 'blue'
                 ? 'bg-blue-200'
                 : 'bg-gray-200'
             "
@@ -56,7 +65,7 @@
           <div
             class="absolute inset-0 h-4"
             :class="
-              invoice.hasData && invoice.color == 'blue'
+              invoice.count && invoice.color == 'blue'
                 ? 'bg-blue-500'
                 : 'bg-gray-500'
             "
@@ -69,12 +78,13 @@
 </template>
 <script>
 import { t } from 'fyo';
-import Button from 'src/components/Button';
+import { ModelNameEnum } from 'models/types';
+import Button from 'src/components/Button.vue';
 import { fyo } from 'src/initFyo';
 import { getDatesAndPeriodicity } from 'src/utils/misc';
 import { routeTo } from 'src/utils/ui';
-import PeriodSelector from './PeriodSelector';
-import SectionHeader from './SectionHeader';
+import PeriodSelector from './PeriodSelector.vue';
+import SectionHeader from './SectionHeader.vue';
 
 export default {
   name: 'UnpaidInvoices',
@@ -87,29 +97,29 @@ export default {
     invoices: [
       {
         title: t`Sales Invoices`,
-        schemaName: 'SalesInvoice',
+        schemaName: ModelNameEnum.SalesInvoice,
         total: 0,
         unpaid: 0,
         paid: 0,
+        count: 0,
         color: 'blue',
         periodKey: 'salesInvoicePeriod',
-        hasData: false,
         barWidth: 40,
       },
       {
         title: t`Purchase Invoices`,
-        schemaName: 'PurchaseInvoice',
+        schemaName: ModelNameEnum.PurchaseInvoice,
         total: 0,
         unpaid: 0,
         paid: 0,
+        count: 0,
         color: 'gray',
         periodKey: 'purchaseInvoicePeriod',
-        hasData: false,
         barWidth: 60,
       },
     ],
-    salesInvoicePeriod: 'This Year',
-    purchaseInvoicePeriod: 'This Year',
+    salesInvoicePeriod: 'This Month',
+    purchaseInvoicePeriod: 'This Month',
   }),
   watch: {
     salesInvoicePeriod: 'calculateInvoiceTotals',
@@ -120,27 +130,27 @@ export default {
   },
   methods: {
     async calculateInvoiceTotals() {
-      let promises = this.invoices.map(async (d) => {
-        let { fromDate, toDate } = await getDatesAndPeriodicity(
-          this.$data[d.periodKey]
+      for (const invoice of this.invoices) {
+        const { fromDate, toDate } = await getDatesAndPeriodicity(
+          this.$data[invoice.periodKey]
         );
 
-        let result = await fyo.db.getTotalOutstanding(
-          d.schemaName,
+        const { total, outstanding } = await fyo.db.getTotalOutstanding(
+          invoice.schemaName,
           fromDate,
           toDate
         );
 
-        let { total, outstanding } = result;
-        d.total = total ?? 0;
-        d.unpaid = outstanding ?? 0;
-        d.paid = total - outstanding;
-        d.hasData = d.total !== 0;
-        d.barWidth = (d.paid / (d.total || 1)) * 100;
-        return d;
-      });
+        const count = await fyo.db.count(invoice.schemaName, {
+          filters: { cancelled: false, submitted: true },
+        });
 
-      this.invoices = await Promise.all(promises);
+        invoice.total = total ?? 0;
+        invoice.unpaid = outstanding ?? 0;
+        invoice.paid = total - outstanding;
+        invoice.count = count;
+        invoice.barWidth = (invoice.paid / (invoice.total || 1)) * 100;
+      }
     },
     async newInvoice(invoice) {
       let doc = await fyo.doc.getNewDoc(invoice.schemaName);
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index b24ab88b..9c1388dc 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -3,32 +3,31 @@ import { getSingleValue } from 'fyo/utils';
 import { DateTime } from 'luxon';
 import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
 import { ModelNameEnum } from 'models/types';
+import { Periodicity } from 'reports/types';
 import SetupWizardSchema from 'schemas/app/SetupWizard.json';
 import { Schema } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 
-export async function getDatesAndPeriodicity(
+export function getDatesAndPeriodicity(
   period: 'This Year' | 'This Quarter' | 'This Month'
-) {
-  let fromDate, toDate;
-  const periodicity = 'Monthly';
-  const accountingSettings = await fyo.doc.getSingle('AccountingSettings');
+): { fromDate: string; toDate: string; periodicity: Periodicity } {
+  const toDate: DateTime = DateTime.now();
+  let fromDate: DateTime;
 
   if (period === 'This Year') {
-    fromDate = accountingSettings.fiscalYearStart;
-    toDate = accountingSettings.fiscalYearEnd;
+    fromDate = toDate.minus({ months: 12 });
   } else if (period === 'This Quarter') {
-    fromDate = DateTime.local().startOf('quarter').toISODate();
-    toDate = DateTime.local().endOf('quarter').toISODate();
+    fromDate = toDate.minus({ months: 3 });
   } else if (period === 'This Month') {
-    fromDate = DateTime.local().startOf('month').toISODate();
-    toDate = DateTime.local().endOf('month').toISODate();
+    fromDate = toDate.minus({ months: 1 });
+  } else {
+    fromDate = toDate.minus({ days: 1 });
   }
 
   return {
-    fromDate,
-    toDate,
-    periodicity,
+    fromDate: fromDate.toISO(),
+    toDate: toDate.toISO(),
+    periodicity: 'Monthly',
   };
 }
 

From 1e35635170c7698cc9e11e64c443c64915e05d63 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 16 May 2022 23:49:22 +0530
Subject: [PATCH 123/163] incr: get cash flow to display

---
 backend/database/bespoke.ts         |   2 +-
 reports/Cashflow/Cashflow.ts        |  52 -------
 src/components/Charts/LineChart.vue |  11 +-
 src/pages/Dashboard/Cashflow.vue    | 203 ++++++++++++----------------
 src/pages/Dashboard/Dashboard.vue   |   9 +-
 src/utils/chart.ts                  |  13 +-
 src/utils/misc.ts                   |   4 +-
 7 files changed, 106 insertions(+), 188 deletions(-)
 delete mode 100644 reports/Cashflow/Cashflow.ts

diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts
index 64db95ba..92315508 100644
--- a/backend/database/bespoke.ts
+++ b/backend/database/bespoke.ts
@@ -67,7 +67,7 @@ export class BespokeQueries {
       .select('name')
       .where('accountType', 'in', ['Cash', 'Bank'])
       .andWhere('isGroup', false);
-    const dateAsMonthYear = db.knex!.raw('strftime("%m-%Y", ??)', 'date');
+    const dateAsMonthYear = db.knex!.raw('strftime("%Y-%m", ??)', 'date');
     return await db.knex!('AccountingLedgerEntry')
       .where('reverted', false)
       .sum({
diff --git a/reports/Cashflow/Cashflow.ts b/reports/Cashflow/Cashflow.ts
deleted file mode 100644
index 568b044a..00000000
--- a/reports/Cashflow/Cashflow.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Fyo } from 'fyo';
-import { DateTime } from 'luxon';
-import {
-  getFiscalYear,
-  getPeriodList,
-} from 'reports/FinancialStatements/financialStatements';
-import { FinancialStatementOptions } from 'reports/types';
-
-class Cashflow {
-  fyo: Fyo;
-  constructor(fyo: Fyo) {
-    this.fyo = fyo;
-  }
-  async run(options: FinancialStatementOptions) {
-    const { fromDate, toDate, periodicity } = options;
-    const res = await this.fyo.db.getCashflow(fromDate, toDate);
-    const fiscalYear = await getFiscalYear(this.fyo);
-    const periodList = getPeriodList(
-      fromDate,
-      toDate,
-      periodicity!,
-      fiscalYear
-    );
-
-    const data = periodList.map((periodKey) => {
-      const monthYear = this.getMonthYear(periodKey, 'MMM yyyy');
-      const cashflowForPeriod = res.find((d) => d['month-year'] === monthYear);
-
-      if (cashflowForPeriod) {
-        return { ...cashflowForPeriod, periodKey };
-      }
-
-      return {
-        inflow: 0,
-        outflow: 0,
-        periodKey,
-        'month-year': monthYear,
-      };
-    });
-
-    return {
-      data,
-      periodList,
-    };
-  }
-
-  getMonthYear(periodKey: string, format: string) {
-    return DateTime.fromFormat(periodKey, format).toFormat('MM-yyyy');
-  }
-}
-
-export default Cashflow;
diff --git a/src/components/Charts/LineChart.vue b/src/components/Charts/LineChart.vue
index 3c30bb83..9e17ad8f 100644
--- a/src/components/Charts/LineChart.vue
+++ b/src/components/Charts/LineChart.vue
@@ -26,7 +26,7 @@
       />
 
       <!-- x Labels -->
-      <template v-if="xLabels.length > 0">
+      <template v-if="drawLabels && xLabels.length > 0">
         <text
           :style="fontStyle"
           v-for="(i, j) in count"
@@ -46,7 +46,7 @@
       </template>
 
       <!-- y Labels -->
-      <template v-if="yLabelDivisions > 0">
+      <template v-if="drawLabels && yLabelDivisions > 0">
         <text
           :style="fontStyle"
           v-for="(i, j) in yLabelDivisions + 1"
@@ -113,6 +113,7 @@
       />
     </svg>
     <Tooltip
+      v-if="showTooltip"
       ref="tooltip"
       :offset="15"
       placement="top"
@@ -142,6 +143,7 @@ export default {
     points: { type: Array, default: () => [[]] },
     drawAxis: { type: Boolean, default: false },
     drawXGrid: { type: Boolean, default: true },
+    drawLabels: { type: Boolean, default: true },
     viewBoxHeight: { type: Number, default: 500 },
     aspectRatio: { type: Number, default: 4 },
     axisPadding: { type: Number, default: 30 },
@@ -164,6 +166,7 @@ export default {
     left: { type: Number, default: 55 },
     extendGridX: { type: Number, default: -20 },
     tooltipDispDistThreshold: { type: Number, default: 40 },
+    showTooltip: { type: Boolean, default: true },
   },
   computed: {
     fontStyle() {
@@ -290,6 +293,10 @@ export default {
       return `rgb(${rgb})`;
     },
     update(event) {
+      if (!this.showTooltip) {
+        return;
+      }
+
       const { x, y } = this.getSvgXY(event);
       const { xi, yi, cx, cy, d } = this.getPointIndexAndCoords(x, y);
 
diff --git a/src/pages/Dashboard/Cashflow.vue b/src/pages/Dashboard/Cashflow.vue
index 032e79ab..93c6cc7f 100644
--- a/src/pages/Dashboard/Cashflow.vue
+++ b/src/pages/Dashboard/Cashflow.vue
@@ -1,110 +1,52 @@
 <template>
-  <div class="mx-4">
-    <template v-if="hasData">
-      <div class="flex items-center justify-between">
-        <div class="font-medium">{{ t`Cashflow` }}</div>
-        <div class="flex text-base">
-          <div class="flex items-center">
-            <span class="w-3 h-3 rounded-sm inline-block bg-blue-500"></span>
-            <span class="ml-2 text-gray-900">{{ t`Inflow` }}</span>
-          </div>
-          <div class="flex items-center ml-6">
-            <span class="w-3 h-3 rounded-sm inline-block bg-gray-500"></span>
-            <span class="ml-2 text-gray-900">{{ t`Outflow` }}</span>
-          </div>
+  <div>
+    <!-- Title and Period Selector -->
+    <div class="flex items-center justify-between">
+      <div class="font-medium">{{ t`Cashflow` }}</div>
+
+      <!-- Chart Legend -->
+      <div class="flex text-base" v-if="hasData">
+        <div class="flex items-center">
+          <span class="w-3 h-3 rounded-sm inline-block bg-blue-500"></span>
+          <span class="ml-2 text-gray-900">{{ t`Inflow` }}</span>
+        </div>
+        <div class="flex items-center ml-6">
+          <span class="w-3 h-3 rounded-sm inline-block bg-gray-500"></span>
+          <span class="ml-2 text-gray-900">{{ t`Outflow` }}</span>
         </div>
-        <PeriodSelector
-          :value="period"
-          @change="(value) => (period = value)"
-          :options="['This Year', 'This Quarter']"
-        />
       </div>
-      <LineChart
+      <div v-else class="w-16 h-5 bg-gray-200 rounded" />
+
+      <PeriodSelector
+        :value="period"
+        @change="(value) => (period = value)"
+        :options="['This Year', 'This Quarter']"
         v-if="hasData"
-        :colors="chartData.colors"
-        :points="chartData.points"
-        :x-labels="chartData.xLabels"
-        :format="chartData.format"
-        :format-x="chartData.formatX"
-        :y-max="chartData.yMax"
       />
-    </template>
-    <svg
-      v-else
-      xmlns="http://www.w3.org/2000/svg"
-      viewBox="0 0 889 280"
-      class="my-4"
-    >
-      <defs>
-        <linearGradient x1="50%" y1="100%" x2="50%" y2=".889%" id="a">
-          <stop stop-color="#FFF" stop-opacity="0" offset="0%" />
-          <stop stop-color="#F4F4F6" offset="100%" />
-        </linearGradient>
-      </defs>
-      <g fill="none" fill-rule="evenodd">
-        <text fill="#112B42" class="font-medium">
-          <tspan y="16">{{ t`Cashflow` }}</tspan>
-        </text>
-        <g fill="#E9E9ED">
-          <path d="M371 2h12v12h-12zM391 2h53v12h-53z" />
-          <g>
-            <path d="M453 2h12v12h-12zM473 2h53v12h-53z" />
-          </g>
-        </g>
-        <path
-          fill="#E9E9ED"
-          d="M0 41h19v12H0zM4 121h15v12H4zM2 81h17v12H2zM4 201h15v12H4zM3 161h16v12H3z"
-        />
-        <path
-          d="M37.25 211.25h849.5v1H37.25zM37.25 167.25h849.5v1H37.25zM37.25 127.25h849.5v1H37.25zM37.25 87.25h849.5v1H37.25zM37.25 47.25h849.5v1H37.25z"
-          stroke="#F6F7F9"
-          stroke-width=".5"
-        />
-        <g fill="#E9E9ED">
-          <path
-            d="M49 228h31v12H49zM122 228h31v12h-31zM195 228h31v12h-31zM268 228h31v12h-31zM341 228h31v12h-31zM414 228h31v12h-31zM487 228h31v12h-31zM560 228h31v12h-31zM633 228h31v12h-31zM706 228h31v12h-31zM779 228h31v12h-31zM852 228h31v12h-31z"
-          />
-        </g>
-        <g fill-rule="nonzero">
-          <path
-            fill="url(#a)"
-            opacity=".5"
-            d="M12 34l78 73 73 12 74-37 73 36.167L383 126l73-55.5L529.223 98 602 0l73 75 73 2 73 34 29 41v25H0V25z"
-            transform="translate(37 35)"
-          />
-          <path
-            stroke="#E9E9ED"
-            stroke-width="3"
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            d="M37 60l12 9 78 73 73 12 74-37 73 36.167L420 161l73-55.5 73.223 27.5L639 35l73 75 73 2 73 34 29 42"
-          />
-          <g>
-            <path
-              fill="url(#a)"
-              opacity=".5"
-              d="M12 44.599l78 31.345 73 5.152 74-26.192L310 .738l73 21.578 73 37.955 73.223 11.808L602 30l73 32.203 73 .86 73 14.598L850 58v48H0V40.734z"
-              transform="translate(37 106)"
-            />
-            <path
-              stroke="#E9E9ED"
-              stroke-width="3"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              d="M37 146.734l12 3.865 78 31.345 73 5.152 74-26.192 73-54.166 73 21.578 73 37.955 73.223 11.808L639 136l73 32.203 73 .86 73 14.598L887 164"
-            />
-          </g>
-        </g>
-      </g>
-    </svg>
+      <div v-else class="w-20 h-5 bg-gray-200 rounded" />
+    </div>
+
+    <!-- Line Chart -->
+    <LineChart
+      v-if="chartData.points.length"
+      :colors="chartData.colors"
+      :points="chartData.points"
+      :x-labels="chartData.xLabels"
+      :format="chartData.format"
+      :format-x="chartData.formatX"
+      :y-max="chartData.yMax"
+      :draw-labels="hasData"
+      :show-tooltip="hasData"
+    />
   </div>
 </template>
 <script>
+import { AccountTypeEnum } from 'models/baseModels/Account/types';
+import { ModelNameEnum } from 'models/types';
 import LineChart from 'src/components/Charts/LineChart.vue';
 import { fyo } from 'src/initFyo';
 import { formatXLabels, getYMax } from 'src/utils/chart';
 import { getDatesAndPeriodicity } from 'src/utils/misc';
-import Cashflow from '../../../reports/Cashflow/Cashflow';
 import PeriodSelector from './PeriodSelector';
 
 export default {
@@ -117,25 +59,29 @@ export default {
     period: 'This Year',
     data: [],
     periodList: [],
+    hasData: false,
   }),
   watch: {
     period: 'setData',
   },
   async activated() {
     await this.setData();
+    if (!this.hasData) {
+      await this.setHasData();
+    }
   },
   computed: {
-    hasData() {
-      let totalInflow = this.data.reduce((sum, d) => d.inflow + sum, 0);
-      let totalOutflow = this.data.reduce((sum, d) => d.outflow + sum, 0);
-      return !(totalInflow === 0 && totalOutflow === 0);
-    },
     chartData() {
-      const xLabels = this.periodList;
-      const points = ['inflow', 'outflow'].map((k) =>
-        this.data.map((d) => d[k])
-      );
-      const colors = ['#2490EF', '#B7BFC6'];
+      let data = this.data;
+      let colors = ['#2490EF', '#B7BFC6'];
+      if (!this.hasData) {
+        data = dummyData;
+        colors = ['#E9EBED', '#B7BFC6'];
+      }
+
+      const xLabels = data.map((cf) => cf['month-year']);
+      const points = ['inflow', 'outflow'].map((k) => data.map((d) => d[k]));
+
       const format = (value) => fyo.format(value ?? 0, 'Currency');
       const yMax = getYMax(points);
       return { points, xLabels, colors, format, yMax, formatX: formatXLabels };
@@ -143,19 +89,44 @@ export default {
   },
   methods: {
     async setData() {
-      let { fromDate, toDate, periodicity } = await getDatesAndPeriodicity(
-        this.period
-      );
-
-      const { data, periodList } = await new Cashflow(this.fyo).run({
-        fromDate,
-        toDate,
-        periodicity,
+      const { fromDate, toDate } = await getDatesAndPeriodicity(this.period);
+      this.data = await fyo.db.getCashflow(fromDate, toDate);
+    },
+    async setHasData() {
+      const accounts = await fyo.db.getAllRaw('Account', {
+        filters: {
+          accountType: ['in', [AccountTypeEnum.Cash, AccountTypeEnum.Bank]],
+        },
       });
-
-      this.data = data;
-      this.periodList = periodList;
+      const accountNames = accounts.map((a) => a.name);
+      const count = await fyo.db.count(ModelNameEnum.AccountingLedgerEntry, {
+        filters: { account: ['in', accountNames] },
+      });
+      this.hasData = count > 0;
     },
   },
 };
+
+const dummyData = [
+  {
+    inflow: 100,
+    outflow: 250,
+    'month-year': '2021-05',
+  },
+  {
+    inflow: 350,
+    outflow: 100,
+    'month-year': '2021-06',
+  },
+  {
+    inflow: 50,
+    outflow: 300,
+    'month-year': '2021-07',
+  },
+  {
+    inflow: 320,
+    outflow: 100,
+    'month-year': '2021-08',
+  },
+];
 </script>
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index c073ee10..4226616a 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -3,14 +3,11 @@
     <PageHeader :title="t`Dashboard`" />
 
     <div class="mx-4 overflow-y-scroll no-scrollbar">
-      <!-- 
       <Cashflow class="mt-5" />
       <hr class="border-t mt-10" />
-      -->
-
       <UnpaidInvoices class="mt-10" />
-      <!--
       <hr class="border-t mt-10" />
+      <!--
       <div class="flex justify-between mx-auto mt-10 ml-4 mr-4 gap-10">
         <ProfitAndLoss class="w-1/2" />
         <Expenses class="w-1/2" />
@@ -22,7 +19,7 @@
 
 <script>
 import PageHeader from 'src/components/PageHeader';
-// import Cashflow from './Cashflow';
+import Cashflow from './Cashflow';
 // import Expenses from './Expenses';
 // import ProfitAndLoss from './ProfitAndLoss';
 import UnpaidInvoices from './UnpaidInvoices';
@@ -32,8 +29,8 @@ export default {
   components: {
     PageHeader,
     UnpaidInvoices,
-    /*
     Cashflow,
+    /*
     ProfitAndLoss,
     Expenses,
     */
diff --git a/src/utils/chart.ts b/src/utils/chart.ts
index 19afd27b..769f69f4 100644
--- a/src/utils/chart.ts
+++ b/src/utils/chart.ts
@@ -1,3 +1,5 @@
+import { DateTime } from 'luxon';
+
 export function prefixFormat(value: number): string {
   /*
   1,000000,000,000,000,000 = 1 P (Pentillion)
@@ -43,7 +45,7 @@ function getVal(minOrMaxVal: number): number {
   return Math.floor(minOrMaxVal / rc) * rc;
 }
 
-export function getYMax(points: Array<Array<number>>): number {
+export function getYMax(points: number[][]): number {
   const maxVal = Math.max(...points.flat());
   if (maxVal === 0) {
     return 0;
@@ -52,7 +54,7 @@ export function getYMax(points: Array<Array<number>>): number {
   return getVal(maxVal);
 }
 
-export function getYMin(points: Array<Array<number>>): number {
+export function getYMin(points: number[][]): number {
   const minVal = Math.min(...points.flat());
   if (minVal === 0) {
     return minVal;
@@ -62,10 +64,5 @@ export function getYMin(points: Array<Array<number>>): number {
 }
 
 export function formatXLabels(label: string) {
-  // Format: Mmm YYYY -> Mm YY
-  const splits = label.split(' ');
-  const month = splits[0];
-  const year = splits[1].slice(2);
-
-  return `${month} ${year}`;
+  return DateTime.fromISO(label).toFormat('MMM yy');
 }
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 9c1388dc..92965fa4 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -3,14 +3,13 @@ import { getSingleValue } from 'fyo/utils';
 import { DateTime } from 'luxon';
 import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
 import { ModelNameEnum } from 'models/types';
-import { Periodicity } from 'reports/types';
 import SetupWizardSchema from 'schemas/app/SetupWizard.json';
 import { Schema } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 
 export function getDatesAndPeriodicity(
   period: 'This Year' | 'This Quarter' | 'This Month'
-): { fromDate: string; toDate: string; periodicity: Periodicity } {
+): { fromDate: string; toDate: string } {
   const toDate: DateTime = DateTime.now();
   let fromDate: DateTime;
 
@@ -27,7 +26,6 @@ export function getDatesAndPeriodicity(
   return {
     fromDate: fromDate.toISO(),
     toDate: toDate.toISO(),
-    periodicity: 'Monthly',
   };
 }
 

From e9226f38c89b789cebadb3f4b665afdbc1b2f555 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 17 May 2022 11:39:08 +0530
Subject: [PATCH 124/163] incr: add MouseFollower - unpaid invoices tooltips -
 fix getstarted

---
 fyo/core/converter.ts                  |  7 +++
 schemas/app/GetStarted.json            |  9 +++-
 src/components/Charts/LineChart.vue    |  2 +-
 src/components/MouseFollower.vue       | 35 ++++++++++++
 src/pages/Dashboard/Cashflow.vue       | 24 +++++++--
 src/pages/Dashboard/UnpaidInvoices.vue | 75 ++++++++++++++++++++++----
 src/pages/GetStarted.vue               | 39 +++++++-------
 src/utils/getStartedConfig.ts          | 13 ++---
 src/utils/misc.ts                      | 19 ++++++-
 src/utils/vueUtils.ts                  | 18 +++++++
 10 files changed, 197 insertions(+), 44 deletions(-)
 create mode 100644 src/components/MouseFollower.vue

diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 09d51296..4671ba30 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -56,6 +56,10 @@ export class Converter {
   }
 
   static toDocValue(value: RawValue, field: Field, fyo: Fyo): DocValue {
+    if (!field?.fieldtype) {
+      console.log(value, field);
+      console.trace();
+    }
     switch (field.fieldtype) {
       case FieldTypeEnum.Currency:
         return toDocCurrency(value, field, fyo);
@@ -102,6 +106,9 @@ export class Converter {
     for (const fieldname in rawValueMap) {
       const field = fieldValueMap[fieldname];
       const rawValue = rawValueMap[fieldname];
+      if (!field) {
+        continue;
+      }
 
       if (Array.isArray(rawValue)) {
         const parentSchemaName = (field as TargetField).target;
diff --git a/schemas/app/GetStarted.json b/schemas/app/GetStarted.json
index a0c0ce40..91a2a14c 100644
--- a/schemas/app/GetStarted.json
+++ b/schemas/app/GetStarted.json
@@ -24,8 +24,13 @@
       "fieldtype": "Check"
     },
     {
-      "fieldname": "itemCreated",
-      "label": "Item Created",
+      "fieldname": "salesItemCreated",
+      "label": "Purchase Item Created",
+      "fieldtype": "Check"
+    },
+    {
+      "fieldname": "purchaseItemCreated",
+      "label": "Sales Item Created",
       "fieldtype": "Check"
     },
     {
diff --git a/src/components/Charts/LineChart.vue b/src/components/Charts/LineChart.vue
index 9e17ad8f..3e4469f6 100644
--- a/src/components/Charts/LineChart.vue
+++ b/src/components/Charts/LineChart.vue
@@ -122,7 +122,7 @@
     >
       <div class="flex flex-col justify-center items-center">
         <p>
-          {{ xi > -1 ? xLabels[xi] : '' }}
+          {{ xi > -1 ? formatX(xLabels[xi]) : '' }}
         </p>
         <p class="font-semibold">
           {{ yi > -1 ? format(points[yi][xi]) : '' }}
diff --git a/src/components/MouseFollower.vue b/src/components/MouseFollower.vue
new file mode 100644
index 00000000..bfbbe496
--- /dev/null
+++ b/src/components/MouseFollower.vue
@@ -0,0 +1,35 @@
+<template>
+  <Tooltip ref="tooltip"><slot></slot></Tooltip>
+</template>
+
+<script>
+import { defineComponent } from 'vue';
+import Tooltip from './Tooltip.vue';
+
+export default defineComponent({
+  props: { show: { type: Boolean, default: false } },
+  components: { Tooltip },
+  watch: {
+    show(val) {
+      if (val) {
+        this.$refs.tooltip.create();
+        this.setListeners();
+      } else {
+        this.$refs.tooltip.destroy();
+        this.removeListener();
+      }
+    },
+  },
+  methods: {
+    mousemoveListener(e) {
+      this.$refs.tooltip.update(e);
+    },
+    setListeners() {
+      window.addEventListener('mousemove', this.mousemoveListener);
+    },
+    removeListener() {
+      window.removeEventListener('mousemove', this.mousemoveListener);
+    },
+  },
+});
+</script>
diff --git a/src/pages/Dashboard/Cashflow.vue b/src/pages/Dashboard/Cashflow.vue
index 93c6cc7f..3b116997 100644
--- a/src/pages/Dashboard/Cashflow.vue
+++ b/src/pages/Dashboard/Cashflow.vue
@@ -46,7 +46,8 @@ import { ModelNameEnum } from 'models/types';
 import LineChart from 'src/components/Charts/LineChart.vue';
 import { fyo } from 'src/initFyo';
 import { formatXLabels, getYMax } from 'src/utils/chart';
-import { getDatesAndPeriodicity } from 'src/utils/misc';
+import { getDatesAndPeriodList } from 'src/utils/misc';
+import { getMapFromList } from 'utils/';
 import PeriodSelector from './PeriodSelector';
 
 export default {
@@ -89,8 +90,25 @@ export default {
   },
   methods: {
     async setData() {
-      const { fromDate, toDate } = await getDatesAndPeriodicity(this.period);
-      this.data = await fyo.db.getCashflow(fromDate, toDate);
+      const { periodList, fromDate, toDate } = await getDatesAndPeriodList(
+        this.period
+      );
+
+      const data = await fyo.db.getCashflow(fromDate, toDate);
+      const dataMap = getMapFromList(data, 'month-year');
+      this.data = periodList.map((p) => {
+        const key = p.toFormat('yyyy-MM');
+        const item = dataMap[key];
+        if (item) {
+          return item;
+        }
+
+        return {
+          inflow: 0,
+          outflow: 0,
+          'month-year': key,
+        };
+      });
     },
     async setHasData() {
       const accounts = await fyo.db.getAllRaw('Account', {
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index d2a1c4dc..db731ce5 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -2,7 +2,7 @@
   <div class="flex justify-between gap-10">
     <div
       class="flex-col justify-between flex-1"
-      v-for="invoice in invoices"
+      v-for="(invoice, i) in invoices"
       :key="invoice.title"
     >
       <!-- Title and Period Selector -->
@@ -10,7 +10,7 @@
         <template #title>{{ invoice.title }}</template>
         <template #action>
           <PeriodSelector
-            v-if="invoice.count"
+            v-if="invoice.hasData"
             :value="$data[invoice.periodKey]"
             @change="(value) => ($data[invoice.periodKey] = value)"
           />
@@ -53,7 +53,11 @@
         </div>
 
         <!-- Widget Bar -->
-        <div class="mt-2 relative rounded overflow-hidden">
+        <div
+          class="mt-2 relative rounded overflow-hidden"
+          @mouseenter="idx = i"
+          @mouseleave="idx = -1"
+        >
           <div
             class="w-full h-4"
             :class="
@@ -74,14 +78,33 @@
         </div>
       </div>
     </div>
+    <MouseFollower
+      v-if="invoices[0].hasData || invoices[1].hasData"
+      :show="idx >= 0"
+      class="text-sm shadow-md px-2 py-1 bg-white text-gray-900 border-l-2"
+      :style="{ borderColor: colors[idx] }"
+    >
+      <div class="flex justify-between gap-4">
+        <p>{{ t`Paid` }}</p>
+        <p class="font-semibold">{{ invoices[idx]?.paidCount ?? 0 }}</p>
+      </div>
+      <div
+        v-if="invoices[idx]?.unpaidCount > 0"
+        class="flex justify-between gap-4"
+      >
+        <p>{{ t`Unpaid` }}</p>
+        <p class="font-semibold">{{ invoices[idx]?.unpaidCount ?? 0 }}</p>
+      </div>
+    </MouseFollower>
   </div>
 </template>
 <script>
 import { t } from 'fyo';
 import { ModelNameEnum } from 'models/types';
 import Button from 'src/components/Button.vue';
+import MouseFollower from 'src/components/MouseFollower.vue';
 import { fyo } from 'src/initFyo';
-import { getDatesAndPeriodicity } from 'src/utils/misc';
+import { getDatesAndPeriodList } from 'src/utils/misc';
 import { routeTo } from 'src/utils/ui';
 import PeriodSelector from './PeriodSelector.vue';
 import SectionHeader from './SectionHeader.vue';
@@ -92,16 +115,22 @@ export default {
     PeriodSelector,
     SectionHeader,
     Button,
+    MouseFollower,
   },
   data: () => ({
+    idx: -1,
+    colors: ['#33A1FF', '#B7BFC6'],
     invoices: [
       {
         title: t`Sales Invoices`,
         schemaName: ModelNameEnum.SalesInvoice,
         total: 0,
         unpaid: 0,
+        hasData: false,
         paid: 0,
         count: 0,
+        unpaidCount: 0,
+        paidCount: 0,
         color: 'blue',
         periodKey: 'salesInvoicePeriod',
         barWidth: 40,
@@ -111,8 +140,11 @@ export default {
         schemaName: ModelNameEnum.PurchaseInvoice,
         total: 0,
         unpaid: 0,
+        hasData: false,
         paid: 0,
         count: 0,
+        unpaidCount: 0,
+        paidCount: 0,
         color: 'gray',
         periodKey: 'purchaseInvoicePeriod',
         barWidth: 60,
@@ -131,7 +163,7 @@ export default {
   methods: {
     async calculateInvoiceTotals() {
       for (const invoice of this.invoices) {
-        const { fromDate, toDate } = await getDatesAndPeriodicity(
+        const { fromDate, toDate } = await getDatesAndPeriodList(
           this.$data[invoice.periodKey]
         );
 
@@ -141,14 +173,19 @@ export default {
           toDate
         );
 
-        const count = await fyo.db.count(invoice.schemaName, {
-          filters: { cancelled: false, submitted: true },
-        });
+        const { countTotal, countOutstanding } = await this.getCounts(
+          invoice.schemaName,
+          DateTime.fromISO(fromDate),
+          DateTime.fromISO(toDate)
+        );
 
         invoice.total = total ?? 0;
         invoice.unpaid = outstanding ?? 0;
         invoice.paid = total - outstanding;
-        invoice.count = count;
+        invoice.hasData = countTotal > 0;
+        invoice.count = countTotal;
+        invoice.paidCount = countTotal - countOutstanding;
+        invoice.unpaidCount = countOutstanding;
         invoice.barWidth = (invoice.paid / (invoice.total || 1)) * 100;
       }
     },
@@ -156,6 +193,26 @@ export default {
       let doc = await fyo.doc.getNewDoc(invoice.schemaName);
       routeTo(`/edit/${invoice.schemaName}/${doc.name}`);
     },
+
+    async getCounts(schemaName, fromDate, toDate) {
+      const outstandingAmounts = await fyo.db.getAllRaw(schemaName, {
+        fields: ['outstandingAmount'],
+        filters: {
+          cancelled: false,
+          submitted: true,
+          date: ['<=', toDate.toISO(), '>=', fromDate.toISO()],
+        },
+      });
+
+      const isOutstanding = outstandingAmounts.map((o) =>
+        parseFloat(o.outstandingAmount)
+      );
+
+      return {
+        countTotal: isOutstanding.length,
+        countOutstanding: isOutstanding.filter((o) => o > 0).length,
+      };
+    },
   },
 };
 </script>
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index 0d24d407..82eff24f 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -166,43 +166,40 @@ export default {
         return;
       }
 
-      if (!fyo.singles.GetStarted.itemCreated) {
-        const count = await fyo.db.count('Item');
-        if (count > 0) {
-          toUpdate.itemCreated = 1;
-        }
+      if (!fyo.singles.GetStarted.salesItemCreated) {
+        const count = await fyo.db.count('Item', { filters: { for: 'Sales' } });
+        toUpdate.salesItemCreated = count > 0;
+      }
+
+      if (!fyo.singles.GetStarted.purchaseItemCreated) {
+        const count = await fyo.db.count('Item', {
+          filters: { for: 'Purchases' },
+        });
+        toUpdate.purchaseItemCreated = count > 0;
       }
 
       if (!fyo.singles.GetStarted.invoiceCreated) {
         const count = await fyo.db.count('SalesInvoice');
-        if (count > 0) {
-          toUpdate.invoiceCreated = 1;
-        }
+        toUpdate.invoiceCreated = count > 0;
       }
 
       if (!fyo.singles.GetStarted.customerCreated) {
-        const count = fyo.db.count('Party', {
+        const count = await fyo.db.count('Party', {
           filters: { role: 'Customer' },
         });
-        if (count > 0) {
-          toUpdate.customerCreated = 1;
-        }
+        toUpdate.customerCreated = count > 0;
       }
 
       if (!fyo.singles.GetStarted.billCreated) {
         const count = await fyo.db.count('SalesInvoice');
-        if (count > 0) {
-          toUpdate.billCreated = 1;
-        }
+        toUpdate.billCreated = count > 0;
       }
 
       if (!fyo.singles.GetStarted.supplierCreated) {
-        const count = fyo.db.count('Party', {
+        const count = await fyo.db.count('Party', {
           filters: { role: 'Supplier' },
         });
-        if (count > 0) {
-          toUpdate.supplierCreated = 1;
-        }
+        toUpdate.supplierCreated = count > 0;
       }
       await this.updateChecks(toUpdate);
     },
@@ -211,10 +208,10 @@ export default {
       await fyo.doc.getSingle('GetStarted');
     },
     isCompleted(item) {
-      return fyo.singles.GetStarted.get(item.fieldname) || 0;
+      return fyo.singles.GetStarted.get(item.fieldname) || false;
     },
     getIconComponent(item) {
-      let completed = fyo.singles.GetStarted[item.fieldname] || 0;
+      let completed = fyo.singles.GetStarted[item.fieldname] || false;
       let name = completed ? 'green-check' : item.icon;
       let size = completed ? '24' : '18';
       return {
diff --git a/src/utils/getStartedConfig.ts b/src/utils/getStartedConfig.ts
index 6f195c62..45717f15 100644
--- a/src/utils/getStartedConfig.ts
+++ b/src/utils/getStartedConfig.ts
@@ -84,8 +84,8 @@ export function getGetStartedConfig() {
           label: t`Add Items`,
           icon: 'item',
           description: t`Add products or services that you sell to your customers`,
-          action: () => routeTo('/list/Item'),
-          fieldname: 'itemCreated',
+          action: () => routeTo(`/list/Item/for/Sales/${t`Sales Items`}`),
+          fieldname: 'salesItemCreated',
           documentation: 'https://frappebooks.com/docs/setting-up#3-add-items',
         },
         {
@@ -93,7 +93,7 @@ export function getGetStartedConfig() {
           label: t`Add Customers`,
           icon: 'customer',
           description: t`Add a few customers to create your first invoice`,
-          action: () => routeTo('/list/Customer'),
+          action: () => routeTo(`/list/Party/role/Customer/${t`Customers`}`),
           fieldname: 'customerCreated',
           documentation:
             'https://frappebooks.com/docs/setting-up#4-add-customers',
@@ -118,15 +118,16 @@ export function getGetStartedConfig() {
           label: t`Add Items`,
           icon: 'item',
           description: t`Add products or services that you buy from your suppliers`,
-          action: () => routeTo('/list/Item'),
-          fieldname: 'itemCreated',
+          action: () =>
+            routeTo(`/list/Item/for/Purchases/${t`Purchase Items`}`),
+          fieldname: 'purchaseItemCreated',
         },
         {
           key: 'Add Suppliers',
           label: t`Add Suppliers`,
           icon: 'supplier',
           description: t`Add a few suppliers to create your first bill`,
-          action: () => routeTo('/list/Supplier'),
+          action: () => routeTo(`/list/Party/role/Supplier/${t`Suppliers`}`),
           fieldname: 'supplierCreated',
         },
         {
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 92965fa4..f4e18e18 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -7,9 +7,9 @@ import SetupWizardSchema from 'schemas/app/SetupWizard.json';
 import { Schema } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 
-export function getDatesAndPeriodicity(
+export function getDatesAndPeriodList(
   period: 'This Year' | 'This Quarter' | 'This Month'
-): { fromDate: string; toDate: string } {
+): { periodList: DateTime[]; fromDate: string; toDate: string } {
   const toDate: DateTime = DateTime.now();
   let fromDate: DateTime;
 
@@ -23,7 +23,22 @@ export function getDatesAndPeriodicity(
     fromDate = toDate.minus({ days: 1 });
   }
 
+  /**
+   * periodList: Monthly decrements before toDate until fromDate
+   */
+  const periodList: DateTime[] = [toDate];
+  while (true) {
+    const nextDate = periodList.at(0)!.minus({ months: 1 });
+    if (nextDate.toMillis() < fromDate.toMillis()) {
+      break;
+    }
+
+    periodList.unshift(nextDate);
+  }
+  periodList.shift();
+
   return {
+    periodList,
     fromDate: fromDate.toISO(),
     toDate: toDate.toISO(),
   };
diff --git a/src/utils/vueUtils.ts b/src/utils/vueUtils.ts
index 93b2c88d..8a476256 100644
--- a/src/utils/vueUtils.ts
+++ b/src/utils/vueUtils.ts
@@ -29,3 +29,21 @@ export function useKeys(callback?: (keys: Set<string>) => void) {
 
   return keys;
 }
+
+export function useMouseLocation() {
+  const loc = ref({ clientX: 0, clientY: 0 });
+
+  const mousemoveListener = (e: MouseEvent) => {
+    loc.value.clientX = e.clientX;
+    loc.value.clientY = e.clientY;
+  };
+
+  onMounted(() => {
+    window.addEventListener('mousemove', mousemoveListener);
+  });
+  onUnmounted(() => {
+    window.removeEventListener('mousemove', mousemoveListener);
+  });
+
+  return loc;
+}

From 07c923c6b183d5095c17b603ad6d700c4fc2bd2b Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 17 May 2022 13:07:02 +0530
Subject: [PATCH 125/163] incr: remove unused reports/** - get profit and loss
 to display

---
 backend/database/bespoke.ts                   |  42 +-
 fyo/core/dbHandler.ts                         |  15 +-
 .../AccountsReceivablePayable.js              | 170 -------
 .../BankReconciliation/BankReconciliation.js  |  54 ---
 .../BankReconciliationImport.js               |  89 ----
 reports/BankReconciliation/viewConfig.js      | 122 -----
 .../financialStatements.ts                    | 426 ------------------
 reports/PurchaseRegister/PurchaseRegister.js  |  56 ---
 reports/PurchaseRegister/viewConfig.js        |  56 ---
 reports/SalesRegister/SalesRegister.js        |  55 ---
 reports/SalesRegister/viewConfig.js           |  56 ---
 reports/view.ts                               |  26 --
 src/components/Charts/BarChart.vue            |   4 +-
 src/pages/Dashboard/Cashflow.vue              |  16 +-
 src/pages/Dashboard/Dashboard.vue             |   8 +-
 src/pages/Dashboard/ProfitAndLoss.vue         |  42 +-
 src/pages/Dashboard/UnpaidInvoices.vue        |  10 +-
 src/utils/misc.ts                             |   6 +-
 src/utils/search.ts                           |   5 +-
 19 files changed, 105 insertions(+), 1153 deletions(-)
 delete mode 100644 reports/AccountsReceivablePayable/AccountsReceivablePayable.js
 delete mode 100644 reports/BankReconciliation/BankReconciliation.js
 delete mode 100644 reports/BankReconciliation/BankReconciliationImport.js
 delete mode 100644 reports/BankReconciliation/viewConfig.js
 delete mode 100644 reports/FinancialStatements/financialStatements.ts
 delete mode 100644 reports/PurchaseRegister/PurchaseRegister.js
 delete mode 100644 reports/PurchaseRegister/viewConfig.js
 delete mode 100644 reports/SalesRegister/SalesRegister.js
 delete mode 100644 reports/SalesRegister/viewConfig.js
 delete mode 100644 reports/view.ts

diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts
index 92315508..bd5cc50d 100644
--- a/backend/database/bespoke.ts
+++ b/backend/database/bespoke.ts
@@ -75,10 +75,50 @@ export class BespokeQueries {
         outflow: 'credit',
       })
       .select({
-        'month-year': dateAsMonthYear,
+        yearmonth: dateAsMonthYear,
       })
       .where('account', 'in', cashAndBankAccounts)
       .whereBetween('date', [fromDate, toDate])
       .groupBy(dateAsMonthYear);
   }
+
+  static async getIncomeAndExpenses(
+    db: DatabaseCore,
+    fromDate: string,
+    toDate: string
+  ) {
+    const income = await db.knex!.raw(
+      `
+      select sum(credit - debit) as balance, strftime('%Y-%m', date) as yearmonth
+      from AccountingLedgerEntry
+      where
+        reverted = false and
+        date between date(?) and date(?) and
+        account in (
+          select name
+          from Account
+          where rootType = 'Income'
+        )
+      group by yearmonth`,
+      [fromDate, toDate]
+    );
+
+    const expense = await db.knex!.raw(
+      `
+      select sum(debit - credit) as balance, strftime('%Y-%m', date) as yearmonth
+      from AccountingLedgerEntry
+      where
+        reverted = false and
+        date between date(?) and date(?) and
+        account in (
+          select name
+          from Account
+          where rootType = 'Expense'
+        )
+      group by yearmonth`,
+      [fromDate, toDate]
+    );
+
+    return { income, expense };
+  }
 }
diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index 9a725684..65e5a5e1 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -17,7 +17,9 @@ import {
 // Return types of Bespoke Queries
 type TopExpenses = { account: string; total: number }[];
 type TotalOutstanding = { total: number; outstanding: number };
-type Cashflow = { inflow: number; outflow: number; 'month-year': string }[];
+type Cashflow = { inflow: number; outflow: number; yearmonth: string }[];
+type Balance = { balance: number; yearmonth: string }[];
+type IncomeExpense = { income: Balance; expense: Balance };
 
 export class DatabaseHandler extends DatabaseBase {
   #fyo: Fyo;
@@ -252,6 +254,17 @@ export class DatabaseHandler extends DatabaseBase {
     )) as Cashflow;
   }
 
+  async getIncomeAndExpenses(
+    fromDate: string,
+    toDate: string
+  ): Promise<IncomeExpense> {
+    return (await this.#demux.callBespoke(
+      'getIncomeAndExpenses',
+      fromDate,
+      toDate
+    )) as IncomeExpense;
+  }
+
   /**
    * Internal methods
    */
diff --git a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js b/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
deleted file mode 100644
index 614c0c84..00000000
--- a/reports/AccountsReceivablePayable/AccountsReceivablePayable.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import fyo from 'fyo';
-
-export default class AccountsReceivablePayable {
-  async run(reportType, { date }) {
-    const rows = await getReceivablePayable({
-      reportType,
-      date,
-    });
-
-    return { rows };
-  }
-}
-
-async function getReceivablePayable({ reportType = 'Receivable', date }) {
-  let entries = [];
-  const debitOrCredit = reportType === 'Receivable' ? 'debit' : 'credit';
-  const referenceType =
-    reportType === 'Receivable' ? 'SalesInvoice' : 'PurchaseInvoice';
-
-  entries = await getLedgerEntries();
-  const vouchers = await getVouchers();
-
-  const futureEntries = getFutureEntries();
-  const returnEntries = getReturnEntries();
-  const pdc = getPDC();
-
-  const validEntries = getValidEntries();
-
-  let data = [];
-
-  for (let entry of validEntries) {
-    const { outStandingAmount, creditNoteAmount } = getOutstandingAmount(entry);
-
-    if (outStandingAmount > 0.1 / 10) {
-      const row = {
-        date: entry.date,
-        party: entry.party,
-      };
-
-      // due date / bill date
-
-      row.voucherType = entry.referenceType;
-      row.voucherNo = entry.referenceName;
-
-      // bill details
-
-      const invoicedAmount = entry[debitOrCredit] || 0;
-      const paidAmount = invoicedAmount - outStandingAmount - creditNoteAmount;
-
-      Object.assign(row, {
-        invoicedAmount,
-        paidAmount,
-        outStandingAmount,
-        creditNoteAmount,
-      });
-
-      // ageing
-
-      data.push(row);
-    }
-  }
-
-  return data;
-
-  // helpers
-
-  async function getVouchers() {
-    return await fyo.db.getAll({
-      doctype: referenceType,
-      fields: ['name', 'date'],
-      filters: {
-        submitted: 1,
-      },
-    });
-  }
-
-  function getValidEntries() {
-    return entries.filter((entry) => {
-      return (
-        entry.date <= date &&
-        entry.referenceType === referenceType &&
-        entry[debitOrCredit] > 0
-      );
-    });
-  }
-
-  function getOutstandingAmount(entry) {
-    let paymentAmount = 0.0,
-      creditNoteAmount = 0.0;
-    let reverseDebitOrCredit = debitOrCredit === 'debit' ? 'credit' : 'debit';
-
-    for (let e of getEntriesFor(
-      entry.party,
-      entry.referenceType,
-      entry.referenceName
-    )) {
-      if (e.date <= date) {
-        const amount = e[reverseDebitOrCredit] - e[debitOrCredit];
-
-        if (!Object.keys(returnEntries).includes(e.referenceName)) {
-          paymentAmount += amount;
-        } else {
-          creditNoteAmount += amount;
-        }
-      }
-    }
-
-    return {
-      outStandingAmount:
-        entry[debitOrCredit] -
-        entry[reverseDebitOrCredit] -
-        paymentAmount -
-        creditNoteAmount,
-      creditNoteAmount,
-    };
-  }
-
-  function getEntriesFor(party, againstVoucherType, againstVoucher) {
-    // TODO
-    return [];
-  }
-
-  function getFutureEntries() {
-    return entries.filter((entry) => entry.date > date);
-  }
-
-  function getReturnEntries() {
-    // TODO
-    return {};
-  }
-
-  function getPDC() {
-    return [];
-  }
-
-  async function getLedgerEntries() {
-    if (entries.length) {
-      return entries;
-    }
-
-    const partyType = reportType === 'Receivable' ? 'customer' : 'supplier';
-    const partyList = (
-      await fyo.db.getAll({
-        doctype: 'Party',
-        filters: {
-          [partyType]: 1,
-        },
-      })
-    ).map((d) => d.name);
-
-    return await fyo.db.getAll({
-      doctype: 'AccountingLedgerEntry',
-      fields: [
-        'name',
-        'date',
-        'account',
-        'party',
-        'referenceType',
-        'referenceName',
-        'sum(debit) as debit',
-        'sum(credit) as credit',
-      ],
-      filters: {
-        party: ['in', partyList],
-      },
-      groupBy: ['referenceType', 'referenceName', 'party'],
-      orderBy: 'date',
-    });
-  }
-}
diff --git a/reports/BankReconciliation/BankReconciliation.js b/reports/BankReconciliation/BankReconciliation.js
deleted file mode 100644
index 4540f16b..00000000
--- a/reports/BankReconciliation/BankReconciliation.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { fyo } from 'src/initFyo'
-
-class BankReconciliation {
-  async run(params) {
-    if (!Object.keys(params).length) return [];
-
-    const filters = {};
-    if (params.paymentAccount) filters.paymentAccount = params.paymentAccount;
-    if (params.party) filters.party = params.party;
-    if (params.toDate || params.fromDate) {
-      filters.date = [];
-      if (params.toDate) filters.date.push('<=', params.toDate);
-      if (params.fromDate) filters.date.push('>=', params.fromDate);
-    }
-
-    filters.paymentMethod = ['in', ['Cheque', 'Transfer']];
-
-    let data = await fyo.db.getAll({
-      doctype: 'Payment',
-      fields: [
-        'date',
-        'account',
-        'paymentAccount',
-        'party',
-        'name',
-        'referenceDate',
-        'referenceId',
-        'clearanceDate',
-      ],
-      filters: filters,
-    });
-
-    for (var i = 0; i < data.length; i++) {
-      let ledger = await fyo.db.getAll({
-        doctype: 'AccountingLedgerEntry',
-        fields: ['date', 'referenceType', 'referenceName', 'debit', 'credit'],
-        filters: {
-          referenceType: 'Payment',
-          account: data[i].paymentAccount,
-          referenceName: data[i].name,
-        },
-      });
-      data[i].credit = ledger[0].credit;
-      data[i].debit = ledger[0].debit;
-      data[i].debit = ledger[0].debit;
-      data[i].referenceName = ledger[0].referenceName;
-      data[i].referenceType = ledger[0].referenceType;
-    }
-
-    return data;
-  }
-}
-
-export default BankReconciliation;
diff --git a/reports/BankReconciliation/BankReconciliationImport.js b/reports/BankReconciliation/BankReconciliationImport.js
deleted file mode 100644
index b407f713..00000000
--- a/reports/BankReconciliation/BankReconciliationImport.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import csv2json from 'csvjson-csv2json';
-import { fyo } from 'src/initFyo';
-import ReconciliationValidation from '../../src/components/ReconciliationValidation';
-
-export const fileImportHandler = (file, report) => {
-  const reader = new FileReader();
-  reader.onload = () => {
-    const csv = reader.result;
-    const json = csvToJsonHandler(csv);
-    findMatchingReferences(json, report);
-  };
-  reader.readAsBinaryString(file);
-};
-
-export const csvToJsonHandler = (csv) => {
-  const json = csv2json(csv, { parseNumbers: true });
-  return json;
-};
-
-export const findMatchingReferences = async (json, report) => {
-  const referenceField = Object.keys(json[0]).filter((field) => {
-    return field.toLowerCase().indexOf('ref') > -1 ? true : false;
-  });
-  const clearanceDateField = Object.keys(json[0]).filter((field) => {
-    return field.toLowerCase().indexOf('date') > -1 ? true : false;
-  });
-  const debitField = Object.keys(json[0]).filter((field) => {
-    return field.toLowerCase().indexOf('debit') > -1 ||
-      field.toLowerCase().indexOf('deposit') > -1
-      ? true
-      : false;
-  });
-  const creditField = Object.keys(json[0]).filter((field) => {
-    return field.toLowerCase().indexOf('credit') > -1 ||
-      field.toLowerCase().indexOf('withdraw') > -1
-      ? true
-      : false;
-  });
-  const balanceField = Object.keys(json[0]).filter((field) => {
-    return field.toLowerCase().indexOf('balance') > -1 ? true : false;
-  });
-  const references = json.map((row) => {
-    return row[referenceField];
-  });
-  const payments = await fyo.db.getAll({
-    doctype: 'Payment',
-    fields: ['*'],
-    filters: {
-      referenceId: ['in', references],
-      paymentAccount: report.currentFilters.paymentAccount,
-      clearanceDate: ['in', [null, undefined, '']],
-    },
-  });
-  if (payments.length) {
-    const entries = payments.map((payment) => {
-      const jsonEntry = json.filter((row) => {
-        return row[referenceField] === payment.referenceId;
-      });
-      return Object.assign(payment, jsonEntry[0]);
-    });
-    const normalizedEntries = entries.map((entry) => {
-      return {
-        'Posting Date': fyo.format(entry.date, 'Date'),
-        'Payment Entry': entry.name,
-        'Ref/Cheq. ID': entry[referenceField],
-        'Cr/Dr':
-          fyo.parseNumber(entry[debitField]) > 0
-            ? entry[debitField] + ' Dr.'
-            : entry[creditField] + ' Cr.',
-        'Clearance Date': entry[clearanceDateField],
-      };
-    });
-    report.$modal.show({
-      modalProps: {
-        title: `Validate Matching Entries`,
-        noFooter: true,
-      },
-      component: ReconciliationValidation,
-      props: {
-        entries: normalizedEntries,
-        afterReconcile: async () => {
-          await report.getReportData(report.currentFilters);
-        },
-      },
-    });
-  } else {
-    //  'No entries found with matching Ref / Cheque ID'
-  }
-};
diff --git a/reports/BankReconciliation/viewConfig.js b/reports/BankReconciliation/viewConfig.js
deleted file mode 100644
index 9524cc66..00000000
--- a/reports/BankReconciliation/viewConfig.js
+++ /dev/null
@@ -1,122 +0,0 @@
-const title = 'Bank Reconciliation';
-import { t } from 'fyo';
-import ImportWizard from '../../src/components/ImportWizart';
-import BankReconciliationImport from './BankReconciliationImport';
-
-export default {
-  title: title,
-  method: 'bank-reconciliation',
-  filterFields: [
-    {
-      fieldtype: 'Link',
-      target: 'Account',
-      size: 'small',
-      placeholder: t`Payment Account`,
-      label: t`Payment Account`,
-      fieldname: 'paymentAccount',
-      getFilters: () => {
-        return {
-          accountType: 'Bank',
-          isGroup: 0,
-        };
-      },
-    },
-    {
-      fieldtype: 'Link',
-      target: 'Party',
-      size: 'small',
-      label: t`Party`,
-      placeholder: t`Party`,
-      fieldname: 'party',
-    },
-    {
-      fieldtype: 'Date',
-      size: 'small',
-      placeholder: t`From Date`,
-      label: t`From Date`,
-      fieldname: 'fromDate',
-    },
-    {
-      fieldtype: 'Date',
-      size: 'small',
-      placeholder: t`To Date`,
-      label: t`To Date`,
-      fieldname: 'toDate',
-    },
-  ],
-  actions: [
-    {
-      label: t`Reconcile`,
-      type: 'secondary',
-      condition: (report) => report.currentFilters.paymentAccount,
-      action: async (report) => {
-        report.$modal.show({
-          modalProps: {
-            title: `Import Bank Account Statement`,
-            noFooter: true,
-          },
-          component: ImportWizard,
-          props: {
-            importHandler: BankReconciliationImport.fileImportHandler,
-            report,
-          },
-        });
-      },
-    },
-  ],
-  getColumns() {
-    return [
-      {
-        label: t`Posting Date`,
-        fieldtype: 'Date',
-        fieldname: 'date',
-      },
-      {
-        label: t`Payment Account`,
-        fieldtype: 'Link',
-      },
-      {
-        label: t`Debit`,
-        fieldtype: 'Currency',
-      },
-      {
-        label: t`Credit`,
-        fieldtype: 'Currency',
-      },
-      {
-        label: t`Balance`,
-        fieldtype: 'Currency',
-      },
-      {
-        label: t`Ref/Cheque ID`,
-        fieldtype: 'Data',
-        fieldname: 'referenceId',
-      },
-      {
-        label: t`Clearance Date`,
-        fieldtype: 'Date',
-        fieldname: 'clearanceDate',
-      },
-      {
-        label: t`Ref. Type`,
-        fieldtype: 'Data',
-        fieldname: 'referenceType',
-      },
-      {
-        label: t`Ref. Name`,
-        fieldtype: 'Data',
-        fieldname: 'referenceName',
-      },
-      {
-        label: t`Ref. Date`,
-        fieldtype: 'Date',
-        fieldname: 'referenceDate',
-      },
-
-      {
-        label: t`Party`,
-        fieldtype: 'Link',
-      },
-    ];
-  },
-};
diff --git a/reports/FinancialStatements/financialStatements.ts b/reports/FinancialStatements/financialStatements.ts
deleted file mode 100644
index 24185928..00000000
--- a/reports/FinancialStatements/financialStatements.ts
+++ /dev/null
@@ -1,426 +0,0 @@
-import { Fyo } from 'fyo';
-import { DocValueMap } from 'fyo/core/types';
-import { DateTime } from 'luxon';
-import { AccountRootType } from 'models/baseModels/Account/types';
-import Money from 'pesa/dist/types/src/money';
-import {
-  BalanceType,
-  FinancialStatementOptions,
-  Periodicity,
-} from 'reports/types';
-import { convertPesaValuesToFloat } from 'src/utils';
-
-interface FiscalYear {
-  start: string;
-  end: string;
-  quarters: number[];
-  isSplit: number;
-}
-
-interface AccountInfo extends DocValueMap {
-  name: string;
-  parentAccount: string;
-  isGroup: boolean;
-  account?: string;
-  indent?: number;
-}
-
-interface LedgerInfo extends DocValueMap {
-  account: string;
-  debit: Money;
-  credit: Money;
-  date: string;
-}
-
-export class FinancialStatements {
-  fyo: Fyo;
-  constructor(fyo: Fyo) {
-    this.fyo = fyo;
-  }
-
-  async getData(options: FinancialStatementOptions) {
-    const rootType = options.rootType;
-    const balanceMustBe = options.balanceMustBe ?? 'Debit';
-    const fromDate = options.fromDate;
-    const toDate = options.toDate;
-    const periodicity = options.periodicity ?? 'Monthly';
-    const accumulateValues = options.accumulateValues ?? false;
-
-    const accounts = await this.getAccounts(rootType);
-    const fiscalYear = await getFiscalYear(this.fyo);
-    const ledgerEntries = await this.getLedgerEntries(
-      fromDate,
-      toDate,
-      accounts
-    );
-    const periodList = getPeriodList(fromDate, toDate, periodicity, fiscalYear);
-    this.setPeriodAmounts(
-      accounts,
-      ledgerEntries,
-      periodicity,
-      fiscalYear,
-      balanceMustBe
-    );
-
-    if (accumulateValues) {
-      this.accumulateValues(accounts, periodList);
-    }
-
-    const totalRow = this.getTotalRow(
-      rootType,
-      balanceMustBe,
-      periodList,
-      accounts
-    );
-    accounts.forEach(convertPesaValuesToFloat);
-
-    return { accounts, totalRow, periodList };
-  }
-
-  setPeriodAmounts(
-    accounts: AccountInfo[],
-    ledgerEntries: LedgerInfo[],
-    periodicity: Periodicity,
-    fiscalYear: FiscalYear,
-    balanceMustBe: BalanceType
-  ) {
-    for (const account of accounts) {
-      const entries = ledgerEntries.filter(
-        (entry) => entry.account === account.name
-      );
-
-      for (const entry of entries) {
-        const periodKey = getPeriodKey(entry.date, periodicity, fiscalYear);
-
-        if (account[periodKey] === undefined) {
-          account[periodKey] = this.fyo.pesa(0.0);
-        }
-
-        const multiplier = balanceMustBe === 'Debit' ? 1 : -1;
-        const value = entry.debit.sub(entry.credit).mul(multiplier);
-        account[periodKey] = value.add(account[periodKey] as Money);
-      }
-    }
-  }
-
-  getTotalRow(
-    rootType: AccountRootType,
-    balanceMustBe: BalanceType,
-    periodList: string[],
-    accounts: AccountInfo[]
-  ) {
-    const totalRow: DocValueMap = {
-      account: `Total ${rootType} (${balanceMustBe})`,
-    };
-
-    periodList.forEach((periodKey) => {
-      if (totalRow[periodKey] === undefined) {
-        totalRow[periodKey] = this.fyo.pesa(0.0);
-      }
-
-      for (const account of accounts) {
-        totalRow[periodKey] = (totalRow[periodKey] as Money).add(
-          (account[periodKey] as Money) ?? 0.0
-        );
-      }
-    });
-
-    convertPesaValuesToFloat(totalRow);
-    return totalRow;
-  }
-
-  async accumulateValues(accounts: AccountInfo[], periodList: string[]) {
-    periodList.forEach((periodKey, i) => {
-      if (i === 0) {
-        return;
-      }
-
-      const previousPeriodKey = periodList[i - 1];
-
-      for (const account of accounts) {
-        if (!account[periodKey]) {
-          account[periodKey] = this.fyo.pesa(0.0);
-        }
-
-        account[periodKey] = (account[periodKey] as Money).add(
-          (account[previousPeriodKey] as Money | undefined) ?? 0
-        );
-      }
-    });
-  }
-
-  async getAccounts(rootType: AccountRootType) {
-    let accounts = (await this.fyo.db.getAll('Account', {
-      fields: ['name', 'parentAccount', 'isGroup'],
-      filters: {
-        rootType,
-      },
-    })) as AccountInfo[];
-
-    accounts = setIndentLevel(accounts);
-    accounts = sortAccounts(accounts);
-
-    accounts.forEach((account) => {
-      account.account = account.name;
-    });
-
-    return accounts;
-  }
-
-  async getLedgerEntries(
-    fromDate: string | null,
-    toDate: string,
-    accounts: AccountInfo[]
-  ) {
-    const accountFilter = ['in', accounts.map((d) => d.name)];
-    let dateFilter: string[] = ['<=', toDate];
-    if (fromDate) {
-      dateFilter = ['>=', fromDate, '<=', toDate];
-    }
-
-    const ledgerEntries = (await this.fyo.db.getAll('AccountingLedgerEntry', {
-      fields: ['account', 'debit', 'credit', 'date'],
-      filters: {
-        account: accountFilter,
-        date: dateFilter,
-      },
-    })) as LedgerInfo[];
-
-    return ledgerEntries;
-  }
-
-  async getTrialBalance(options: FinancialStatementOptions) {
-    const { rootType, fromDate, toDate } = options;
-    const accounts = await this.getAccounts(rootType);
-    const ledgerEntries = await this.getLedgerEntries(null, toDate, accounts);
-
-    for (const account of accounts) {
-      const accountEntries = ledgerEntries.filter(
-        (entry) => entry.account === account.name
-      );
-      // opening
-      const beforePeriodEntries = accountEntries.filter(
-        (entry) => entry.date < fromDate
-      );
-
-      account.opening = beforePeriodEntries.reduce(
-        (acc, entry) => acc.add(entry.debit).sub(entry.credit),
-        this.fyo.pesa(0)
-      );
-
-      if (account.opening.gte(0)) {
-        account.openingDebit = account.opening;
-        account.openingCredit = this.fyo.pesa(0);
-      } else {
-        account.openingCredit = account.opening.neg();
-        account.openingDebit = this.fyo.pesa(0);
-      }
-
-      // debit / credit
-      const periodEntries = accountEntries.filter(
-        (entry) => entry.date >= fromDate && entry.date < toDate
-      );
-      account.debit = periodEntries.reduce(
-        (acc, entry) => acc.add(entry.debit),
-        this.fyo.pesa(0)
-      );
-      account.credit = periodEntries.reduce(
-        (acc, entry) => acc.add(entry.credit),
-        this.fyo.pesa(0)
-      );
-
-      // closing
-      account.closing = account.opening.add(account.debit).sub(account.credit);
-
-      if (account.closing.gte(0)) {
-        account.closingDebit = account.closing;
-        account.closingCredit = this.fyo.pesa(0);
-      } else {
-        account.closingCredit = account.closing.neg();
-        account.closingDebit = this.fyo.pesa(0);
-      }
-
-      if (account.debit.neq(0) || account.credit.neq(0)) {
-        setParentEntry(account, account.parentAccount);
-      }
-    }
-
-    function setParentEntry(leafAccount: AccountInfo, parentName: string) {
-      for (const acc of accounts) {
-        if (acc.name === parentName) {
-          acc.debit = (acc.debit as Money).add(leafAccount.debit as Money);
-          acc.credit = (acc.credit as Money).add(leafAccount.credit as Money);
-          acc.closing = (acc.opening as Money).add(acc.debit).sub(acc.credit);
-
-          if (acc.closing.gte(0)) {
-            acc.closingDebit = acc.closing;
-          } else {
-            acc.closingCredit = acc.closing.neg();
-          }
-
-          if (acc.parentAccount) {
-            setParentEntry(leafAccount, acc.parentAccount);
-          } else {
-            return;
-          }
-        }
-      }
-    }
-
-    accounts.forEach(convertPesaValuesToFloat);
-    return accounts;
-  }
-}
-
-function setIndentLevel(
-  accounts: AccountInfo[],
-  parentAccount?: string | null,
-  level?: number
-): AccountInfo[] {
-  if (parentAccount === undefined) {
-    parentAccount = null;
-    level = 0;
-  }
-
-  accounts.forEach((account) => {
-    if (
-      account.parentAccount === parentAccount &&
-      account.indent === undefined
-    ) {
-      account.indent = level;
-      setIndentLevel(accounts, account.name, (level ?? 0) + 1);
-    }
-  });
-
-  return accounts;
-}
-
-function sortAccounts(accounts: AccountInfo[]) {
-  const out: AccountInfo[] = [];
-  const pushed: Record<string, boolean> = {};
-
-  pushToOut(null);
-
-  function pushToOut(parentAccount: string | null) {
-    accounts.forEach((account) => {
-      if (pushed[account.name] && account.parentAccount !== parentAccount) {
-        return;
-      }
-
-      out.push(account);
-      pushed[account.name] = true;
-
-      pushToOut(account.name);
-    });
-  }
-
-  return out;
-}
-
-export function getPeriodList(
-  fromDate: string,
-  toDate: string,
-  periodicity: Periodicity,
-  fiscalYear: FiscalYear
-) {
-  if (!fromDate) {
-    fromDate = fiscalYear.start;
-  }
-
-  const monthsToAdd = {
-    Monthly: 1,
-    Quarterly: 3,
-    'Half Yearly': 6,
-    Yearly: 12,
-  }[periodicity];
-
-  const startDate = DateTime.fromISO(fromDate).startOf('month');
-  const endDate = DateTime.fromISO(toDate).endOf('month');
-  let curDate = startDate;
-  const periodKeyList: string[] = [];
-
-  while (curDate <= endDate) {
-    const periodKey = getPeriodKey(curDate, periodicity, fiscalYear);
-    periodKeyList.push(periodKey);
-    curDate = curDate.plus({ months: monthsToAdd });
-  }
-
-  return periodKeyList;
-}
-
-function getPeriodKey(
-  dateObj: DateTime | string,
-  periodicity: Periodicity,
-  fiscalYear: FiscalYear
-) {
-  if (typeof dateObj === 'string') {
-    dateObj = DateTime.fromISO(dateObj);
-  }
-
-  const { start, quarters, isSplit } = fiscalYear;
-  const { month, year } = dateObj;
-  const fisacalStart = DateTime.fromISO(start);
-
-  if (periodicity === 'Monthly') {
-    return `${dateObj.monthShort} ${year}`;
-  }
-
-  if (periodicity === 'Quarterly') {
-    const key =
-      month < fisacalStart.month
-        ? `${year - 1} - ${year}`
-        : `${year} - ${year + 1}`;
-    const strYear = isSplit ? key : `${year}`;
-    return {
-      1: `Q1 ${strYear}`,
-      2: `Q2 ${strYear}`,
-      3: `Q3 ${strYear}`,
-      4: `Q4 ${strYear}`,
-    }[quarters[month - 1]] as string;
-  }
-
-  if (periodicity === 'Half Yearly') {
-    const key =
-      month < fisacalStart.month
-        ? `${year - 1} - ${year}`
-        : `${year} - ${year + 1}`;
-    const strYear = isSplit ? key : `${year}`;
-    return {
-      1: `1st Half ${strYear}`,
-      2: `1st Half ${strYear}`,
-      3: `2nd Half ${strYear}`,
-      4: `2nd Half ${strYear}`,
-    }[quarters[month - 1]] as string;
-  }
-
-  const key =
-    month < fisacalStart.month
-      ? `${year - 1} - ${year}`
-      : `${year} - ${year + 1}`;
-  const strYear = isSplit ? key : `${year}`;
-  return `FY ${strYear}`;
-}
-
-export async function getFiscalYear(fyo: Fyo): Promise<FiscalYear> {
-  const accountingSettings = await fyo.doc.getSingle('AccountingSettings');
-
-  const fiscalYearStart = accountingSettings.fiscalYearStart as string;
-  const fiscalYearEnd = accountingSettings.fiscalYearEnd as string;
-
-  //right now quaters received from luxon lib is fixed to Jan as starting quarter
-  //moving the financial quarters, according to of start of fiscal year month
-  const quarters = [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4];
-  const start = DateTime.fromISO(fiscalYearStart);
-  quarters.unshift(...quarters.splice(13 - start.month, 11));
-
-  //check if fiscal year ends in next year
-  const end = DateTime.fromISO(fiscalYearEnd);
-  const isFiscalSplit = start.year - end.year;
-
-  return {
-    start: fiscalYearStart,
-    end: fiscalYearEnd,
-    quarters: quarters,
-    isSplit: isFiscalSplit,
-  };
-}
diff --git a/reports/PurchaseRegister/PurchaseRegister.js b/reports/PurchaseRegister/PurchaseRegister.js
deleted file mode 100644
index 8210d8cc..00000000
--- a/reports/PurchaseRegister/PurchaseRegister.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import { fyo } from 'src/initFyo';
-
-class PurchaseRegister {
-  async run({ fromDate, toDate, supplier }) {
-    if (!fromDate && !toDate && !supplier) return { rows: [] };
-
-    let filters = {};
-    if (supplier) {
-      filters.supplier = supplier;
-    }
-
-    if (fromDate && toDate) {
-      filters.date = ['>=', fromDate, '<=', toDate];
-    } else if (fromDate) {
-      filters.date = ['>=', fromDate];
-    } else if (toDate) {
-      filters.date = ['<=', toDate];
-    }
-    filters.submitted = 1;
-
-    const bills = await fyo.db.getAll({
-      doctype: 'PurchaseInvoice',
-      fields: ['name', 'date', 'supplier', 'account', 'netTotal', 'grandTotal'],
-      filters,
-      orderBy: 'date',
-      order: 'desc',
-    });
-
-    const billNames = bills.map((d) => d.name);
-
-    const taxes = await fyo.db.getAll({
-      doctype: 'TaxSummary',
-      fields: ['parent', 'amount'],
-      filters: {
-        parenttype: 'PurchaseInvoice',
-        parent: ['in', billNames],
-      },
-      orderBy: 'name',
-    });
-
-    for (let bill of bills) {
-      bill.totalTax = taxes
-        .filter((tax) => tax.parent === bill.name)
-        .reduce((acc, tax) => {
-          if (tax.amount) {
-            acc = acc + tax.amount;
-          }
-          return acc;
-        }, 0);
-    }
-
-    return { rows: bills };
-  }
-}
-
-export default PurchaseRegister;
diff --git a/reports/PurchaseRegister/viewConfig.js b/reports/PurchaseRegister/viewConfig.js
deleted file mode 100644
index 2434667e..00000000
--- a/reports/PurchaseRegister/viewConfig.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const title = 'Purchase Register';
-import { t } from 'fyo';
-
-export default {
-  title: title,
-  method: 'purchase-register',
-  filterFields: [
-    {
-      fieldtype: 'Link',
-      target: 'Party',
-      label: t`Supplier Name`,
-      fieldname: 'supplier',
-      size: 'small',
-      placeholder: t`Supplier Name`,
-      getFilters: (query) => {
-        if (query)
-          return {
-            keywords: ['like', query],
-            supplier: 1,
-          };
-
-        return {
-          supplier: 1,
-        };
-      },
-    },
-    {
-      fieldtype: 'Date',
-      fieldname: 'fromDate',
-      size: 'small',
-      placeholder: t`From Date`,
-      label: t`From Date`,
-      required: 1,
-    },
-    {
-      fieldtype: 'Date',
-      size: 'small',
-      placeholder: t`To Date`,
-      fieldname: 'toDate',
-      label: t`To Date`,
-      required: 1,
-    },
-  ],
-  actions: [],
-  getColumns() {
-    return [
-      { label: t`PurchaseInvoice`, fieldname: 'name' },
-      { label: t`Posting Date`, fieldname: 'date' },
-      { label: t`Supplier`, fieldname: 'supplier' },
-      { label: t`Payable Account`, fieldname: 'account' },
-      { label: t`Net Total`, fieldname: 'netTotal', fieldtype: 'Currency' },
-      { label: t`Total Tax`, fieldname: 'totalTax', fieldtype: 'Currency' },
-      { label: t`Grand Total`, fieldname: 'grandTotal', fieldtype: 'Currency' },
-    ];
-  },
-};
diff --git a/reports/SalesRegister/SalesRegister.js b/reports/SalesRegister/SalesRegister.js
deleted file mode 100644
index d0d23bef..00000000
--- a/reports/SalesRegister/SalesRegister.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { fyo } from 'src/initFyo';
-
-class SalesRegister {
-  async run({ fromDate, toDate, customer }) {
-    if (!fromDate && !toDate && !customer) return { rows: [] };
-
-    let filters = {};
-    if (customer) {
-      filters.customer = customer;
-    }
-
-    if (fromDate && toDate) {
-      filters.date = ['>=', fromDate, '<=', toDate];
-    } else if (fromDate) {
-      filters.date = ['>=', fromDate];
-    } else if (toDate) {
-      filters.date = ['<=', toDate];
-    }
-
-    const invoices = await fyo.db.getAll({
-      doctype: 'SalesInvoice',
-      fields: ['name', 'date', 'customer', 'account', 'netTotal', 'grandTotal'],
-      filters: filters,
-      orderBy: 'date',
-      order: 'desc',
-    });
-
-    const invoiceNames = invoices.map((d) => d.name);
-
-    const taxes = await fyo.db.getAll({
-      doctype: 'TaxSummary',
-      fields: ['parent', 'amount'],
-      filters: {
-        parenttype: 'Invoice',
-        parent: ['in', invoiceNames],
-      },
-      orderBy: 'name',
-    });
-
-    for (let invoice of invoices) {
-      invoice.totalTax = taxes
-        .filter((tax) => tax.parent === invoice.name)
-        .reduce((acc, tax) => {
-          if (tax.amount) {
-            acc = acc + tax.amount;
-          }
-          return acc;
-        }, 0);
-    }
-
-    return { rows: invoices };
-  }
-}
-
-export default SalesRegister;
diff --git a/reports/SalesRegister/viewConfig.js b/reports/SalesRegister/viewConfig.js
deleted file mode 100644
index 2036ff8b..00000000
--- a/reports/SalesRegister/viewConfig.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const title = 'Sales Register';
-import { t } from 'fyo';
-
-export default {
-  title: title,
-  method: 'sales-register',
-  filterFields: [
-    {
-      fieldtype: 'Link',
-      target: 'Party',
-      label: t`Customer Name`,
-      size: 'small',
-      placeholder: t`Customer Name`,
-      fieldname: 'customer',
-      getFilters: (query) => {
-        if (query)
-          return {
-            keywords: ['like', query],
-            customer: 1,
-          };
-
-        return {
-          customer: 1,
-        };
-      },
-    },
-    {
-      fieldtype: 'Date',
-      fieldname: 'fromDate',
-      size: 'small',
-      placeholder: t`From Date`,
-      label: t`From Date`,
-      required: 1,
-    },
-    {
-      fieldtype: 'Date',
-      size: 'small',
-      placeholder: t`To Date`,
-      fieldname: 'toDate',
-      label: t`To Date`,
-      required: 1,
-    },
-  ],
-  actions: [],
-  getColumns() {
-    return [
-      { label: t`SalesInvoice`, fieldname: 'name' },
-      { label: t`Posting Date`, fieldname: 'date', fieldtype: 'Date' },
-      { label: t`Customer`, fieldname: 'customer' },
-      { label: t`Receivable Account`, fieldname: 'account' },
-      { label: t`Net Total`, fieldname: 'netTotal', fieldtype: 'Currency' },
-      { label: t`Total Tax`, fieldname: 'totalTax', fieldtype: 'Currency' },
-      { label: t`Grand Total`, fieldname: 'grandTotal', fieldtype: 'Currency' },
-    ];
-  },
-};
diff --git a/reports/view.ts b/reports/view.ts
deleted file mode 100644
index b75ebf9b..00000000
--- a/reports/view.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// import BalanceSheetViewConfig from './BalanceSheet/viewConfig';
-// import GeneralLedgerViewConfig from './GeneralLedger/viewConfig';
-// import GoodsAndServiceTaxGSTR1View from './GoodsAndServiceTax/GSTR1View';
-// import GoodsAndServiceTaxGSTR2View from './GoodsAndServiceTax/GSTR2View';
-// import ProfitAndLossViewConfig from './ProfitAndLoss/viewConfig';
-// import PurchaseRegisterViewConfig from './PurchaseRegister/viewConfig';
-// import SalesRegisterViewConfig from './SalesRegister/viewConfig';
-// import TrialBalanceViewConfig from './TrialBalance/viewConfig';
-
-// export default {
-//   'general-ledger': GeneralLedgerViewConfig,
-//   'sales-register': SalesRegisterViewConfig,
-//   'purchase-register': PurchaseRegisterViewConfig,
-//   'balance-sheet': BalanceSheetViewConfig,
-//   'profit-and-loss': ProfitAndLossViewConfig,
-//   'trial-balance': TrialBalanceViewConfig,
-//   'gstr-1': GoodsAndServiceTaxGSTR1View,
-//   'gstr-2': GoodsAndServiceTaxGSTR2View,
-// };
-
-interface ReportView {
-  title: string;
-  method: string;
-}
-
-export default {} as Record<string, ReportView>;
diff --git a/src/components/Charts/BarChart.vue b/src/components/Charts/BarChart.vue
index 25412809..f0c32f69 100644
--- a/src/components/Charts/BarChart.vue
+++ b/src/components/Charts/BarChart.vue
@@ -123,7 +123,7 @@
     >
       <div class="flex flex-col justify-center items-center">
         <p>
-          {{ xi > -1 ? xLabels[xi] : '' }}
+          {{ xi > -1 ? formatX(xLabels[xi]) : '' }}
         </p>
         <p class="font-semibold">
           {{ yi > -1 ? format(points[yi][xi]) : '' }}
@@ -133,8 +133,8 @@
   </div>
 </template>
 <script>
-import Tooltip from '../Tooltip.vue';
 import { prefixFormat } from 'src/utils/chart';
+import Tooltip from '../Tooltip.vue';
 
 export default {
   props: {
diff --git a/src/pages/Dashboard/Cashflow.vue b/src/pages/Dashboard/Cashflow.vue
index 3b116997..ba5798e7 100644
--- a/src/pages/Dashboard/Cashflow.vue
+++ b/src/pages/Dashboard/Cashflow.vue
@@ -80,7 +80,7 @@ export default {
         colors = ['#E9EBED', '#B7BFC6'];
       }
 
-      const xLabels = data.map((cf) => cf['month-year']);
+      const xLabels = data.map((cf) => cf['yearmonth']);
       const points = ['inflow', 'outflow'].map((k) => data.map((d) => d[k]));
 
       const format = (value) => fyo.format(value ?? 0, 'Currency');
@@ -94,8 +94,8 @@ export default {
         this.period
       );
 
-      const data = await fyo.db.getCashflow(fromDate, toDate);
-      const dataMap = getMapFromList(data, 'month-year');
+      const data = await fyo.db.getCashflow(fromDate.toISO(), toDate.toISO());
+      const dataMap = getMapFromList(data, 'yearmonth');
       this.data = periodList.map((p) => {
         const key = p.toFormat('yyyy-MM');
         const item = dataMap[key];
@@ -106,7 +106,7 @@ export default {
         return {
           inflow: 0,
           outflow: 0,
-          'month-year': key,
+          yearmonth: key,
         };
       });
     },
@@ -129,22 +129,22 @@ const dummyData = [
   {
     inflow: 100,
     outflow: 250,
-    'month-year': '2021-05',
+    yearmonth: '2021-05',
   },
   {
     inflow: 350,
     outflow: 100,
-    'month-year': '2021-06',
+    yearmonth: '2021-06',
   },
   {
     inflow: 50,
     outflow: 300,
-    'month-year': '2021-07',
+    yearmonth: '2021-07',
   },
   {
     inflow: 320,
     outflow: 100,
-    'month-year': '2021-08',
+    yearmonth: '2021-08',
   },
 ];
 </script>
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index 4226616a..ff95573f 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -7,12 +7,12 @@
       <hr class="border-t mt-10" />
       <UnpaidInvoices class="mt-10" />
       <hr class="border-t mt-10" />
-      <!--
       <div class="flex justify-between mx-auto mt-10 ml-4 mr-4 gap-10">
         <ProfitAndLoss class="w-1/2" />
+        <!--
         <Expenses class="w-1/2" />
-      </div>
        -->
+      </div>
     </div>
   </div>
 </template>
@@ -21,7 +21,7 @@
 import PageHeader from 'src/components/PageHeader';
 import Cashflow from './Cashflow';
 // import Expenses from './Expenses';
-// import ProfitAndLoss from './ProfitAndLoss';
+import ProfitAndLoss from './ProfitAndLoss';
 import UnpaidInvoices from './UnpaidInvoices';
 
 export default {
@@ -30,8 +30,8 @@ export default {
     PageHeader,
     UnpaidInvoices,
     Cashflow,
-    /*
     ProfitAndLoss,
+    /*
     Expenses,
     */
   },
diff --git a/src/pages/Dashboard/ProfitAndLoss.vue b/src/pages/Dashboard/ProfitAndLoss.vue
index 574ba504..a1bb05da 100644
--- a/src/pages/Dashboard/ProfitAndLoss.vue
+++ b/src/pages/Dashboard/ProfitAndLoss.vue
@@ -28,11 +28,11 @@
   </div>
 </template>
 <script>
-import { fyo } from 'src/initFyo';
 import BarChart from 'src/components/Charts/BarChart.vue';
+import { fyo } from 'src/initFyo';
 import { formatXLabels, getYMax, getYMin } from 'src/utils/chart';
-import { getDatesAndPeriodicity } from 'src/utils/misc';
-import ProfitAndLoss from '../../../reports/ProfitAndLoss/ProfitAndLoss';
+import { getDatesAndPeriodList } from 'src/utils/misc';
+import { getValueMapFromList } from 'utils';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
 
@@ -46,7 +46,7 @@ export default {
   data: () => ({
     period: 'This Year',
     data: [],
-    periodList: [],
+    hasData: false,
   }),
   activated() {
     this.setData();
@@ -56,13 +56,13 @@ export default {
   },
   computed: {
     chartData() {
-      const points = [this.periodList.map((p) => this.data[p])];
+      const points = [this.data.map((d) => d.balance)];
       const colors = [{ positive: '#2490EF', negative: '#B7BFC6' }];
       const format = (value) => fyo.format(value ?? 0, 'Currency');
       const yMax = getYMax(points);
       const yMin = getYMin(points);
       return {
-        xLabels: this.periodList,
+        xLabels: this.data.map((d) => d.yearmonth),
         points,
         format,
         colors,
@@ -71,25 +71,31 @@ export default {
         formatX: formatXLabels,
       };
     },
-    hasData() {
-      return this.periodList.some((key) => this.data[key] !== 0);
-    },
   },
   methods: {
     async setData() {
-      let { fromDate, toDate, periodicity } = await getDatesAndPeriodicity(
+      const { fromDate, toDate, periodList } = await getDatesAndPeriodList(
         this.period
       );
 
-      let pl = new ProfitAndLoss(this.fyo);
-      let res = await pl.run({
-        fromDate,
-        toDate,
-        periodicity,
-      });
+      const data = await fyo.db.getIncomeAndExpenses(
+        fromDate.toISO(),
+        toDate.toISO()
+      );
+      const incomes = getValueMapFromList(data.income, 'yearmonth', 'balance');
+      const expenses = getValueMapFromList(
+        data.expense,
+        'yearmonth',
+        'balance'
+      );
 
-      this.data = res.rows.at(-1);
-      this.periodList = res.columns;
+      this.data = periodList.map((d) => {
+        const key = d.toFormat('yyyy-MM');
+        const inc = incomes[key] ?? 0;
+        const exp = expenses[key] ?? 0;
+        return { yearmonth: key, balance: inc - exp };
+      });
+      this.hasData = data.income.length > 0 || data.expense.length > 0;
     },
   },
 };
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index db731ce5..75499c04 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -80,7 +80,9 @@
     </div>
     <MouseFollower
       v-if="invoices[0].hasData || invoices[1].hasData"
+      :offset="15"
       :show="idx >= 0"
+      placement="top"
       class="text-sm shadow-md px-2 py-1 bg-white text-gray-900 border-l-2"
       :style="{ borderColor: colors[idx] }"
     >
@@ -169,14 +171,14 @@ export default {
 
         const { total, outstanding } = await fyo.db.getTotalOutstanding(
           invoice.schemaName,
-          fromDate,
-          toDate
+          fromDate.toISO(),
+          toDate.toISO()
         );
 
         const { countTotal, countOutstanding } = await this.getCounts(
           invoice.schemaName,
-          DateTime.fromISO(fromDate),
-          DateTime.fromISO(toDate)
+          fromDate,
+          toDate
         );
 
         invoice.total = total ?? 0;
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index f4e18e18..00100317 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -9,7 +9,7 @@ import { fyo } from 'src/initFyo';
 
 export function getDatesAndPeriodList(
   period: 'This Year' | 'This Quarter' | 'This Month'
-): { periodList: DateTime[]; fromDate: string; toDate: string } {
+): { periodList: DateTime[]; fromDate: DateTime; toDate: DateTime } {
   const toDate: DateTime = DateTime.now();
   let fromDate: DateTime;
 
@@ -39,8 +39,8 @@ export function getDatesAndPeriodList(
 
   return {
     periodList,
-    fromDate: fromDate.toISO(),
-    toDate: toDate.toISO(),
+    fromDate,
+    toDate,
   };
 }
 
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 1ecca7c9..cf9fb875 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -1,7 +1,6 @@
 import { t } from 'fyo';
 import { DocValueMap } from 'fyo/core/types';
 import { ModelNameEnum } from 'models/types';
-import reports from 'reports/view';
 import { OptionField } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 import { GetAllOptions } from 'utils/db/types';
@@ -123,13 +122,15 @@ function getCreateList(): SearchItem[] {
 }
 
 function getReportList(): SearchItem[] {
-  return Object.values(reports).map((report) => {
+  /*return Object.values(reports).map((report) => {
     return {
       label: report.title,
       route: `/report/${report.method}`,
       group: 'Report',
     };
   });
+  */
+  return [];
 }
 
 function getListViewList(): SearchItem[] {

From 67f35b5f790aebcecaebd8513be9ca455306a56d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 17 May 2022 13:38:12 +0530
Subject: [PATCH 126/163] incr: get top expenses to display

---
 backend/database/bespoke.ts            | 10 ++++------
 src/pages/Dashboard/Dashboard.vue      | 22 +++++++++-------------
 src/pages/Dashboard/Expenses.vue       | 26 +++++++++++++++++++-------
 src/pages/Dashboard/UnpaidInvoices.vue |  6 +++---
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts
index bd5cc50d..76316dfc 100644
--- a/backend/database/bespoke.ts
+++ b/backend/database/bespoke.ts
@@ -32,13 +32,11 @@ export class BespokeQueries {
 
     const topExpenses = await db
       .knex!.select({
-        total: db.knex!.raw('sum(cast(?? as real)) - sum(cast(?? as real))', [
-          'debit',
-          'credit',
-        ]),
+        total: db.knex!.raw('sum(cast(debit as real) - cast(credit as real))'),
       })
       .select('account')
       .from('AccountingLedgerEntry')
+      .where('reverted', false)
       .where('account', 'in', expenseAccounts)
       .whereBetween('date', [fromDate, toDate])
       .groupBy('account')
@@ -89,7 +87,7 @@ export class BespokeQueries {
   ) {
     const income = await db.knex!.raw(
       `
-      select sum(credit - debit) as balance, strftime('%Y-%m', date) as yearmonth
+      select sum(cast(credit as real) - cast(debit as real)) as balance, strftime('%Y-%m', date) as yearmonth
       from AccountingLedgerEntry
       where
         reverted = false and
@@ -105,7 +103,7 @@ export class BespokeQueries {
 
     const expense = await db.knex!.raw(
       `
-      select sum(debit - credit) as balance, strftime('%Y-%m', date) as yearmonth
+      select sum(cast(debit as real) - cast(credit as real)) as balance, strftime('%Y-%m', date) as yearmonth
       from AccountingLedgerEntry
       where
         reverted = false and
diff --git a/src/pages/Dashboard/Dashboard.vue b/src/pages/Dashboard/Dashboard.vue
index ff95573f..96c5ee17 100644
--- a/src/pages/Dashboard/Dashboard.vue
+++ b/src/pages/Dashboard/Dashboard.vue
@@ -2,16 +2,14 @@
   <div class="flex flex-col">
     <PageHeader :title="t`Dashboard`" />
 
-    <div class="mx-4 overflow-y-scroll no-scrollbar">
-      <Cashflow class="mt-5" />
-      <hr class="border-t mt-10" />
-      <UnpaidInvoices class="mt-10" />
-      <hr class="border-t mt-10" />
-      <div class="flex justify-between mx-auto mt-10 ml-4 mr-4 gap-10">
-        <ProfitAndLoss class="w-1/2" />
-        <!--
-        <Expenses class="w-1/2" />
-       -->
+    <div class="mx-4 overflow-y-scroll no-scrollbar flex flex-col gap-8">
+      <Cashflow class="" />
+      <hr />
+      <UnpaidInvoices />
+      <hr />
+      <div class="flex gap-8">
+        <ProfitAndLoss class="w-full" />
+        <Expenses class="w-full" />
       </div>
     </div>
   </div>
@@ -20,7 +18,7 @@
 <script>
 import PageHeader from 'src/components/PageHeader';
 import Cashflow from './Cashflow';
-// import Expenses from './Expenses';
+import Expenses from './Expenses';
 import ProfitAndLoss from './ProfitAndLoss';
 import UnpaidInvoices from './UnpaidInvoices';
 
@@ -31,9 +29,7 @@ export default {
     UnpaidInvoices,
     Cashflow,
     ProfitAndLoss,
-    /*
     Expenses,
-    */
   },
 };
 </script>
diff --git a/src/pages/Dashboard/Expenses.vue b/src/pages/Dashboard/Expenses.vue
index 2f74a7e3..9e653d6e 100644
--- a/src/pages/Dashboard/Expenses.vue
+++ b/src/pages/Dashboard/Expenses.vue
@@ -7,9 +7,11 @@
       </template>
     </SectionHeader>
     <div class="flex relative" v-show="hasData">
-      <div class="w-1/2">
+      <!-- Chart Legend -->
+      <div class="w-1/2 flex flex-col gap-5 mt-8">
+        <!-- Ledgend Item -->
         <div
-          class="mt-5 flex justify-between items-center text-sm"
+          class="flex justify-between items-center text-sm"
           v-for="(d, i) in expenses"
           :key="d.name"
         >
@@ -18,8 +20,12 @@
             @mouseover="active = i"
             @mouseleave="active = null"
           >
-            <div class="w-3 h-3 rounded-sm" :class="d.class"></div>
-            <div class="ml-3">{{ d.account }}</div>
+            <div class="w-3 h-3 rounded-sm flex-shrink-0" :class="d.class" />
+            <p
+              class="ml-2 w-24 overflow-x-scroll whitespace-nowrap no-scrollbar"
+            >
+              {{ d.account }}
+            </p>
           </div>
           <p class="whitespace-nowrap">
             {{ fyo.format(d.total, 'Currency') }}
@@ -38,6 +44,8 @@
         @change="(value) => (active = value)"
       />
     </div>
+
+    <!-- Empty Message -->
     <div
       v-if="expenses.length === 0"
       class="flex-1 w-full h-full flex-center my-20"
@@ -52,7 +60,7 @@
 <script>
 import { fyo } from 'src/initFyo';
 import theme from 'src/theme';
-import { getDatesAndPeriodicity } from 'src/utils/misc';
+import { getDatesAndPeriodList } from 'src/utils/misc';
 import DonutChart from '../../components/Charts/DonutChart.vue';
 import PeriodSelector from './PeriodSelector';
 import SectionHeader from './SectionHeader';
@@ -94,8 +102,12 @@ export default {
   },
   methods: {
     async setData() {
-      const { fromDate, toDate } = await getDatesAndPeriodicity(this.period);
-      let topExpenses = await fyo.db.getTopExpenses(fromDate, toDate);
+      const { fromDate, toDate } = await getDatesAndPeriodList(this.period);
+      let topExpenses = await fyo.db.getTopExpenses(
+        fromDate.toISO(),
+        toDate.toISO()
+      );
+
       const shades = [
         { class: 'bg-gray-800', hex: theme.backgroundColor.gray['800'] },
         { class: 'bg-gray-600', hex: theme.backgroundColor.gray['600'] },
diff --git a/src/pages/Dashboard/UnpaidInvoices.vue b/src/pages/Dashboard/UnpaidInvoices.vue
index 75499c04..b15a040f 100644
--- a/src/pages/Dashboard/UnpaidInvoices.vue
+++ b/src/pages/Dashboard/UnpaidInvoices.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex justify-between gap-10">
+  <div class="flex justify-between gap-8">
     <div
       class="flex-col justify-between flex-1"
       v-for="(invoice, i) in invoices"
@@ -152,8 +152,8 @@ export default {
         barWidth: 60,
       },
     ],
-    salesInvoicePeriod: 'This Month',
-    purchaseInvoicePeriod: 'This Month',
+    salesInvoicePeriod: 'This Year',
+    purchaseInvoicePeriod: 'This Year',
   }),
   watch: {
     salesInvoicePeriod: 'calculateInvoiceTotals',

From 496b2b77aaf5d4d9ba1aafa9d0053ab683e41286 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 17 May 2022 17:42:57 +0530
Subject: [PATCH 127/163] incr: display gstr reports

---
 accounting/gst.js                            | 332 ------------------
 dummy/helpers.ts                             |   4 +-
 dummy/items.json                             |   2 +-
 dummy/parties.json                           |   2 +-
 models/baseModels/Address/Address.ts         |   5 +-
 models/baseModels/Invoice/Invoice.ts         |   1 +
 models/regionalModels/in/Address.ts          |   7 +-
 models/regionalModels/in/Party.ts            |   3 +
 regional/in.ts                               |  77 +++--
 reports/GoodsAndServiceTax/BaseGSTR.js       |  95 ------
 reports/GoodsAndServiceTax/BaseGSTR.ts       | 340 +++++++++++++++++++
 reports/GoodsAndServiceTax/BaseViewConfig.js | 106 ------
 reports/GoodsAndServiceTax/GSTR1.js          |  32 --
 reports/GoodsAndServiceTax/GSTR1.ts          |  13 +
 reports/GoodsAndServiceTax/GSTR1View.js      |  49 ---
 reports/GoodsAndServiceTax/GSTR2.js          |  26 --
 reports/GoodsAndServiceTax/GSTR2.ts          |  13 +
 reports/GoodsAndServiceTax/GSTR2View.js      |  38 ---
 reports/GoodsAndServiceTax/types.ts          |  28 ++
 reports/index.ts                             |   4 +
 src/components/Controls/Base.vue             |   6 +-
 src/components/Report/ListReport.vue         |  12 +
 src/pages/Dashboard/Expenses.vue             |  36 +-
 src/utils/index.ts                           |  15 +
 src/utils/sidebarConfig.ts                   |   6 +-
 25 files changed, 496 insertions(+), 756 deletions(-)
 delete mode 100644 accounting/gst.js
 delete mode 100644 reports/GoodsAndServiceTax/BaseGSTR.js
 create mode 100644 reports/GoodsAndServiceTax/BaseGSTR.ts
 delete mode 100644 reports/GoodsAndServiceTax/BaseViewConfig.js
 delete mode 100644 reports/GoodsAndServiceTax/GSTR1.js
 create mode 100644 reports/GoodsAndServiceTax/GSTR1.ts
 delete mode 100644 reports/GoodsAndServiceTax/GSTR1View.js
 delete mode 100644 reports/GoodsAndServiceTax/GSTR2.js
 create mode 100644 reports/GoodsAndServiceTax/GSTR2.ts
 delete mode 100644 reports/GoodsAndServiceTax/GSTR2View.js
 create mode 100644 reports/GoodsAndServiceTax/types.ts

diff --git a/accounting/gst.js b/accounting/gst.js
deleted file mode 100644
index 65fdb261..00000000
--- a/accounting/gst.js
+++ /dev/null
@@ -1,332 +0,0 @@
-import { t } from 'fyo';
-import { DateTime } from 'luxon';
-import { fyo } from 'src/initFyo';
-import { showMessageDialog } from 'src/utils';
-import { stateCodeMap } from '../regional/in';
-import { exportCsv, saveExportData } from '../reports/commonExporter';
-import { getSavePath } from '../src/utils';
-
-const GST = {
-  'GST-0': 0,
-  'GST-0.25': 0.25,
-  'GST-3': 3,
-  'GST-5': 5,
-  'GST-6': 6,
-  'GST-12': 12,
-  'GST-18': 18,
-  'GST-28': 28,
-  'IGST-0': 0,
-  'IGST-0.25': 0.25,
-  'IGST-3': 3,
-  'IGST-5': 5,
-  'IGST-6': 6,
-  'IGST-12': 12,
-  'IGST-18': 18,
-  'IGST-28': 28,
-};
-
-const CSGST = {
-  'GST-0': 0,
-  'GST-0.25': 0.125,
-  'GST-3': 1.5,
-  'GST-5': 2.5,
-  'GST-6': 3,
-  'GST-12': 6,
-  'GST-18': 9,
-  'GST-28': 14,
-};
-
-const IGST = {
-  'IGST-0.25': 0.25,
-  'IGST-3': 3,
-  'IGST-5': 5,
-  'IGST-6': 6,
-  'IGST-12': 12,
-  'IGST-18': 18,
-  'IGST-28': 28,
-};
-
-export async function generateGstr1Json(getReportData) {
-  const { gstin } = fyo.AccountingSettings;
-  if (!gstin) {
-    showMessageDialog({
-      message: t`Export Failed`,
-      detail: t`Please set GSTIN in General Settings.`,
-    });
-    return;
-  }
-
-  const {
-    rows,
-    filters: { transferType, toDate },
-  } = getReportData();
-
-  const { filePath, canceled } = await getSavePath('gstr-1', 'json');
-  if (canceled || !filePath) return;
-
-  const gstData = {
-    version: 'GST3.0.4',
-    hash: 'hash',
-    gstin: gstin,
-    // fp is the the MMYYYY for the last month of the report
-    // for example if you are extracting report for 1st July 2020 to 31st September 2020 then
-    // fb = 092020
-    fp: DateTime.fromISO(toDate).toFormat('MMyyyy'),
-  };
-
-  if (transferType === 'B2B') {
-    gstData.b2b = await generateB2bData(rows);
-  } else if (transferType === 'B2CL') {
-    gstData.b2cl = await generateB2clData(rows);
-  } else if (transferType === 'B2CS') {
-    gstData.b2cs = await generateB2csData(rows);
-  }
-
-  const jsonData = JSON.stringify(gstData);
-  await saveExportData(jsonData, filePath);
-}
-
-async function generateB2bData(rows) {
-  const b2b = [];
-
-  for (let row of rows) {
-    const customer = {
-      ctin: row.gstin,
-      inv: [],
-    };
-
-    const invRecord = {
-      inum: row.invNo,
-      idt: DateTime.fromFormat(row.invDate, 'yyyy-MM-dd').toFormat(
-        'dd-MM-yyyy'
-      ),
-      val: row.invAmt,
-      pos: row.gstin && row.gstin.substring(0, 2),
-      rchrg: row.reverseCharge,
-      inv_typ: 'R',
-      itms: [],
-    };
-
-    const items = await fyo.db.getAllRaw('SalesInvoiceItem', {
-      fields: ['*'],
-      filters: { parent: invRecord.inum },
-    });
-
-    items.forEach((item) => {
-      const itemRecord = {
-        num: item.hsnCode,
-        itm_det: {
-          txval: fyo.pesa(item.baseAmount).float,
-          rt: GST[item.tax],
-          csamt: 0,
-          camt: fyo
-            .pesa(CSGST[item.tax] || 0)
-            .mul(item.baseAmount)
-            .div(100).float,
-          samt: fyo
-            .pesa(CSGST[item.tax] || 0)
-            .mul(item.baseAmount)
-            .div(100).float,
-          iamt: fyo
-            .pesa(IGST[item.tax] || 0)
-            .mul(item.baseAmount)
-            .div(100).float,
-        },
-      };
-
-      invRecord.itms.push(itemRecord);
-    });
-
-    const customerRecord = b2b.find((b) => b.ctin === row.gstin);
-
-    if (customerRecord) {
-      customerRecord.inv.push(invRecord);
-    } else {
-      customer.inv.push(invRecord);
-      b2b.push(customer);
-    }
-  }
-
-  return b2b;
-}
-
-async function generateB2clData(invoices) {
-  const b2cl = [];
-
-  for (let invoice of invoices) {
-    const stateInvoiceRecord = {
-      pos: stateCodeMap[invoice.place.toUpperCase()],
-      inv: [],
-    };
-
-    const invRecord = {
-      inum: invoice.invNo,
-      idt: DateTime.fromFormat(invoice.invDate, 'yyyy-MM-dd').toFormat(
-        'dd-MM-yyyy'
-      ),
-      val: invoice.invAmt,
-      itms: [],
-    };
-
-    const items = await fyo.db.getAllRaw('SalesInvoiceItem', {
-      fields: ['*'],
-      filters: { parent: invRecord.inum },
-    });
-
-    items.forEach((item) => {
-      const itemRecord = {
-        num: item.hsnCode,
-        itm_det: {
-          txval: fyo.pesa(item.baseAmount).float,
-          rt: GST[item.tax],
-          csamt: 0,
-          iamt: fyo
-            .pesa(invoice.rate || 0)
-            .mul(item.baseAmount)
-            .div(100).float,
-        },
-      };
-
-      invRecord.itms.push(itemRecord);
-    });
-
-    const stateRecord = b2cl.find((b) => b.pos === stateCodeMap[invoice.place]);
-
-    if (stateRecord) {
-      stateRecord.inv.push(invRecord);
-    } else {
-      stateInvoiceRecord.inv.push(invRecord);
-      b2cl.push(stateInvoiceRecord);
-    }
-  }
-
-  return b2cl;
-}
-
-async function generateB2csData(invoices) {
-  const b2cs = [];
-
-  for (let invoice of invoices) {
-    const pos = invoice.place.toUpperCase();
-
-    const invRecord = {
-      sply_ty: invoice.inState ? 'INTRA' : 'INTER',
-      pos: stateCodeMap[pos],
-      // "OE" - Abbreviation for errors and omissions excepted.
-      typ: 'OE',
-      txval: invoice.taxVal,
-      rt: invoice.rate,
-      iamt: !invoice.inState ? (invoice.taxVal * invoice.rate) / 100 : 0,
-      camt: invoice.inState ? invoice.cgstAmt : 0,
-      samt: invoice.inState ? invoice.sgstAmt : 0,
-      csamt: 0,
-    };
-
-    b2cs.push(invRecord);
-  }
-
-  return b2cs;
-}
-
-export async function generateGstr2Csv(getReportData) {
-  const { gstin } = fyo.AccountingSettings;
-  if (!gstin) {
-    showMessageDialog({
-      message: t`Export Failed`,
-      detail: t`Please set GSTIN in General Settings.`,
-    });
-    return;
-  }
-
-  const {
-    rows,
-    columns,
-    filters: { transferType, toDate },
-  } = getReportData();
-
-  const { filePath, canceled } = await getSavePath('gstr-2', 'csv');
-  if (canceled || !filePath) return;
-
-  let gstData;
-  if (transferType === 'B2B') {
-    gstData = await generateB2bCsvGstr2(rows, columns);
-  }
-
-  await exportCsv(gstData.rows, gstData.columns, filePath);
-}
-
-async function generateB2bCsvGstr2(rows, columns) {
-  const csvColumns = [
-    {
-      label: t`GSTIN of Supplier`,
-      fieldname: 'gstin',
-    },
-    {
-      label: t`Invoice Number`,
-      fieldname: 'invNo',
-    },
-    {
-      label: t`Invoice Date`,
-      fieldname: 'invDate',
-    },
-    {
-      label: t`Invoice Value`,
-      fieldname: 'invAmt',
-    },
-    {
-      label: t`Place of supply`,
-      fieldname: 'place',
-    },
-    {
-      label: t`Reverse Charge`,
-      fieldname: 'reverseCharge',
-    },
-    {
-      label: t`Rate`,
-      fieldname: 'rate',
-    },
-    {
-      label: t`Taxable Value`,
-      fieldname: 'taxVal',
-    },
-    {
-      label: t`Intergrated Tax Paid`,
-      fieldname: 'igstAmt',
-    },
-    {
-      label: t`Central Tax Paid`,
-      fieldname: 'cgstAmt',
-    },
-    {
-      label: t`State/UT Tax Paid`,
-      fieldname: 'sgstAmt',
-    },
-  ];
-
-  return {
-    columns: csvColumns || [],
-    rows: rows || [],
-  };
-}
-
-export async function generateGstr1Csv(getReportData) {
-  const { gstin } = fyo.AccountingSettings;
-  if (!gstin) {
-    showMessageDialog({
-      message: t`Export Failed`,
-      detail: t`Please set GSTIN in General Settings.`,
-    });
-    return;
-  }
-
-  const {
-    rows,
-    columns,
-    filters: { transferType, toDate },
-  } = getReportData();
-
-  const { filePath, canceled } = await getSavePath('gstr-1', 'csv');
-  if (canceled || !filePath) return;
-
-  await exportCsv(rows, columns, filePath);
-}
diff --git a/dummy/helpers.ts b/dummy/helpers.ts
index 2012d801..a6e837a1 100644
--- a/dummy/helpers.ts
+++ b/dummy/helpers.ts
@@ -22,9 +22,7 @@ export const purchaseItemPartyMap: Record<string, string> = Object.keys(
   return acc;
 }, {} as Record<string, string>);
 
-export const flow = [
-  0.15, 0.1, 0.25, 0.1, 0.01, 0.01, 0.01, 0.05, 0, 0.15, 0.2, 0.4,
-];
+export const flow = [0.25, 0.2, 0.35, 0.2, 0.1, 0.01, 0.01, 0.15, 0, 0.25, 0.3, 0.5];
 export function getFlowConstant(months: number) {
   // Jan to December
 
diff --git a/dummy/items.json b/dummy/items.json
index 98b3d820..09acafbb 100644
--- a/dummy/items.json
+++ b/dummy/items.json
@@ -1 +1 @@
-[{"name": "Dry-Cleaning", "description": null, "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 69, "hsnCode": 999712, "for": "Sales"}, {"name": "Electricity", "description": "Bzz Bzz", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Utility Expenses", "tax": "GST-0", "rate": 6000, "hsnCode": 271600, "for": "Purchases"}, {"name": "Marketing - Video", "description": "One single video", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 15000, "hsnCode": 998371, "for": "Purchases"}, {"name": "Office Rent", "description": "Rent per day", "unit": "Day", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Office Rent", "tax": "GST-18", "rate": 100000, "hsnCode": 997212, "for": "Purchases"}, {"name": "Office Cleaning", "description": "Cleaning cost per day", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Office Maintenance Expenses", "tax": "GST-18", "rate": 100000, "hsnCode": 998533, "for": "Purchases"}, {"name": "Social Ads", "description": "Cost per click", "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 50, "hsnCode": 99836, "for": "Purchases"}, {"name": "Cool Cloth", "description": "Some real \ud83c\udd92 cloth", "unit": "Meter", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4000, "hsnCode": 59111000, "for": "Both"}, {"name": "611 Jeans - PCH", "description": "Peach coloured 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 4499, "hsnCode": 62034990, "for": "Both"}, {"name": "611 Jeans - SHR", "description": "Shark skin 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 6499, "hsnCode": 62034990, "for": "Both"}, {"name": "Bominga Shoes", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4999, "hsnCode": 640291, "for": "Both"}, {"name": "Cryo Gloves", "description": "Keeps hands cool", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 3499, "hsnCode": 611693, "for": "Both"}, {"name": "Epaulettes - 4POR", "description": "Porcelain epaulettes", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2499, "hsnCode": 62179090, "for": "Both"}, {"name": "Full Sleeve - BLK", "description": "Black sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 599, "hsnCode": 100820, "for": "Both"}, {"name": "Full Sleeve - COL", "description": "All color sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 499, "hsnCode": 100820, "for": "Both"}, {"name": "Jacket - RAW", "description": "Raw baby skinned jackets", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 8999, "hsnCode": 100820, "for": "Both"}, {"name": "Jade Slippers", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2999, "hsnCode": 640520, "for": "Both"}]
\ No newline at end of file
+[{"name": "Dry-Cleaning", "description": null, "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 69, "hsnCode": 999712, "for": "Sales"}, {"name": "Electricity", "description": "Bzz Bzz", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Utility Expenses", "tax": "GST-0", "rate": 6000, "hsnCode": 271600, "for": "Purchases"}, {"name": "Marketing - Video", "description": "One single video", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 15000, "hsnCode": 998371, "for": "Purchases"}, {"name": "Office Rent", "description": "Rent per day", "unit": "Day", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Office Rent", "tax": "GST-18", "rate": 50000, "hsnCode": 997212, "for": "Purchases"}, {"name": "Office Cleaning", "description": "Cleaning cost per day", "unit": "Day", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Office Maintenance Expenses", "tax": "GST-18", "rate": 7500, "hsnCode": 998533, "for": "Purchases"}, {"name": "Social Ads", "description": "Cost per click", "unit": "Unit", "itemType": "Service", "incomeAccount": "Service", "expenseAccount": "Marketing Expenses", "tax": "GST-18", "rate": 50, "hsnCode": 99836, "for": "Purchases"}, {"name": "Cool Cloth", "description": "Some real \ud83c\udd92 cloth", "unit": "Meter", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4000, "hsnCode": 59111000, "for": "Both"}, {"name": "611 Jeans - PCH", "description": "Peach coloured 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 4499, "hsnCode": 62034990, "for": "Both"}, {"name": "611 Jeans - SHR", "description": "Shark skin 611s", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 6499, "hsnCode": 62034990, "for": "Both"}, {"name": "Bominga Shoes", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 4999, "hsnCode": 640291, "for": "Both"}, {"name": "Cryo Gloves", "description": "Keeps hands cool", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 3499, "hsnCode": 611693, "for": "Both"}, {"name": "Epaulettes - 4POR", "description": "Porcelain epaulettes", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2499, "hsnCode": 62179090, "for": "Both"}, {"name": "Full Sleeve - BLK", "description": "Black sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 599, "hsnCode": 100820, "for": "Both"}, {"name": "Full Sleeve - COL", "description": "All color sleeved", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 499, "hsnCode": 100820, "for": "Both"}, {"name": "Jacket - RAW", "description": "Raw baby skinned jackets", "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-12", "rate": 8999, "hsnCode": 100820, "for": "Both"}, {"name": "Jade Slippers", "description": null, "unit": "Unit", "itemType": "Product", "incomeAccount": "Sales", "expenseAccount": "Cost of Goods Sold", "tax": "GST-18", "rate": 2999, "hsnCode": 640520, "for": "Both"}]
\ No newline at end of file
diff --git a/dummy/parties.json b/dummy/parties.json
index 7ba08c18..6871abf4 100644
--- a/dummy/parties.json
+++ b/dummy/parties.json
@@ -1 +1 @@
-[{"name": "Roy Rolston", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy-rolston.243@generic_indian.in", "phone": "+91 8673-431508", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Aloysius Albuquerque", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aloysius.albuquerque_909@gmail.com", "phone": "+91 6077-213977", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "James", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "james_133@generic_indian.in", "phone": "+91 6612-501211", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Mary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6081-020316", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Robert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "robert_434@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patricia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patricia_100@partiesunited.co", "phone": "+91 8559-301636", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "John", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "john_411@partiesunited.co", "phone": "+91 8025-338366", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jennifer", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jennifer_308@generic_indian.in", "phone": "+91 8011-889773", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Michael", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michael-851@redis.rs", "phone": "+91 9051-544006", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Linda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "linda-316@yahoo.co.in", "phone": "+91 8521-103184", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "William", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "william_825@gmail.com", "phone": "+91 7872-683669", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elizabeth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elizabeth.119@gmail.com", "phone": "+91 8762-458159", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "David", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "david_976@redis.rs", "phone": "+91 8107-285956", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Barbara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "barbara.781@partiesunited.co", "phone": "+91 9315-603377", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Richard", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "richard.37@yahoo.co.in", "phone": "+91 6932-849598", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Susan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "susan.782@redis.rs", "phone": "+91 7802-101844", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joseph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joseph@partiesunited.co", "phone": "+91 7993-701055", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jessica", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jessica-498@gmail.com", "phone": "+91 6288-147387", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Thomas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "thomas-831@yahoo.co.in", "phone": "+91 6150-277307", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sarah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sarah-821@gmail.com", "phone": "+91 7834-468508", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charles", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charles-440@generic_indian.in", "phone": "+91 9652-716987", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Karen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "karen_745@generic_indian.in", "phone": "+91 8031-054884", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christopher", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christopher_856@yahoo.co.in", "phone": "+91 8054-054595", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nancy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nancy_876@partiesunited.co", "phone": "+91 9623-437324", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Daniel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lisa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lisa.763@yahoo.co.in", "phone": "+91 7425-212962", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Matthew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "matthew.769@generic_indian.in", "phone": "+91 7585-335288", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Betty", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "betty.954@generic_indian.in", "phone": "+91 8910-292787", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Anthony", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anthony_135@redis.rs", "phone": "+91 6442-915158", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Margaret", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "margaret@yahoo.co.in", "phone": "+91 9900-176473", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Mark", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "mark-313@redis.rs", "phone": "+91 6425-429890", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Sandra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7184-095331", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Donald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donald@gmail.com", "phone": "+91 8599-995758", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Ashley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ashley.442@generic_indian.in", "phone": "+91 9702-537030", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Steven", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "steven-693@yahoo.co.in", "phone": "+91 9024-337715", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kimberly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kimberly_316@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Paul", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "paul_553@gmail.com", "phone": "+91 8896-498910", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emily", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emily.859@redis.rs", "phone": "+91 9537-954916", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrew.21@partiesunited.co", "phone": "+91 7061-410554", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Donna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donna_209@yahoo.co.in", "phone": "+91 6918-117768", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joshua", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joshua.54@partiesunited.co", "phone": "+91 7997-664425", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Michelle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michelle-558@partiesunited.co", "phone": "+91 7234-792697", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kenneth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kenneth.124@partiesunited.co", "phone": "+91 6388-353257", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dorothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dorothy.722@yahoo.co.in", "phone": "+91 8768-999569", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kevin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kevin.700@partiesunited.co", "phone": "+91 9947-180680", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carol", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carol_967@partiesunited.co", "phone": "+91 7690-935998", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brian.135@generic_indian.in", "phone": "+91 6760-645133", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Amanda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amanda_465@gmail.com", "phone": "+91 9374-006670", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "George", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "george-684@gmail.com", "phone": "+91 7865-482442", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Melissa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "melissa-92@gmail.com", "phone": "+91 9276-351947", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Edward", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "edward-724@redis.rs", "phone": "+91 8878-239777", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Deborah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "deborah-948@gmail.com", "phone": "+91 9971-174980", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ronald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ronald.712@yahoo.co.in", "phone": "+91 8660-547203", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephanie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephanie_503@yahoo.co.in", "phone": "+91 9686-335218", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Timothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "timothy-659@redis.rs", "phone": "+91 9242-666484", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rebecca", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rebecca.909@generic_indian.in", "phone": "+91 6157-734755", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jason", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jason.519@redis.rs", "phone": "+91 7376-163583", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sharon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sharon@partiesunited.co", "phone": "+91 9030-867592", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeffrey", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeffrey.269@redis.rs", "phone": "+91 6155-787954", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Laura", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "laura-507@yahoo.co.in", "phone": "+91 9275-073654", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ryan-197@generic_indian.in", "phone": "+91 6964-549642", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cynthia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cynthia_737@redis.rs", "phone": "+91 7151-704445", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jacob", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacob.131@generic_indian.in", "phone": "+91 6720-918848", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathleen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathleen.509@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gary_422@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amy@partiesunited.co", "phone": "+91 6603-938674", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nicholas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicholas_902@generic_indian.in", "phone": "+91 6916-877233", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Shirley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "shirley.680@yahoo.co.in", "phone": "+91 8031-368297", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Eric", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eric_294@yahoo.co.in", "phone": "+91 8000-105404", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Angela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "angela-786@partiesunited.co", "phone": "+91 6472-464465", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jonathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jonathan_247@gmail.com", "phone": "+91 9606-808217", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Helen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "helen-896@redis.rs", "phone": "+91 9292-092553", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Stephen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephen_570@redis.rs", "phone": "+91 7075-893154", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Anna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anna-892@partiesunited.co", "phone": "+91 9984-317917", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Larry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6981-350385", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brenda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brenda_857@redis.rs", "phone": "+91 9048-980115", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Justin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "justin_87@partiesunited.co", "phone": "+91 6562-623759", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Pamela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "pamela-143@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Scott", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7065-102356", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Nicole", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicole_813@yahoo.co.in", "phone": "+91 6639-036774", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brandon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Emma", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emma@generic_indian.in", "phone": "+91 9754-565236", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Benjamin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "benjamin.607@generic_indian.in", "phone": "+91 6050-030214", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samantha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samantha_307@partiesunited.co", "phone": "+91 7580-455682", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Samuel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samuel_241@partiesunited.co", "phone": "+91 6069-872786", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Katherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "katherine-577@yahoo.co.in", "phone": "+91 9997-474009", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gregory", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gregory_127@redis.rs", "phone": "+91 7253-710783", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christine@generic_indian.in", "phone": "+91 6293-485105", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frank", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frank_483@generic_indian.in", "phone": "+91 6108-326068", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Debra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "debra.627@redis.rs", "phone": "+91 9828-819615", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexander", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexander-930@generic_indian.in", "phone": "+91 7739-815431", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rachel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rachel-974@generic_indian.in", "phone": "+91 8208-032828", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Raymond", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "raymond@generic_indian.in", "phone": "+91 6157-997059", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Catherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "catherine-558@gmail.com", "phone": "+91 6483-743758", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Patrick", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patrick-219@redis.rs", "phone": "+91 9461-091027", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carolyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7096-205664", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jack", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jack_834@yahoo.co.in", "phone": "+91 9824-334265", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janet", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janet.630@yahoo.co.in", "phone": "+91 9343-312052", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dennis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dennis-885@generic_indian.in", "phone": "+91 6595-499139", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ruth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ruth_748@redis.rs", "phone": "+91 6129-548924", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jerry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jerry-737@redis.rs", "phone": "+91 6587-158112", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Maria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8540-576184", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Tyler", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "tyler.608@yahoo.co.in", "phone": "+91 8120-401026", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Heather", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "heather.936@yahoo.co.in", "phone": "+91 7403-810842", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Aaron", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aaron-848@partiesunited.co", "phone": "+91 6903-123806", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diane", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diane_524@yahoo.co.in", "phone": "+91 6848-481723", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7697-063913", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Virginia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Adam", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "adam-315@gmail.com", "phone": "+91 7901-689261", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julie.230@redis.rs", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Henry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "henry@redis.rs", "phone": "+91 9768-025008", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joyce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joyce.11@redis.rs", "phone": "+91 8242-739499", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Nathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nathan@yahoo.co.in", "phone": "+91 8308-038476", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Victoria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "victoria_754@redis.rs", "phone": "+91 8148-203319", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Douglas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "douglas_697@yahoo.co.in", "phone": "+91 8502-237693", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Olivia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "olivia_85@partiesunited.co", "phone": "+91 6223-560874", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Zachary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "zachary_505@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kelly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kelly_210@yahoo.co.in", "phone": "+91 8087-195915", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Peter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "peter.799@yahoo.co.in", "phone": "+91 8125-227555", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kyle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kyle_373@yahoo.co.in", "phone": "+91 7395-383762", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Lauren", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lauren_877@gmail.com", "phone": "+91 9360-951111", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Walter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "walter@gmail.com", "phone": "+91 9514-260980", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joan-490@generic_indian.in", "phone": "+91 8336-845169", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ethan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ethan.413@yahoo.co.in", "phone": "+91 9179-041456", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Evelyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "evelyn-598@redis.rs", "phone": "+91 7981-294172", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jeremy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeremy-835@redis.rs", "phone": "+91 9147-220263", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judith.20@yahoo.co.in", "phone": "+91 7251-751246", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Harold", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "harold_551@redis.rs", "phone": "+91 9401-384317", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Megan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "megan.904@generic_indian.in", "phone": "+91 7925-884527", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Keith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "keith_210@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Cheryl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cheryl.732@yahoo.co.in", "phone": "+91 9487-572037", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Christian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christian_480@yahoo.co.in", "phone": "+91 9411-240949", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Andrea", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrea@generic_indian.in", "phone": "+91 8727-997312", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Roger", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roger_641@redis.rs", "phone": "+91 7473-818935", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Hannah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "hannah.769@yahoo.co.in", "phone": "+91 6686-668901", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Noah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "noah_207@yahoo.co.in", "phone": "+91 8992-301729", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Martha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "martha-310@yahoo.co.in", "phone": "+91 6313-479933", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gerald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gerald_179@yahoo.co.in", "phone": "+91 9887-686162", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jacqueline", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacqueline@gmail.com", "phone": "+91 8593-840483", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Carl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carl.824@redis.rs", "phone": "+91 9097-819761", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Frances", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frances_39@partiesunited.co", "phone": "+91 7824-282142", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Terry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "terry.141@gmail.com", "phone": "+91 7348-035379", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Gloria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gloria_30@yahoo.co.in", "phone": "+91 8806-055737", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Sean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sean_95@gmail.com", "phone": "+91 8934-646432", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ann", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ann_288@yahoo.co.in", "phone": "+91 9000-981649", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Austin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9052-505694", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Teresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "teresa@redis.rs", "phone": "+91 8881-147169", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Arthur", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "arthur_297@generic_indian.in", "phone": "+91 7099-547700", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kathryn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathryn-111@partiesunited.co", "phone": "+91 8094-478845", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Lawrence", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lawrence-786@generic_indian.in", "phone": "+91 6605-548110", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sara_839@generic_indian.in", "phone": "+91 9246-881823", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jesse", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jesse.754@redis.rs", "phone": "+91 9735-507412", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Janice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janice.373@yahoo.co.in", "phone": "+91 6024-331463", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Dylan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9281-407234", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jean.752@redis.rs", "phone": "+91 9760-343923", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Bryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bryan-366@gmail.com", "phone": "+91 7075-562308", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Alice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alice_184@partiesunited.co", "phone": "+91 9859-541927", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Joe", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joe_938@redis.rs", "phone": "+91 8006-110462", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Madison", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "madison-73@generic_indian.in", "phone": "+91 9678-686103", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Jordan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jordan_36@generic_indian.in", "phone": "+91 8632-788053", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Doris", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "doris.619@partiesunited.co", "phone": "+91 6587-381586", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Billy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "billy-142@redis.rs", "phone": "+91 9406-093375", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Abigail", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "abigail-990@redis.rs", "phone": "+91 9206-424202", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bruce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bruce-731@yahoo.co.in", "phone": "+91 7316-922695", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Julia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julia-342@gmail.com", "phone": "+91 9487-215411", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Albert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9968-538377", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Judy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judy_273@partiesunited.co", "phone": "+91 7531-535899", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Willie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "willie.643@yahoo.co.in", "phone": "+91 6099-745727", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Grace", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8615-872677", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Gabriel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gabriel-143@partiesunited.co", "phone": "+91 7176-396024", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Denise", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9742-780556", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Logan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "logan-501@partiesunited.co", "phone": "+91 7502-995330", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Amber", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amber_656@partiesunited.co", "phone": "+91 6443-649379", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alan.559@partiesunited.co", "phone": "+91 9366-429457", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marilyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marilyn-955@gmail.com", "phone": "+91 7325-781593", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Juan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "juan.265@gmail.com", "phone": "+91 7281-553316", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Beverly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "beverly.942@gmail.com", "phone": "+91 9131-160413", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Wayne", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "wayne_126@generic_indian.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Danielle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "danielle@generic_indian.in", "phone": "+91 7340-384768", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Roy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy_727@gmail.com", "phone": "+91 7704-501835", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Theresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "theresa_105@partiesunited.co", "phone": "+91 9967-448938", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Ralph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ralph@gmail.com", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Sophia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sophia-673@generic_indian.in", "phone": "+91 8223-607553", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Randy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "randy_860@generic_indian.in", "phone": "+91 6169-701291", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Marie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marie-30@gmail.com", "phone": "+91 9268-326999", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Eugene", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eugene.184@partiesunited.co", "phone": "+91 9559-021953", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Diana", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diana-382@gmail.com", "phone": "+91 9924-520313", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Vincent", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "vincent@gmail.com", "phone": "+91 8501-753300", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Brittany", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brittany-498@redis.rs", "phone": null, "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Russell", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "russell-231@generic_indian.in", "phone": "+91 9483-010961", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Natalie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "natalie.274@partiesunited.co", "phone": "+91 9173-621005", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Elijah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elijah-297@generic_indian.in", "phone": "+91 6003-986454", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Isabella", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "isabella_744@gmail.com", "phone": "+91 8748-767047", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Louis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "louis.458@yahoo.co.in", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Charlotte", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charlotte_854@gmail.com", "phone": "+91 8977-318168", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Bobby", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bobby-848@gmail.com", "phone": "+91 7823-275321", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Rose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rose-115@yahoo.co.in", "phone": "+91 9256-804668", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Philip", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "philip.671@generic_indian.in", "phone": "+91 9883-666803", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Alexis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexis.502@partiesunited.co", "phone": null, "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Johnny", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "johnny-539@redis.rs", "phone": "+91 7375-255292", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Kayla", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kayla.143@generic_indian.in", "phone": "+91 8955-753462", "address": null, "gst_type": "Consumer", "gstin": null}, {"name": "Le Socials", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "le-socials_303@partiesunited.co", "phone": "+91 7291-372570", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Janky Office Spaces", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "janky_office_spaces@generic_indian.in", "phone": "+91 6940-107991", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Josf\u00e9\u00f1a's 611s", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "josf\u00e9\u00f1a's_611s.655@partiesunited.co", "phone": "+91 6457-794213", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Lankness Feet Fomenters", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "lankness.feet.fomenters_579@generic_indian.in", "phone": "+91 6656-484318", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "The Overclothes Company", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "the-overclothes-company.136@partiesunited.co", "phone": "+91 7766-798598", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Adani Electricity Mumbai Limited", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "adani-electricity-mumbai-limited_190@redis.rs", "phone": "+91 7465-683036", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Only Fulls", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "only_fulls.358@generic_indian.in", "phone": "+91 6685-388192", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Just Epaulettes", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "just-epaulettes_400@partiesunited.co", "phone": "+91 7847-418151", "address": null, "gst_type": "Registered Regular", "gstin": null}, {"name": "Maxwell", "role": "Both", "defaultAccount": null, "currency": "INR", "email": "maxwell-757@partiesunited.co", "phone": "+91 8178-647022", "address": null, "gst_type": "Unregistered", "gstin": null}]
\ No newline at end of file
+[{"name": "Roy Rolston", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy-rolston@partiesunited.co", "phone": "+91 8364-764417", "address": null, "gstType": "Registered Regular", "gstin": "27YQPCH7868M1Z4"}, {"name": "Aloysius Albuquerque", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aloysius.albuquerque-418@gmail.com", "phone": "+91 9624-847744", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "James", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Mary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "mary-654@partiesunited.co", "phone": "+91 6578-469775", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Robert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "robert-153@gmail.com", "phone": "+91 8187-238152", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Patricia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patricia_477@partiesunited.co", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "John", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "john_629@redis.rs", "phone": "+91 9912-497940", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jennifer", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jennifer_241@yahoo.co.in", "phone": "+91 7525-888566", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Michael", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michael_330@redis.rs", "phone": "+91 6392-754783", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Linda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "linda.739@redis.rs", "phone": "+91 7645-479546", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "William", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "william_187@gmail.com", "phone": "+91 6040-716971", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Elizabeth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elizabeth-739@redis.rs", "phone": "+91 9086-927694", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "David", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "david.231@redis.rs", "phone": "+91 8933-614178", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Barbara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "barbara-287@yahoo.co.in", "phone": "+91 8884-319024", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Richard", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "richard-971@redis.rs", "phone": "+91 8618-127941", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Susan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "susan-915@redis.rs", "phone": "+91 7251-099321", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Joseph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joseph-107@partiesunited.co", "phone": "+91 8663-691738", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jessica", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jessica.990@gmail.com", "phone": "+91 6998-742236", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Thomas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "thomas.926@generic_indian.in", "phone": "+91 7084-655002", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Sarah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sarah@generic_indian.in", "phone": "+91 7550-184329", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Charles", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charles.73@generic_indian.in", "phone": "+91 9789-506872", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Karen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "karen.117@redis.rs", "phone": "+91 9267-675391", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Christopher", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7327-130379", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Nancy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nancy-257@generic_indian.in", "phone": "+91 8224-410113", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Daniel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "daniel_417@partiesunited.co", "phone": "+91 7927-461249", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Lisa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lisa-919@gmail.com", "phone": "+91 8757-609167", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Matthew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "matthew_656@gmail.com", "phone": "+91 7885-004818", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Betty", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "betty-750@partiesunited.co", "phone": "+91 6023-939214", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Anthony", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anthony.855@generic_indian.in", "phone": "+91 7786-783597", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Margaret", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "margaret.476@redis.rs", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Mark", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "mark_883@yahoo.co.in", "phone": "+91 6085-686899", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Sandra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8370-381962", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Donald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donald.588@redis.rs", "phone": "+91 9391-684888", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Ashley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ashley_875@partiesunited.co", "phone": "+91 8484-066804", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Steven", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "steven.621@gmail.com", "phone": "+91 9508-736407", "address": null, "gstType": "Registered Regular", "gstin": "22YVIPP4362P1Z0"}, {"name": "Kimberly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6336-613829", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Paul", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "paul_94@gmail.com", "phone": "+91 9636-016561", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Emily", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emily.9@partiesunited.co", "phone": "+91 9446-701003", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Andrew", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6932-393648", "address": null, "gstType": "Registered Regular", "gstin": "30VGGPM2265X1Z7"}, {"name": "Donna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "donna_761@generic_indian.in", "phone": "+91 8500-322971", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Joshua", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joshua_519@partiesunited.co", "phone": "+91 9554-755939", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Michelle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "michelle_12@gmail.com", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Kenneth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kenneth-395@partiesunited.co", "phone": "+91 9464-655370", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Dorothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dorothy-735@partiesunited.co", "phone": "+91 7618-732184", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Kevin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kevin.407@gmail.com", "phone": "+91 6609-978693", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Carol", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carol_598@yahoo.co.in", "phone": "+91 6810-371783", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Brian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brian-175@yahoo.co.in", "phone": "+91 9108-370654", "address": null, "gstType": "Registered Regular", "gstin": "32WVYPD4263C1Z6"}, {"name": "Amanda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7132-399853", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "George", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "george.582@yahoo.co.in", "phone": "+91 9174-381459", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Melissa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "melissa.138@partiesunited.co", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Edward", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "edward@yahoo.co.in", "phone": "+91 7864-241916", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Deborah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8420-572864", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Ronald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Stephanie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephanie-760@yahoo.co.in", "phone": "+91 7958-877954", "address": null, "gstType": "Registered Regular", "gstin": "27GVTPF2529Z1Z0"}, {"name": "Timothy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "timothy.870@gmail.com", "phone": "+91 7042-295454", "address": null, "gstType": "Registered Regular", "gstin": "22NYRPJ7193Q1Z3"}, {"name": "Rebecca", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rebecca-154@generic_indian.in", "phone": "+91 9179-230036", "address": null, "gstType": "Registered Regular", "gstin": "32ZCJPN2356I1Z3"}, {"name": "Jason", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jason-903@partiesunited.co", "phone": "+91 8332-016355", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Sharon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sharon.389@yahoo.co.in", "phone": "+91 8857-354880", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jeffrey", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeffrey_618@gmail.com", "phone": "+91 7636-744410", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Laura", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "laura.821@generic_indian.in", "phone": "+91 6640-756477", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Ryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ryan-786@yahoo.co.in", "phone": "+91 7598-295525", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Cynthia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cynthia.400@generic_indian.in", "phone": "+91 7518-806673", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jacob", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacob_155@redis.rs", "phone": "+91 7607-980767", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Kathleen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kathleen.110@yahoo.co.in", "phone": "+91 9288-658480", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Gary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9893-841572", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Amy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amy.309@yahoo.co.in", "phone": "+91 8738-127052", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Nicholas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicholas_204@redis.rs", "phone": "+91 7216-717493", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Shirley", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "shirley.761@redis.rs", "phone": "+91 6820-763351", "address": null, "gstType": "Registered Regular", "gstin": "07SSCCK4795S1Z10"}, {"name": "Eric", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eric@generic_indian.in", "phone": "+91 8658-962487", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Angela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9544-644681", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jonathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jonathan.581@partiesunited.co", "phone": "+91 8196-534803", "address": null, "gstType": "Registered Regular", "gstin": "07JNQPI1074A1Z2"}, {"name": "Helen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "helen_972@generic_indian.in", "phone": "+91 7132-446467", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Stephen", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "stephen_100@yahoo.co.in", "phone": "+91 8066-679022", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Anna", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "anna_414@yahoo.co.in", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Larry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "larry.516@yahoo.co.in", "phone": null, "address": null, "gstType": "Registered Regular", "gstin": "22BRXPB6438V1Z3"}, {"name": "Brenda", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brenda.815@partiesunited.co", "phone": "+91 7423-101842", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Justin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "justin.401@redis.rs", "phone": "+91 8866-453732", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Pamela", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "pamela@partiesunited.co", "phone": "+91 7563-921607", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Scott", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "scott.883@partiesunited.co", "phone": "+91 9988-884200", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Nicole", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nicole@yahoo.co.in", "phone": "+91 7772-518773", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Brandon", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brandon@generic_indian.in", "phone": "+91 8947-357902", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Emma", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "emma@generic_indian.in", "phone": "+91 8065-422177", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Benjamin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "benjamin_861@partiesunited.co", "phone": "+91 8785-964341", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Samantha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samantha-387@gmail.com", "phone": "+91 6411-733274", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Samuel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "samuel-67@partiesunited.co", "phone": "+91 8279-383554", "address": null, "gstType": "Registered Regular", "gstin": "30GNLPE7564C1Z0"}, {"name": "Katherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "katherine.329@generic_indian.in", "phone": "+91 7806-866367", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Gregory", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gregory_137@redis.rs", "phone": "+91 7086-527568", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Christine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christine@redis.rs", "phone": "+91 9322-241005", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Frank", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9610-590035", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Debra", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "debra-43@partiesunited.co", "phone": "+91 9320-275225", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Alexander", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexander-745@gmail.com", "phone": "+91 6806-881315", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Rachel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rachel.9@partiesunited.co", "phone": "+91 8891-016921", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Raymond", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "raymond.674@gmail.com", "phone": "+91 6722-485384", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Catherine", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "catherine@generic_indian.in", "phone": "+91 6087-083904", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Patrick", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "patrick-954@generic_indian.in", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Carolyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carolyn_427@generic_indian.in", "phone": "+91 6559-056027", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jack", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jack.52@generic_indian.in", "phone": "+91 9271-276848", "address": null, "gstType": "Registered Regular", "gstin": "27QTMPP9445O1Z2"}, {"name": "Janet", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janet-238@generic_indian.in", "phone": "+91 9480-057399", "address": null, "gstType": "Registered Regular", "gstin": "30YVEPM2956X1Z4"}, {"name": "Dennis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dennis-538@yahoo.co.in", "phone": "+91 9056-153204", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Ruth", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ruth_952@yahoo.co.in", "phone": "+91 9629-547895", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jerry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jerry_234@generic_indian.in", "phone": null, "address": null, "gstType": "Registered Regular", "gstin": "27CZCPT5025J1Z0"}, {"name": "Maria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "maria-332@gmail.com", "phone": "+91 8189-540178", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Tyler", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "tyler.435@partiesunited.co", "phone": "+91 7429-650519", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Heather", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "heather@yahoo.co.in", "phone": "+91 8581-500728", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Aaron", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "aaron-332@gmail.com", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Diane", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "diane@gmail.com", "phone": "+91 7137-826433", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jose_905@yahoo.co.in", "phone": "+91 6231-344468", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Virginia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "virginia_959@yahoo.co.in", "phone": "+91 6642-811609", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Adam", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "adam-747@yahoo.co.in", "phone": "+91 9680-421390", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Julie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julie_316@redis.rs", "phone": "+91 7135-908088", "address": null, "gstType": "Registered Regular", "gstin": "27JTJPD8067A1Z4"}, {"name": "Henry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "henry-115@gmail.com", "phone": "+91 9387-229109", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Joyce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joyce_116@partiesunited.co", "phone": "+91 6797-685407", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Nathan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "nathan.237@partiesunited.co", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Victoria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "victoria-362@generic_indian.in", "phone": "+91 8697-929638", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Douglas", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "douglas_940@yahoo.co.in", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Olivia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "olivia.438@gmail.com", "phone": "+91 9925-579281", "address": null, "gstType": "Registered Regular", "gstin": "07HJRPQ5913I1Z6"}, {"name": "Zachary", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7752-067279", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Kelly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kelly-569@generic_indian.in", "phone": "+91 7858-074356", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Peter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "peter_295@partiesunited.co", "phone": "+91 8471-579894", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Kyle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kyle_753@gmail.com", "phone": "+91 8638-076686", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Lauren", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lauren_876@generic_indian.in", "phone": "+91 6701-905380", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Walter", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "walter-392@gmail.com", "phone": "+91 8196-877407", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Joan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8678-760803", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Ethan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ethan-879@redis.rs", "phone": "+91 7878-450479", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Evelyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "evelyn@generic_indian.in", "phone": "+91 9856-258902", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jeremy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jeremy_290@redis.rs", "phone": "+91 6383-093707", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Judith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judith@partiesunited.co", "phone": "+91 6687-472462", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Harold", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8811-307098", "address": null, "gstType": "Registered Regular", "gstin": "32AZTPA5997N1Z3"}, {"name": "Megan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "megan_864@redis.rs", "phone": "+91 9622-798026", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Keith", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 9827-357442", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Cheryl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "cheryl.704@gmail.com", "phone": "+91 9470-151094", "address": null, "gstType": "Registered Regular", "gstin": "32EHNPM9327R1Z10"}, {"name": "Christian", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "christian.307@redis.rs", "phone": "+91 7820-659075", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Andrea", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "andrea-66@yahoo.co.in", "phone": "+91 8865-015945", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Roger", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roger_398@yahoo.co.in", "phone": "+91 9010-018524", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Hannah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "hannah-742@partiesunited.co", "phone": "+91 8839-110499", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Noah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "noah-65@generic_indian.in", "phone": "+91 8386-843599", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Martha", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "martha.441@generic_indian.in", "phone": "+91 7881-002204", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Gerald", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8448-134403", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jacqueline", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jacqueline-981@generic_indian.in", "phone": "+91 6343-646106", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Carl", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "carl-878@generic_indian.in", "phone": "+91 7642-940183", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Frances", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "frances_178@generic_indian.in", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Terry", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "terry-434@yahoo.co.in", "phone": "+91 7919-057462", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Gloria", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gloria-239@yahoo.co.in", "phone": "+91 6633-860264", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Sean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sean@yahoo.co.in", "phone": "+91 8597-778037", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Ann", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ann_30@gmail.com", "phone": "+91 7553-381240", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Austin", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "austin-910@partiesunited.co", "phone": "+91 8179-903611", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Teresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "teresa.461@yahoo.co.in", "phone": "+91 8654-794198", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Arthur", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "arthur.261@gmail.com", "phone": "+91 8591-727345", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Kathryn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7553-353763", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Lawrence", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "lawrence_504@redis.rs", "phone": "+91 7800-930823", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Sara", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "sara-874@redis.rs", "phone": "+91 6550-401548", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jesse", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8391-197233", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Janice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "janice-3@generic_indian.in", "phone": "+91 7838-829539", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Dylan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "dylan_17@partiesunited.co", "phone": "+91 8490-297413", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jean", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jean_67@partiesunited.co", "phone": "+91 6536-623838", "address": null, "gstType": "Registered Regular", "gstin": "30KKJPQ1372G1Z6"}, {"name": "Bryan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bryan-34@gmail.com", "phone": "+91 9573-313194", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Alice", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alice.708@redis.rs", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Joe", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "joe.232@generic_indian.in", "phone": "+91 6815-438967", "address": null, "gstType": "Registered Regular", "gstin": "22LGOPA3222S1Z0"}, {"name": "Madison", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "madison_16@partiesunited.co", "phone": "+91 6323-819289", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Jordan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "jordan_329@gmail.com", "phone": "+91 9958-214474", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Doris", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8265-604921", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Billy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "billy.876@partiesunited.co", "phone": "+91 8252-440697", "address": null, "gstType": "Registered Regular", "gstin": "32WTVPO1637Q1Z2"}, {"name": "Abigail", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "abigail-445@generic_indian.in", "phone": "+91 9110-758387", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Bruce", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bruce.639@generic_indian.in", "phone": "+91 7279-246307", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Julia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "julia.950@partiesunited.co", "phone": "+91 8121-831374", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Albert", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "albert@yahoo.co.in", "phone": "+91 9380-129478", "address": null, "gstType": "Registered Regular", "gstin": "27LJNPL5438V1Z3"}, {"name": "Judy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "judy-622@redis.rs", "phone": "+91 8288-615356", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Willie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "willie.482@gmail.com", "phone": "+91 9463-671396", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Grace", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "grace-113@redis.rs", "phone": "+91 7939-158183", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Gabriel", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "gabriel_997@yahoo.co.in", "phone": "+91 8622-240964", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Denise", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "denise.960@redis.rs", "phone": "+91 9377-118903", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Logan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Amber", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "amber-307@partiesunited.co", "phone": "+91 9029-427995", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Alan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alan.844@yahoo.co.in", "phone": "+91 7506-672233", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Marilyn", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marilyn@partiesunited.co", "phone": "+91 8471-047686", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Juan", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 7977-135896", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Beverly", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "beverly-993@gmail.com", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Wayne", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "wayne.497@redis.rs", "phone": "+91 9886-432030", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Danielle", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "danielle_813@yahoo.co.in", "phone": "+91 8980-756924", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Roy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "roy.350@gmail.com", "phone": "+91 9930-062360", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Theresa", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "theresa.538@partiesunited.co", "phone": "+91 7079-462390", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Ralph", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "ralph-611@gmail.com", "phone": "+91 6564-488033", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Sophia", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8603-039297", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Randy", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "randy.493@yahoo.co.in", "phone": "+91 6692-244741", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Marie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "marie.328@partiesunited.co", "phone": "+91 9089-500095", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Eugene", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "eugene-126@redis.rs", "phone": null, "address": null, "gstType": "Registered Regular", "gstin": "27ISQPL0662M1Z9"}, {"name": "Diana", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 8582-063412", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Vincent", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "vincent-551@redis.rs", "phone": "+91 7307-403536", "address": null, "gstType": "Registered Regular", "gstin": "32POPPV9927R1Z9"}, {"name": "Brittany", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "brittany_431@partiesunited.co", "phone": "+91 7124-128260", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Russell", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": null, "phone": "+91 6315-053860", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Natalie", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "natalie-655@generic_indian.in", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Elijah", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "elijah-660@gmail.com", "phone": "+91 7596-290047", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Isabella", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "isabella@yahoo.co.in", "phone": "+91 7294-796072", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Louis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "louis-336@gmail.com", "phone": "+91 9433-004577", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Charlotte", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "charlotte-886@gmail.com", "phone": "+91 6655-639480", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Bobby", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "bobby_737@yahoo.co.in", "phone": "+91 8534-723705", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Rose", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "rose-274@partiesunited.co", "phone": "+91 9337-991300", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Philip", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "philip.930@gmail.com", "phone": "+91 9925-686539", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Alexis", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "alexis_850@yahoo.co.in", "phone": null, "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Johnny", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "johnny_204@generic_indian.in", "phone": "+91 7187-876740", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Kayla", "role": "Customer", "defaultAccount": "Debtors", "currency": "INR", "email": "kayla-287@generic_indian.in", "phone": "+91 9985-769077", "address": null, "gstType": "Consumer", "gstin": null}, {"name": "Le Socials", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "le-socials_172@yahoo.co.in", "phone": "+91 9879-452232", "address": null, "gstType": "Registered Regular", "gstin": "07RAQCB3836J1Z8"}, {"name": "Janky Office Spaces", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "janky.office.spaces-417@yahoo.co.in", "phone": "+91 7308-863851", "address": null, "gstType": "Registered Regular", "gstin": "32UGFPV2343M1Z4"}, {"name": "Josf\u00e9\u00f1a's 611s", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "josf\u00e9\u00f1a's_611s@redis.rs", "phone": "+91 6085-833491", "address": null, "gstType": "Registered Regular", "gstin": "30GHJPM5774L1Z9"}, {"name": "Lankness Feet Fomenters", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "lankness_feet_fomenters_222@redis.rs", "phone": "+91 7985-215055", "address": null, "gstType": "Registered Regular", "gstin": "30SHWCG9396V1Z6"}, {"name": "The Overclothes Company", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "the-overclothes-company.105@yahoo.co.in", "phone": "+91 7245-972879", "address": null, "gstType": "Registered Regular", "gstin": "07ULPPU8278Q1Z6"}, {"name": "Adani Electricity Mumbai Limited", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "adani-electricity-mumbai-limited-903@yahoo.co.in", "phone": "+91 9955-187016", "address": null, "gstType": "Registered Regular", "gstin": "22KTNCA0958Q1Z4"}, {"name": "Only Fulls", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "only.fulls_465@gmail.com", "phone": "+91 9291-250658", "address": null, "gstType": "Registered Regular", "gstin": "07HWIPM5574P1Z10"}, {"name": "Just Epaulettes", "role": "Supplier", "defaultAccount": "Creditors", "currency": "INR", "email": "just_epaulettes-901@partiesunited.co", "phone": "+91 8233-194054", "address": null, "gstType": "Registered Regular", "gstin": "32OZWPO6297K1Z10"}, {"name": "Maxwell", "role": "Both", "defaultAccount": null, "currency": "INR", "email": "maxwell.688@gmail.com", "phone": "+91 9065-184842", "address": null, "gstType": "Unregistered", "gstin": null}]
\ No newline at end of file
diff --git a/models/baseModels/Address/Address.ts b/models/baseModels/Address/Address.ts
index 4abf5b4d..583c8f9a 100644
--- a/models/baseModels/Address/Address.ts
+++ b/models/baseModels/Address/Address.ts
@@ -1,8 +1,7 @@
 import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { EmptyMessageMap, FormulaMap, ListsMap } from 'fyo/model/types';
-import { stateCodeMap } from 'regional/in';
-import { titleCase } from 'utils';
+import { codeStateMap } from 'regional/in';
 import { getCountryInfo } from 'utils/misc';
 
 export class Address extends Doc {
@@ -36,7 +35,7 @@ export class Address extends Doc {
       const country = doc?.country as string | undefined;
       switch (country) {
         case 'India':
-          return Object.keys(stateCodeMap).map(titleCase).sort();
+          return Object.values(codeStateMap).sort();
         default:
           return [] as string[];
       }
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 540ab938..c1a78b50 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -19,6 +19,7 @@ export abstract class Invoice extends Transactional {
   account?: string;
   currency?: string;
   netTotal?: Money;
+  grandTotal?: Money;
   baseGrandTotal?: Money;
   outstandingAmount?: Money;
   exchangeRate?: number;
diff --git a/models/regionalModels/in/Address.ts b/models/regionalModels/in/Address.ts
index 4556d60c..1c9e94e8 100644
--- a/models/regionalModels/in/Address.ts
+++ b/models/regionalModels/in/Address.ts
@@ -1,7 +1,6 @@
 import { FormulaMap, ListsMap } from 'fyo/model/types';
 import { Address as BaseAddress } from 'models/baseModels/Address/Address';
-import { stateCodeMap } from 'regional/in';
-import { titleCase } from 'utils';
+import { codeStateMap } from 'regional/in';
 
 export class Address extends BaseAddress {
   formulas: FormulaMap = {
@@ -30,7 +29,7 @@ export class Address extends BaseAddress {
 
     pos: {
       formula: async () => {
-        const stateList = Object.keys(stateCodeMap).map(titleCase).sort();
+        const stateList = Object.values(codeStateMap).sort();
         const state = this.state as string;
         if (stateList.includes(state)) {
           return state;
@@ -44,7 +43,7 @@ export class Address extends BaseAddress {
   static lists: ListsMap = {
     ...BaseAddress.lists,
     pos: () => {
-      return Object.keys(stateCodeMap).map(titleCase).sort();
+      return Object.values(codeStateMap).sort();
     },
   };
 }
diff --git a/models/regionalModels/in/Party.ts b/models/regionalModels/in/Party.ts
index 58012228..9571c933 100644
--- a/models/regionalModels/in/Party.ts
+++ b/models/regionalModels/in/Party.ts
@@ -3,6 +3,9 @@ import { Party as BaseParty } from 'models/baseModels/Party/Party';
 import { GSTType } from './types';
 
 export class Party extends BaseParty {
+  gstin?: string;
+  gstType?: GSTType;
+
   async beforeSync() {
     const gstin = this.get('gstin') as string | undefined;
     const gstType = this.get('gstType') as GSTType;
diff --git a/regional/in.ts b/regional/in.ts
index ac8d0d87..05c086f9 100644
--- a/regional/in.ts
+++ b/regional/in.ts
@@ -1,39 +1,38 @@
-// prettier-ignore
-export const stateCodeMap = {
-  'JAMMU AND KASHMIR': '01',
-  'HIMACHAL PRADESH': '02',
-  'PUNJAB': '03',
-  'CHANDIGARH': '04',
-  'UTTARAKHAND': '05',
-  'HARYANA': '06',
-  'DELHI': '07',
-  'RAJASTHAN': '08',
-  'UTTAR PRADESH': '09',
-  'BIHAR': '10',
-  'SIKKIM': '11',
-  'ARUNACHAL PRADESH': '12',
-  'NAGALAND': '13',
-  'MANIPUR': '14',
-  'MIZORAM': '15',
-  'TRIPURA': '16',
-  'MEGHALAYA': '17',
-  'ASSAM': '18',
-  'WEST BENGAL': '19',
-  'JHARKHAND': '20',
-  'ODISHA': '21',
-  'CHATTISGARH': '22',
-  'MADHYA PRADESH': '23',
-  'GUJARAT': '24',
-  'DADRA AND NAGAR HAVELI AND DAMAN AND DIU': '26',
-  'MAHARASHTRA': '27',
-  'KARNATAKA': '29',
-  'GOA': '30',
-  'LAKSHADWEEP': '31',
-  'KERALA': '32',
-  'TAMIL NADU': '33',
-  'PUDUCHERRY': '34',
-  'ANDAMAN AND NICOBAR ISLANDS': '35',
-  'TELANGANA': '36',
-  'ANDHRA PRADESH': '37',
-  'LADAKH': '38',
-};
+export const codeStateMap = {
+  '01': 'Jammu and Kashmir',
+  '02': 'Himachal Pradesh',
+  '03': 'Punjab',
+  '04': 'Chandigarh',
+  '05': 'Uttarakhand',
+  '06': 'Haryana',
+  '07': 'Delhi',
+  '08': 'Rajasthan',
+  '09': 'Uttar Pradesh',
+  '10': 'Bihar',
+  '11': 'Sikkim',
+  '12': 'Arunachal Pradesh',
+  '13': 'Nagaland',
+  '14': 'Manipur',
+  '15': 'Mizoram',
+  '16': 'Tripura',
+  '17': 'Meghalaya',
+  '18': 'Assam',
+  '19': 'West Bengal',
+  '20': 'Jharkhand',
+  '21': 'Odisha',
+  '22': 'Chattisgarh',
+  '23': 'Madhya Pradesh',
+  '24': 'Gujarat',
+  '26': 'Dadra and Nagar Haveli and Daman and Diu',
+  '27': 'Maharashtra',
+  '29': 'Karnataka',
+  '30': 'Goa',
+  '31': 'Lakshadweep',
+  '32': 'Kerala',
+  '33': 'Tamil Nadu',
+  '34': 'Puducherry',
+  '35': 'Andaman and Nicobar Islands',
+  '36': 'Telangana',
+  '37': 'Andhra Pradesh',
+  '38': 'Ladakh',
+} as Record<string, string>;
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.js b/reports/GoodsAndServiceTax/BaseGSTR.js
deleted file mode 100644
index b0a11072..00000000
--- a/reports/GoodsAndServiceTax/BaseGSTR.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { fyo } from 'src/initFyo';
-import { stateCodeMap } from '../../accounting/gst';
-import { convertPesaValuesToFloat } from '../../src/utils';
-
-class BaseGSTR {
-  async getCompleteReport(gstrType, filters) {
-    if (['GSTR-1', 'GSTR-2'].includes(gstrType)) {
-      const place = filters.place;
-      delete filters.place;
-      let entries = await fyo.db.getAll({
-        doctype: gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice',
-        filters,
-      });
-      filters.place = place;
-
-      let tableData = [];
-      for (let entry of entries) {
-        entry.doctype =
-          gstrType === 'GSTR-1' ? 'SalesInvoice' : 'PurchaseInvoice';
-        const row = await this.getRow(entry);
-        tableData.push(row);
-      }
-
-      if (Object.keys(filters).length != 0) {
-        tableData = tableData.filter((row) => {
-          if (filters.account) return row.account === filters.account;
-          if (filters.transferType)
-            return row.transferType === filters.transferType;
-          if (filters.place) return row.place === filters.place;
-          return true;
-        });
-      }
-
-      tableData.forEach(convertPesaValuesToFloat);
-      return tableData;
-    } else {
-      return [];
-    }
-  }
-
-  async getRow(ledgerEntry) {
-    ledgerEntry = await fyo.doc.getDoc(ledgerEntry.doctype, ledgerEntry.name);
-
-    const row = {};
-    const { gstin } = fyo.AccountingSettings;
-
-    let party = await fyo.doc.getDoc(
-      'Party',
-      ledgerEntry.customer || ledgerEntry.supplier
-    );
-
-    if (party.address) {
-      let addressDetails = await fyo.doc.getDoc('Address', party.address);
-      row.place = addressDetails.pos || '';
-    }
-
-    row.gstin = party.gstin;
-    row.partyName = ledgerEntry.customer || ledgerEntry.supplier;
-    row.invNo = ledgerEntry.name;
-    row.invDate = ledgerEntry.date;
-    row.rate = 0;
-    row.inState =
-      gstin && gstin.substring(0, 2) === stateCodeMap[row.place?.toUpperCase()];
-    row.reverseCharge = !party.gstin ? 'Y' : 'N';
-
-    ledgerEntry.taxes?.forEach((tax) => {
-      row.rate += tax.rate;
-      const taxAmt = ledgerEntry.netTotal.percent(tax.rate);
-
-      switch (tax.account) {
-        case 'IGST': {
-          row.igstAmt = taxAmt;
-          row.inState = false;
-        }
-        case 'CGST':
-          row.cgstAmt = taxAmt;
-        case 'SGST':
-          row.sgstAmt = taxAmt;
-        case 'Nil Rated':
-          row.nilRated = true;
-        case 'Exempt':
-          row.exempt = true;
-        case 'Non GST':
-          row.nonGST = true;
-      }
-    });
-
-    row.invAmt = ledgerEntry.grandTotal;
-    row.taxVal = ledgerEntry.netTotal;
-
-    return row;
-  }
-}
-
-export default BaseGSTR;
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.ts b/reports/GoodsAndServiceTax/BaseGSTR.ts
new file mode 100644
index 00000000..48a242d2
--- /dev/null
+++ b/reports/GoodsAndServiceTax/BaseGSTR.ts
@@ -0,0 +1,340 @@
+import { t } from 'fyo';
+import { DateTime } from 'luxon';
+import { Invoice } from 'models/baseModels/Invoice/Invoice';
+import { Party } from 'models/regionalModels/in/Party';
+import { ModelNameEnum } from 'models/types';
+import { codeStateMap } from 'regional/in';
+import { Report } from 'reports/Report';
+import { ColumnField, ReportData, ReportRow } from 'reports/types';
+import { Field, OptionField } from 'schemas/types';
+import { isNumeric } from 'src/utils';
+import { GSTRRow, GSTRType, TransferType, TransferTypeEnum } from './types';
+
+export abstract class BaseGSTR extends Report {
+  place?: string;
+  toDate?: string;
+  fromDate?: string;
+  transferType?: TransferType;
+  usePagination: boolean = true;
+
+  abstract gstrType: GSTRType;
+
+  get transferTypeMap(): Record<string, string> {
+    if (this.gstrType === 'GSTR-2') {
+      return {
+        B2B: 'B2B',
+      };
+    }
+
+    return {
+      B2B: 'B2B',
+      B2CL: 'B2C-Large',
+      B2CS: 'B2C-Small',
+      NR: 'Nil Rated, Exempted and Non GST supplies',
+    };
+  }
+
+  get schemaName() {
+    if (this.gstrType === 'GSTR-1') {
+      return ModelNameEnum.SalesInvoice;
+    }
+
+    return ModelNameEnum.PurchaseInvoice;
+  }
+
+  async setReportData(): Promise<void> {
+    const gstrRows = await this.getGstrRows();
+    const filteredRows = this.filterGstrRows(gstrRows);
+    this.reportData = this.getReportDataFromGSTRRows(filteredRows);
+  }
+
+  getReportDataFromGSTRRows(gstrRows: GSTRRow[]): ReportData {
+    const reportData: ReportData = [];
+    for (const row of gstrRows) {
+      const reportRow: ReportRow = { cells: [] };
+
+      for (const { fieldname, fieldtype, width } of this.columns) {
+        const align = isNumeric(fieldtype) ? 'right' : 'left';
+
+        const rawValue = row[fieldname as keyof GSTRRow];
+        let value = '';
+        if (rawValue !== undefined) {
+          value = this.fyo.format(rawValue, fieldtype);
+        }
+
+        reportRow.cells.push({
+          align,
+          rawValue,
+          value,
+          width: width ?? 1,
+        });
+      }
+
+      reportData.push(reportRow);
+    }
+
+    return reportData;
+  }
+
+  filterGstrRows(gstrRows: GSTRRow[]) {
+    return gstrRows.filter((row) => {
+      let allow = true;
+      if (this.place) {
+        allow &&= codeStateMap[this.place] === row.place;
+      }
+      this.place;
+      return (allow &&= this.transferFilterFunction(row));
+    });
+  }
+
+  get transferFilterFunction(): (row: GSTRRow) => boolean {
+    if (this.transferType === 'B2B') {
+      return (row) => !!row.gstin;
+    }
+
+    if (this.transferType === 'B2CL') {
+      return (row) => !row.gstin && !row.inState && row.invAmt >= 250000;
+    }
+
+    if (this.transferType === 'B2CS') {
+      return (row) => !row.gstin && (row.inState || row.invAmt < 250000);
+    }
+
+    if (this.transferType === 'NR') {
+      return (row) => row.rate === 0; // this takes care of both nil rated, exempted goods
+    }
+
+    return (_) => true;
+  }
+
+  async getEntries() {
+    const date: string[] = [];
+    if (this.toDate) {
+      date.push('<=', this.toDate);
+    }
+
+    if (this.fromDate) {
+      date.push('>=', this.fromDate);
+    }
+
+    return (await this.fyo.db.getAllRaw(this.schemaName, {
+      filters: { date, submitted: true, cancelled: false },
+    })) as { name: string }[];
+  }
+
+  async getGstrRows(): Promise<GSTRRow[]> {
+    const entries = await this.getEntries();
+    const gstrRows: GSTRRow[] = [];
+    for (const entry of entries) {
+      const gstrRow = await this.getGstrRow(entry.name as string);
+      gstrRows.push(gstrRow);
+    }
+    return gstrRows;
+  }
+
+  async getGstrRow(entryName: string): Promise<GSTRRow> {
+    const entry = (await this.fyo.doc.getDoc(
+      this.schemaName,
+      entryName
+    )) as Invoice;
+    const gstin = (await this.fyo.getValue(
+      ModelNameEnum.AccountingSettings,
+      'gstin'
+    )) as string | null;
+
+    const party = (await this.fyo.doc.getDoc('Party', entry.party!)) as Party;
+
+    let place = '';
+    if (party.address) {
+      const pos = (await this.fyo.getValue(
+        ModelNameEnum.Address,
+        party.address as string,
+        'pos'
+      )) as string | undefined;
+
+      place = pos ?? '';
+    } else if (party.gstin) {
+      const code = party.gstin.slice(0, 2);
+      place = codeStateMap[code] ?? '';
+    }
+
+    let inState = false;
+    if (gstin) {
+      inState = codeStateMap[gstin.slice(0, 2)] === place;
+    }
+
+    const gstrRow: GSTRRow = {
+      gstin: party.gstin ?? '',
+      partyName: entry.party!,
+      invNo: entry.name!,
+      invDate: entry.date!,
+      rate: 0,
+      reverseCharge: !party.gstin ? 'Y' : 'N',
+      inState,
+      place,
+      invAmt: entry.grandTotal?.float ?? 0,
+      taxVal: entry.netTotal?.float ?? 0,
+    };
+
+    for (const tax of entry.taxes ?? []) {
+      gstrRow.rate += tax.rate ?? 0;
+    }
+
+    this.setTaxValuesOnGSTRRow(entry, gstrRow);
+    return gstrRow;
+  }
+
+  setTaxValuesOnGSTRRow(entry: Invoice, gstrRow: GSTRRow) {
+    for (const tax of entry.taxes ?? []) {
+      const rate = tax.rate ?? 0;
+      gstrRow.rate += rate;
+      const taxAmt = entry.netTotal!.percent(rate).float;
+
+      switch (tax.account) {
+        case 'IGST': {
+          gstrRow.igstAmt = taxAmt;
+          gstrRow.inState = false;
+        }
+        case 'CGST':
+          gstrRow.cgstAmt = taxAmt;
+        case 'SGST':
+          gstrRow.sgstAmt = taxAmt;
+        case 'Nil Rated':
+          gstrRow.nilRated = true;
+        case 'Exempt':
+          gstrRow.exempt = true;
+        case 'Non GST':
+          gstrRow.nonGST = true;
+      }
+    }
+  }
+
+  async setDefaultFilters() {
+    if (!this.toDate) {
+      this.toDate = DateTime.local().toISODate();
+    }
+
+    if (!this.fromDate) {
+      this.fromDate = DateTime.local().minus({ months: 3 }).toISODate();
+    }
+
+    if (!this.transferType) {
+      this.transferType = 'B2B';
+    }
+  }
+
+  getFilters(): Field[] {
+    const transferTypeMap = this.transferTypeMap;
+    const options = Object.keys(transferTypeMap).map((k) => ({
+      value: k,
+      label: transferTypeMap[k],
+    }));
+
+    return [
+      {
+        fieldtype: 'Select',
+        label: t`Transfer Type`,
+        placeholder: t`Transfer Type`,
+        fieldname: 'transferType',
+        options,
+      } as OptionField,
+      {
+        fieldtype: 'AutoComplete',
+        label: t`Place`,
+        placeholder: t`Place`,
+        fieldname: 'place',
+        options: Object.keys(codeStateMap).map((code) => {
+          return {
+            value: code,
+            label: codeStateMap[code],
+          };
+        }),
+      } as OptionField,
+      {
+        fieldtype: 'Date',
+        label: t`From Date`,
+        placeholder: t`From Date`,
+        fieldname: 'fromDate',
+      },
+      {
+        fieldtype: 'Date',
+        label: t`To Date`,
+        placeholder: t`To Date`,
+        fieldname: 'toDate',
+      },
+    ];
+  }
+
+  getColumns(): ColumnField[] | Promise<ColumnField[]> {
+    const columns = [
+      {
+        label: t`Party`,
+        fieldtype: 'Data',
+        fieldname: 'partyName',
+        width: 1.5,
+      },
+      {
+        label: t`Invoice No.`,
+        fieldname: 'invNo',
+        fieldtype: 'Data',
+      },
+      {
+        label: t`Invoice Value`,
+        fieldname: 'invAmt',
+        fieldtype: 'Currency',
+      },
+      {
+        label: t`Invoice Date`,
+        fieldname: 'invDate',
+        fieldtype: 'Date',
+      },
+      {
+        label: t`Place of supply`,
+        fieldname: 'place',
+        fieldtype: 'Data',
+      },
+      {
+        label: t`Rate`,
+        fieldname: 'rate',
+        width: 0.5,
+      },
+      {
+        label: t`Taxable Value`,
+        fieldname: 'taxVal',
+        fieldtype: 'Currency',
+      },
+      {
+        label: t`Reverse Chrg.`,
+        fieldname: 'reverseCharge',
+        fieldtype: 'Data',
+      },
+      {
+        label: t`Intergrated Tax`,
+        fieldname: 'igstAmt',
+        fieldtype: 'Currency',
+      },
+      {
+        label: t`Central Tax`,
+        fieldname: 'cgstAmt',
+        fieldtype: 'Currency',
+      },
+      {
+        label: t`State Tax`,
+        fieldname: 'sgstAmt',
+        fieldtype: 'Currency',
+      },
+    ] as ColumnField[];
+
+    const transferType = this.transferType ?? TransferTypeEnum.B2B;
+    if (transferType === TransferTypeEnum.B2B) {
+      columns.unshift({
+        label: t`GSTIN No.`,
+        fieldname: 'gstin',
+        fieldtype: 'Data',
+        width: 1.5,
+      });
+    }
+
+    return columns;
+  }
+}
diff --git a/reports/GoodsAndServiceTax/BaseViewConfig.js b/reports/GoodsAndServiceTax/BaseViewConfig.js
deleted file mode 100644
index 3171e755..00000000
--- a/reports/GoodsAndServiceTax/BaseViewConfig.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import { t } from 'fyo';
-import { DateTime } from 'luxon';
-import { stateCodeMap } from '../../accounting/gst';
-import { titleCase } from '../../src/utils';
-
-export default {
-  filterFields: [
-    {
-      fieldtype: 'AutoComplete',
-      label: t`Place`,
-      size: 'small',
-      placeholder: t`Place`,
-      fieldname: 'place',
-      getList: () => Object.keys(stateCodeMap).map(titleCase).sort(),
-    },
-    {
-      fieldtype: 'Date',
-      label: t`From Date`,
-      size: 'small',
-      placeholder: t`From Date`,
-      fieldname: 'fromDate',
-      default: () => DateTime.local().minus({ months: 3 }).toISODate(),
-    },
-    {
-      fieldtype: 'Date',
-      label: t`To Date`,
-      size: 'small',
-      placeholder: t`To Date`,
-      fieldname: 'toDate',
-      default: () => DateTime.local().toISODate(),
-    },
-  ],
-  getColumns({ filters }) {
-    const columns = [
-      {
-        label: t`Party`,
-        fieldtype: 'Data',
-        fieldname: 'partyName',
-        width: 1.5,
-      },
-      {
-        label: t`Invoice No.`,
-        fieldname: 'invNo',
-        fieldtype: 'Data',
-      },
-      {
-        label: t`Invoice Value`,
-        fieldname: 'invAmt',
-        fieldtype: 'Currency',
-      },
-      {
-        label: t`Invoice Date`,
-        fieldname: 'invDate',
-        fieldtype: 'Date',
-      },
-      {
-        label: t`Place of supply`,
-        fieldname: 'place',
-        fieldtype: 'Data',
-      },
-      {
-        label: t`Rate`,
-        fieldname: 'rate',
-        fieldtype: 'Data',
-        width: 0.5,
-      },
-      {
-        label: t`Taxable Value`,
-        fieldname: 'taxVal',
-        fieldtype: 'Currency',
-      },
-      {
-        label: t`Reverse Chrg.`,
-        fieldname: 'reverseCharge',
-        fieldtype: 'Data',
-      },
-      {
-        label: t`Intergrated Tax`,
-        fieldname: 'igstAmt',
-        fieldtype: 'Currency',
-      },
-      {
-        label: t`Central Tax`,
-        fieldname: 'cgstAmt',
-        fieldtype: 'Currency',
-      },
-      {
-        label: t`State Tax`,
-        fieldname: 'sgstAmt',
-        fieldtype: 'Currency',
-      },
-    ];
-
-    const transferType = filters.transferType || 'B2B';
-    if (transferType === 'B2B') {
-      columns.unshift({
-        label: t`GSTIN No.`,
-        fieldname: 'gstin',
-        fieldtype: 'Data',
-        width: 1.5,
-      });
-    }
-
-    return columns;
-  },
-};
diff --git a/reports/GoodsAndServiceTax/GSTR1.js b/reports/GoodsAndServiceTax/GSTR1.js
deleted file mode 100644
index 8759da5e..00000000
--- a/reports/GoodsAndServiceTax/GSTR1.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import BaseGSTR from './BaseGSTR';
-
-class GSTR1 extends BaseGSTR {
-  async run(params) {
-    if (!Object.keys(params).length) return [];
-
-    let filters = {};
-    filters.cancelled = 0;
-    if (params.toDate || params.fromDate) {
-      filters.date = [];
-
-      if (params.place) filters.place = params.place;
-      if (params.toDate) filters.date.push('<=', params.toDate);
-      if (params.fromDate) filters.date.push('>=', params.fromDate);
-    }
-
-    const data = await this.getCompleteReport('GSTR-1', filters);
-
-    // prettier-ignore
-    const conditions = {
-      'B2B': row => row.gstin,
-      'B2CL': row => !row.gstin && !row.inState && row.invAmt >= 250000,
-      'B2CS': row => !row.gstin && (row.inState || row.invAmt < 250000),
-      'NR': row => (row.rate === 0), // this takes care of both nil rated, exempted goods
-    };
-
-    if (!params.transferType) return data;
-    return data.filter((row) => conditions[params.transferType](row));
-  }
-}
-
-export default GSTR1;
diff --git a/reports/GoodsAndServiceTax/GSTR1.ts b/reports/GoodsAndServiceTax/GSTR1.ts
new file mode 100644
index 00000000..3f2316b1
--- /dev/null
+++ b/reports/GoodsAndServiceTax/GSTR1.ts
@@ -0,0 +1,13 @@
+import { Action } from 'fyo/model/types';
+import { BaseGSTR } from './BaseGSTR';
+import { GSTRType } from './types';
+
+export class GSTR1 extends BaseGSTR {
+  static title = 'GSTR1';
+  static reportName = 'gstr-1';
+
+  gstrType: GSTRType = 'GSTR-1';
+  getActions(): Action[] {
+    return [];
+  }
+}
diff --git a/reports/GoodsAndServiceTax/GSTR1View.js b/reports/GoodsAndServiceTax/GSTR1View.js
deleted file mode 100644
index 68f5d671..00000000
--- a/reports/GoodsAndServiceTax/GSTR1View.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const title = 'GSTR 1';
-import { t } from 'fyo';
-import { generateGstr1Csv, generateGstr1Json } from '../../accounting/gst';
-import baseConfig from './BaseViewConfig';
-
-const transferTypeMap = {
-  B2B: 'B2B',
-  B2CL: 'B2C-Large',
-  B2CS: 'B2C-Small',
-  NR: 'Nil Rated, Exempted and Non GST supplies',
-};
-
-const transferType = {
-  fieldtype: 'Select',
-  label: t`Transfer Type`,
-  placeholder: t`Transfer Type`,
-  fieldname: 'transferType',
-  options: Object.keys(transferTypeMap),
-  map: transferTypeMap,
-  default: 'B2B',
-  size: 'small',
-};
-
-const actions = [
-  {
-    group: t`Export`,
-    label: t`JSON`,
-    type: 'primary',
-    action: async (report, filters) => {
-      generateGstr1Json(report, filters);
-    },
-  },
-  {
-    group: t`Export`,
-    label: t`CSV`,
-    type: 'primary',
-    action: async (report, filters) => {
-      generateGstr1Csv(report, filters);
-    },
-  },
-];
-
-export default {
-  title: title,
-  method: 'gstr-1',
-  filterFields: [ transferType, ...baseConfig.filterFields],
-  actions: actions,
-  getColumns: baseConfig.getColumns,
-};
diff --git a/reports/GoodsAndServiceTax/GSTR2.js b/reports/GoodsAndServiceTax/GSTR2.js
deleted file mode 100644
index 20e5059c..00000000
--- a/reports/GoodsAndServiceTax/GSTR2.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import BaseGSTR from './BaseGSTR';
-
-class GSTR2 extends BaseGSTR {
-  async run(params) {
-    if (!Object.keys(params).length) return [];
-
-    let filters = {};
-    if (params.toDate || params.fromDate) {
-      filters.date = [];
-      if (params.toDate) filters.date.push('<=', params.toDate);
-      if (params.fromDate) filters.date.push('>=', params.fromDate);
-    }
-
-    const data = await this.getCompleteReport('GSTR-2', filters);
-
-    // prettier-ignore
-    const conditions = {
-      'B2B': row => row.gstin,
-    };
-
-    if (!params.transferType) return data;
-    return data.filter((row) => conditions[params.transferType](row));
-  }
-}
-
-export default GSTR2;
diff --git a/reports/GoodsAndServiceTax/GSTR2.ts b/reports/GoodsAndServiceTax/GSTR2.ts
new file mode 100644
index 00000000..861ec099
--- /dev/null
+++ b/reports/GoodsAndServiceTax/GSTR2.ts
@@ -0,0 +1,13 @@
+import { Action } from 'fyo/model/types';
+import { BaseGSTR } from './BaseGSTR';
+import { GSTRType } from './types';
+
+export class GSTR2 extends BaseGSTR {
+  static title = 'GSTR2';
+  static reportName = 'gstr-2';
+
+  gstrType: GSTRType = 'GSTR-2';
+  getActions(): Action[] {
+    return [];
+  }
+}
diff --git a/reports/GoodsAndServiceTax/GSTR2View.js b/reports/GoodsAndServiceTax/GSTR2View.js
deleted file mode 100644
index 92bb314e..00000000
--- a/reports/GoodsAndServiceTax/GSTR2View.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const title = 'GSTR 2';
-import { t } from 'fyo';
-import { generateGstr2Csv } from '../../accounting/gst';
-import baseConfig from './BaseViewConfig';
-
-const transferTypeMap = {
-  B2B: 'B2B',
-};
-
-const transferType = {
-  fieldtype: 'Select',
-  label: t`Transfer Type`,
-  placeholder: t`Transfer Type`,
-  fieldname: 'transferType',
-  options: Object.keys(transferTypeMap),
-  map: transferTypeMap,
-  default: 'B2B',
-  size: 'small',
-};
-
-const actions = [
-  {
-    group: t`Export`,
-    label: t`CSV`,
-    type: 'primary',
-    action: async (report, filters) => {
-      generateGstr2Csv(report, filters);
-    },
-  },
-];
-
-export default {
-  title: title,
-  method: 'gstr-2',
-  filterFields: [ transferType, ...baseConfig.filterFields],
-  actions: actions,
-  getColumns: baseConfig.getColumns,
-};
diff --git a/reports/GoodsAndServiceTax/types.ts b/reports/GoodsAndServiceTax/types.ts
new file mode 100644
index 00000000..50468748
--- /dev/null
+++ b/reports/GoodsAndServiceTax/types.ts
@@ -0,0 +1,28 @@
+
+export enum TransferTypeEnum {
+  'B2B' = 'B2B',
+'B2CL' = 'B2C',
+  'B2CS' = 'B2C',
+  'NR' = 'NR',
+}
+
+export type TransferType = keyof typeof TransferTypeEnum;
+export type GSTRType = 'GSTR-1' | 'GSTR-2';
+export interface GSTRRow {
+  gstin: string;
+  partyName: string;
+  invNo: string;
+  invDate: Date;
+  rate: number;
+  reverseCharge: 'Y' | 'N';
+  inState: boolean;
+  place: string;
+  invAmt: number;
+  taxVal: number;
+  igstAmt?: number;
+  cgstAmt?: number;
+  sgstAmt?: number;
+  exempt?: boolean;
+  nonGST?: boolean;
+  nilRated?: boolean;
+}
diff --git a/reports/index.ts b/reports/index.ts
index 1b4cf056..c65e4657 100644
--- a/reports/index.ts
+++ b/reports/index.ts
@@ -1,5 +1,7 @@
 import { BalanceSheet } from './BalanceSheet/BalanceSheet';
 import { GeneralLedger } from './GeneralLedger/GeneralLedger';
+import { GSTR1 } from './GoodsAndServiceTax/GSTR1';
+import { GSTR2 } from './GoodsAndServiceTax/GSTR2';
 import { ProfitAndLoss } from './ProfitAndLoss/ProfitAndLoss';
 import { TrialBalance } from './TrialBalance/TrialBalance';
 
@@ -8,4 +10,6 @@ export const reports = {
   ProfitAndLoss,
   BalanceSheet,
   TrialBalance,
+  GSTR1,
+  GSTR2,
 };
diff --git a/src/components/Controls/Base.vue b/src/components/Controls/Base.vue
index 1c95b03c..c9d6b7db 100644
--- a/src/components/Controls/Base.vue
+++ b/src/components/Controls/Base.vue
@@ -21,6 +21,8 @@
 </template>
 
 <script>
+import { isNumeric } from 'src/utils';
+
 export default {
   name: 'Base',
   props: {
@@ -105,9 +107,7 @@ export default {
     parse(value) {
       return value;
     },
-    isNumeric(df) {
-      return ['Int', 'Float', 'Currency'].includes(df.fieldtype);
-    },
+    isNumeric,
   },
 };
 </script>
diff --git a/src/components/Report/ListReport.vue b/src/components/Report/ListReport.vue
index ccbb16bf..356ac69b 100644
--- a/src/components/Report/ListReport.vue
+++ b/src/components/Report/ListReport.vue
@@ -75,6 +75,7 @@
 </template>
 <script>
 import { Report } from 'reports/Report';
+import { FieldTypeEnum } from 'schemas/types';
 import { defineComponent } from 'vue';
 import Paginator from '../Paginator.vue';
 import WithScroll from '../WithScroll.vue';
@@ -143,6 +144,17 @@ export default defineComponent({
         styles['padding-left'] = '0px';
       }
 
+      if (
+        !cell.align &&
+        [
+          FieldTypeEnum.Currency,
+          FieldTypeEnum.Int,
+          FieldTypeEnum.Float,
+        ].includes(cell.fieldtype)
+      ) {
+        styles['text-align'] = 'right';
+      }
+
       if (i === this.report.columns.length - 1) {
         styles['padding-right'] = '0px';
       }
diff --git a/src/pages/Dashboard/Expenses.vue b/src/pages/Dashboard/Expenses.vue
index 9e653d6e..202430a6 100644
--- a/src/pages/Dashboard/Expenses.vue
+++ b/src/pages/Dashboard/Expenses.vue
@@ -11,24 +11,18 @@
       <div class="w-1/2 flex flex-col gap-5 mt-8">
         <!-- Ledgend Item -->
         <div
-          class="flex justify-between items-center text-sm"
+          class="flex items-center text-sm"
           v-for="(d, i) in expenses"
           :key="d.name"
+          @mouseover="active = i"
+          @mouseleave="active = null"
         >
-          <div
-            class="flex items-center"
-            @mouseover="active = i"
-            @mouseleave="active = null"
-          >
-            <div class="w-3 h-3 rounded-sm flex-shrink-0" :class="d.class" />
-            <p
-              class="ml-2 w-24 overflow-x-scroll whitespace-nowrap no-scrollbar"
-            >
-              {{ d.account }}
-            </p>
-          </div>
-          <p class="whitespace-nowrap">
-            {{ fyo.format(d.total, 'Currency') }}
+          <div class="w-3 h-3 rounded-sm flex-shrink-0" :class="d.class" />
+          <p class="ml-2 overflow-x-scroll whitespace-nowrap no-scrollbar w-28">
+            {{ d.account }} 
+          </p>
+          <p class="whitespace-nowrap flex-shrink-0 ml-auto">
+            {{ fyo.format(d?.total ?? 0, 'Currency') }}
           </p>
         </div>
       </div>
@@ -116,11 +110,13 @@ export default {
         { class: 'bg-gray-200', hex: theme.backgroundColor.gray['200'] },
       ];
 
-      topExpenses = topExpenses.map((d, i) => {
-        d.color = shades[i].hex;
-        d.class = shades[i].class;
-        return d;
-      });
+      topExpenses = topExpenses
+        .filter((e) => e.total > 0)
+        .map((d, i) => {
+          d.color = shades[i].hex;
+          d.class = shades[i].class;
+          return d;
+        });
 
       this.expenses = topExpenses;
     },
diff --git a/src/utils/index.ts b/src/utils/index.ts
index da0b8f1f..cae8c404 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -6,6 +6,7 @@ import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import { DuplicateEntryError, LinkValidationError } from 'fyo/utils/errors';
 import Money from 'pesa/dist/types/src/money';
+import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 
 export function stringifyCircular(
   obj: unknown,
@@ -97,3 +98,17 @@ export function getErrorMessage(e: Error, doc?: Doc): string {
 
   return errorMessage;
 }
+
+export function isNumeric(fieldtype: Field | FieldType): boolean {
+  if (typeof fieldtype !== 'string') {
+    fieldtype = fieldtype?.fieldtype;
+  }
+
+  const numericTypes: FieldType[] = [
+    FieldTypeEnum.Int,
+    FieldTypeEnum.Float,
+    FieldTypeEnum.Currency,
+  ];
+
+  return numericTypes.includes(fieldtype);
+}
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 7885db56..53053f3c 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -158,20 +158,18 @@ function getCompleteSidebar(): SidebarConfig {
           name: 'trial-balance',
           route: '/report/TrialBalance',
         },
-        /*
         {
           label: t`GSTR1`,
           name: 'gstr1',
-          route: '/report/gstr-1',
+          route: '/report/GSTR1',
           hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
         },
         {
           label: t`GSTR2`,
           name: 'gstr2',
-          route: '/report/gstr-2',
+          route: '/report/GSTR2',
           hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
         },
-        */
       ],
     },
     {

From e20d7fc6d2bafd1864647fa8dc4e5388dd909c5d Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 18 May 2022 12:34:33 +0530
Subject: [PATCH 128/163] incr: enable non GST report exports

---
 fyo/model/doc.ts                       |   4 +
 reports/AccountReport.ts               |   5 -
 reports/GeneralLedger/GeneralLedger.ts |   5 -
 reports/LedgerReport.ts                |   6 +
 reports/Report.ts                      |  10 +
 reports/TrialBalance/TrialBalance.ts   |   5 -
 reports/commonExporter.ts              | 254 ++++++++++++++-----------
 src/pages/Report.vue                   |  37 +++-
 src/router.ts                          |   2 +-
 9 files changed, 187 insertions(+), 141 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index e5073771..9330d3ce 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -168,6 +168,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
     }
 
     this._setDirty(true);
+    if (typeof value === 'string') {
+      value = value.trim();
+    }
+
     if (Array.isArray(value)) {
       for (const row of value) {
         this.push(fieldname, row);
diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index 1084608d..5b0eae1c 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -1,5 +1,4 @@
 import { t } from 'fyo';
-import { Action } from 'fyo/model/types';
 import { cloneDeep } from 'lodash';
 import { DateTime } from 'luxon';
 import { AccountRootType } from 'models/baseModels/Account/types';
@@ -413,10 +412,6 @@ export abstract class AccountReport extends LedgerReport {
     return [columns, dateColumns].flat();
   }
 
-  getActions(): Action[] {
-    return [];
-  }
-
   metaFilters: string[] = ['basedOn'];
 }
 
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index a5dd6d2b..ec169f73 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -1,5 +1,4 @@
 import { Fyo, t } from 'fyo';
-import { Action } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { ModelNameEnum } from 'models/types';
 import { LedgerReport } from 'reports/LedgerReport';
@@ -408,8 +407,4 @@ export class GeneralLedger extends LedgerReport {
 
     return columns;
   }
-
-  getActions(): Action[] {
-    return [];
-  }
 }
diff --git a/reports/LedgerReport.ts b/reports/LedgerReport.ts
index 822f2582..95832265 100644
--- a/reports/LedgerReport.ts
+++ b/reports/LedgerReport.ts
@@ -1,8 +1,10 @@
 import { t } from 'fyo';
+import { Action } from 'fyo/model/types';
 import { ModelNameEnum } from 'models/types';
 import { Report } from 'reports/Report';
 import { GroupedMap, LedgerEntry, RawLedgerEntry } from 'reports/types';
 import { QueryFilter } from 'utils/db/types';
+import getCommonExportActions from './commonExporter';
 
 type GroupByKey = 'account' | 'party' | 'referenceName';
 
@@ -95,4 +97,8 @@ export abstract class LedgerReport extends Report {
   }
 
   abstract _getQueryFilters(): Promise<QueryFilter>;
+
+  getActions(): Action[] {
+    return getCommonExportActions(this);
+  }
 }
diff --git a/reports/Report.ts b/reports/Report.ts
index 60a3de6d..4f000073 100644
--- a/reports/Report.ts
+++ b/reports/Report.ts
@@ -21,6 +21,16 @@ export abstract class Report extends Observable<RawValue> {
     this.reportData = [];
   }
 
+  get title() {
+    // @ts-ignore
+    return this.constructor.title;
+  }
+
+  get reportName() {
+    // @ts-ignore
+    return this.constructor.reportName;
+  }
+
   async initialize() {
     /**
      * Not in constructor cause possibly async.
diff --git a/reports/TrialBalance/TrialBalance.ts b/reports/TrialBalance/TrialBalance.ts
index 9dc9ab54..03720391 100644
--- a/reports/TrialBalance/TrialBalance.ts
+++ b/reports/TrialBalance/TrialBalance.ts
@@ -1,5 +1,4 @@
 import { t } from 'fyo';
-import { Action } from 'fyo/model/types';
 import { ValueError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
 import {
@@ -284,8 +283,4 @@ export class TrialBalance extends AccountReport {
       },
     ] as ColumnField[];
   }
-
-  getActions(): Action[] {
-    return [];
-  }
 }
diff --git a/reports/commonExporter.ts b/reports/commonExporter.ts
index 2a29f18f..17de0728 100644
--- a/reports/commonExporter.ts
+++ b/reports/commonExporter.ts
@@ -1,12 +1,17 @@
-import { DocValue, DocValueMap } from 'fyo/core/types';
+import { Fyo, t } from 'fyo';
+import { Action } from 'fyo/model/types';
 import { Verb } from 'fyo/telemetry/types';
-import { Field } from 'schemas/types';
-import { fyo } from 'src/initFyo';
 import { getSavePath, saveData, showExportInFolder } from 'src/utils/ipcCalls';
+import { getIsNullOrUndef } from 'utils';
+import { generateCSV } from 'utils/csvParser';
+import { Report } from './Report';
+import { ReportCell } from './types';
+
+type ExportExtention = 'csv' | 'json';
 
 interface JSONExport {
   columns: { fieldname: string; label: string }[];
-  rows: Record<string, DocValue>[];
+  rows: Record<string, unknown>[];
   filters: Record<string, string>;
   timestamp: string;
   reportName: string;
@@ -14,69 +19,44 @@ interface JSONExport {
   softwareVersion: string;
 }
 
-type GetReportData = () => {
-  rows: DocValueMap[];
-  columns: Field[];
-  filters: Record<string, string>;
-};
+export default function getCommonExportActions(report: Report): Action[] {
+  const exportExtention = ['csv', 'json'] as ExportExtention[];
 
-type TemplateObject = { template: string };
-
-function templateToInnerText(innerHTML: string): string {
-  const temp = document.createElement('template');
-  temp.innerHTML = innerHTML.trim();
-  // @ts-ignore
-  return temp.content.firstChild!.innerText;
+  return exportExtention.map((ext) => ({
+    group: t`Export`,
+    label: ext.toUpperCase(),
+    type: 'primary',
+    action: async () => {
+      await exportReport(ext, report);
+    },
+  }));
 }
 
-function deObjectify(value: TemplateObject | DocValue) {
-  if (typeof value !== 'object') return value;
-  if (value === null) return '';
+async function exportReport(extention: ExportExtention, report: Report) {
+  const { filePath, canceled } = await getSavePath(
+    report.reportName,
+    extention
+  );
 
-  const innerHTML = (value as TemplateObject).template;
-  if (!innerHTML) return '';
-  return templateToInnerText(innerHTML);
-}
-
-function csvFormat(value: TemplateObject | DocValue): string {
-  if (typeof value === 'string') {
-    return `"${value}"`;
-  } else if (value === null) {
-    return '';
-  } else if (typeof value === 'object') {
-    const innerHTML = (value as TemplateObject).template;
-
-    if (!innerHTML) return '';
-    return csvFormat(deObjectify(value as TemplateObject));
+  if (canceled || !filePath) {
+    return;
   }
 
-  return String(value);
+  switch (extention) {
+    case 'csv':
+      await exportCsv(report, filePath);
+      break;
+    case 'json':
+      await exportJson(report, filePath);
+      break;
+    default:
+      return;
+  }
+
+  report.fyo.telemetry.log(Verb.Exported, report.reportName, { extention });
 }
 
-export async function exportCsv(
-  rows: DocValueMap[],
-  columns: Field[],
-  filePath: string
-) {
-  const fieldnames = columns.map(({ fieldname }) => fieldname);
-  const labels = columns.map(({ label }) => csvFormat(label));
-  const csvRows = [
-    labels.join(','),
-    ...rows.map((row) =>
-      fieldnames.map((f) => csvFormat(row[f] as DocValue)).join(',')
-    ),
-  ];
-
-  saveExportData(csvRows.join('\n'), filePath);
-}
-
-async function exportJson(
-  rows: DocValueMap[],
-  columns: Field[],
-  filePath: string,
-  filters: Record<string, string>,
-  reportName: string
-) {
+async function exportJson(report: Report, filePath: string) {
   const exportObject: JSONExport = {
     columns: [],
     rows: [],
@@ -86,76 +66,120 @@ async function exportJson(
     softwareName: '',
     softwareVersion: '',
   };
-  const fieldnames = columns.map(({ fieldname }) => fieldname);
 
+  const columns = report.columns;
+  const displayPrecision =
+    (report.fyo.singles.SystemSettings?.displayPrecision as number) ?? 2;
+
+  /**
+   * Set columns as list of fieldname, label
+   */
   exportObject.columns = columns.map(({ fieldname, label }) => ({
     fieldname,
     label,
   }));
 
-  exportObject.rows = rows.map((row) =>
-    fieldnames.reduce((acc, f) => {
-      const value = row[f];
-      if (value === undefined) {
-        acc[f] = '';
-      } else {
-        acc[f] = deObjectify(value as DocValue | TemplateObject);
-      }
+  /**
+   * Set rows as fieldname: value map
+   */
+  for (const row of report.reportData) {
+    if (row.isEmpty) {
+      continue;
+    }
 
-      return acc;
-    }, {} as Record<string, DocValue>)
-  );
+    const rowObj: Record<string, unknown> = {};
+    for (const c in row.cells) {
+      const { label } = columns[c];
+      const cell = getValueFromCell(row.cells[c], displayPrecision);
+      rowObj[label] = cell;
+    }
 
-  exportObject.filters = Object.keys(filters)
-    .filter((name) => filters[name] !== null && filters[name] !== undefined)
-    .reduce((acc, name) => {
-      acc[name] = filters[name];
-      return acc;
-    }, {} as Record<string, string>);
-
-  exportObject.timestamp = new Date().toISOString();
-  exportObject.reportName = reportName;
-  exportObject.softwareName = 'Frappe Books';
-  exportObject.softwareVersion = fyo.store.appVersion;
-
-  await saveExportData(JSON.stringify(exportObject), filePath);
-}
-
-async function exportReport(
-  extention: string,
-  reportName: string,
-  getReportData: GetReportData
-) {
-  const { rows, columns, filters } = getReportData();
-
-  const { filePath, canceled } = await getSavePath(reportName, extention);
-  if (canceled || !filePath) return;
-
-  switch (extention) {
-    case 'csv':
-      await exportCsv(rows, columns, filePath);
-      break;
-    case 'json':
-      await exportJson(rows, columns, filePath, filters, reportName);
-      break;
-    default:
-      return;
+    exportObject.rows.push(rowObj);
   }
 
-  fyo.telemetry.log(Verb.Exported, reportName, { extention });
+  /**
+   * Set filter map
+   */
+  for (const { fieldname } of report.filters) {
+    const value = report.get(fieldname);
+    if (getIsNullOrUndef(value)) {
+      continue;
+    }
+
+    exportObject.filters[fieldname] = String(value);
+  }
+
+  /**
+   * Metadata
+   */
+  exportObject.timestamp = new Date().toISOString();
+  exportObject.reportName = report.reportName;
+  exportObject.softwareName = 'Frappe Books';
+  exportObject.softwareVersion = report.fyo.store.appVersion;
+
+  await saveExportData(JSON.stringify(exportObject), filePath, report.fyo);
 }
 
-export default function getCommonExportActions(reportName: string) {
-  return ['csv', 'json'].map((ext) => ({
-    group: fyo.t`Export`,
-    label: ext.toUpperCase(),
-    type: 'primary',
-    action: async (getReportData: GetReportData) =>
-      await exportReport(ext, reportName, getReportData),
-  }));
+export async function exportCsv(report: Report, filePath: string) {
+  const csvMatrix = convertReportToCSVMatrix(report);
+  const csvString = generateCSV(csvMatrix);
+  saveExportData(csvString, filePath, report.fyo);
 }
 
-export async function saveExportData(data: string, filePath: string) {
+function convertReportToCSVMatrix(report: Report): unknown[][] {
+  const displayPrecision =
+    (report.fyo.singles.SystemSettings?.displayPrecision as number) ?? 2;
+  const reportData = report.reportData;
+  const columns = report.columns!;
+
+  const csvdata: unknown[][] = [];
+  csvdata.push(columns.map((c) => c.label));
+  for (const row of reportData) {
+    if (row.isEmpty) {
+      csvdata.push(Array(row.cells.length).fill(''));
+      continue;
+    }
+
+    const csvrow: unknown[] = [];
+    for (const c in row.cells) {
+      const cell = getValueFromCell(row.cells[c], displayPrecision);
+      csvrow.push(cell);
+    }
+
+    csvdata.push(csvrow);
+  }
+
+  return csvdata;
+}
+
+function getValueFromCell(cell: ReportCell, displayPrecision: number) {
+  const rawValue = cell.rawValue;
+
+  if (rawValue instanceof Date) {
+    return rawValue.toISOString();
+  }
+
+  if (typeof rawValue === 'number') {
+    const value = rawValue.toFixed(displayPrecision);
+
+    /**
+     * remove insignificant zeroes
+     */
+    if (value.endsWith('0'.repeat(displayPrecision))) {
+      return value.slice(0, -displayPrecision - 1);
+    }
+
+    return value;
+  }
+
+  if (getIsNullOrUndef(cell)) {
+    return '';
+  }
+
+  return rawValue;
+}
+
+export async function saveExportData(data: string, filePath: string, fyo: Fyo) {
   await saveData(data, filePath);
   showExportInFolder(fyo.t`Export Successful`, filePath);
 }
diff --git a/src/pages/Report.vue b/src/pages/Report.vue
index c7e1baae..569707de 100644
--- a/src/pages/Report.vue
+++ b/src/pages/Report.vue
@@ -1,19 +1,15 @@
 <template>
   <div class="flex flex-col w-full h-full">
     <PageHeader :title="title">
-      <!-- 
       <DropdownWithActions
-        v-for="group of actionGroups"
+        v-for="group of groupedActions"
         :key="group.label"
         :type="group.type"
         :actions="group.actions"
         class="text-xs"
       >
-        {{ group.label }}
+        {{ group.group }}
       </DropdownWithActions>
-      <DropdownWithActions :actions="actions" />
-
-     -->
     </PageHeader>
 
     <!-- Filters -->
@@ -42,6 +38,7 @@ import { computed } from '@vue/reactivity';
 import { t } from 'fyo';
 import { reports } from 'reports';
 import FormControl from 'src/components/Controls/FormControl.vue';
+import DropdownWithActions from 'src/components/DropdownWithActions.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import ListReport from 'src/components/Report/ListReport.vue';
 import { fyo } from 'src/initFyo';
@@ -49,7 +46,7 @@ import { defineComponent } from 'vue';
 
 export default defineComponent({
   props: {
-    reportName: String,
+    reportClassName: String,
   },
   data() {
     return {
@@ -62,7 +59,7 @@ export default defineComponent({
       report: computed(() => this.report),
     };
   },
-  components: { PageHeader, FormControl, ListReport },
+  components: { PageHeader, FormControl, ListReport, DropdownWithActions },
   async activated() {
     await this.setReportData();
     if (fyo.store.isDevelopment) {
@@ -71,12 +68,32 @@ export default defineComponent({
   },
   computed: {
     title() {
-      return reports[this.reportName]?.title ?? t`Report`;
+      return reports[this.reportClassName]?.title ?? t`Report`;
+    },
+    groupedActions() {
+      const actions = this.report?.getActions() ?? [];
+      const actionsMap = actions.reduce((acc, ac) => {
+        if (!ac.group) {
+          ac.group = 'none';
+        }
+
+        acc[ac.group] ??= {
+          group: ac.group,
+          label: ac.label ?? '',
+          type: ac.type,
+          actions: [],
+        };
+
+        acc[ac.group].actions.push(ac);
+        return acc;
+      }, {});
+
+      return Object.values(actionsMap);
     },
   },
   methods: {
     async setReportData() {
-      const Report = reports[this.reportName];
+      const Report = reports[this.reportClassName];
 
       if (this.report === null) {
         this.report = new Report(fyo);
diff --git a/src/router.ts b/src/router.ts
index 9fc48c6a..400fb116 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -88,7 +88,7 @@ const routes: RouteRecordRaw[] = [
     props: true,
   },
   {
-    path: '/report/:reportName',
+    path: '/report/:reportClassName',
     name: 'Report',
     component: Report,
     props: true,

From 5a633b9d07f96a7df40ec629ca0d835b8b7ced1b Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 18 May 2022 14:18:30 +0530
Subject: [PATCH 129/163] incr: add gstr exports

---
 fyo/core/converter.ts                     |   4 -
 reports/GoodsAndServiceTax/BaseGSTR.ts    |   8 +
 reports/GoodsAndServiceTax/GSTR1.ts       |   4 -
 reports/GoodsAndServiceTax/GSTR2.ts       |   4 -
 reports/GoodsAndServiceTax/gstExporter.ts | 367 ++++++++++++++++++++++
 reports/GoodsAndServiceTax/types.ts       |   5 +-
 reports/commonExporter.ts                 |  33 +-
 reports/types.ts                          |   2 +-
 8 files changed, 394 insertions(+), 33 deletions(-)
 create mode 100644 reports/GoodsAndServiceTax/gstExporter.ts

diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index 4671ba30..d519427e 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -56,10 +56,6 @@ export class Converter {
   }
 
   static toDocValue(value: RawValue, field: Field, fyo: Fyo): DocValue {
-    if (!field?.fieldtype) {
-      console.log(value, field);
-      console.trace();
-    }
     switch (field.fieldtype) {
       case FieldTypeEnum.Currency:
         return toDocCurrency(value, field, fyo);
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.ts b/reports/GoodsAndServiceTax/BaseGSTR.ts
index 48a242d2..92e39afa 100644
--- a/reports/GoodsAndServiceTax/BaseGSTR.ts
+++ b/reports/GoodsAndServiceTax/BaseGSTR.ts
@@ -1,4 +1,5 @@
 import { t } from 'fyo';
+import { Action } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { Invoice } from 'models/baseModels/Invoice/Invoice';
 import { Party } from 'models/regionalModels/in/Party';
@@ -8,6 +9,7 @@ import { Report } from 'reports/Report';
 import { ColumnField, ReportData, ReportRow } from 'reports/types';
 import { Field, OptionField } from 'schemas/types';
 import { isNumeric } from 'src/utils';
+import getGSTRExportActions from './gstExporter';
 import { GSTRRow, GSTRType, TransferType, TransferTypeEnum } from './types';
 
 export abstract class BaseGSTR extends Report {
@@ -16,6 +18,7 @@ export abstract class BaseGSTR extends Report {
   fromDate?: string;
   transferType?: TransferType;
   usePagination: boolean = true;
+  gstrRows?: GSTRRow[];
 
   abstract gstrType: GSTRType;
 
@@ -45,6 +48,7 @@ export abstract class BaseGSTR extends Report {
   async setReportData(): Promise<void> {
     const gstrRows = await this.getGstrRows();
     const filteredRows = this.filterGstrRows(gstrRows);
+    this.gstrRows = filteredRows;
     this.reportData = this.getReportDataFromGSTRRows(filteredRows);
   }
 
@@ -337,4 +341,8 @@ export abstract class BaseGSTR extends Report {
 
     return columns;
   }
+
+  getActions(): Action[] {
+    return getGSTRExportActions(this);
+  }
 }
diff --git a/reports/GoodsAndServiceTax/GSTR1.ts b/reports/GoodsAndServiceTax/GSTR1.ts
index 3f2316b1..9b8085e9 100644
--- a/reports/GoodsAndServiceTax/GSTR1.ts
+++ b/reports/GoodsAndServiceTax/GSTR1.ts
@@ -1,4 +1,3 @@
-import { Action } from 'fyo/model/types';
 import { BaseGSTR } from './BaseGSTR';
 import { GSTRType } from './types';
 
@@ -7,7 +6,4 @@ export class GSTR1 extends BaseGSTR {
   static reportName = 'gstr-1';
 
   gstrType: GSTRType = 'GSTR-1';
-  getActions(): Action[] {
-    return [];
-  }
 }
diff --git a/reports/GoodsAndServiceTax/GSTR2.ts b/reports/GoodsAndServiceTax/GSTR2.ts
index 861ec099..b1abe12e 100644
--- a/reports/GoodsAndServiceTax/GSTR2.ts
+++ b/reports/GoodsAndServiceTax/GSTR2.ts
@@ -1,4 +1,3 @@
-import { Action } from 'fyo/model/types';
 import { BaseGSTR } from './BaseGSTR';
 import { GSTRType } from './types';
 
@@ -7,7 +6,4 @@ export class GSTR2 extends BaseGSTR {
   static reportName = 'gstr-2';
 
   gstrType: GSTRType = 'GSTR-2';
-  getActions(): Action[] {
-    return [];
-  }
 }
diff --git a/reports/GoodsAndServiceTax/gstExporter.ts b/reports/GoodsAndServiceTax/gstExporter.ts
new file mode 100644
index 00000000..42011683
--- /dev/null
+++ b/reports/GoodsAndServiceTax/gstExporter.ts
@@ -0,0 +1,367 @@
+import { Action } from 'fyo/model/types';
+import { Verb } from 'fyo/telemetry/types';
+import { DateTime } from 'luxon';
+import { ModelNameEnum } from 'models/types';
+import { codeStateMap } from 'regional/in';
+import { ExportExtention } from 'reports/types';
+import { getSavePath } from 'src/utils/ipcCalls';
+import { showMessageDialog } from 'src/utils/ui';
+import { invertMap } from 'utils';
+import { getCsvData, saveExportData } from '../commonExporter';
+import { BaseGSTR } from './BaseGSTR';
+import { TransferTypeEnum } from './types';
+
+const GST = {
+  'GST-0': 0,
+  'GST-0.25': 0.25,
+  'GST-3': 3,
+  'GST-5': 5,
+  'GST-6': 6,
+  'GST-12': 12,
+  'GST-18': 18,
+  'GST-28': 28,
+  'IGST-0': 0,
+  'IGST-0.25': 0.25,
+  'IGST-3': 3,
+  'IGST-5': 5,
+  'IGST-6': 6,
+  'IGST-12': 12,
+  'IGST-18': 18,
+  'IGST-28': 28,
+} as Record<string, number>;
+
+const CSGST = {
+  'GST-0': 0,
+  'GST-0.25': 0.125,
+  'GST-3': 1.5,
+  'GST-5': 2.5,
+  'GST-6': 3,
+  'GST-12': 6,
+  'GST-18': 9,
+  'GST-28': 14,
+} as Record<string, number>;
+
+const IGST = {
+  'IGST-0.25': 0.25,
+  'IGST-3': 3,
+  'IGST-5': 5,
+  'IGST-6': 6,
+  'IGST-12': 12,
+  'IGST-18': 18,
+  'IGST-28': 28,
+} as Record<string, number>;
+
+interface GSTData {
+  version: string;
+  hash: string;
+  gstin: string;
+  fp: string;
+  b2b?: B2BCustomer[];
+  b2cl?: B2CLStateInvoiceRecord[];
+  b2cs?: B2CSInvRecord[];
+}
+
+interface B2BCustomer {
+  ctin: string;
+  inv: B2BInvRecord[];
+}
+
+interface B2BInvRecord {
+  inum: string;
+  idt: string;
+  val: number;
+  pos: string;
+  rchrg: 'Y' | 'N';
+  inv_typ: string;
+  itms: B2BItmRecord[];
+}
+
+interface B2BItmRecord {
+  num: number;
+  itm_det: {
+    txval: number;
+    rt: number;
+    csamt: number;
+    camt: number;
+    samt: number;
+    iamt: number;
+  };
+}
+
+interface B2CLInvRecord {
+  inum: string;
+  idt: string;
+  val: number;
+  itms: B2CLItmRecord[];
+}
+
+interface B2CLItmRecord {
+  num: number;
+  itm_det: {
+    txval: number;
+    rt: number;
+    csamt: 0;
+    iamt: number;
+  };
+}
+
+interface B2CLStateInvoiceRecord {
+  pos: string;
+  inv: B2CLInvRecord[];
+}
+
+interface B2CSInvRecord {
+  sply_ty: 'INTRA' | 'INTER';
+  pos: string;
+  typ: 'OE'; // "OE" -  Errors and omissions excepted.
+  txval: number;
+  rt: number;
+  iamt: number;
+  camt: number;
+  samt: number;
+  csamt: number;
+}
+
+export default function getGSTRExportActions(report: BaseGSTR): Action[] {
+  const exportExtention = ['csv', 'json'] as ExportExtention[];
+
+  return exportExtention.map((ext) => ({
+    group: `Export`,
+    label: ext.toUpperCase(),
+    type: 'primary',
+    action: async () => {
+      await exportReport(ext, report);
+    },
+  }));
+}
+
+async function exportReport(extention: ExportExtention, report: BaseGSTR) {
+  const canExport = await getCanExport(report);
+  if (!canExport) {
+    return;
+  }
+
+  const { filePath, canceled } = await getSavePath(
+    report.reportName,
+    extention
+  );
+
+  if (canceled || !filePath) {
+    return;
+  }
+
+  let data = '';
+
+  if (extention === 'csv') {
+    data = getCsvData(report);
+  } else if (extention === 'json') {
+    data = await getGstrJsonData(report);
+  }
+
+  if (!data.length) {
+    return;
+  }
+
+  await saveExportData(data, filePath, report.fyo);
+  report.fyo.telemetry.log(Verb.Exported, report.reportName, { extention });
+}
+
+async function getCanExport(report: BaseGSTR) {
+  const gstin = await report.fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'gstin'
+  );
+  if (gstin) {
+    return true;
+  }
+
+  showMessageDialog({
+    message: 'Cannot Export',
+    detail: 'Please set GSTIN in General Settings.',
+  });
+
+  return false;
+}
+
+export async function getGstrJsonData(report: BaseGSTR): Promise<string> {
+  const toDate = report.toDate!;
+  const transferType = report.transferType!;
+  const gstin = await report.fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'gstin'
+  );
+
+  const gstData: GSTData = {
+    version: 'GST3.0.4',
+    hash: 'hash',
+    gstin: gstin as string,
+    fp: DateTime.fromISO(toDate).toFormat('MMyyyy'),
+  };
+
+  if (transferType === TransferTypeEnum.B2B) {
+    gstData.b2b = await generateB2bData(report);
+  } else if (transferType === TransferTypeEnum.B2CL) {
+    gstData.b2cl = await generateB2clData(report);
+  } else if (transferType === TransferTypeEnum.B2CS) {
+    gstData.b2cs = await generateB2csData(report);
+  }
+
+  return JSON.stringify(gstData);
+}
+
+async function generateB2bData(report: BaseGSTR): Promise<B2BCustomer[]> {
+  const fyo = report.fyo;
+  const b2b: B2BCustomer[] = [];
+
+  const schemaName =
+    report.gstrType === 'GSTR-1'
+      ? ModelNameEnum.SalesInvoiceItem
+      : ModelNameEnum.PurchaseInvoiceItem;
+
+  for (const row of report.gstrRows ?? []) {
+    const invRecord: B2BInvRecord = {
+      inum: row.invNo,
+      idt: DateTime.fromJSDate(row.invDate).toFormat('dd-MM-yyyy'),
+      val: row.invAmt,
+      pos: row.gstin && row.gstin.substring(0, 2),
+      rchrg: row.reverseCharge,
+      inv_typ: 'R',
+      itms: [],
+    };
+
+    const items = await fyo.db.getAllRaw(schemaName, {
+      fields: ['baseAmount', 'tax', 'hsnCode'],
+      filters: { parent: invRecord.inum as string },
+    });
+
+    items.forEach((item) => {
+      const hsnCode = item.hsnCode as number;
+      const tax = item.tax as string;
+      const baseAmount = (item.baseAmount ?? 0) as string;
+
+      const itemRecord: B2BItmRecord = {
+        num: hsnCode,
+        itm_det: {
+          txval: fyo.pesa(baseAmount).float,
+          rt: GST[tax],
+          csamt: 0,
+          camt: fyo
+            .pesa(CSGST[tax] ?? 0)
+            .mul(baseAmount)
+            .div(100).float,
+          samt: fyo
+            .pesa(CSGST[tax] ?? 0)
+            .mul(baseAmount)
+            .div(100).float,
+          iamt: fyo
+            .pesa(IGST[tax] ?? 0)
+            .mul(baseAmount)
+            .div(100).float,
+        },
+      };
+
+      invRecord.itms.push(itemRecord);
+    });
+
+    const customerRecord = b2b.find((b) => b.ctin === row.gstin);
+    const customer = {
+      ctin: row.gstin,
+      inv: [],
+    } as B2BCustomer;
+
+    if (customerRecord) {
+      customerRecord.inv.push(invRecord);
+    } else {
+      customer.inv.push(invRecord);
+      b2b.push(customer);
+    }
+  }
+
+  return b2b;
+}
+
+async function generateB2clData(
+  report: BaseGSTR
+): Promise<B2CLStateInvoiceRecord[]> {
+  const fyo = report.fyo;
+  const b2cl: B2CLStateInvoiceRecord[] = [];
+  const stateCodeMap = invertMap(codeStateMap);
+
+  const schemaName =
+    report.gstrType === 'GSTR-1'
+      ? ModelNameEnum.SalesInvoiceItem
+      : ModelNameEnum.PurchaseInvoiceItem;
+
+  for (const row of report.gstrRows ?? []) {
+    const invRecord: B2CLInvRecord = {
+      inum: row.invNo,
+      idt: DateTime.fromJSDate(row.invDate).toFormat('dd-MM-yyyy'),
+      val: row.invAmt,
+      itms: [],
+    };
+
+    const items = await fyo.db.getAllRaw(schemaName, {
+      fields: ['hsnCode', 'tax', 'baseAmount'],
+      filters: { parent: invRecord.inum },
+    });
+
+    items.forEach((item) => {
+      const hsnCode = item.hsnCode as number;
+      const tax = item.tax as string;
+      const baseAmount = (item.baseAmount ?? 0) as string;
+
+      const itemRecord: B2CLItmRecord = {
+        num: hsnCode,
+        itm_det: {
+          txval: fyo.pesa(baseAmount).float,
+          rt: GST[tax] ?? 0,
+          csamt: 0,
+          iamt: fyo
+            .pesa(row.rate ?? 0)
+            .mul(baseAmount)
+            .div(100).float,
+        },
+      };
+
+      invRecord.itms.push(itemRecord);
+    });
+
+    const stateRecord = b2cl.find((b) => b.pos === stateCodeMap[row.place]);
+    const stateInvoiceRecord: B2CLStateInvoiceRecord = {
+      pos: stateCodeMap[row.place],
+      inv: [],
+    };
+
+    if (stateRecord) {
+      stateRecord.inv.push(invRecord);
+    } else {
+      stateInvoiceRecord.inv.push(invRecord);
+      b2cl.push(stateInvoiceRecord);
+    }
+  }
+
+  return b2cl;
+}
+
+function generateB2csData(report: BaseGSTR): B2CSInvRecord[] {
+  const stateCodeMap = invertMap(codeStateMap);
+  const b2cs: B2CSInvRecord[] = [];
+
+  for (const row of report.gstrRows ?? []) {
+    const invRecord: B2CSInvRecord = {
+      sply_ty: row.inState ? 'INTRA' : 'INTER',
+      pos: stateCodeMap[row.place],
+      typ: 'OE',
+      txval: row.taxVal,
+      rt: row.rate,
+      iamt: !row.inState ? (row.taxVal * row.rate) / 100 : 0,
+      camt: row.inState ? row.cgstAmt ?? 0 : 0,
+      samt: row.inState ? row.sgstAmt ?? 0 : 0,
+      csamt: 0,
+    };
+
+    b2cs.push(invRecord);
+  }
+
+  return b2cs;
+}
diff --git a/reports/GoodsAndServiceTax/types.ts b/reports/GoodsAndServiceTax/types.ts
index 50468748..3971f829 100644
--- a/reports/GoodsAndServiceTax/types.ts
+++ b/reports/GoodsAndServiceTax/types.ts
@@ -1,8 +1,7 @@
-
 export enum TransferTypeEnum {
   'B2B' = 'B2B',
-'B2CL' = 'B2C',
-  'B2CS' = 'B2C',
+  'B2CL' = 'B2CL',
+  'B2CS' = 'B2CS',
   'NR' = 'NR',
 }
 
diff --git a/reports/commonExporter.ts b/reports/commonExporter.ts
index 17de0728..e8001e54 100644
--- a/reports/commonExporter.ts
+++ b/reports/commonExporter.ts
@@ -5,9 +5,7 @@ import { getSavePath, saveData, showExportInFolder } from 'src/utils/ipcCalls';
 import { getIsNullOrUndef } from 'utils';
 import { generateCSV } from 'utils/csvParser';
 import { Report } from './Report';
-import { ReportCell } from './types';
-
-type ExportExtention = 'csv' | 'json';
+import { ExportExtention, ReportCell } from './types';
 
 interface JSONExport {
   columns: { fieldname: string; label: string }[];
@@ -42,21 +40,23 @@ async function exportReport(extention: ExportExtention, report: Report) {
     return;
   }
 
-  switch (extention) {
-    case 'csv':
-      await exportCsv(report, filePath);
-      break;
-    case 'json':
-      await exportJson(report, filePath);
-      break;
-    default:
-      return;
+  let data = '';
+
+  if (extention === 'csv') {
+    data = getCsvData(report);
+  } else if (extention === 'json') {
+    data = getJsonData(report);
   }
 
+  if (!data.length) {
+    return;
+  }
+
+  await saveExportData(data, filePath, report.fyo);
   report.fyo.telemetry.log(Verb.Exported, report.reportName, { extention });
 }
 
-async function exportJson(report: Report, filePath: string) {
+function getJsonData(report: Report): string {
   const exportObject: JSONExport = {
     columns: [],
     rows: [],
@@ -117,13 +117,12 @@ async function exportJson(report: Report, filePath: string) {
   exportObject.softwareName = 'Frappe Books';
   exportObject.softwareVersion = report.fyo.store.appVersion;
 
-  await saveExportData(JSON.stringify(exportObject), filePath, report.fyo);
+  return JSON.stringify(exportObject);
 }
 
-export async function exportCsv(report: Report, filePath: string) {
+export function getCsvData(report: Report): string {
   const csvMatrix = convertReportToCSVMatrix(report);
-  const csvString = generateCSV(csvMatrix);
-  saveExportData(csvString, filePath, report.fyo);
+  return generateCSV(csvMatrix);
 }
 
 function convertReportToCSVMatrix(report: Report): unknown[][] {
diff --git a/reports/types.ts b/reports/types.ts
index 92548bb2..416df57b 100644
--- a/reports/types.ts
+++ b/reports/types.ts
@@ -2,7 +2,7 @@ import { DateTime } from 'luxon';
 import { AccountRootType } from 'models/baseModels/Account/types';
 import { BaseField, RawValue } from 'schemas/types';
 
-export type ExportExtension = 'csv' | 'json';
+export type ExportExtention = 'csv' | 'json';
 
 export interface ReportCell {
   bold?: boolean;

From 986d4da23e0b27e9ca6cd7a0fca0256603bea787 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 18 May 2022 14:55:44 +0530
Subject: [PATCH 130/163] incr: add separate item for gst

---
 src/components/Icons/18/gst.vue | 23 ++++++++++++++++++
 src/utils/sidebarConfig.ts      | 43 +++++++++++++++++++++++----------
 2 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 src/components/Icons/18/gst.vue

diff --git a/src/components/Icons/18/gst.vue b/src/components/Icons/18/gst.vue
new file mode 100644
index 00000000..eaf0c5be
--- /dev/null
+++ b/src/components/Icons/18/gst.vue
@@ -0,0 +1,23 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M2 1C0.895431 1 0 1.89543 0 3V15C0 16.1046 0.89543 17 2 17H16C17.1046 17 18 16.1046 18 15V3C18 1.89543 17.1046 1 16 1H2ZM8.58582 13.4571V11.64H6.95725V13.5429C6.95725 14.0229 7.10582 14.4114 7.40297 14.7086C7.70011 14.9943 8.08868 15.1371 8.56868 15.1371H9.46011C9.94011 15.1371 10.3287 14.9943 10.6258 14.7086C10.923 14.4114 11.0715 14.0229 11.0715 13.5429V10.1314C11.0715 9.83429 10.9973 9.6 10.8487 9.42857C10.7115 9.25714 10.5515 9.13143 10.3687 9.05143C10.1858 8.97143 10.043 8.90857 9.94011 8.86286L8.58582 8.26286V4.68C8.58582 4.62286 8.61439 4.59429 8.67154 4.59429H9.35725C9.41439 4.59429 9.44297 4.62286 9.44297 4.68V6.99429L11.0715 7.13143V4.59429C11.0715 4.11429 10.923 3.73143 10.6258 3.44571C10.3287 3.14857 9.94011 3 9.46011 3H8.56868C8.08868 3 7.70011 3.14857 7.40297 3.44571C7.10582 3.73143 6.95725 4.11429 6.95725 4.59429V8.50286C6.95725 8.8 7.02582 9.03429 7.16297 9.20571C7.31154 9.37714 7.47725 9.50857 7.66011 9.6C7.84297 9.68 7.98582 9.73714 8.08868 9.77143L9.44297 10.3714V13.4571C9.44297 13.5143 9.41439 13.5429 9.35725 13.5429H8.67154C8.61439 13.5429 8.58582 13.5143 8.58582 13.4571ZM12.0715 4.59429V3H16.7858V4.59429H15.2429V15H13.6144V4.59429H12.0715ZM5.51153 14.5714C5.80867 14.2743 5.95724 13.8857 5.95724 13.4057V8.17714H3.79724L3.6601 9.77143H4.32867V13.32C4.32867 13.3771 4.3001 13.4057 4.24295 13.4057H3.21438C3.15724 13.4057 3.12867 13.3771 3.12867 13.32V4.68C3.12867 4.62286 3.15724 4.59429 3.21438 4.59429H4.24295C4.3001 4.59429 4.32867 4.62286 4.32867 4.68V7.33714H5.95724V4.59429C5.95724 4.11429 5.80867 3.73143 5.51153 3.44571C5.21438 3.14857 4.82581 3 4.34581 3H3.11153C2.63153 3 2.24295 3.14857 1.94581 3.44571C1.64867 3.73143 1.5001 4.11429 1.5001 4.59429V13.4057C1.5001 13.8857 1.64867 14.2743 1.94581 14.5714C2.24295 14.8571 2.63153 15 3.11153 15H4.34581C4.82581 15 5.21438 14.8571 5.51153 14.5714Z"
+      :fill="darkColor"
+    />
+  </svg>
+</template>
+<script>
+import Base from '../base';
+export default {
+  name: 'IconReports',
+  extends: Base,
+};
+</script>
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index 53053f3c..a06254e8 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -1,6 +1,6 @@
 import { t } from 'fyo';
 import { fyo } from '../initFyo';
-import { SidebarConfig } from './types';
+import { SidebarConfig, SidebarRoot } from './types';
 
 export function getSidebarConfig(): SidebarConfig {
   const sideBar = getCompleteSidebar();
@@ -25,6 +25,34 @@ export function getFilteredSidebar(sideBar: SidebarConfig): SidebarConfig {
   });
 }
 
+function getRegionalSidebar(): SidebarRoot[] {
+  const hasGstin = !!fyo.singles?.AccountingSettings?.gstin;
+  if (!hasGstin) {
+    return [];
+  }
+
+  return [
+    {
+      label: 'GST',
+      name: 'gst',
+      icon: 'gst',
+      route: '/report/GSTR1',
+      items: [
+        {
+          label: t`GSTR1`,
+          name: 'gstr1',
+          route: '/report/GSTR1',
+        },
+        {
+          label: t`GSTR2`,
+          name: 'gstr2',
+          route: '/report/GSTR2',
+        },
+      ],
+    },
+  ];
+}
+
 function getCompleteSidebar(): SidebarConfig {
   return [
     {
@@ -158,20 +186,9 @@ function getCompleteSidebar(): SidebarConfig {
           name: 'trial-balance',
           route: '/report/TrialBalance',
         },
-        {
-          label: t`GSTR1`,
-          name: 'gstr1',
-          route: '/report/GSTR1',
-          hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
-        },
-        {
-          label: t`GSTR2`,
-          name: 'gstr2',
-          route: '/report/GSTR2',
-          hidden: () => fyo.singles.AccountingSettings!.country !== 'India',
-        },
       ],
     },
+    ...getRegionalSidebar(),
     {
       label: t`Setup`,
       name: t`setup`,

From 37dc3e911f41029ffcf32bc646130187e481d6f4 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 18 May 2022 20:28:35 +0530
Subject: [PATCH 131/163] incr: small fixes

---
 fyo/model/doc.ts                       | 4 ++++
 main.ts                                | 6 +++++-
 reports/BalanceSheet/BalanceSheet.ts   | 3 +++
 reports/GeneralLedger/GeneralLedger.ts | 3 +++
 reports/GoodsAndServiceTax/BaseGSTR.ts | 3 +++
 reports/ProfitAndLoss/ProfitAndLoss.ts | 3 +++
 reports/Report.ts                      | 1 +
 reports/TrialBalance/TrialBalance.ts   | 3 +++
 src/components/Charts/BarChart.vue     | 4 ++--
 src/components/Charts/LineChart.vue    | 2 +-
 src/components/Report/ListReport.vue   | 5 ++++-
 src/components/TwoColumnForm.vue       | 4 ++--
 src/pages/ListView/List.vue            | 2 +-
 src/pages/QuickEditForm.vue            | 1 +
 src/utils/sidebarConfig.ts             | 2 +-
 src/utils/ui.ts                        | 2 +-
 16 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 9330d3ce..ea16882d 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -86,6 +86,10 @@ export class Doc extends Observable<DocValue | Doc[]> {
     return this._notInserted;
   }
 
+  get inserted(): boolean {
+    return !this._notInserted;
+  }
+
   get tableFields(): TargetField[] {
     return this.schema.fields.filter(
       (f) => f.fieldtype === FieldTypeEnum.Table
diff --git a/main.ts b/main.ts
index b4784dd0..87d8432c 100644
--- a/main.ts
+++ b/main.ts
@@ -84,7 +84,7 @@ export class Main {
           .ELECTRON_NODE_INTEGRATION as unknown as boolean,
       },
       frame: this.isLinux,
-      resizable: true,
+      resizable: false,
     };
     if (this.isDevelopment || this.isLinux) {
       Object.assign(options, { icon: this.icon });
@@ -139,6 +139,10 @@ export class Main {
       this.mainWindow = null;
     });
 
+    this.mainWindow.on('will-resize', (e) => {
+      e.preventDefault();
+    });
+
     this.mainWindow.webContents.on('did-finish-load', () => {
       if (this.mainWindow === null) {
         return;
diff --git a/reports/BalanceSheet/BalanceSheet.ts b/reports/BalanceSheet/BalanceSheet.ts
index bd704b7a..9129f899 100644
--- a/reports/BalanceSheet/BalanceSheet.ts
+++ b/reports/BalanceSheet/BalanceSheet.ts
@@ -13,6 +13,7 @@ import { getMapFromList } from 'utils';
 export class BalanceSheet extends AccountReport {
   static title = t`Balance Sheet`;
   static reportName = 'balance-sheet';
+  loading: boolean = false;
 
   get rootTypes(): AccountRootType[] {
     return [
@@ -23,6 +24,7 @@ export class BalanceSheet extends AccountReport {
   }
 
   async setReportData(filter?: string) {
+    this.loading = true;
     if (filter !== 'hideGroupAmounts') {
       await this._setRawData();
     }
@@ -55,6 +57,7 @@ export class BalanceSheet extends AccountReport {
     this.reportData = await this.getReportDataFromRows(
       getMapFromList(rootTypeRows, 'rootType')
     );
+    this.loading = false;
   }
 
   async getReportDataFromRows(
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index ec169f73..0c39a12e 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -23,6 +23,7 @@ export class GeneralLedger extends LedgerReport {
   static title = t`General Ledger`;
   static reportName = 'general-ledger';
   usePagination: boolean = true;
+  loading: boolean = false;
 
   ascending: boolean = false;
   reverted: boolean = false;
@@ -42,6 +43,7 @@ export class GeneralLedger extends LedgerReport {
   }
 
   async setReportData(filter?: string) {
+    this.loading = true;
     let sort = true;
     if (filter !== 'grouped' || this._rawData.length === 0) {
       await this._setRawData();
@@ -78,6 +80,7 @@ export class GeneralLedger extends LedgerReport {
     });
 
     this.reportData = this._convertEntriesToReportData(consolidated);
+    this.loading = false;
   }
 
   _setIndexOnEntries(map: GroupedMap) {
diff --git a/reports/GoodsAndServiceTax/BaseGSTR.ts b/reports/GoodsAndServiceTax/BaseGSTR.ts
index 92e39afa..245bec08 100644
--- a/reports/GoodsAndServiceTax/BaseGSTR.ts
+++ b/reports/GoodsAndServiceTax/BaseGSTR.ts
@@ -19,6 +19,7 @@ export abstract class BaseGSTR extends Report {
   transferType?: TransferType;
   usePagination: boolean = true;
   gstrRows?: GSTRRow[];
+  loading: boolean = false;
 
   abstract gstrType: GSTRType;
 
@@ -46,10 +47,12 @@ export abstract class BaseGSTR extends Report {
   }
 
   async setReportData(): Promise<void> {
+    this.loading = true;
     const gstrRows = await this.getGstrRows();
     const filteredRows = this.filterGstrRows(gstrRows);
     this.gstrRows = filteredRows;
     this.reportData = this.getReportDataFromGSTRRows(filteredRows);
+    this.loading = false;
   }
 
   getReportDataFromGSTRRows(gstrRows: GSTRRow[]): ReportData {
diff --git a/reports/ProfitAndLoss/ProfitAndLoss.ts b/reports/ProfitAndLoss/ProfitAndLoss.ts
index e4965624..40f5f67b 100644
--- a/reports/ProfitAndLoss/ProfitAndLoss.ts
+++ b/reports/ProfitAndLoss/ProfitAndLoss.ts
@@ -17,12 +17,14 @@ import {
 export class ProfitAndLoss extends AccountReport {
   static title = t`Profit And Loss`;
   static reportName = 'profit-and-loss';
+  loading: boolean = false;
 
   get rootTypes(): AccountRootType[] {
     return [AccountRootTypeEnum.Income, AccountRootTypeEnum.Expense];
   }
 
   async setReportData(filter?: string) {
+    this.loading = true;
     if (filter !== 'hideGroupAmounts') {
       await this._setRawData();
     }
@@ -66,6 +68,7 @@ export class ProfitAndLoss extends AccountReport {
       incomeRoot,
       expenseRoot
     );
+    this.loading = false;
   }
 
   async getReportDataFromRows(
diff --git a/reports/Report.ts b/reports/Report.ts
index 4f000073..2e2797a4 100644
--- a/reports/Report.ts
+++ b/reports/Report.ts
@@ -14,6 +14,7 @@ export abstract class Report extends Observable<RawValue> {
   filters: Field[] = [];
   reportData: ReportData;
   usePagination: boolean = false;
+  abstract loading: boolean;
 
   constructor(fyo: Fyo) {
     super();
diff --git a/reports/TrialBalance/TrialBalance.ts b/reports/TrialBalance/TrialBalance.ts
index 03720391..66c7c6f3 100644
--- a/reports/TrialBalance/TrialBalance.ts
+++ b/reports/TrialBalance/TrialBalance.ts
@@ -36,6 +36,7 @@ export class TrialBalance extends AccountReport {
   fromDate?: string;
   toDate?: string;
   hideGroupAmounts: boolean = false;
+  loading: boolean = false;
 
   _rawData: LedgerEntry[] = [];
   _dateRanges?: DateRange[];
@@ -53,6 +54,7 @@ export class TrialBalance extends AccountReport {
   }
 
   async setReportData(filter?: string) {
+    this.loading = true;
     if (filter !== 'hideGroupAmounts') {
       await this._setRawData();
     }
@@ -74,6 +76,7 @@ export class TrialBalance extends AccountReport {
       .filter((row) => !!row.rootNode);
 
     this.reportData = await this.getReportDataFromRows(rootTypeRows);
+    this.loading = false;
   }
 
   async getReportDataFromRows(
diff --git a/src/components/Charts/BarChart.vue b/src/components/Charts/BarChart.vue
index f0c32f69..d3726a59 100644
--- a/src/components/Charts/BarChart.vue
+++ b/src/components/Charts/BarChart.vue
@@ -161,10 +161,10 @@ export default {
     format: { type: Function, default: (n) => n.toFixed(1) },
     formatY: { type: Function, default: prefixFormat },
     formatX: { type: Function, default: (v) => v },
-    fontSize: { type: Number, default: 25 },
+    fontSize: { type: Number, default: 22 },
     fontColor: { type: String, default: '#415668' },
     bottom: { type: Number, default: 0 },
-    width: { type: Number, default: 34 },
+    width: { type: Number, default: 28 },
     left: { type: Number, default: 65 },
     radius: { type: Number, default: 17 },
     extendGridX: { type: Number, default: -20 },
diff --git a/src/components/Charts/LineChart.vue b/src/components/Charts/LineChart.vue
index 3e4469f6..b2307146 100644
--- a/src/components/Charts/LineChart.vue
+++ b/src/components/Charts/LineChart.vue
@@ -160,7 +160,7 @@ export default {
     format: { type: Function, default: (n) => n.toFixed(1) },
     formatY: { type: Function, default: prefixFormat },
     formatX: { type: Function, default: (v) => v },
-    fontSize: { type: Number, default: 18 },
+    fontSize: { type: Number, default: 20 },
     fontColor: { type: String, default: '#415668' },
     bottom: { type: Number, default: 0 },
     left: { type: Number, default: 55 },
diff --git a/src/components/Report/ListReport.vue b/src/components/Report/ListReport.vue
index 356ac69b..5e1bab09 100644
--- a/src/components/Report/ListReport.vue
+++ b/src/components/Report/ListReport.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="overflow-hidden flex flex-col h-full">
     <!-- Report Outer Container -->
-    <div class="overflow-hidden">
+    <div class="overflow-hidden" v-if="dataSlice.length">
       <!--Title Row -->
       <div
         class="w-full overflow-x-hidden flex items-center border-b"
@@ -61,6 +61,9 @@
       </WithScroll>
       <!-- Report Rows Container -->
     </div>
+    <p v-else class="w-full text-center mt-20 text-gray-800 text-base">
+      {{ report.loading ? t`Loading Report...` : t`No Values to be Displayed` }}
+    </p>
 
     <!-- Pagination Footer -->
     <div class="mt-auto flex-shrink-0" v-if="report.usePagination">
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 13e62801..2c53ddac 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -179,7 +179,7 @@ export default {
       }
 
       // handle rename
-      if (this.autosave && df.fieldname === 'name' && !this.doc.notInserted) {
+      if (this.autosave && df.fieldname === 'name' && this.doc.inserted) {
         return this.doc.rename(value);
       }
 
@@ -190,7 +190,7 @@ export default {
     async onChangeCommon(df, value, oldValue) {
       let isSet = false;
       try {
-        isSet = this.doc.set(df.fieldname, value);
+        isSet = await this.doc.set(df.fieldname, value);
       } catch (err) {
         this.errors[df.fieldname] = getErrorMessage(err, this.doc);
       }
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index dd03cf83..19e2a019 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -54,7 +54,7 @@
     </div>
 
     <!-- Pagination Footer -->
-    <div class="mt-auto">
+    <div class="mt-auto" v-if="data?.length">
       <hr />
       <Paginator :item-count="data.length" @index-change="setPageIndices" />
     </div>
diff --git a/src/pages/QuickEditForm.vue b/src/pages/QuickEditForm.vue
index 95615689..bc2a3cbe 100644
--- a/src/pages/QuickEditForm.vue
+++ b/src/pages/QuickEditForm.vue
@@ -58,6 +58,7 @@
         v-if="titleField"
         :df="titleField"
         :value="doc[titleField.fieldname]"
+        :read-only="doc.inserted"
         @change="(value) => valueChange(titleField, value)"
         @input="setTitleSize"
       />
diff --git a/src/utils/sidebarConfig.ts b/src/utils/sidebarConfig.ts
index a06254e8..29238a7c 100644
--- a/src/utils/sidebarConfig.ts
+++ b/src/utils/sidebarConfig.ts
@@ -7,7 +7,7 @@ export function getSidebarConfig(): SidebarConfig {
   return getFilteredSidebar(sideBar);
 }
 
-export function getFilteredSidebar(sideBar: SidebarConfig): SidebarConfig {
+function getFilteredSidebar(sideBar: SidebarConfig): SidebarConfig {
   return sideBar.filter((root) => {
     root.items = root.items?.filter((item) => {
       if (item.hidden !== undefined) {
diff --git a/src/utils/ui.ts b/src/utils/ui.ts
index 5170ae57..db093408 100644
--- a/src/utils/ui.ts
+++ b/src/utils/ui.ts
@@ -283,7 +283,7 @@ function getDeleteAction(doc: Doc): Action {
     async action() {
       const res = await deleteDocWithPrompt(doc);
       if (res) {
-        routeTo(`/list/${doc.schemaName}`);
+        router.back();
       }
     },
   };

From ce87ff6802e7ffbf10fd05ff3b2f6b68e31e2ec2 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 18 May 2022 22:25:24 +0530
Subject: [PATCH 132/163] fix: address issue, create filters

---
 fyo/model/doc.ts                             |  1 +
 models/baseModels/Invoice/Invoice.ts         |  6 ++++++
 models/baseModels/InvoiceItem/InvoiceItem.ts |  5 +++++
 models/baseModels/Party/Party.ts             | 13 -------------
 schemas/app/PurchaseInvoice.json             |  3 +++
 schemas/app/PurchaseInvoiceItem.json         |  3 +++
 schemas/app/SalesInvoice.json                |  3 +++
 schemas/app/SalesInvoiceItem.json            |  3 +++
 schemas/app/TaxDetail.json                   |  1 +
 schemas/tests/Party.json                     |  1 +
 schemas/types.ts                             |  1 +
 src/components/Controls/Link.vue             | 17 +++++++++++++++--
 src/components/TwoColumnForm.vue             | 10 ++++------
 13 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index ea16882d..3dd9db93 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -799,6 +799,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
 
   static lists: ListsMap = {};
   static filters: FiltersMap = {};
+  static createFilters: FiltersMap = {}; // Used by the *Create* dropdown option
   static defaults: DefaultMap = {};
   static emptyMessages: EmptyMessageMap = {};
 
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index c1a78b50..650f50a6 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -229,4 +229,10 @@ export abstract class Invoice extends Transactional {
     }),
     numberSeries: (doc: Doc) => ({ referenceType: doc.schemaName }),
   };
+
+  static createFilters: FiltersMap = {
+    party: (doc: Doc) => ({
+      role: doc.isSales ? 'Customer' : 'Supplier',
+    }),
+  };
 }
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index e1564129..6025f9ae 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -115,4 +115,9 @@ export abstract class InvoiceItem extends Doc {
       };
     },
   };
+  static createFilters: FiltersMap = {
+    item: (doc: Doc) => {
+      return { for: doc.isSales ? 'Sales' : 'Purchases' };
+    },
+  };
 }
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 932df43d..88591cc7 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -89,19 +89,6 @@ export class Party extends Doc {
     currency: {
       formula: async () => this.fyo.singles.SystemSettings!.currency as string,
     },
-    address: {
-      formula: async () => {
-        const address = this.address as string | undefined;
-        if (address) {
-          return (await this.fyo.getValue(
-            'Address',
-            address,
-            'addressDisplay'
-          )) as string;
-        }
-        return '';
-      },
-    },
   };
 
   validations: ValidationMap = {
diff --git a/schemas/app/PurchaseInvoice.json b/schemas/app/PurchaseInvoice.json
index 7ae099f1..78b673e6 100644
--- a/schemas/app/PurchaseInvoice.json
+++ b/schemas/app/PurchaseInvoice.json
@@ -24,6 +24,7 @@
       "label": "Party",
       "fieldtype": "Link",
       "target": "Party",
+      "create": true,
       "required": true
     },
     {
@@ -31,6 +32,7 @@
       "label": "Account",
       "fieldtype": "Link",
       "target": "Account",
+      "create": true,
       "required": true
     },
     {
@@ -101,6 +103,7 @@
       "label": "Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
+      "create": true,
       "required": true,
       "default": "PINV-"
     }
diff --git a/schemas/app/PurchaseInvoiceItem.json b/schemas/app/PurchaseInvoiceItem.json
index df6eadbc..88f866dd 100644
--- a/schemas/app/PurchaseInvoiceItem.json
+++ b/schemas/app/PurchaseInvoiceItem.json
@@ -8,6 +8,7 @@
       "label": "Item",
       "fieldtype": "Link",
       "target": "Item",
+      "create": true,
       "required": true
     },
     {
@@ -40,6 +41,7 @@
       "label": "Account",
       "fieldtype": "Link",
       "target": "Account",
+      "create": true,
       "required": true,
       "readOnly": true
     },
@@ -47,6 +49,7 @@
       "fieldname": "tax",
       "label": "Tax",
       "fieldtype": "Link",
+      "create": true,
       "target": "Tax"
     },
     {
diff --git a/schemas/app/SalesInvoice.json b/schemas/app/SalesInvoice.json
index 4bbe22ae..ddb0829c 100644
--- a/schemas/app/SalesInvoice.json
+++ b/schemas/app/SalesInvoice.json
@@ -23,6 +23,7 @@
       "label": "Party",
       "fieldtype": "Link",
       "target": "Party",
+      "create": true,
       "required": true
     },
     {
@@ -30,6 +31,7 @@
       "label": "Account",
       "fieldtype": "Link",
       "target": "Account",
+      "create": true,
       "required": true
     },
     {
@@ -100,6 +102,7 @@
       "label": "Number Series",
       "fieldtype": "Link",
       "target": "NumberSeries",
+      "create": true,
       "required": true,
       "default": "SINV-"
     }
diff --git a/schemas/app/SalesInvoiceItem.json b/schemas/app/SalesInvoiceItem.json
index 81cec3c6..582fbb53 100644
--- a/schemas/app/SalesInvoiceItem.json
+++ b/schemas/app/SalesInvoiceItem.json
@@ -8,6 +8,7 @@
       "label": "Item",
       "fieldtype": "Link",
       "target": "Item",
+      "create": true,
       "required": true
     },
     {
@@ -41,6 +42,7 @@
       "hidden": true,
       "fieldtype": "Link",
       "target": "Account",
+      "create": true,
       "required": true,
       "readOnly": true
     },
@@ -48,6 +50,7 @@
       "fieldname": "tax",
       "label": "Tax",
       "fieldtype": "Link",
+      "create": true,
       "target": "Tax"
     },
     {
diff --git a/schemas/app/TaxDetail.json b/schemas/app/TaxDetail.json
index d98a1a1e..b286aac3 100644
--- a/schemas/app/TaxDetail.json
+++ b/schemas/app/TaxDetail.json
@@ -9,6 +9,7 @@
       "label": "Tax Account",
       "fieldtype": "Link",
       "target": "Account",
+      "create": true,
       "required": true
     },
     {
diff --git a/schemas/tests/Party.json b/schemas/tests/Party.json
index a95fb656..121a7065 100644
--- a/schemas/tests/Party.json
+++ b/schemas/tests/Party.json
@@ -41,6 +41,7 @@
       "fieldname": "defaultAccount",
       "label": "Default Account",
       "fieldtype": "Link",
+      "create": true,
       "target": "Account"
     },
     {
diff --git a/schemas/types.ts b/schemas/types.ts
index 113232d1..7954852f 100644
--- a/schemas/types.ts
+++ b/schemas/types.ts
@@ -49,6 +49,7 @@ export interface OptionField extends BaseField {
 export interface TargetField extends BaseField {
   fieldtype: FieldTypeEnum.Table | FieldTypeEnum.Link;
   target: string;                // Name of the table or group of tables to fetch values
+  create?: boolean;              // Whether to show Create in the dropdown
 }
 
 export interface DynamicLinkField extends BaseField {
diff --git a/src/components/Controls/Link.vue b/src/components/Controls/Link.vue
index d5aafe37..ff012849 100644
--- a/src/components/Controls/Link.vue
+++ b/src/components/Controls/Link.vue
@@ -77,7 +77,7 @@ export default {
           .map(({ item }) => item);
       }
 
-      if (this.doc) {
+      if (this.doc && this.df.create) {
         options = options.concat(this.getCreateNewOption());
       }
 
@@ -119,7 +119,9 @@ export default {
     async openNewDoc() {
       const schemaName = this.df.target;
       const doc = await fyo.doc.getNewDoc(schemaName);
-      const filters = await this.getFilters();
+
+      const filters = await this.getCreateFilters();
+
       const { openQuickEdit } = await import('src/utils/ui');
 
       openQuickEdit({
@@ -135,6 +137,17 @@ export default {
         this.$router.back();
       });
     },
+    async getCreateFilters() {
+      const { schemaName, fieldname } = this.df;
+      const getFilters = fyo.models[schemaName]?.createFilters?.[fieldname];
+      const filters = await getFilters?.(this.doc);
+
+      if (filters === undefined) {
+        return await this.getFilters();
+      }
+
+      return filters;
+    },
     async getFilters() {
       const { schemaName, fieldname } = this.df;
       const getFilters = fyo.models[schemaName]?.filters?.[fieldname];
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 2c53ddac..c22b869b 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -36,7 +36,7 @@
           <Button
             type="primary"
             class="w-1/2 text-white"
-            @click="saveInlineEditDoc"
+            @click="saveInlineEditDoc(df)"
           >
             {{ t`Save` }}
           </Button>
@@ -237,9 +237,6 @@ export default {
       this.inlineEditField = df;
       if (!this.doc[df.fieldname]) {
         this.inlineEditDoc = await fyo.doc.getNewDoc(df.target);
-        this.inlineEditDoc.once('afterSync', async () => {
-          await this.onChangeCommon(df, this.inlineEditDoc.name);
-        });
       } else {
         this.inlineEditDoc = this.doc.getLink(df.fieldname);
       }
@@ -251,12 +248,13 @@ export default {
         fyo.getField(df.target, fieldname)
       );
     },
-    async saveInlineEditDoc() {
+    async saveInlineEditDoc(df) {
       if (!this.inlineEditDoc) {
         return;
       }
 
-      await this.$refs.inlineEditForm[0].sync();
+      await this.inlineEditDoc.sync();
+      await this.onChangeCommon(df, this.inlineEditDoc.name);
       await this.doc.loadLinks();
 
       if (this.emitChange) {

From 3a527c1fddb28382b5dc611c13e5e8a418ce13ce Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 18 May 2022 23:04:51 +0530
Subject: [PATCH 133/163] incr: remove chevrons when readonly

---
 src/components/Controls/Currency.vue | 2 +-
 src/components/Controls/Table.vue    | 3 ++-
 src/components/Controls/TableRow.vue | 4 +++-
 src/components/TwoColumnForm.vue     | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/Controls/Currency.vue b/src/components/Controls/Currency.vue
index 2ef9a373..8f0a10ae 100644
--- a/src/components/Controls/Currency.vue
+++ b/src/components/Controls/Currency.vue
@@ -17,7 +17,7 @@
     />
     <div
       v-show="!showInput"
-      :class="[inputClasses, 'cursor-text']"
+      :class="[inputClasses, 'cursor-text whitespace-nowrap overflow-x-scroll']"
       @click="activateInput"
       @focus="activateInput"
       tabindex="0"
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index 0ecf3f39..831987ef 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -27,11 +27,12 @@
       v-if="value"
     >
       <TableRow
+        v-for="row in value"
         :class="{ 'pointer-events-none': isReadOnly }"
         ref="table-row"
-        v-for="row in value"
         :key="row.name"
         v-bind="{ row, tableFields, size, ratio, isNumeric }"
+        :read-only="isReadOnly"
         @remove="removeRow(row)"
       />
     </div>
diff --git a/src/components/Controls/TableRow.vue b/src/components/Controls/TableRow.vue
index 94d2df34..c1098331 100644
--- a/src/components/Controls/TableRow.vue
+++ b/src/components/Controls/TableRow.vue
@@ -16,11 +16,12 @@
 
     <!-- Data Input Form Control -->
     <FormControl
+      v-for="df in tableFields"
       :size="size"
       class="py-2"
+      :read-only="readOnly"
       :input-class="{ 'text-right': isNumeric(df), 'bg-transparent': true }"
       :key="df.fieldname"
-      v-for="df in tableFields"
       :df="df"
       :value="row[df.fieldname]"
       @change="(value) => onChange(df, value)"
@@ -50,6 +51,7 @@ export default {
     size: String,
     ratio: Array,
     isNumeric: Function,
+    readOnly: Boolean,
   },
   emits: ['remove'],
   components: {
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index c22b869b..610231e0 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -297,7 +297,7 @@ export default {
       };
     },
     submitted() {
-      return Boolean(this.doc.schema.isSubmittable && this.doc.submitted);
+      return this.doc.isSubmitted;
     },
   },
 };

From 694aa4e69ca098ad0b5a7ef9c95e462e9b3600ae Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 10:40:59 +0530
Subject: [PATCH 134/163] v0.5.0-beta.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93c7b865..e0b139c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frappe-books",
-  "version": "0.4.3-beta.0",
+  "version": "0.5.0-beta.0",
   "description": "Simple book-keeping app for everyone",
   "main": "background.js",
   "author": {

From 56e5a7fc740765d39d01aa2e39f8ba7461ad6086 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 11:26:33 +0530
Subject: [PATCH 135/163] incr: shift contactMothership - ship lang files too
 cause sometimes errors out.

---
 electron-builder.yml                          |  11 +-
 .../contactMothership.ts                      |   4 +-
 {src => main}/getLanguageMap.ts               |  98 +++++----
 main/registerIpcMainActionListeners.ts        |   6 +-
 package.json                                  |   1 +
 yarn.lock                                     | 188 +++++++++++++++++-
 6 files changed, 253 insertions(+), 55 deletions(-)
 rename src/contactMothership.js => main/contactMothership.ts (96%)
 rename {src => main}/getLanguageMap.ts (73%)

diff --git a/electron-builder.yml b/electron-builder.yml
index acb5245a..9efe367a 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -1,12 +1,11 @@
 productName: Frappe Books
 appId: io.frappe.books
 afterSign: build/notarize.js
-extraResources: [
-  { 
-    from: 'log_creds.txt',
-    to: '../creds/log_creds.txt',  
-  }
-]
+extraResources:
+  [
+    { from: 'log_creds.txt', to: '../creds/log_creds.txt' },
+    { from: 'translations', to: '../translations' },
+  ]
 mac:
   type: distribution
   category: public.app-category.finance
diff --git a/src/contactMothership.js b/main/contactMothership.ts
similarity index 96%
rename from src/contactMothership.js
rename to main/contactMothership.ts
index 2ba4dcfd..6f84fc77 100644
--- a/src/contactMothership.js
+++ b/main/contactMothership.ts
@@ -41,7 +41,7 @@ export function getUrlAndTokenString() {
   };
 }
 
-function post(bodyJson) {
+function post(bodyJson: string) {
   const inProduction = app.isPackaged;
   const { url, tokenString } = getUrlAndTokenString();
   const isHttps = url.split(':')[0].toLowerCase() === 'https';
@@ -79,7 +79,7 @@ function post(bodyJson) {
   req.end();
 }
 
-export function sendError(bodyJson) {
+export function sendError(bodyJson: string) {
   post(bodyJson);
 }
 
diff --git a/src/getLanguageMap.ts b/main/getLanguageMap.ts
similarity index 73%
rename from src/getLanguageMap.ts
rename to main/getLanguageMap.ts
index 95b623c1..1f7dd85f 100644
--- a/src/getLanguageMap.ts
+++ b/main/getLanguageMap.ts
@@ -1,4 +1,8 @@
 /**
+ * Language files are packaged into the binary, if
+ * newer files are available (if internet available)
+ * then those will replace the current file.
+ *
  * Language files are fetched from the frappe/books repo
  * the language files before storage have a ISO timestamp
  * prepended to the file.
@@ -7,44 +11,21 @@
  * takes place only if a new update has been pushed.
  */
 
-const fs = require('fs/promises');
-const path = require('path');
-const fetch = require('node-fetch').default;
-
+import { constants } from 'fs';
+import fs from 'fs/promises';
+import path from 'path';
 import { splitCsvLine } from 'utils/translationHelpers';
 import { LanguageMap } from 'utils/types';
 
+const fetch = require('node-fetch').default;
+
 const VALENTINES_DAY = 1644796800000;
 
-export async function getLanguageMap(
-  code: string,
-  isDevelopment: boolean = false
-): Promise<LanguageMap> {
-  const contents = await getContents(code, isDevelopment);
+export async function getLanguageMap(code: string): Promise<LanguageMap> {
+  const contents = await getContents(code);
   return getMapFromContents(contents);
 }
 
-async function getContents(code: string, isDevelopment: boolean) {
-  if (isDevelopment) {
-    const filePath = path.resolve('translations', `${code}.csv`);
-    const contents = await fs.readFile(filePath, { encoding: 'utf-8' });
-    return ['', contents].join('\n');
-  }
-
-  let contents = await getContentsIfExists(code);
-  if (contents.length === 0) {
-    contents = (await fetchAndStoreFile(code)) ?? contents;
-  } else {
-    contents = (await getUpdatedContent(code, contents)) ?? contents;
-  }
-
-  if (!contents || contents.length === 0) {
-    throwCouldNotFetchFile(code);
-  }
-
-  return contents;
-}
-
 function getMapFromContents(contents: string): LanguageMap {
   const lines: string[] = contents.split('\n').slice(1);
   return lines
@@ -64,17 +45,28 @@ function getMapFromContents(contents: string): LanguageMap {
     }, {} as LanguageMap);
 }
 
-async function getContentsIfExists(code: string): Promise<string> {
-  const filePath = getFilePath(code);
-  try {
-    return await fs.readFile(filePath, { encoding: 'utf-8' });
-  } catch (err) {
-    if ((err as NodeJS.ErrnoException).code !== 'ENOENT') {
-      throw err;
-    }
+async function getContents(code: string) {
+  let contents = await getContentsIfExists(code);
+  if (contents.length === 0) {
+    contents = (await fetchAndStoreFile(code)) || contents;
+  } else {
+    contents = (await getUpdatedContent(code, contents)) || contents;
+  }
 
+  if (!contents || contents.length === 0) {
+    throwCouldNotFetchFile(code);
+  }
+
+  return contents;
+}
+
+async function getContentsIfExists(code: string): Promise<string> {
+  const filePath = await getTranslationFilePath(code);
+  if (!filePath) {
     return '';
   }
+
+  return await fs.readFile(filePath, { encoding: 'utf-8' });
 }
 
 async function fetchAndStoreFile(code: string, date?: Date) {
@@ -135,8 +127,28 @@ async function getLastUpdated(code: string): Promise<Date> {
   }
 }
 
-function getFilePath(code: string) {
-  return path.resolve(process.resourcesPath, 'translations', `${code}.csv`);
+async function getTranslationFilePath(code: string) {
+  let filePath = path.join(
+    process.resourcesPath,
+    `../translations/${code}.csv`
+  );
+
+  try {
+    await fs.access(filePath, constants.R_OK);
+  } catch {
+    /**
+     * This will be used for in Development mode
+     */
+    filePath = path.join(__dirname, `../translations/${code}.csv`);
+  }
+
+  try {
+    await fs.access(filePath, constants.R_OK);
+  } catch {
+    return '';
+  }
+
+  return filePath;
 }
 
 function throwCouldNotFetchFile(code: string) {
@@ -144,7 +156,11 @@ function throwCouldNotFetchFile(code: string) {
 }
 
 async function storeFile(code: string, contents: string) {
-  const filePath = getFilePath(code);
+  const filePath = await getTranslationFilePath(code);
+  if (!filePath) {
+    return;
+  }
+
   const dirname = path.dirname(filePath);
   await fs.mkdir(dirname, { recursive: true });
   await fs.writeFile(filePath, contents, { encoding: 'utf-8' });
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 0bb4759d..365971d1 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -4,12 +4,12 @@ import fs from 'fs/promises';
 import path from 'path';
 import databaseManager from '../backend/database/manager';
 import { Main } from '../main';
-import { getUrlAndTokenString, sendError } from '../src/contactMothership';
-import { getLanguageMap } from '../src/getLanguageMap';
 import saveHtmlAsPdf from '../src/saveHtmlAsPdf';
 import { DatabaseMethod } from '../utils/db/types';
 import { DatabaseResponse } from '../utils/ipc/types';
 import { IPC_ACTIONS } from '../utils/messages';
+import { getUrlAndTokenString, sendError } from './contactMothership';
+import { getLanguageMap } from './getLanguageMap';
 
 export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(IPC_ACTIONS.TOGGLE_MAXIMIZE_CURRENT_WINDOW, (event) => {
@@ -69,7 +69,7 @@ export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(IPC_ACTIONS.GET_LANGUAGE_MAP, async (event, code) => {
     const obj = { languageMap: {}, success: true, message: '' };
     try {
-      obj.languageMap = await getLanguageMap(code, main.isDevelopment);
+      obj.languageMap = await getLanguageMap(code);
     } catch (err) {
       obj.success = false;
       obj.message = (err as Error).message;
diff --git a/package.json b/package.json
index e0b139c6..5a5d0077 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "babel-loader": "^8.2.3",
     "dotenv": "^16.0.0",
     "electron": "^15.3.5",
+    "electron-builder": "^23.0.3",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
     "electron-updater": "^4.3.9",
diff --git a/yarn.lock b/yarn.lock
index 92cb8962..6054d38f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1000,6 +1000,19 @@
     dir-compare "^2.4.0"
     fs-extra "^9.0.1"
 
+"@electron/universal@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.0.tgz#518cac72bccd79c00bf41345119e6fdbabdb871d"
+  integrity sha512-eu20BwNsrMPKoe2bZ3/l9c78LclDvxg3PlVXrQf3L50NaUuW5M59gbPytI+V4z7/QMrohUHetQaU0ou+p1UG9Q==
+  dependencies:
+    "@malept/cross-spawn-promise" "^1.1.0"
+    asar "^3.1.0"
+    debug "^4.3.1"
+    dir-compare "^2.4.0"
+    fs-extra "^9.0.1"
+    minimatch "^3.0.4"
+    plist "^3.0.4"
+
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -1203,6 +1216,11 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
@@ -2327,6 +2345,13 @@ address@^1.1.2:
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -2481,6 +2506,11 @@ app-builder-bin@3.7.1:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e"
   integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==
 
+app-builder-bin@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0"
+  integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==
+
 app-builder-lib@22.13.1:
   version "22.13.1"
   resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.13.1.tgz#9beee0dd3df32fcce303b933d187bf986efe3381"
@@ -2511,6 +2541,37 @@ app-builder-lib@22.13.1:
     semver "^7.3.5"
     temp-file "^3.4.0"
 
+app-builder-lib@23.0.3:
+  version "23.0.3"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.0.3.tgz#44c90237abdc4ad9b34a24658bee022828ad6205"
+  integrity sha512-1qrtXYHXJfXhzJnMtVGjIva3067F1qYQubl2oBjI61gCBoCHvhghdYJ57XxXTQQ0VxnUhg1/Iaez87uXp8mD8w==
+  dependencies:
+    "7zip-bin" "~5.1.1"
+    "@develar/schema-utils" "~2.6.5"
+    "@electron/universal" "1.2.0"
+    "@malept/flatpak-bundler" "^0.4.0"
+    async-exit-hook "^2.0.1"
+    bluebird-lst "^1.0.9"
+    builder-util "23.0.2"
+    builder-util-runtime "9.0.0"
+    chromium-pickle-js "^0.2.0"
+    debug "^4.3.2"
+    ejs "^3.1.6"
+    electron-osx-sign "^0.6.0"
+    electron-publish "23.0.2"
+    form-data "^4.0.0"
+    fs-extra "^10.0.0"
+    hosted-git-info "^4.0.2"
+    is-ci "^3.0.0"
+    isbinaryfile "^4.0.8"
+    js-yaml "^4.1.0"
+    lazy-val "^1.0.5"
+    minimatch "^3.0.4"
+    read-config-file "6.2.0"
+    sanitize-filename "^1.6.3"
+    semver "^7.3.5"
+    temp-file "^3.4.0"
+
 aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -2595,7 +2656,7 @@ arrify@^2.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
-asar@^3.0.3:
+asar@^3.0.3, asar@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
   integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==
@@ -3143,6 +3204,14 @@ builder-util-runtime@8.8.1:
     debug "^4.3.2"
     sax "^1.2.4"
 
+builder-util-runtime@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz#3a40ba7382712ccdb24471567f91d7c167e00830"
+  integrity sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA==
+  dependencies:
+    debug "^4.3.2"
+    sax "^1.2.4"
+
 builder-util@22.13.1:
   version "22.13.1"
   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.13.1.tgz#fb2165c725b9405f0605a765cf91ec1870995ada"
@@ -3164,6 +3233,29 @@ builder-util@22.13.1:
     stat-mode "^1.0.0"
     temp-file "^3.4.0"
 
+builder-util@23.0.2:
+  version "23.0.2"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.0.2.tgz#da84a971076397e3a671726f4bb96f0c2214fea7"
+  integrity sha512-HaNHL3axNW/Ms8O1mDx3I07G+ZnZ/TKSWWvorOAPau128cdt9S+lNx5ocbx8deSaHHX4WFXSZVHh3mxlaKJNgg==
+  dependencies:
+    "7zip-bin" "~5.1.1"
+    "@types/debug" "^4.1.6"
+    "@types/fs-extra" "^9.0.11"
+    app-builder-bin "4.0.0"
+    bluebird-lst "^1.0.9"
+    builder-util-runtime "9.0.0"
+    chalk "^4.1.1"
+    cross-spawn "^7.0.3"
+    debug "^4.3.2"
+    fs-extra "^10.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-ci "^3.0.0"
+    js-yaml "^4.1.0"
+    source-map-support "^0.5.19"
+    stat-mode "^1.0.0"
+    temp-file "^3.4.0"
+
 builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -3706,7 +3798,7 @@ colors@1.0.3:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
   integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
 
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -4298,6 +4390,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 debug@4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
@@ -4556,6 +4655,20 @@ dmg-builder@22.13.1:
   optionalDependencies:
     dmg-license "^1.0.9"
 
+dmg-builder@23.0.3:
+  version "23.0.3"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.0.3.tgz#ea94bc76fcd94612641580f3c6ae42c3f07f3fee"
+  integrity sha512-mBYrHHnSM5PC656TDE+xTGmXIuWHAGmmRfyM+dV0kP+AxtwPof4pAXNQ8COd0/exZQ4dqf72FiPS3B9G9aB5IA==
+  dependencies:
+    app-builder-lib "23.0.3"
+    builder-util "23.0.2"
+    builder-util-runtime "9.0.0"
+    fs-extra "^10.0.0"
+    iconv-lite "^0.6.2"
+    js-yaml "^4.1.0"
+  optionalDependencies:
+    dmg-license "^1.0.9"
+
 dmg-license@^1.0.9:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.9.tgz#a2fb8d692af0e30b0730b5afc91ed9edc2d9cb4f"
@@ -4773,6 +4886,24 @@ electron-builder@^22.2.0:
     update-notifier "^5.1.0"
     yargs "^17.0.1"
 
+electron-builder@^23.0.3:
+  version "23.0.3"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.0.3.tgz#16264a0d8e3d40da1467bcc8ef7917538b54a3bc"
+  integrity sha512-0lnTsljAgcOMuIiOjPcoFf+WxOOe/O04hZPgIvvUBXIbz3kolbNu0Xdch1f5WuQ40NdeZI7oqs8Eo395PcuGHQ==
+  dependencies:
+    "@types/yargs" "^17.0.1"
+    app-builder-lib "23.0.3"
+    builder-util "23.0.2"
+    builder-util-runtime "9.0.0"
+    chalk "^4.1.1"
+    dmg-builder "23.0.3"
+    fs-extra "^10.0.0"
+    is-ci "^3.0.0"
+    lazy-val "^1.0.5"
+    read-config-file "6.2.0"
+    update-notifier "^5.1.0"
+    yargs "^17.0.1"
+
 electron-devtools-installer@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.2.0.tgz#acc48d24eb7033fe5af284a19667e73b78d406d0"
@@ -4803,6 +4934,18 @@ electron-osx-sign@^0.5.0:
     minimist "^1.2.0"
     plist "^3.0.1"
 
+electron-osx-sign@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8"
+  integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==
+  dependencies:
+    bluebird "^3.5.0"
+    compare-version "^0.1.2"
+    debug "^2.6.8"
+    isbinaryfile "^3.0.2"
+    minimist "^1.2.0"
+    plist "^3.0.1"
+
 electron-publish@22.13.1:
   version "22.13.1"
   resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.13.1.tgz#7d3aedf988f995c149cc620aef0772559342ea03"
@@ -4816,6 +4959,19 @@ electron-publish@22.13.1:
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
+electron-publish@23.0.2:
+  version "23.0.2"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.0.2.tgz#aa11419ae57b847df4beb63b95e2b2a43161957c"
+  integrity sha512-8gMYgWqv96lc83FCm85wd+tEyxNTJQK7WKyPkNkO8GxModZqt1GO8S+/vAnFGxilS/7vsrVRXFfqiCDUCSuxEg==
+  dependencies:
+    "@types/fs-extra" "^9.0.11"
+    builder-util "23.0.2"
+    builder-util-runtime "9.0.0"
+    chalk "^4.1.1"
+    fs-extra "^10.0.0"
+    lazy-val "^1.0.5"
+    mime "^2.5.2"
+
 electron-store@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.0.1.tgz#9b598c1d2edeffebee9d8c1cd957ad368c528925"
@@ -5713,6 +5869,15 @@ fork-ts-checker-webpack-plugin@^3.1.1:
     tapable "^1.0.0"
     worker-rpc "^0.1.0"
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 form-data@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -6406,6 +6571,15 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
   integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
 http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -6450,6 +6624,14 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
+https-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -8834,7 +9016,7 @@ please-upgrade-node@^3.2.0:
   dependencies:
     semver-compare "^1.0.0"
 
-plist@^3.0.1:
+plist@^3.0.1, plist@^3.0.4:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987"
   integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==

From 03ee04369662bbae7cf186f2dd4e12f38bfd6727 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 13:00:28 +0530
Subject: [PATCH 136/163] incr: fetch translateables from schema.json - use
 legit csv

---
 main/getLanguageMap.ts                 |  40 ++++---
 reports/GeneralLedger/GeneralLedger.ts |   2 +-
 scripts/generateTranslations.ts        | 154 ++++++++++++++++++-------
 utils/csvParser.ts                     |   7 +-
 utils/translationHelpers.ts            |  31 -----
 5 files changed, 141 insertions(+), 93 deletions(-)

diff --git a/main/getLanguageMap.ts b/main/getLanguageMap.ts
index 1f7dd85f..f985ae6a 100644
--- a/main/getLanguageMap.ts
+++ b/main/getLanguageMap.ts
@@ -14,7 +14,7 @@
 import { constants } from 'fs';
 import fs from 'fs/promises';
 import path from 'path';
-import { splitCsvLine } from 'utils/translationHelpers';
+import { parseCSV } from 'utils/csvParser';
 import { LanguageMap } from 'utils/types';
 
 const fetch = require('node-fetch').default;
@@ -23,26 +23,32 @@ const VALENTINES_DAY = 1644796800000;
 
 export async function getLanguageMap(code: string): Promise<LanguageMap> {
   const contents = await getContents(code);
-  return getMapFromContents(contents);
+  return getMapFromCsv(contents);
 }
 
-function getMapFromContents(contents: string): LanguageMap {
-  const lines: string[] = contents.split('\n').slice(1);
-  return lines
-    .map((l) => splitCsvLine(l) as string[])
-    .filter((l) => l.length >= 2)
-    .reduce((acc, l) => {
-      const key = l[0].slice(1, -1);
-      const translation = l[1].slice(1, -1);
-      acc[key] = { translation };
+function getMapFromCsv(csv: string): LanguageMap {
+  const matrix = parseCSV(csv);
+  const languageMap: LanguageMap = {};
 
-      const context = l.slice(2)[0];
-      if (context?.length) {
-        acc[key].context = context;
-      }
+  for (const row of matrix) {
+    /**
+     * Ignore lines that have no translations
+     */
+    if (!row[0] || !row[1]) {
+      continue;
+    }
 
-      return acc;
-    }, {} as LanguageMap);
+    const source = row[0];
+    const translation = row[1];
+    const context = row[3];
+
+    languageMap[source] = { translation };
+    if (context?.length) {
+      languageMap[source].context = context;
+    }
+  }
+
+  return languageMap;
 }
 
 async function getContents(code: string) {
diff --git a/reports/GeneralLedger/GeneralLedger.ts b/reports/GeneralLedger/GeneralLedger.ts
index 0c39a12e..0c4bc40c 100644
--- a/reports/GeneralLedger/GeneralLedger.ts
+++ b/reports/GeneralLedger/GeneralLedger.ts
@@ -344,7 +344,7 @@ export class GeneralLedger extends LedgerReport {
   getColumns(): ColumnField[] {
     let columns = [
       {
-        label: t`#`,
+        label: '#',
         fieldtype: 'Int',
         fieldname: 'index',
         align: 'right',
diff --git a/scripts/generateTranslations.ts b/scripts/generateTranslations.ts
index c082efeb..6df7f38e 100644
--- a/scripts/generateTranslations.ts
+++ b/scripts/generateTranslations.ts
@@ -1,15 +1,17 @@
 import fs from 'fs/promises';
 import path from 'path';
+import { generateCSV, parseCSV } from '../utils/csvParser';
 import {
   getIndexFormat,
   getWhitespaceSanitized,
-  splitCsvLine,
-  wrap,
 } from '../utils/translationHelpers';
 
 const translationsFolder = path.resolve(__dirname, '..', 'translations');
 const PATTERN = /(?<!\w)t`([^`]+)`/g;
 
+type Content = { fileName: string; content: string };
+type UnknownMap = Record<string, unknown>;
+
 function shouldIgnore(p: string, ignoreList: string[]): boolean {
   const name = p.split(path.sep).at(-1) ?? '';
   return ignoreList.includes(name);
@@ -17,7 +19,8 @@ function shouldIgnore(p: string, ignoreList: string[]): boolean {
 
 async function getFileList(
   root: string,
-  ignoreList: string[]
+  ignoreList: string[],
+  extPattern: RegExp = /\.(js|ts|vue)$/
 ): Promise<string[]> {
   const contents: string[] = await fs.readdir(root);
   const files: string[] = [];
@@ -28,11 +31,11 @@ async function getFileList(
     const isDir = (await fs.stat(absPath)).isDirectory();
 
     if (isDir && !shouldIgnore(absPath, ignoreList)) {
-      const pr = getFileList(absPath, ignoreList).then((fl) => {
+      const pr = getFileList(absPath, ignoreList, extPattern).then((fl) => {
         files.push(...fl);
       });
       promises.push(pr);
-    } else if (absPath.match(/\.(js|ts|vue)$/) !== null) {
+    } else if (absPath.match(extPattern) !== null) {
       files.push(absPath);
     }
   }
@@ -88,13 +91,20 @@ function tStringFinder(content: string): string[] {
   });
 }
 
-function mapToTStringArray(tMap: Map<string, string[]>): string[] {
+function tStringsToArray(
+  tMap: Map<string, string[]>,
+  tStrings: string[]
+): string[] {
   const tSet: Set<string> = new Set();
   for (const k of tMap.keys()) {
     tMap.get(k)!.forEach((s) => tSet.add(s));
   }
-  const tArray = [...tSet];
-  return tArray.sort();
+
+  for (const ts of tStrings) {
+    tSet.add(ts);
+  }
+
+  return Array.from(tSet).sort();
 }
 
 function printHelp() {
@@ -141,36 +151,31 @@ function getTranslationFilePath(languageCode: string) {
 
 async function regenerateTranslation(tArray: string[], path: string) {
   // Removes old strings, adds new strings
-  const contents = await fs.readFile(path, { encoding: 'utf-8' });
+  const storedCSV = await fs.readFile(path, { encoding: 'utf-8' });
+  const storedMatrix = parseCSV(storedCSV);
+
   const map: Map<string, string[]> = new Map();
+  for (const row of storedMatrix) {
+    const tstring = row[0];
+    map.set(tstring, row.slice(1));
+  }
 
-  // Populate map
-  contents
-    .split('\n')
-    .filter((l) => l.length)
-    .map(splitCsvLine)
-    .forEach((l) => {
-      if (l[1] === '' || !l[1]) {
-        return;
-      }
+  const matrix = tArray.map((source) => {
+    const stored = map.get(source) ?? [];
+    const translation = stored[0] ?? '';
+    const context = stored[1] ?? '';
 
-      map.set(l[0].trim(), l.slice(1));
-    });
+    return [source, translation, context];
+  });
+  const csv = generateCSV(matrix);
 
-  const regenContent = tArray
-    .map((l) => {
-      const source = wrap(l);
-      const translations = map.get(source);
-      return [source, ...(translations ?? [])].join(',');
-    })
-    .join('\n');
-  await fs.writeFile(path, regenContent, { encoding: 'utf-8' });
+  await fs.writeFile(path, csv, { encoding: 'utf-8' });
   console.log(`\tregenerated: ${path}`);
 }
 
 async function regenerateTranslations(languageCode: string, tArray: string[]) {
   // regenerate one file
-  if (languageCode.length === 0) {
+  if (languageCode.length !== 0) {
     const path = getTranslationFilePath(languageCode);
     regenerateTranslation(tArray, path);
     return;
@@ -178,12 +183,13 @@ async function regenerateTranslations(languageCode: string, tArray: string[]) {
 
   // regenerate all translation files
   console.log(`Language code not passed, regenerating all translations.`);
-  const contents = (await fs.readdir(translationsFolder)).filter((f) =>
-    f.endsWith('.csv')
-  );
-  contents.forEach((f) =>
-    regenerateTranslation(tArray, path.resolve(translationsFolder, f))
-  );
+  for (const filePath of await fs.readdir(translationsFolder)) {
+    if (!filePath.endsWith('.csv')) {
+      continue;
+    }
+
+    regenerateTranslation(tArray, path.resolve(translationsFolder, filePath));
+  }
 }
 
 async function writeTranslations(languageCode: string, tArray: string[]) {
@@ -204,13 +210,82 @@ async function writeTranslations(languageCode: string, tArray: string[]) {
       throw err;
     }
 
-    const content = tArray.map(wrap).join(',\n') + ',';
-    await fs.writeFile(path, content, { encoding: 'utf-8' });
+    const matrix = tArray.map((s) => [s, '', '']);
+    const csv = generateCSV(matrix);
+    await fs.writeFile(path, csv, { encoding: 'utf-8' });
     console.log(`Generated translation file for '${languageCode}': ${path}`);
   }
 }
 
-type Content = { fileName: string; content: string };
+async function getTStringsFromJsonFileList(
+  fileList: string[]
+): Promise<string[]> {
+  const promises: Promise<void>[] = [];
+  const schemaTStrings: string[][] = [];
+
+  for (const filePath of fileList) {
+    const promise = fs
+      .readFile(filePath, { encoding: 'utf8' })
+      .then((content) => {
+        const schema = JSON.parse(content) as Record<string, unknown>;
+        const tStrings: string[] = [];
+        pushTStringsFromSchema(schema, tStrings, [
+          'label',
+          'description',
+          'placeholder',
+        ]);
+        return tStrings;
+      })
+      .then((ts) => {
+        schemaTStrings.push(ts);
+      });
+
+    promises.push(promise);
+  }
+
+  await Promise.all(promises);
+  return schemaTStrings.flat();
+}
+
+function pushTStringsFromSchema(
+  map: UnknownMap | UnknownMap[],
+  array: string[],
+  translateable: string[]
+) {
+  if (Array.isArray(map)) {
+    for (const item of map) {
+      pushTStringsFromSchema(item, array, translateable);
+    }
+    return;
+  }
+
+  if (typeof map !== 'object') {
+    return;
+  }
+
+  for (const key of Object.keys(map)) {
+    const value = map[key];
+    if (translateable.includes(key) && typeof value === 'string') {
+      array.push(value);
+    }
+
+    if (typeof value !== 'object') {
+      continue;
+    }
+
+    pushTStringsFromSchema(
+      value as UnknownMap | UnknownMap[],
+      array,
+      translateable
+    );
+  }
+}
+
+async function getSchemaTStrings() {
+  const root = path.resolve(__dirname, '../schemas');
+  const fileList = await getFileList(root, ['tests', 'regional'], /\.json$/);
+  return await getTStringsFromJsonFileList(fileList);
+}
 
 async function run() {
   if (printHelp()) {
@@ -225,7 +300,8 @@ async function run() {
   const fileList: string[] = await getFileList(root, ignoreList);
   const contents: Content[] = await getFileContents(fileList);
   const tMap: Map<string, string[]> = await getAllTStringsMap(contents);
-  const tArray: string[] = mapToTStringArray(tMap);
+  const schemaTStrings: string[] = await getSchemaTStrings();
+  const tArray: string[] = tStringsToArray(tMap, schemaTStrings);
 
   try {
     await fs.stat(translationsFolder);
diff --git a/utils/csvParser.ts b/utils/csvParser.ts
index 3ec3b7be..9cd5bc2c 100644
--- a/utils/csvParser.ts
+++ b/utils/csvParser.ts
@@ -49,11 +49,8 @@ function splitCsvBlock(text: string, splitter: string = '\r\n'): string[] {
   return lines;
 }
 
-function splitCsvLine(line: string): string[] {
-  if (line.at(-1) !== ',') {
-    // if conforming to spec, it should not end with ','
-    line += ',';
-  }
+export function splitCsvLine(line: string): string[] {
+  line += ',';
 
   const items = [];
   let item = '';
diff --git a/utils/translationHelpers.ts b/utils/translationHelpers.ts
index a028ef6b..84d7a995 100644
--- a/utils/translationHelpers.ts
+++ b/utils/translationHelpers.ts
@@ -57,34 +57,3 @@ export function getWhitespaceSanitized(str: string) {
 export function getIndexList(str: string) {
   return [...str.matchAll(/\${([^}]+)}/g)].map(([_, i]) => parseInt(i));
 }
-
-export function wrap(str: string) {
-  return '`' + str + '`';
-}
-
-export function splitCsvLine(line: string) {
-  let t = true;
-  const chars = [...line];
-  const indices = chars
-    .map((c, i) => {
-      if (c === '`') {
-        t = !t;
-      }
-
-      if (c === ',' && t) {
-        return i;
-      }
-
-      return -1;
-    })
-    .filter((i) => i !== -1);
-
-  let s = 0;
-  const splits = indices.map((i) => {
-    const split = line.slice(s, i);
-    s = i + 1;
-    return split.trim();
-  });
-  splits.push(line.slice(s).trim());
-  return splits.filter((s) => s !== ',' && s !== '');
-}

From 19c898fee3cf5e1272b6f2f59c9795513b663c69 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 13:26:58 +0530
Subject: [PATCH 137/163] incr: convert translations to legit csv - regenerate
 them

---
 translations/ar.csv    | 1186 +++++++++++++++++++++-----------------
 translations/ca-ES.csv | 1238 +++++++++++++++++++++-------------------
 translations/de.csv    | 1131 ++++++++++++++++++++----------------
 translations/fr.csv    | 1131 ++++++++++++++++++++----------------
 translations/pt.csv    | 1131 ++++++++++++++++++++----------------
 5 files changed, 3260 insertions(+), 2557 deletions(-)

diff --git a/translations/ar.csv b/translations/ar.csv
index a600d147..56c03304 100644
--- a/translations/ar.csv
+++ b/translations/ar.csv
@@ -1,534 +1,652 @@
-`${0} ${1} already exists.`,`${0} ${1} موجودة من قبل.`
-`${0} ${1} is linked with existing records.`,`${0} ${1} مرطبت بسجل موجود.`
-`${0} already exists.`,`${0} موجود بالفعل.`
-`${0} filters applied`,`${0} تم تطبيق الفيلتر`
-`* required fields`,`* الحقول المطلوبة`
-`1 filter applied`,`تم تطبيق فلتر واحد`
-`Accepted Quantity`,`الكمية المقبولة`
-`Account`,`الحساب`
-`Account Entries`,`إدخالات الحساب`
-`Account Name`,`اسم الحساب`
-`Account Type`,`نوع الحساب`
-`Accounting Ledger Entries`,`إدخالات دفتر الأستاذ`
-`Accounting Settings`,`إعدادات المحاسبة`
-`Accounts`,`الحسابات`
-`Accounts Payable`,`الحسابات الدائنة`
-`Accounts Receivable`,`حسابات القبض`
-`Accumulated Depreciation`,`الاستهلاك المتراكم`
-`Add Account`,`إضافة حساب`
-`Add Customers`,`إضافة العملاء`
-`Add Group`,`إضافة مجموعة`
-`Add Items`,`إضافة عناصر`
-`Add Row`,`إضافة صف`
-`Add Suppliers`,`إضافة الموردين`
-`Add Taxes`,`إضافة ضرائب`
-`Add a filter`,`إضافة تصفية`
-`Address`,`العنوان`
-`Address Display`,`عرض العنوان`
-`Address Line 1`,`سطر العنوان 1`
-`Address Line 2`,`سطر العنوان 2`
-`Administrative Expenses`,`مصاريف إدارية`
-`Against Account`,`ضد الحساب`
-`All References`,`كل المراجع`
-`Allocated Amount`,`المبلغ المخصص`
-`Amount`,`المبلغ`
-`Amount (Company Currency)`,`المبلغ (عملة الشركة)`
-`Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.`,`المبلغ: ${0} والشطب: $ {1} أقل من إجمالي المبلغ المخصص للمراجع: $ {2} .`
-`Amount: ${0} is less than the total amount allocated to references: ${1}.`,`المبلغ: ${0} أقل من إجمالي المبلغ المخصص للمراجع: $ {1} `
-`An error occurred.`,`حدث خطأ`
-`Application of Funds (Assets)`,`تطبيق الأموال (الأصول)`
-`Are you sure you want to cancel ${0} ${1}?`,`هل أنت متأكد أنك تريد إلغاء ${0} $ {1}؟ `
-`Are you sure you want to delete ${0} ${1}?`,`هل أنت متأكد أنك تريد حذف ${0} $ {1}؟ `
-`Are you sure you want to submit this Bill?`,`هل أنت متأكد أنك تريد تقديم مشروع القانون هذا؟`
-`Are you sure you want to submit this Invoice?`,`هل أنت متأكد أنك تريد إرسال هذه الفاتورة؟`
-`Are you sure you want to submit this Journal Entry?`,`هل أنت متأكد أنك تريد إرسال إدخال دفتر اليومية هذا؟`
-`Assign Imported Labels`,`تعيين التسميات المستوردة`
-`Back`,`رجوع`
-`Bad import data.`,`بيانات استيراد تالفة`
-`Balance`,`التوازن`
-`Balance Sheet`,`الميزانية`
-`Bank Accounts`,`حسابات بنكية`
-`Bank Name`,`اسم البنك`
-`Bank Overdraft Account`,`حساب مصرفي السحب على المكشوف`
-`Bill`,`الفاتورة`
-`Bill Created`,`الفاتورة أنشأت`
-`Bill No`,`رقم الفاتورة `
-`Bills`,`الفواتير`
-`Bills Settings`,`إعدادات الفواتير`
-`Black`,`أسود`
-`Body`,`الجسم`
-`Both`,`كلاهما`
-`Buildings`,`المباني`
-`CSV`
-`Can't open database file: ${0}. Please create a new file.`,`لا يمكن فتح ملف قاعدة البيانات: ${0}. الرجاء إنشاء ملف جديد`
-`Cancel`,`إلغاء`
-`Cancelled`,`ملغاة`
-`Capital Equipments`,`معدات رأس المال`
-`Capital Stock`,`رأس المال`
-`Cash`,`نقد`
-`Cash In Hand`,`نقدا في اليد`
-`Cashflow`,`التدفق النقدي`
-`Central Tax`,`الضرائب المركزية`
-`Central Tax Paid`,`الضرائب المركزية المدفوعة`
-`Change File`,`تغيير الملف`
-`Chart Of Accounts Reviewed`,`مراجعة مخطط الحسابات`
-`Chart of Accounts`,`مخطط الحسابات`
-`Checking for updates`,`التحقق من وجود تحديثات`
-`City / Town`,`المدينة / البلدة`
-`Clearance Date`,`تاريخ التخليص`
-`Click to create`,`انقر للإنشاء`
-`Close`,`إغلاق`
-`Closing (Cr)`,`(Cr) إغلاق`
-`Closing (Dr)`,`(Dr) إغلاق`
-`Color`,`اللون`
-`Commission on Sales`,`عمولة على المبيعات`
-`Common`,`عام`
-`Common Items`,`العناصر المشتركة`
-`Company Address`,`عنوان الشركة`
-`Company Logo`,`شعار الشركة`
-`Company Name`,`اسم الشركة`
-`Company Settings`,`إعدادات الشركة`
-`Company Setup`,`إعداد الشركة`
-`Completed`,`مكتمل`
-`Confirm Password`,`تأكيد كلمة المرور`
-`Contains`,`يحتوي`
-`Cost of Goods Sold`,`تكلفة البضائع المباعة`
-`Could not import ${0} ${1}.`,`تعذر استيراد ${0} $ {1} .`
-`Could not select file.`,`تعذر تحديد الملف.`
-`Country`,`البلد`
-`Create`,`إنشاء`
-`Create Bill`,`إنشاء فاتورة`
-`Create Invoice`,`إنشاء فاتورة`
-`Create a new file and store it in your computer.`,`إنشاء ملف جديد وتخزينه في جهاز الكمبيوتر الخاص بك.`
-`Create a new file or select an existing one from your computer`,`أنشئ ملفًا جديدًا أو حدد ملفًا موجودًا من جهاز الكمبيوتر الخاص بك`
-`Credit`,`الائتمان`
-`Creditors`,`الدائنون`
-`Currency`,`العملة`
-`Currency Name`,`اسم العملة`
-`Current`,`الحالي`
-`Current Assets`,`الأصول الحالية`
-`Current Liabilities`,`الخصوم المتداولة`
-`Custom Hex`
-`Customer`,`الزبون`
-`Customer Created`,`خلق العميل`
-`Customer Currency`,`عملة العميل`
-`Customer Name`,`اسم الزبون`
-`Customers`,`العملاء`
-`Customise`,`تخصيص`
-`Customize`,`تخصيص`
-`DB Connection Error`,`خطأ اتصال قاعدة البيانات`
-`Dashboard`,`لوحة القيادة`
-`Data Import`,`استيراد البيانات`
-`Date`,`التاريخ`
-`Date Format`,`تنسيق التاريخ`
-`Debit`,`مدين`
-`Debtors`,`المدينون`
-`Default Account`,`الحساب الافتراضي`
-`Delete`,`حذف`
-`Depreciation`,`إهلاك`
-`Description`,`الوصف`
-`Details`,`التفاصيل`
-`Direct Expenses`,`المصاريف المباشرة`
-`Direct Income`,`الدخل المباشر`
-`Display Logo in Invoice`,`عرض الشعار في الفاتورة`
-`Display Precision`,`دقة العرض`
-`Display Precision should have a value between 0 and 9.`,`دقة العرض يجب أن تكون لها قيمة بين 0 و 9.`
-`Dividends Paid`,`توزيعات أرباح مدفوعة`
-`Document ${0} ${1} has been modified after loading`,`المستند ${0} ${1} تم تعديل المستند بعد تحميله`
-`Document type ${0} is not submittable`,`نوع المستند ${0} غير قابل للإرسال`
-`Documentation`,`التوثيق`
-`Does Not Contain`,`لا يحتوي`
-`Download Update`,`تنزيل التحديث`
-`Downloading update`,`جارٍ تنزيل التحديث`
-`Duties and Taxes`,`الرسوم والضرائب`
-`Earnest Money`,`كسب المال`
-`Edit`,`تحرير`
-`Electronic Equipments`,`معدات إلكترونية`
-`Email`,`البريد الإلكتروني`
-`Email Account`,`حساب بريد إلكتروني`
-`Email Address`,`عنوان البريد الإلكتروني`
-`Empty`,`فارغ`
-`Enable Notifications`,`تمكين الإخطارات`
-`Entertainment Expenses`,`مصاريف ترفيه`
-`Entry ID`,`معرف الإدخال`
-`Entry No`,`رقم الإدخال`
-`Entry Type`,`نوع الإدخال`
-`Equity`,`حقوق الملكية`
-`Error`,`خطأ`
-`Error:`,`خطأ:`
-`Event Settings`,`إعدادات الحدث`
-`Exchange Gain/Loss`,`مكاسب / خسارة الصرف`
-`Exchange Rate`,`سعر الصرف`
-`Existing File`,`ملف موجود`
-`Expense`,`المصاريف`
-`Expenses`,`المصروفات`
-`Expenses Included In Valuation`,`المصروفات المدرجة في التقييم`
-`Export Failed`,`فشل التصدير`
-`Export Successful`,`تم التصدير بنجاح`
-`Fax`,`فاكس`
-`Fieldname`,`اسم المجال`
-`File Name`,`اسم الملف`
-`File Path`,`مسار الملف`
-`File Size`,`حجم الملف`
-`File selection failed.`,`فشل اختيار الملف`
-`Filter`, التصفية`
-`Fiscal Year End Date`,`تاريخ نهاية السنة المالية`
-`Fiscal Year Start Date`,`تاريخ بدء السنة المالية`
-`Fixed Assets`,`الأصول الثابتة`
-`Font`,`الخط`
-`For`,`من أجل`
-`Fraction`,`كسر`
-`Fraction Units`,`وحدات الكسر`
-`Freight and Forwarding Charges`,`مصاريف الشحن`
-`From`,`من`
-`From Account`,`من الحساب`
-`From Date`,`من تاريخ`
-`Fulfillment`,`الاستيفاء`
-`Fulfillment Settings`,`إعدادات الاستيفاء`
-`Full Name`,`الاسم الكامل`
-`Furnitures and Fixtures`,`الأثاث والتجهيزات`
-`GST Registration`,`التسجيل في ضريبة السلع والخدمات`
-`GSTIN`
-`GSTIN No.`
-`GSTIN of Supplier`
-`GSTR 3B`
-`GSTR 3B Report`
-`GSTR1`
-`GSTR2`
-`Gain/Loss on Asset Disposal`,`الربح / الخسارة من التصرف في الأصول`
-`Gender`,`الجنس`
-`General`,`عام`
-`General Ledger`
-`Get Started`,`ابدأ`
-`Grand Total`,`المجموع الكلي`
-`Grand Total (Company Currency)`,`المجموع الكلي (عملة الشركة)`
-`Greater Than`,`أكبر من`
-`HSN/SAC`
-`Hex Value`
-`Hide & Auto Report Errors`,`إخفاء & الإبلاغ التلقائي عن الأخطاء`
-`Hide Get Started`,`إخفاء قائمة البدء`
-`Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.`,`يخفي قسم البدء من الشريط الجانبي. سيكون التغيير مرئيًا عند إعادة التشغيل أو تحديث التطبيق`
-`How to Use Data Import?`,`كيفية استخدام استيراد البيانات؟`
-`I can't find my language.`,`لا أجد لغتي`
-`ID`,`المعرف`
-`Image`,`صورة`
-`Import Data`,`استيراد البيانات`
-`Import Failed`,`فشل الاستيراد`
-`Import More`,`استيراد المزيد`
-`Import Success`,`نجاح الاستيراد`
-`Import Type`,`نوع الاستيراد`
-`Importer Settings`,`إعدادات المستورد`
-`Income`,`الدخل`
-`Indirect Expenses`,`مصاريف غير مباشرة`
-`Indirect Income`,`الدخل غير المباشر`
-`Inflow`,`التدفق`
-`Install Update`,`تثبيت التحديث`
-`Intergrated Tax`,`ضريبة متكاملة`
-`Intergrated Tax Paid`,`ضريبة متكاملة مدفوعة`
-`Internal Precision`,`الدقة الداخلية`
-`Investments`,`استثمارات`
-`Invoice`,`الفاتورة`
-`Invoice Created`,`الفاتورة المُنشأة`
-`Invoice Date`,`تاريخ الفاتورة`
-`Invoice No`,`رقم الفاتورة`
-`Invoice No.`,`رقم الفاتورة`
-`Invoice Number`,`رقم الفاتورة`
-`Invoice Setup`,`إعداد الفاتورة`
-`Invoice Value`,`قيمة الفاتورة`
-`Invoices`,`الفواتير`
-`Is`,`هو`
-`Is Customer`,`هو العميل`
-`Is Empty`,`فارغ`
-`Is Group`,`هي المجموعة`
-`Is Not`,`ليس`
-`Is Not Empty`,`ليس فارغ`
-`Is Supplier`,`مورد`
-`Item`,`العنصر`
-`Item Created`,`تم إنشاء العنصر`
-`Item Name`,`اسم العنصر`
-`Items`,`العناصر`
-`JSON`
-`JSON Data`,`بيانات JSON`
-`Journal Entry`,`إدخال دفتر اليومية`
-`Journal Entry Setting`,`إعداد إدخال دفتر اليومية`
-`Label Index`,`فهرس التسمية`
-`Language`,`اللغة`
-`Ledger Entries`,`إدخالات دفتر الأستاذ`
-`Ledger Entry`,`إدخال دفتر الأستاذ`
-`Legal Expenses`,`المصاريف القانونية`
-`Less Than`,`أقل من`
-`Load an existing .db file from your computer.`,`تحميل ملف .db موجود من جهاز الكمبيوتر الخاص بك.`
-`Loading...`,`تحميل ...`
-`Loans (Liabilities)`,`قروض (خصوم)`
-`Loans and Advances (Assets)`,`القروض والسلف (الأصول)`
-`Locale`,`اللغة`
-`Logo`,`الشعار`
-`MIME Type`,`نوع MIME`
-`Make Payment`,`إجراء الدفع`
-`Marketing Expenses`,`مصاريف التسويق`
-`Miscellaneous Expenses`,`مصاريف متنوعة`
-`Mobile Number`,`رقم الجوال`
-`Month`,`الشهر`
-`Name`,`الاسم`
-`Net Total`,`الإجمالي الصافي`
-`Net Total (Company Currency)`,`صافي الإجمالي (عملة الشركة)`
-`New Account`,`حساب جديد`
-`New Bill`,`فاتورة جديدة`
-`New File`,`ملف جديد`
-`New Invoice`,`فاتورة جديدة`
-`New Journal Entry`,`إدخال جديد في دفتر اليومية`
-`New version available`,`إصدار جديد متاح`
-`Next`,`التالي`
-`No`,`لا`
-`No Data to Import`,`لا توجد بيانات للاستيراد`
-`No expenses in this period`,`لا توجد نفقات في هذه الفترة`
-`No filters selected`,`لم يتم تحديد عوامل تصفية`
-`No labels have been assigned.`,`لم يتم تعيين أي تسميات.`
-`No results found.`,`لم يتم العثور على نتائج`
-`No transactions yet`,`لا توجد معاملات حتى الآن`
-`No updates available`,`لا توجد تحديثات متاحة`
-`None`,`لا شيء`
-`Notes`,`ملاحظات`
-`Number Series`,`سلسلة الأرقام`
-`Office Equipments`,`معدات مكتبية`
-`Office Maintenance Expenses`,`مصاريف صيانة المكاتب`
-`Office Rent`,`إيجار مكتب`
-`Onboarding Complete`,`اكتمال الإعداد`
-`Open Folder`,`فتح مجلد`
-`Opening (Cr)`,`(Cr) الافتتاح`
-`Opening (Dr)`,`(Dr) افتتاح`
-`Opening Balance Equity`,`الرصيد الافتتاحي حقوق الملكية`
-`Opening Balances`,`أرصدة الافتتاح`
-`Organisation`,`التنظيم`
-`Outflow`,`التدفق`
-`Outstanding Amount`,`المبلغ المستحق`
-`PDF`
-`Pad Zeros`
-`Paid`,`مدفوع`
-`Parent`,`الوالد`
-`Parent Account`,`الحساب الوالد`
-`Party`,`حفلة`
-`Password`,`كلمة المرور`
-`Pay`,`دفع`
-`Payable Account`,`حساب الدفع`
-`Payment`,`الدفع`
-`Payment Account`,`حساب الدفع`
-`Payment For`,`الدفع مقابل`
-`Payment Method`,`طريقة الدفع`
-`Payment No`,`رقم الدفع`
-`Payment Reference`,`مرجع الدفع`
-`Payment Settings`,`إعدادات الدفع`
-`Payment Type`,`نوع الدفع`
-`Payment amount cannot be ${0}.`,`لا يمكن أن يكون مبلغ الدفعة ${0}`
-`Payment amount cannot be less than zero.`,`مبلغ الدفعة لا يمكن أن يكون أقل من الصفر.`
-`Payment amount cannot exceed ${0}.`,`مبلغ الدفعة لا يمكن أن يتجاوز ${0} .`
-`Payment amount: ${0} should be greater than 0.`,`مبلغ الدفعة: ${0} يجب أن يكون أكبر من 0.`
-`Payment amount: ${0} should be less than Outstanding amount: ${1}.`,`مبلغ الدفعة: ${0} يجب أن يكون أقل من المبلغ المستحق: ${1}`
-`Payments`,`المدفوعات`
-`Payroll Payable`,`الرواتب المستحقة الدفع`
-`Periodicity`,`الدورية`
-`Phone`,`الهاتف`
-`Place`,`مكان`
-`Place of Supply`,`مكان التوريد`
-`Place of supply`,`مكان التوريد`
-`Plants and Machineries`,`المصانع والآليات`
-`Please assign the following fields ${0}`,`الرجاء تخصيص الحقول التالية ${0} `
-`Please fill all values`,`الرجاء ملء جميع القيم`
-`Please select a file with data to import.`,`الرجاء تحديد ملف به بيانات للاستيراد.`
-`Please select an existing database or create a new one.`,`الرجاء تحديد قاعدة بيانات موجودة أو إنشاء قاعدة جديدة.`
-`Please set GSTIN in General Settings.`,`الرجاء تعيين رقم GSTIN في الإعدادات العامة.`
-`Postal Code`,`الرمز البريدي`
-`Postal Expenses`,`المصاريف البريدية`
-`Posting Date`,`تاريخ النشر`
-`Prefix`,`بادئة`
-`Prevent errors from showing and automatically report all errors.`,`منع ظهور الأخطاء والإبلاغ عن جميع الأخطاء تلقائيًا.`
-`Print`,`طباعة`
-`Print Format`,`تنسيق الطباعة`
-`Print PDF`,`طباعة PDF`
-`Print Settings`,`إعدادات الطباعة`
-`Print and Stationery`,`طباعة و المكتبة`
-`Profit And Loss`,`الربح والخسارة`
-`Profit and Loss`,`الربح والخسارة`
-`Purchase`,`شراء`
-`Purchase Items`,`شراء العناصر`
-`Purchase Order`,`طلب الشراء`
-`Purchase Order Settings`,`إعدادات طلب الشراء`
-`Purchase Receipt`,`إيصال الشراء`
-`Purchase Receipt Settings`,`إعدادات إيصال الشراء`
-`PurchaseInvoice`,`فاتورة الشراء`
-`PurchaseOrder`,`طلب الشراء`
-`PurchaseReceipt`,`استلام الشراء`
-`Purchases`,`المشتريات`
-`Quantity`,`الكمية`
-`Quantity (${0}) cannot be less than zero.`,`لا يمكن أن تكون الكمية (${0}) أقل من صفر.`
-`Quotation`,`الاقتباس`
-`Quotation Settings`,`إعدادات الاقتباس`
-`Rate`,`معدل`
-`Rate (${0}) cannot be less zero.`,`لا يمكن أن يكون `السعر (${0}) أقل من صفر.`
-`Rate (Company Currency)`,`السعر (عملة الشركة)`
-`Rate can't be negative.`,`لا يمكن أن يكون المعدل سالبًا`
-`Re-Open`,`إعادة فتح`
-`Receivable Account`,`حساب المدين`
-`Receive`,`تلقي`
-`Recent Invoices`,`الفواتير الحديثة`
-`Reconcile`,`التوفيق`
-`Ref. / Cheque No.`,`المرجع. / رقم الشيك`
-`Ref. Date`,`المرجع. التاريخ`
-`Ref. Name`,`المرجع. الاسم`
-`Ref. Type`,`المرجع. النوع`
-`Ref/Cheque ID`,`المرجع / التحقق من المعرف`
-`Reference Date`,`تاريخ المرجع`
-`Reference DocType`,`نوع المستند المرجعي`
-`Reference Field`,`حقل مرجعي`
-`Reference Name`,`اسم المرجع`
-`Reference Number`,`الرقم المرجعي`
-`Reference Type`,`نوع المرجع`
-`Reload App`,`إعادة تحميل التطبيق`
-`Report Error`,`الإبلاغ عن خطأ`
-`Reports`,`التقارير`
-`Required Fields not Assigned`,`الحقول المطلوبة غير معيَّنة`
-`Reset`,`إعادة`
-`Reset Filters`,`إعادة تعيين التصفية`
-`Retained Earnings`,`الأرباح المحتجزة`
-`Reverse Charge`,`الشحن العكسي`
-`Reverse Chrg.`,``الشحن العكسي`
-`Reverted`,`تم إرجاعه`
-`Review Accounts`,`مراجعة الحسابات`
-`Role`,`الدور`
-`Roles`,`الأدوار`
-`Root Type`,`نوع الجذر`
-`Round Off`,`جولة خارج`
-`Round Off Account`,`تقريب الحساب`
-`SMTP Host`,`مضيف SMTP`
-`SMTP Port`,`منفذ SMTP`
-`Salary`,`الراتب`
-`Sales`,`المبيعات`
-`Sales Expenses`,`مصاريف المبيعات`
-`Sales Items`,`عناصر المبيعات`
-`Sales Order`,`طلب المبيعات`
-`Sales Order Settings`,`إعدادات أوامر المبيعات`
-`SalesInvoice`,`فاتورة المبيعات`
-`SalesInvoice Settings`,`إعدادات فاتورة المبيعات`
-`SalesOrder`,`طلب المبيعات`
-`Save`,`حفظ`
-`Save & Close`,`حفظ وإغلاق`
-`Save Template`,`حفظ النموذج`
-`Save as PDF`,`حفظ كملف PDF`
-`Save as PDF Successful`,`PDF حفظ كملف ناجح`
-`Saving`,`حفظ`
-`Schedule`,`الجدول`
-`Secured Loans`,`قروض مضمونة`
-`Securities and Deposits`,`الأوراق المالية والودائع`
-`Select CoA`,`حدد شهادة توثيق البرامج`
-`Select File`,`تحديد ملف`
-`Select Folder`,`تحديد مجلد`
-`Select Image`,`حدد صورة`
-`Select Logo`,`اختر الشعار`
-`Select a file for import`,`حدد ملفًا للاستيراد`
-`Select a file to load the company transactions`,`حدد ملفاً لتحميل معاملات الشركة`
-`Select file`,`تحديد ملف`
-`Select folder`,`تحديد مجلد`
-`Select your language`,`اختر لغتك`
-`Selected file`,`الملف المحدد`
-`Send`,`إرسال`
-`Service`,`الخدمة`
-`Set an Import Type`,`تعيين نوع الاستيراد`
-`Set the display language.`,`ضبط لغة العرض.`
-`Set the local code. This is used for number formatting.`,`اضبط الكود المحلي. يستخدم هذا لتنسيق الأرقام`
-`Sets how many digits are shown after the decimal point.`,`تعيين عدد الأرقام التي تظهر بعد العلامة العشرية.`
-`Sets the app-wide date display format.`,`يضبط تنسيق عرض التاريخ على مستوى التطبيق.`
-`Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.`,`يضبط الدقة الداخلية المستخدمة في الحسابات النقدية. يجب أن يكون الرقم الأعلى من 6 كافيًا لمعظم العملات`
-`Setting Up...`,`الإعداد ...`
-`Settings`,`الإعدادات`
-`Settings changes will be visible on reload`,`ستكون تغييرات الإعدادات مرئية عند إعادة التحميل`
-`Setup`,`الإعداد`
-`Setup Complete`,`اكتمل الإعداد`
-`Setup Wizard`,`معالج الإعداد`
-`Setup your organization`,`إعداد منظمتك`
-`Setup Your Workspace`,`إعداد مساحة العمل الخاصة بك`
-`Show Me`,`أرني`
-`Smallest Currency Fraction Value`,`أصغر قيمة لكسر العملة`
-`Softwares`,`البرامج`
-`Something has gone terribly wrong. Please check the console and raise an issue.`,`لقد حدث خطأ ما بشكل رهيب. يرجى التحقق من وحدة التحكم وإثارة المشكلة`
-`Source of Funds (Liabilities)`,`مصدر الأموال (الخصوم)`
-`Standard Chart of Accounts`,`المخطط القياسي للحسابات`
-`Start`,`ابدأ`
-`Start Time`,`وقت البدء`
-`State`,`الدولة`
-`State Tax`,`ضريبة الولاية`
-`State/UT Tax Paid`,`الولاية / ضريبة UT المدفوعة`
-`Status`,`الحالة`
-`Stock Adjustment`,`تسوية المخزون`
-`Stock Assets`,`أصول المخزون`
-`Stock Expenses`,`مصاريف المخزون`
-`Stock In Hand`,`المخزون في متناول اليد`
-`Stock Liabilities`,`مطلوبات المخزون`
-`Stock Received But Not Billed`,`تم استلام المخزون ولكن لم يتم إصدار فاتورة به`
-`Subject`,`الموضوع`
-`Submit`,`إرسال`
-`Submit on Import`,`إرسال عند الاستيراد`
-`Submitted`,`مقدم`
-`Subtotal`,`المجموع الفرعي`
-`Successfully created the following ${0} entries:`,`تم بنجاح إنشاء إدخالات ${0} التالية:`
-`Supplier`,`المورد`
-`Supplier Created`,`إنشاء المورد`
-`Supplier Currency`,`عملة المورد`
-`Supplier Name`,`اسم المورد`
-`Suppliers`,`الموردون`
-`Symbol`,`الرمز`
-`System`,`النظام`
-`System Settings`,`إعدادات النظام`
-`System Setup`,`إعداد النظام`
-`Tax`,`الضريبة`
-`Tax Account`,`حساب الضرائب`
-`Tax Assets`,`الأصول الضريبية`
-`Tax Detail`,`التفاصيل الضريبية`
-`Tax ID`,`المعرّف الضريبي`
-`Taxable Value`,`القيمة الخاضعة للضريبة`
-`Taxes`,`الضرائب`
-`Telephone Expenses`,`مصاريف الهاتف`
-`Template`,`قالب`
-`Temporary Accounts`,`حسابات مؤقتة`
-`Temporary Opening`,`الافتتاح المؤقت`
-`Terms`,`الشروط`
-`The following ${0} entries were created: ${1}`,`تم إنشاء إدخالات ${0} التالية: $ {1}`
-`Theme Color`,`لون الموضوع`
-`This action is permanent`,`هذا العمل دائم`
-`This action is permanent and will cancel the following payment: ${0}`,`هذا الإجراء نهائي وسيؤدي إلى إلغاء الدفعة التالية: ${0}`
-`This action is permanent and will cancel the following payments: ${0}`,`هذا الإجراء نهائي وسيؤدي إلى إلغاء الدفعات التالية: ${0} `
-`Title`,`العنوان`
-`To`,`إلى`
-`To Account`,`الحساب`
-`To Date`,`حتى الآن`
-`To Do`
-`Top Expenses`,`أهم المصروفات`
-`Total Spending`,`إجمالي الإنفاق`
-`Total Tax`,`إجمالي الضرائب`
-`Transfer Type`,`نوع التحويل`
-`Travel Expenses`,`مصاريف السفر`
-`Trial Balance`,`ميزان المراجعة`
-`Type`,`النوع`
-`Unit Type`,`نوع الوحدة`
-`Unpaid`,`غير مدفوعة الأجر`
-`Unsecured Loans`,`قروض غير مضمونة`
-`Update downloaded`,`تم تنزيل التحديث`
-`User ID`,`معرف المستخدم`
-`User Remark`,`ملاحظة المستخدم`
-`Username`,`اسم المستخدم`
-`Utility Expenses`,`نفقات المرافق`
-`Value`,`القيمة`
-`Value missing for ${0}`,`القيمة مفقودة لـ ${0}`
-`Verify Imported Data`,`التحقق من البيانات المستوردة`
-`Version ${0} available`,`الإصدار ${0} متاح`
-`View Bills`,`عرض الفواتير`
-`View Invoices`,`عرض الفواتير`
-`Welcome to Frappe Books`,`مرحبًا بكم في Frappe Books`
-`Write Off`,`شطب`
-`Write Off / Refund`,`شطب / استرداد`
-`Write Off Account`,`شطب الحساب`
-`Write Off Account not set. Please set Write Off Account in General Settings`,`شطب الحساب لم يتم تعيينه. يرجى تعيين حساب الشطب في الإعدادات العامة`
-`Year`,`السنة`
-`Yes`,`نعم`
-`Your Name`,`اسمك`
-`name`,`الاسم`
-`verify the imported data and click on`,`تحقق من البيانات المستوردة وانقر فوق`
\ No newline at end of file
+"${0} ${1} already exists.","${0} ${1} موجودة من قبل.",
+"${0} ${1} has been modified after loading",,
+"${0} ${1} is linked with existing records.","${0} ${1} مرطبت بسجل موجود.",
+"${0} already exists.","${0} موجود بالفعل.",
+"${0} filters applied","${0} تم تطبيق الفيلتر",
+"${0} rows",,
+"* required fields","* الحقول المطلوبة",
+0%,,
+03-23-2022,,
+03/23/2022,,
+"1 filter applied","تم تطبيق فلتر واحد",
+2022-03-23,,
+"23 Mar, 2022",,
+23-03-2022,,
+23/03/2022,,
+9888900000,,
+Account,الحساب,
+"Account Entries","إدخالات الحساب",
+"Account Name","اسم الحساب",
+"Account Type","نوع الحساب",
+"Accounting Ledger Entry",,
+"Accounting Settings","إعدادات المحاسبة",
+Accounts,الحسابات,
+"Accounts Payable","الحسابات الدائنة",
+"Accounts Receivable","حسابات القبض",
+"Accumulated Depreciation","الاستهلاك المتراكم",
+"Add Account","إضافة حساب",
+"Add Customers","إضافة العملاء",
+"Add Group","إضافة مجموعة",
+"Add Items","إضافة عناصر",
+"Add Row","إضافة صف",
+"Add Suppliers","إضافة الموردين",
+"Add Taxes","إضافة ضرائب",
+"Add a few customers to create your first invoice",,
+"Add a few suppliers to create your first bill",,
+"Add a filter","إضافة تصفية",
+"Add a remark",,
+"Add invoice terms",,
+"Add products or services that you buy from your suppliers",,
+"Add products or services that you sell to your customers",,
+Address,العنوان,
+"Address Display","عرض العنوان",
+"Address Line 1","سطر العنوان 1",
+"Address Line 2","سطر العنوان 2",
+"Administrative Expenses","مصاريف إدارية",
+All,,
+"Allow Telemetry",,
+Amount,المبلغ,
+"Amount (Company Currency)","المبلغ (عملة الشركة)",
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","المبلغ: ${0} والشطب: $ {1} أقل من إجمالي المبلغ المخصص للمراجع: $ {2} .",
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","المبلغ: ${0} أقل من إجمالي المبلغ المخصص للمراجع: $ {1} ",
+"An error occurred.","حدث خطأ",
+"Anonymized Telemetry",,
+"Application of Funds (Assets)","تطبيق الأموال (الأصول)",
+Arial,,
+"Ascending Order",,
+Asset,,
+"Assign Imported Labels","تعيين التسميات المستوردة",
+Back,رجوع,
+"Bad import data.","بيانات استيراد تالفة",
+Balance,التوازن,
+"Balance Sheet",الميزانية,
+Bank,,
+"Bank Accounts","حسابات بنكية",
+"Bank Entry",,
+"Bank Name","اسم البنك",
+"Bank Overdraft Account","حساب مصرفي السحب على المكشوف",
+"Base Error",,
+"Based On",,
+Basic,,
+"Basic I",,
+"Basic II",,
+Bill,الفاتورة,
+"Bill Created","الفاتورة أنشأت",
+"Bill No","رقم الفاتورة ",
+Black,أسود,
+Blue,,
+Both,كلاهما,
+Buildings,المباني,
+Business,,
+Cancel,إلغاء,
+"Cancel ${0} ${1}?",,
+Cancelled,ملغاة,
+"Cannot Commit Error",,
+"Capital Equipments","معدات رأس المال",
+"Capital Stock","رأس المال",
+Cash,نقد,
+"Cash Entry",,
+"Cash In Hand","نقدا في اليد",
+Cashflow,"التدفق النقدي",
+"Central Tax","الضرائب المركزية",
+"Change File","تغيير الملف",
+"Change Ref Type",,
+Chargeable,,
+"Chart Of Accounts Reviewed","مراجعة مخطط الحسابات",
+"Chart of Accounts","مخطط الحسابات",
+"Check for Updates",,
+"Checking for updates","التحقق من وجود تحديثات",
+Cheque,,
+"City / Town","المدينة / البلدة",
+Clear,,
+"Clearance Date","تاريخ التخليص",
+"Click to create","انقر للإنشاء",
+Close,إغلاق,
+Closing,,
+"Closing (Cr)","(Cr) إغلاق",
+"Closing (Dr)","(Dr) إغلاق",
+Color,اللون,
+"Commission on Sales","عمولة على المبيعات",
+Common,عام,
+"Common Items","العناصر المشتركة",
+"Company Address","عنوان الشركة",
+"Company Logo","شعار الشركة",
+"Company Name","اسم الشركة",
+"Company Settings","إعدادات الشركة",
+"Company Setup","إعداد الشركة",
+Completed,مكتمل,
+Condition,,
+"Consolidate Columns",,
+Contains,يحتوي,
+"Contra Entry",,
+"Cost of Goods Sold","تكلفة البضائع المباعة",
+"Could not import ${0} ${1}.","تعذر استيراد ${0} $ {1} .",
+"Could not select file.","تعذر تحديد الملف.",
+Country,البلد,
+"Country Code",,
+"Country code used to initialize regional settings.",,
+Courier,,
+Cr.,,
+Create,إنشاء,
+"Create Bill","إنشاء فاتورة",
+"Create Demo",,
+"Create Invoice","إنشاء فاتورة",
+"Create Purchase",,
+"Create Sale",,
+"Create a new file and store it in your computer.","إنشاء ملف جديد وتخزينه في جهاز الكمبيوتر الخاص بك.",
+"Create a new file or select an existing one from your computer","أنشئ ملفًا جديدًا أو حدد ملفًا موجودًا من جهاز الكمبيوتر الخاص بك",
+"Create your first bill and mail it to your supplier",,
+"Create your first invoice and mail it to your customer",,
+Created,,
+"Created By",,
+"Creating Items and Parties",,
+"Creating Journal Entries",,
+"Creating Purchase Invoices",,
+Credit,الائتمان,
+"Credit Card Entry",,
+"Credit Note",,
+Creditors,الدائنون,
+Currency,العملة,
+"Currency Name","اسم العملة",
+Current,الحالي,
+"Current Assets","الأصول الحالية",
+"Current Liabilities","الخصوم المتداولة",
+"Custom Hex",,
+Customer,الزبون,
+"Customer Created","خلق العميل",
+"Customer Currency","عملة العميل",
+Customers,العملاء,
+Customise,تخصيص,
+"Customize your invoices by adding a logo and address details",,
+Dashboard,"لوحة القيادة",
+"Data Import","استيراد البيانات",
+"Database Error",,
+"Database file: ${0}",,
+Date,التاريخ,
+"Date Format","تنسيق التاريخ",
+Day,,
+Debit,مدين,
+"Debit Note",,
+Debtors,المدينون,
+"Default Account","الحساب الافتراضي",
+Delete,حذف,
+"Delete ${0} ${1}?",,
+"Delete ${0}?",,
+Depreciation,إهلاك,
+"Depreciation Entry",,
+Description,الوصف,
+Details,التفاصيل,
+"Direct Expenses","المصاريف المباشرة",
+"Direct Income","الدخل المباشر",
+"Disables telemetry. No data will be collected, you are completely invisble to us.",,
+"Display Logo in Invoice","عرض الشعار في الفاتورة",
+"Display Precision","دقة العرض",
+"Display Precision should have a value between 0 and 9.","دقة العرض يجب أن تكون لها قيمة بين 0 و 9.",
+"Dividends Paid","توزيعات أرباح مدفوعة",
+Docs,,
+Documentation,التوثيق,
+"Does Not Contain","لا يحتوي",
+"Don't Log Anything",,
+"Don't Log Usage",,
+"Download Update","تنزيل التحديث",
+"Downloading update","جارٍ تنزيل التحديث",
+Dr.,,
+Draft,,
+Duplicate,,
+"Duplicate ${0} ${1}?",,
+"Duplicate Entry Error",,
+"Duties and Taxes","الرسوم والضرائب",
+"Earnest Money","كسب المال",
+Edit,تحرير,
+"Electronic Equipments","معدات إلكترونية",
+Email,"البريد الإلكتروني",
+"Email Address","عنوان البريد الإلكتروني",
+Empty,فارغ,
+"Enables telemetry. Does not include usage patterns.",,
+"Enables telemetry. Includes usage patterns.",,
+"Enter Country to load States",,
+"Enter State",,
+"Entertainment Expenses","مصاريف ترفيه",
+"Entry No","رقم الإدخال",
+"Entry Type","نوع الإدخال",
+Equity,"حقوق الملكية",
+Error,خطأ,
+Error:,خطأ:,
+"Exchange Gain/Loss","مكاسب / خسارة الصرف",
+"Exchange Rate","سعر الصرف",
+"Excise Entry",,
+"Existing File","ملف موجود",
+Expense,المصاريف,
+"Expense Account",,
+Expenses,المصروفات,
+"Expenses Included In Valuation","المصروفات المدرجة في التقييم",
+Export,,
+"Export Successful","تم التصدير بنجاح",
+Fax,فاكس,
+Field,,
+Fieldname,"اسم المجال",
+"File selection failed.","فشل اختيار الملف",
+Filter," التصفية`",
+"Fiscal Year",,
+"Fiscal Year End Date","تاريخ نهاية السنة المالية",
+"Fiscal Year Start Date","تاريخ بدء السنة المالية",
+"Fixed Asset",,
+"Fixed Assets","الأصول الثابتة",
+Font,الخط,
+For,"من أجل",
+"Forbidden Error",,
+Fraction,كسر,
+"Fraction Units","وحدات الكسر",
+"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
+"Freight and Forwarding Charges","مصاريف الشحن",
+"From Account","من الحساب",
+"From Date","من تاريخ",
+"From Year",,
+"Full Name","الاسم الكامل",
+"Furnitures and Fixtures","الأثاث والتجهيزات",
+"GSTIN No.",,
+GSTR1,,
+GSTR2,,
+"Gain/Loss on Asset Disposal","الربح / الخسارة من التصرف في الأصول",
+General,عام,
+"General Ledger",,
+"Get Started",ابدأ,
+Gram,,
+"Grand Total","المجموع الكلي",
+"Grand Total (Company Currency)","المجموع الكلي (عملة الشركة)",
+"Greater Than","أكبر من",
+Green,,
+"Group By",,
+HSN/SAC,,
+"HSN/SAC Code",,
+"Half Yearly",,
+"Half Years",,
+"Hello there! 👋",,
+"Hex Value",,
+"Hide Get Started","إخفاء قائمة البدء",
+"Hide Group Amounts",,
+"Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.","يخفي قسم البدء من الشريط الجانبي. سيكون التغيير مرئيًا عند إعادة التشغيل أو تحديث التطبيق",
+Hour,,
+"How to Use Data Import",,
+"I can't find my language.","لا أجد لغتي",
+INR,,
+Image,صورة,
+"Import Data","استيراد البيانات",
+"Import Failed","فشل الاستيراد",
+"Import More","استيراد المزيد",
+"Import Success","نجاح الاستيراد",
+"Import Type","نوع الاستيراد",
+"Importer Settings","إعدادات المستورد",
+"Include Cancelled",,
+Income,الدخل,
+"Income Account",,
+Indigo,,
+"Indirect Expenses","مصاريف غير مباشرة",
+"Indirect Income","الدخل غير المباشر",
+Inflow,التدفق,
+"Install Update","تثبيت التحديث",
+Inter,,
+"Intergrated Tax","ضريبة متكاملة",
+"Internal Precision","الدقة الداخلية",
+"Invalid value ${0} for ${1}",,
+Investments,استثمارات,
+Invoice,الفاتورة,
+"Invoice Created","الفاتورة المُنشأة",
+"Invoice Date","تاريخ الفاتورة",
+"Invoice No","رقم الفاتورة",
+"Invoice No.","رقم الفاتورة",
+"Invoice Setup","إعداد الفاتورة",
+"Invoice Value","قيمة الفاتورة",
+Invoices,الفواتير,
+Is,هو,
+"Is Empty",فارغ,
+"Is Group","هي المجموعة",
+"Is Not",ليس,
+"Is Not Empty","ليس فارغ",
+Item,العنصر,
+"Item Description",,
+"Item Name","اسم العنصر",
+Items,العناصر,
+"John Doe",,
+"Journal Entries",,
+"Journal Entry","إدخال دفتر اليومية",
+"Journal Entry Account",,
+Kg,,
+"Know More",,
+"Label Index","فهرس التسمية",
+Language,اللغة,
+"Ledger Entries","إدخالات دفتر الأستاذ",
+"Left Index",,
+"Legal Expenses","المصاريف القانونية",
+"Less Than","أقل من",
+Liability,,
+"Link Validation Error",,
+List,,
+"Load an existing .db file from your computer.","تحميل ملف .db موجود من جهاز الكمبيوتر الخاص بك.",
+"Loading Report...",,
+Loading...,"تحميل ...",
+"Loans (Liabilities)","قروض (خصوم)",
+"Loans and Advances (Assets)","القروض والسلف (الأصول)",
+Locale,اللغة,
+Logo,الشعار,
+"Make Entry",,
+"Make Payment","إجراء الدفع",
+"Mandatory Error",,
+"Mar 23, 2022",,
+"Marketing Expenses","مصاريف التسويق",
+Merriweather,,
+Meter,,
+Minimal,,
+"Miscellaneous Expenses","مصاريف متنوعة",
+Modern,,
+Modified,,
+"Modified By",,
+Monthly,,
+Months,,
+Montserrat,,
+Name,الاسم,
+Navigate,,
+"Net Total","الإجمالي الصافي",
+"Net Total (Company Currency)","صافي الإجمالي (عملة الشركة)",
+"New ${0}",,
+"New Account","حساب جديد",
+"New File","ملف جديد",
+"New Journal Entry","إدخال جديد في دفتر اليومية",
+"New Purchase",,
+"New Purchase Invoice",,
+"New Sale",,
+"New Sales Invoice",,
+"New version available","إصدار جديد متاح",
+Next,التالي,
+No,لا,
+"No Data to Import","لا توجد بيانات للاستيراد",
+"No Values to be Displayed",,
+"No entries found",,
+"No expenses in this period","لا توجد نفقات في هذه الفترة",
+"No filters selected","لم يتم تحديد عوامل تصفية",
+"No labels have been assigned.","لم يتم تعيين أي تسميات.",
+"No results found",,
+"No transactions yet","لا توجد معاملات حتى الآن",
+"No updates available","لا توجد تحديثات متاحة",
+None,"لا شيء",
+"Not Found Error",,
+Notes,ملاحظات,
+"Number Series","سلسلة الأرقام",
+"Number of ${0}",,
+"Office Equipments","معدات مكتبية",
+"Office Maintenance Expenses","مصاريف صيانة المكاتب",
+"Office Rent","إيجار مكتب",
+"Onboarding Complete","اكتمال الإعداد",
+"Open Folder","فتح مجلد",
+"Open Sans",,
+"Opening (Cr)","(Cr) الافتتاح",
+"Opening (Dr)","(Dr) افتتاح",
+"Opening Balance Equity","الرصيد الافتتاحي حقوق الملكية",
+"Opening Balances","أرصدة الافتتاح",
+"Opening Entry",,
+Orange,,
+Organisation,التنظيم,
+Outflow,التدفق,
+"Outstanding Amount","المبلغ المستحق",
+Oxygen,,
+"Pad Zeros",,
+Page,,
+Paid,مدفوع,
+Parent,الوالد,
+"Parent Account","الحساب الوالد",
+Party,حفلة,
+"Patch Run",,
+Pay,دفع,
+Payable,,
+Payment,الدفع,
+"Payment For","الدفع مقابل",
+"Payment Method","طريقة الدفع",
+"Payment No","رقم الدفع",
+"Payment Reference","مرجع الدفع",
+"Payment Type","نوع الدفع",
+"Payment amount cannot be ${0}.","لا يمكن أن يكون مبلغ الدفعة ${0}",
+"Payment amount cannot be less than zero.","مبلغ الدفعة لا يمكن أن يكون أقل من الصفر.",
+"Payment amount cannot exceed ${0}.","مبلغ الدفعة لا يمكن أن يتجاوز ${0} .",
+"Payment amount: ${0} should be greater than 0.","مبلغ الدفعة: ${0} يجب أن يكون أكبر من 0.",
+"Payment amount: ${0} should be less than Outstanding amount: ${1}.","مبلغ الدفعة: ${0} يجب أن يكون أقل من المبلغ المستحق: ${1}",
+Payments,المدفوعات,
+"Payroll Payable","الرواتب المستحقة الدفع",
+Periodicity,الدورية,
+Phone,الهاتف,
+Pink,,
+Place,مكان,
+"Place of supply","مكان التوريد",
+"Plants and Machineries","المصانع والآليات",
+"Please Wait",,
+"Please assign the following fields ${0}","الرجاء تخصيص الحقول التالية ${0} ",
+"Please fill all values","الرجاء ملء جميع القيم",
+"Please select a file with data to import.","الرجاء تحديد ملف به بيانات للاستيراد.",
+"Please select a valid reference type.",,
+"Please select an option:",,
+"Postal Code","الرمز البريدي",
+"Postal Expenses","المصاريف البريدية",
+"Posting Date","تاريخ النشر",
+Prefix,بادئة,
+"Prime Bank",,
+Print,طباعة,
+"Print Settings","إعدادات الطباعة",
+"Print and Stationery","طباعة و المكتبة",
+Product,,
+"Profit And Loss","الربح والخسارة",
+"Profit and Loss","الربح والخسارة",
+Purchase,شراء,
+"Purchase Invoice",,
+"Purchase Invoice Item",,
+"Purchase Invoices",,
+"Purchase Item Created",,
+"Purchase Items","شراء العناصر",
+"Purchase Payments",,
+Purchases,المشتريات,
+Purple,,
+Quantity,الكمية,
+Quarterly,,
+Quarters,,
+Rate,معدل,
+"Rate (${0}) cannot be less zero.","لا يمكن أن يكون `السعر (${0}) أقل من صفر.",
+"Rate (Company Currency)","السعر (عملة الشركة)",
+"Rate can't be negative.","لا يمكن أن يكون المعدل سالبًا",
+Receivable,,
+Receive,تلقي,
+"Recent Invoices","الفواتير الحديثة",
+Red,,
+"Ref Name",,
+"Ref Type",,
+"Ref. / Cheque No.","المرجع. / رقم الشيك",
+"Ref. Date","المرجع. التاريخ",
+"Ref. Name","المرجع. الاسم",
+"Ref. Type","المرجع. النوع",
+Reference,,
+"Reference Date","تاريخ المرجع",
+"Reference Number","الرقم المرجعي",
+"Reference Type","نوع المرجع",
+"Reload App","إعادة تحميل التطبيق",
+Report,,
+"Report Error","الإبلاغ عن خطأ",
+"Report Issue",,
+Reports,التقارير,
+"Required Fields not Assigned","الحقول المطلوبة غير معيَّنة",
+Reset,إعادة,
+"Retained Earnings","الأرباح المحتجزة",
+"Reverse Chrg.","`الشحن العكسي",
+Reverted,"تم إرجاعه",
+Reverts,,
+"Review Accounts","مراجعة الحسابات",
+"Review your chart of accounts, add any account or tax heads as needed",,
+"Right Index",,
+Role,الدور,
+"Root Type","نوع الجذر",
+"Round Off","جولة خارج",
+"Round Off Account","تقريب الحساب",
+Salary,الراتب,
+Sales,المبيعات,
+"Sales Expenses","مصاريف المبيعات",
+"Sales Invoice",,
+"Sales Invoice Item",,
+"Sales Invoice Settings",,
+"Sales Invoices",,
+"Sales Invoie",,
+"Sales Item Created",,
+"Sales Items","عناصر المبيعات",
+"Sales Payments",,
+Save,حفظ,
+"Save Option",,
+"Save Template","حفظ النموذج",
+"Save as PDF","حفظ كملف PDF",
+"Save as PDF Successful","PDF حفظ كملف ناجح",
+Saving,حفظ,
+Search,,
+"Secured Loans","قروض مضمونة",
+"Securities and Deposits","الأوراق المالية والودائع",
+Select,,
+"Select CoA","حدد شهادة توثيق البرامج",
+"Select Color",,
+"Select Country",,
+"Select File","تحديد ملف",
+"Select Folder","تحديد مجلد",
+"Select Image","حدد صورة",
+"Select Logo","اختر الشعار",
+"Select a file for import","حدد ملفًا للاستيراد",
+"Select file","تحديد ملف",
+"Select folder","تحديد مجلد",
+"Select your language","اختر لغتك",
+"Selected file","الملف المحدد",
+"Send anonymized usage data and error reports to help improve the product.",,
+Service,الخدمة,
+"Set Anonymized Telemetry",,
+"Set an Import Type","تعيين نوع الاستيراد",
+"Set the display language.","ضبط لغة العرض.",
+"Set the local code. This is used for number formatting.","اضبط الكود المحلي. يستخدم هذا لتنسيق الأرقام",
+"Sets how many digits are shown after the decimal point.","تعيين عدد الأرقام التي تظهر بعد العلامة العشرية.",
+"Sets the app-wide date display format.","يضبط تنسيق عرض التاريخ على مستوى التطبيق.",
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","يضبط الدقة الداخلية المستخدمة في الحسابات النقدية. يجب أن يكون الرقم الأعلى من 6 كافيًا لمعظم العملات",
+"Setting Up Instance",,
+"Setting Up...","الإعداد ...",
+Settings,الإعدادات,
+"Settings changes will be visible on reload","ستكون تغييرات الإعدادات مرئية عند إعادة التحميل",
+Setup,الإعداد,
+"Setup Complete","اكتمل الإعداد",
+"Setup Wizard","معالج الإعداد",
+"Setup Your Workspace","إعداد مساحة العمل الخاصة بك",
+"Setup system defaults like date format and display precision",,
+"Setup your company information, email, country and fiscal year",,
+"Setup your opening balances before performing any accounting entries",,
+"Setup your organization","إعداد منظمتك",
+"Setup your tax templates for your sales or purchase transactions",,
+"Show Me",أرني,
+"Single Value",,
+"Smallest Currency Fraction Value","أصغر قيمة لكسر العملة",
+Softwares,البرامج,
+"Something has gone terribly wrong. Please check the console and raise an issue.","لقد حدث خطأ ما بشكل رهيب. يرجى التحقق من وحدة التحكم وإثارة المشكلة",
+"Source of Funds (Liabilities)","مصدر الأموال (الخصوم)",
+"Standard Chart of Accounts","المخطط القياسي للحسابات",
+Start,ابدأ,
+State,الدولة,
+"State Tax","ضريبة الولاية",
+Status,الحالة,
+Stock,,
+"Stock Adjustment","تسوية المخزون",
+"Stock Assets","أصول المخزون",
+"Stock Expenses","مصاريف المخزون",
+"Stock In Hand","المخزون في متناول اليد",
+"Stock Liabilities","مطلوبات المخزون",
+"Stock Received But Not Billed","تم استلام المخزون ولكن لم يتم إصدار فاتورة به",
+Submit,إرسال,
+"Submit Journal Entry?",,
+"Submit Purchase Invoice?",,
+"Submit Sales Invoice?",,
+"Submit on Import","إرسال عند الاستيراد",
+Submitted,مقدم,
+Submitting,,
+Subtotal,"المجموع الفرعي",
+"Successfully created the following ${0} entries:","تم بنجاح إنشاء إدخالات ${0} التالية:",
+Supplier,المورد,
+"Supplier Created","إنشاء المورد",
+"Supplier Currency","عملة المورد",
+Suppliers,الموردون,
+Symbol,الرمز,
+System,النظام,
+"System Settings","إعدادات النظام",
+"System Setup","إعداد النظام",
+Tax,الضريبة,
+"Tax Account","حساب الضرائب",
+"Tax Assets","الأصول الضريبية",
+"Tax Detail","التفاصيل الضريبية",
+"Tax ID","المعرّف الضريبي",
+"Tax Summary",,
+"Taxable Value","القيمة الخاضعة للضريبة",
+Taxes,الضرائب,
+Teal,,
+"Telephone Expenses","مصاريف الهاتف",
+Template,قالب,
+Temporary,,
+"Temporary Accounts","حسابات مؤقتة",
+"Temporary Opening","الافتتاح المؤقت",
+Terms,الشروط,
+"The following ${0} entries were created: ${1}","تم إنشاء إدخالات ${0} التالية: $ {1}",
+"Theme Color","لون الموضوع",
+"This Month",,
+"This Quarter",,
+"This Year",,
+"This action is permanent","هذا العمل دائم",
+"This action is permanent and will cancel the following payment: ${0}","هذا الإجراء نهائي وسيؤدي إلى إلغاء الدفعة التالية: ${0}",
+"This action is permanent and will cancel the following payments: ${0}","هذا الإجراء نهائي وسيؤدي إلى إلغاء الدفعات التالية: ${0} ",
+"This action is permanent and will delete associated ledger entries.",,
+"This action is permanent.",,
+"Times New Roman",,
+"To Account",الحساب,
+"To Account and From Account can't be the same: ${0}",,
+"To Date","حتى الآن",
+"To Year",,
+"Top Expenses","أهم المصروفات",
+Total,,
+"Total Asset (Debit)",,
+"Total Credit",,
+"Total Debit",,
+"Total Debit: ${0} must be equal to Total Credit: ${1}",,
+"Total Equity (Credit)",,
+"Total Expense (Debit)",,
+"Total Income (Credit)",,
+"Total Liability (Credit)",,
+"Total Profit",,
+"Total Spending","إجمالي الإنفاق",
+Transfer,,
+"Transfer Type","نوع التحويل",
+"Travel Expenses","مصاريف السفر",
+"Trial Balance","ميزان المراجعة",
+Type,النوع,
+"Type to search...",,
+Unit,,
+"Unit Type","نوع الوحدة",
+Unpaid,"غير مدفوعة الأجر",
+"Unsecured Loans","قروض غير مضمونة",
+"Until Date",,
+"Update downloaded","تم تنزيل التحديث",
+"User Remark","ملاحظة المستخدم",
+"Utility Expenses","نفقات المرافق",
+"Validation Error",,
+Value,القيمة,
+"Value missing for ${0}","القيمة مفقودة لـ ${0}",
+"Verify Imported Data","التحقق من البيانات المستوردة",
+Version,,
+"Version ${0} available","الإصدار ${0} متاح",
+"View Purchases",,
+"View Sales",,
+"Welcome to Frappe Books","مرحبًا بكم في Frappe Books",
+"Write Off",شطب,
+"Write Off Account","شطب الحساب",
+"Write Off Account not set. Please set Write Off Account in General Settings","شطب الحساب لم يتم تعيينه. يرجى تعيين حساب الشطب في الإعدادات العامة",
+"Write Off Entry",,
+Yearly,,
+Years,,
+Yellow,,
+Yes,نعم,
+"Your Name",اسمك,
+john@doe.com,,
+reports,,
+setup,,
+"verify the imported data and click on","تحقق من البيانات المستوردة وانقر فوق",
\ No newline at end of file
diff --git a/translations/ca-ES.csv b/translations/ca-ES.csv
index 16895fe5..9488d648 100644
--- a/translations/ca-ES.csv
+++ b/translations/ca-ES.csv
@@ -1,586 +1,652 @@
-`${0} ${1} already exists.`,`${0} ${1} ja existeix.`
-`${0} ${1} is linked with existing records.`,`${0} ${1} té relació amb un registre que ja existeix.`
-`${0} already exists.`,`${0} ja existeix.`
-`${0} filters applied`,`${0} filtres aplicats`
-`* required fields`,`* camps necessaris`
-`1 filter applied`,`1 filtre aplicat`
-`Accepted Quantity`,`Quantitat acceptada`
-`Account`,`Compte`
-`Account Entries`,`Moviments del compte`
-`Account Name`,`Nom del compte`
-`Account Type`,`Tipus de compte`
-`Accounting Ledger Entries`,`Accounting Ledger Entries`
-`Accounting Settings`,`Ajustaments de comptabilitat`
-`Accounts`,`Accounts`
-`Accounts Payable`,`Comptes per pagaments`
-`Accounts Receivable`,`Comptes d’entrada`
-`Accumulated Depreciation`,`Accumulated Depreciation`
-`Add Account`,`Afegir compte`
-`Add Customers`,`Afegir clients`
-`Add Group`,`Afegir grup`
-`Add Items`,`Afegir ítems`
-`Add Row`,`Afegir columna`
-`Add Suppliers`,`Afegir proveïdor`
-`Add Taxes`,`Afegir taxes`
-`Add a few customers to create your first invoice`,`Afegeix alguns clients per a crear la teva primera factura`
-`Add a few suppliers to create your first bill`,`Afegeix alguns proveïdors per a crear la teva primera factura`
-`Add a filter`,`Afegir un filtre`
-`Add products or services that you buy from your suppliers`,`Afegeix productes o serveis que compris a proveïdors`
-`Add products or services that you sell to your customers`,`Afegeix productes o serveis que venguis a clients`
-`Address`,`Direcció`
-`Address Display`,`Mostrar direcció`
-`Address Line 1`,`Direcció línea 1`
-`Address Line 2`,`Direcció línea 2`
-`Administrative Expenses`,`Despeses administratives`
-`Against Account`,`Compte de despeses`
-`All References`,`Totes les referències`
-`Allocated Amount`,`Import assignat`
-`Allow Telemetry`,`Permetre telemetria`
-`Amount`,`Quantitat`
-`Amount (Company Currency)`,`Quantitat (Moneda de la empresa)`
-`Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.`,`Quantitat: ${0} i quantitat cancel·lada: ${1} és menor que la quantitat total que figura a les referències: ${2}.`
-`Amount: ${0} is less than the total amount allocated to references: ${1}.`,`Quantitat: ${0} és menor que la quantitat total que figura a les referències: ${1}.`
-`An error occurred.`,`Hi ha hagut un error.`
-`Anonymized Telemetry`,`Telemetria anònima`
-`Application of Funds (Assets)`,`Aplicació de fons (Actius)`
-`Are you sure you want to cancel ${0} ${1}?`,`Estàs segur que vols cancel·lar ${0} ${1}?`
-`Are you sure you want to delete ${0} ${1}?`,`Estàs segur que vols eliminar ${0} ${1}?`
-`Are you sure you want to submit this Bill?`,`Estàs segur que vols enviar la factura?`
-`Are you sure you want to submit this Invoice?`,`Estàs segur que vols albarà?`
-`Are you sure you want to submit this Journal Entry?`,`Estàs segur que vols enviar aquesta entrada de diari?`
-`Assign Imported Labels`,`Asignar etiquetes importades`
-`Back`,`Enrere`
-`Bad import data.`,`Dades importades amb errors.`
-`Balance`,`Balanç`
-`Balance Sheet`,`Full de balanç`
-`Bank Accounts`,`Comptes bancaris`
-`Bank Entry`,`Entrada bancària`
-`Bank Name`,`Nom del banc`
-`Bank Overdraft Account`,`Compte bancari d’exedents`
-`Bill`,`Factura`
-`Bill Created`,`Factura creada`
-`Bill No`,`Factura No`
-`Bills`,`Factures`
-`Bills Settings`,`Configuració de factures`
-`Black`,`Negre`
-`Body`,`Cos`
-`Both`,`Ambdós`
-`Buildings`,`Buildings`
-`CSV`,`CSV`
-`Can't open database file: ${0}. Please create a new file.`,`No es pot obrir l’fitxer de la base de dades: ${0}. Crea un fitxer nou si us plau.`
-`Cancel`,`Cancel·la`
-`Cancelled`,`Cancel·lat`
-`Capital Equipments`,`Capital Equipments`
-`Capital Stock`,`Capital Stock`
-`Cash`,`Efectiu`
-`Cash Entry`,`Entrades d'efectiu`
-`Cash In Hand`,`Efectiu disponible`
-`Cashflow`,`Flux`
-`Central Tax`,`Tributacions`
-`Central Tax Paid`,`Tributacions pagades`
-`Change File`,`Canviar fitxer`
-`Chart Of Accounts Reviewed`,`Diagrama de comptes revisat`
-`Chart of Accounts`,`Diagrama de comptes`
-`Check for Updates`,`Comprova si hi ha actualitzacions`
-`Checking for updates`,`S'estan comprovant les actualitzacions`
-`Cheque`,`Xec`
-`City / Town`,`Ciutat`
-`Clearance Date`,`Data de neteja`
-`Click to create`,`Fes clic per crear`
-`Close`,`Tancar`
-`Closing (Cr)`,`Tancant (Cr)`
-`Closing (Dr)`,`Tancant (Dr)`
-`Color`,`Color`
-`Commission on Sales`,`Comisions de venda`
-`Common`,`Comuns`
-`Common Items`,`Elements comuns`
-`Company Address`,`Adreça de l'empresa`
-`Company Logo`,`Logotip de l'empresa`
-`Company Name`,`Nom de l'empresa`
-`Company Settings`,`Paràmetres de l'empresa`
-`Company Setup`,`Configuració de l'empresa`
-`Completed`,`Completat`
-`Confirm Password`,`Confirma la contrassenya`
-`Contains`,`Conté`
-`Contra Entry`,`Entrades en contra`
-`Cost of Goods Sold`,`Cost dels béns venuts`
-`Could not import ${0} ${1}.`,`No s'ha pogut importar ${0} ${1}.`
-`Could not select file.`,`No s'ha pogut seleccionar l'fitxer.`
-`Country`,`País`
-`Create`,`Crear`
-`Create Bill`,`Crear factura`
-`Create Invoice`,`Crear alabarà`
-`Create a new file and store it in your computer.`,`Crea un fitxer nou i emmagatzema'l a l'ordinador.`
-`Create a new file or select an existing one from your computer`,`Crea un fitxer nou o selecciona un existent des del teu ordinador`
-`Create your first bill and mail it to your supplier`,`Crea la primera factura i envia-la al proveïdor`
-`Create your first invoice and mail it to your customer`,`Crea la teva primera factura i envia-la al client`
-`Credit`,`Crèdit`
-`Credit Card Entry`,`Entrada de targeta de crèdit`
-`Credit Note`,`Nota de crèdit`
-`Creditors`,`Creditors`
-`Currency`,`Divisa`
-`Currency Name`,`Nom de la divisa`
-`Current`,`Actual`
-`Current Assets`,`Actius actuals`
-`Current Liabilities`,`Obligacions actuals
-`Custom Hex`,`Hexadecimal personalitzat`
-`Customer`,`Customer`
-`Customer Created`,`Client creat`
-`Customer Currency`,`Divisa del client`
-`Customer Name`,`Nom del client`
-`Customers`,`Clients`
-`Customise`,`Personalitzar`
-`Customize`,`Personalitzar`
-`Customize your invoices by adding a logo and address details`,`Personalitza les teves factures afegint-hi un logotip i l'adreça`
-`DB Connection Error`,`Error de connexió a la base de dades`
-`Dashboard`,`Tauler`
-`Data Import`,`Importar dades`
-`Date`,`Data`
-`Date Format`,`Format de la data`
-`Debit`,`Dèbit`
-`Debit Note`,`Nota de dèbil`
-`Debtors`,`Deutors`
-`Default Account`,`Compte per defecte`
-`Delete`,`Eliminar`
-`Depreciation`,`Depreciació`
-`Depreciation Entry`,`Entrada de depreciació`
-`Description`,`Descripció`
-`Details`,`Detalls`
-`Direct Expenses`,`Despeses directes`
-`Direct Income`,`Ingressos directes`
-`Disables telemetry. No data will be collected,you are completely invisble to us.`
-`Display Logo in Invoice`,`Mostra el logotip a la factura`
-`Display Precision`,`Precisió de la pantalla`
-`Display Precision should have a value between 0 and 9.`,`Precisión de la pantalla ha de tenir un valor entre 0 i 9.`
-`Dividends Paid`,`Divindends pagats`
-`Document ${0} ${1} has been modified after loading`,`El document ${0} ${1} s'ha modificat després de carregar`
-`Document type ${0} is not submittable`,`El tipus de document ${0} no és presentable`
-`Documentation`,`Documentació`
-`Does Not Contain`,`No conté`
-`Don't Log Anything`,`No registrar`
-`Don't Log Usage`,`No registrar l'ús`
-`Download Update`,`Descarregar actualització`
-`Downloading update`,`Descarregant actualització`
-`Draft`,`Esborrany`
-`Duplicate`,`Duplicar`
-`Duplicate ${0} ${1}?`,`Duplicar ${0} ${1}?`
-`Duties and Taxes`,`Deures i taxes`
-`Earnest Money`,`Paga i senyal`
-`Edit`,`Editar`
-`Electronic Equipments`,`Equips electrònics`
-`Email`,`Correu electrònic`
-`Email Account`,`Adreça de correu electrònic`
-`Email Address`,`Correu electrònic`
-`Empty`,`Buit`
-`Enable Notifications`,`Habilita les notificacions`
-`Enables telemetry. Does not include usage patterns.`,`Habilita la telemetria. No inclou patrons d'ús.`
-`Enables telemetry. Includes usage patterns.`,`Habilita la telemetria. Inclou els patrons d'ús.`
-`Entertainment Expenses`,`Despeses d'entreteniment`
-`Entry ID`,`Identificació de l'entrada`
-`Entry No`,`Número de l'entrada`
-`Entry Type`,`Tipus d'entrada`
-`Equity`,`Capital`
-`Error`,`Error`
-`Error:`,`Error:`
-`Event Settings`,`Paràmetres d'esdeveniments`
-`Exchange Gain/Loss`,`Canvi de guanys/pèrdues`
-`Exchange Rate`,`Taxa d'intercanvi`
-`Excise Entry`,`Entrada d'impostos especials`
-`Existing File`,`fitxer existent`
-`Expense`,`Despesa`
-`Expenses`,`Despeses`
-`Expenses Included In Valuation`,`Despeses incloses en el valor`
-`Export`,`Exportar`
-`Export Failed`,`Ha fallat l'exportació`
-`Export Successful`,`Exportació correcta`
-`Fax`,`Fax`
-`Fieldname`,`Nom`
-`File Name`,`Nom de l'fitxer`
-`File Path`,`Direcció de l'fitxer`
-`File Size`,`Tamany de l'fitxer`
-`File selection failed.`,`La selecció de l'fitxer ha fallat .`
-`Filter`,`Filtre`
-`Fiscal Year End Date`,`Data de finalització de l'any fiscal`
-`Fiscal Year Start Date`,`Data d'inici de l'any fiscal`
-`Fixed Assets`,`Actius fixes`
-`Font`,`Font`
-`For`,`For`
-`Fraction`,`Fracció`
-`Fraction Units`,`Unitats de fracció`
-`Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on,`Frappe Books no utilitza telemetria per defecte. Aquesta és l'única manera de saber si els nostres usuaris fan servir l'aplicació regularment. Ens serà de gran ajuda si l'actives.
-`Freight and Forwarding Charges`,`Càrregues de transport i reenviaments`
-`From`,`Des de`
-`From Account`,`Compte d'arribada`
-`From Date`,`Des de`
-`Fulfillment`,`Emplenament`
-`Fulfillment Settings`,`Paràmetres d'emplenament`
-`Full Name`,`Nom complet`
-`Furnitures and Fixtures`,`Mobiliari i reparacions`
-`GST Registration`,`Registre GST`
-`GSTIN`,`GSTIN`
-`GSTIN No.`,`GSTIN No.`
-`GSTIN of Supplier`,`GSTIN del proveïdor`
-`GSTR 3B`,`GSTR 3B`
-`GSTR 3B Report`,`Informe GSTR 3B`
-`GSTR1`,`GSTR1`
-`GSTR2`,`GSTR2`
-`Gain/Loss on Asset Disposal`,`Guanys/pèrdues dels actius disposats`
-`Gender`,`Gènere`
-`General`,`General`
-`General Ledger`,`Llibre de comptabilidad general`
-`Get Started`,`Introducció`
-`Grand Total`,`Total`
-`Grand Total (Company Currency)`,`Total (Divisa de l'empresa)`
-`Greater Than`,`Més gran que`
-`HSN/SAC`,`HSN/SAC`
-`Half Yearly`,`Mitja anual`
-`Hello there! 👋`,`Hola! 👋`
-`Hex Value`,`Valor hexadecimal`
-`Hide Get Started`,`Amaga l'introducció`
-`Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.`,`Amaga la secció d'introducció de la barra lateral. El canvi serà efectiu quan reiniciis o refresquis l'aplicació.`
-`How to Use Data Import`,`Com usar la importació de dades`
-`I can't find my language.`,`No trobo la meva llengua.`
-`ID`,`Identificació`
-`Image`,`Imatge`
-`Import Data`,`Importar dades`
-`Import Failed`,`L'importació ha fallat`
-`Import More`,`Importar-ne més`
-`Import Success`,`L'importació ha sigut un èxit`
-`Import Type`,`Tipus d'importació`
-`Importer Settings`,`Configuració de l'importació`
-`Income`,`Ingressos`
-`Indirect Expenses`,`Despeses indirectes`
-`Indirect Income`,`Ingressos indirectes`
-`Inflow`,`Entrades`
-`Install Update`,`Instal·lar actualització`
-`Intergrated Tax`,`Taxes integrades`
-`Intergrated Tax Paid`,`Taxes integrades pagades`
-`Internal Precision`,`Precisió interna`
-`Investments`,`Inversions`
-`Invoice`,`Factura`
-`Invoice Created`,`Factura creada`
-`Invoice Date`,`Data de factura`
-`Invoice No`,`Factura No`
-`Invoice No.`,`Factura No.`
-`Invoice Number`,`Número de factura`
-`Invoice Setup`,`Configuració de la factura`
-`Invoice Value`,`Preu de la factura`
-`Invoices`,`Factures`
-`Is`,`És`
-`Is Customer`,`És client`
-`Is Empty`,`És buit`
-`Is Group`,`És un grup`
-`Is Not`,`No és`
-`Is Not Empty`,`No és buit`
-`Is Supplier`,`És proveïdor`
-`Item`,`Elements`
-`Item Created`,`Elements creats`
-`Item Name`,`Nom de l'element`
-`Items`,`Elements`
-`JSON`,`JSON`
-`JSON Data`,`Dades JSON`
-`Journal Entry`,`Entrada del diari`
-`Journal Entry Setting`,`Configuració de l'entrada del diari`
-`Know More`,`Saber-ne més`
-`Label Index`,`Índex d'etiquetes`
-`Language`,`Idiom`
-`Ledger Entries`,`Entrades del llibre de comptabilitat`
-`Ledger Entry`,`Entrada del llibre de comptabilitat`
-`Legal Expenses`,`Despeses al llibre de comptabilitat`
-`Less Than`,`Menor que`
-`Load an existing .db file from your computer.`,`Carrega un fitxer .db existent des del teu ordinador.`
-`Loading...`,`Loading...`
-`Loans (Liabilities)`,`Préstecs (Càrregues)`
-`Loans and Advances (Assets)`,`Préstecs i avançaments (Actius)`
-`Locale`,`Local`
-`Logo`,`Logotip`
-`MIME Type`,`Tipus MIME`
-`Make Payment`,`Fer pagaments`
-`Marketing Expenses`,`Despeses de màrqueting`
-`Miscellaneous Expenses`,`Despeses diverses`
-`Mobile Number`,`Número de mòbil`
-`Month`,`Mes`
-`Monthly`,`Mensual`
-`Name`,`Nom`
-`Net Total`,`Net Total`
-`Net Total (Company Currency)`,`Net Total (Divisa de la companyia)`
-`New Account`,`Compte nou`
-`New Bill`,`Nova factura`
-`New File`,`Nou fitxer`
-`New Invoice`,`Nou albarà`
-`New Journal Entry`,`Nova entrada de diari`
-`New version available`,`Nova versió disponible`
-`Next`,`Següent`
-`No`,`No`
-`No Data to Import`,`No hi ha dades a importar`
-`No expenses in this period`,`No hi ha despeses en aquest periode`
-`No filters selected`,`No s'han seleccionat filtres`
-`No labels have been assigned.`,`No s'han assignat etiquetes`
-`No results found.`,`No s'han trobat resultats.`
-`No transactions yet`,`Encara no hi ha transaccions`
-`No updates available`,`No hi ha cap actualització disponible`
-`None`,`Cap`
-`Notes`,`Notes`
-`Number Series`,`Sèries numèriques`
-`Office Equipments`,`Equipament d'officina`
-`Office Maintenance Expenses`,`Manteniment de material d'oficina`
-`Office Rent`,`Lloguer d'oficina`
-`Onboarding Complete`,`Incorporació completa`
-`Open Folder`,`Obrir carpeta`
-`Opening (Cr)`,`Obrint (Cr)`
-`Opening (Dr)`,`Obrint (Dr)`
-`Opening Balance Equity`,`Equitat de saldo d'obertura`
-`Opening Balances`,`Saldo d'obertura`
-`Opening Entry`,`Obertura d'entrada`
-`Organisation`,`Organització`
-`Outflow`,`Despeses`
-`Outstanding Amount`,`Import excepcional`
-`PDF`,`PDF`
-`Pad Zeros`,`Convertir números en text`
-`Paid`,`Pagat`
-`Parent`,`Principal`
-`Parent Account`,`Compte principal`
-`Party`,`Grup`
-`Password`,`Contrassenya`
-`Pay`,`Pagar`
-`Payable Account`,`Compte pagable`
-`Payment`,`Pagament`
-`Payment Account`,`Compte de pagament`
-`Payment For`,`Pagament per`
-`Payment Method`,`Mètode de pagament`
-`Payment No`,`Pagament Número`
-`Payment Reference`,`Referència de pagament`
-`Payment Settings`,`Ajustaments de pagament`
-`Payment Type`,`Tipus de pagament`
-`Payment amount cannot be ${0}.`,`La quantitat a pagar no pot ser ${0}.`
-`Payment amount cannot be less than zero.`,`La quantitat a pagar no pot ser zero.`
-`Payment amount cannot exceed ${0}.`,`La quantitat a pagar no pot ser superior a ${0}.`
-`Payment amount: ${0} should be greater than 0.`,`Quantitat a pagar: ${0} ha de ser superior a 0.`
-`Payment amount: ${0} should be less than Outstanding amount: ${1}.`,`Quantitat a pagar: ${0} ha de ser menor que l'import exepcional: ${1}.`
-`Payments`,`Pagaments`
-`Payroll Payable`,`Nòmina pagable`
-`Periodicity`,`Periodicitat`
-`Phone`,`Telèfon`
-`Place`,`Lloc`
-`Place of Supply`,`Lloc de subministrament`
-`Place of supply`,`Lloc de subministrament`
-`Plants and Machineries`,`Plantes i màquines`
-`Please assign the following fields ${0}`,`Assigneu els camps següents ${0}`
-`Please fill all values`,`Empleneu tots els valors`
-`Please select a file with data to import.`,`Selecciona un fitxer amb les dades a importar.`
-`Please select an existing database or create a new one.`,`Selecciona una base de dades existent o crea una de nova.`
-`Please select an option:`,`Selecciona una opció:`
-`Please set GSTIN in General Settings.`,`Extableix GSTIN a Ajustaments Generals.`
-`Postal Code`,`Codi postal`
-`Postal Expenses`,`Expenses d'enviament`
-`Posting Date`,`Data d'enviament`
-`Prefix`,`Prefix`
-`Print`,`Imprimir`
-`Print Format`,`Format d'impressió`
-`Print PDF`,`Imprimeix PDF`
-`Print Settings`,`Ajustaments d'impressió`
-`Print and Stationery`,`Print and Stationery`
-`Profit And Loss`,`Guanys i pèrdues`
-`Profit and Loss`,`Guanys i pèrdues`
-`Purchase`,`Compres`
-`Purchase Items`,`Comprar artícles`
-`Purchase Order`,`Ordres de compra`
-`Purchase Order Settings`,`Ajustaments d'ordres de compra`
-`Purchase Receipt`,`Rebuts`
-`Purchase Receipt Settings`,`Ajustaments dels rebuts`
-`PurchaseInvoice`,`Factures de compra`
-`PurchaseOrder`,`Ordres de compra`
-`PurchaseReceipt`,`Rebut de compra`
-`Purchases`,`Compres`
-`Quantity`,`Quantitats`
-`Quantity (${0}) cannot be less than zero.`,`La quantitat (${0}) no pot ser inferior a zero.`
-`Quarterly`,`Trimestral`
-`Quotation`,`Pressupost`
-`Quotation Settings`,`Ajustaments del pressupost`
-`Rate`,`Tarifa`
-`Rate (${0}) cannot be less zero.`,`La tarifa (${0}) no pot ser inferior a zero.`
-`Rate (Company Currency)`,`Tarifa (Divisa de la companyia)`
-`Rate can't be negative.`,`La tarifa no pot ser negativa.`
-`Re-Open`,`Reobrir`
-`Receivable Account`,`Compte per a cobraments`
-`Receive`,`Rebre`
-`Recent Invoices`,`Factures recents`
-`Reconcile`,`Reconciliar`
-`Ref. / Cheque No.`,`Ref. / Xec número.`
-`Ref. Date`,`Data Ref.`
-`Ref. Name`,`Nom Ref.`
-`Ref. Type`,`Tipus Ref.`
-`Ref/Cheque ID`,`Identificador Ref/Xec`
-`Reference Date`,`Data de la Referencia`
-`Reference DocType`,`Referencia DocType`
-`Reference Field`,`Camp de Referencia`
-`Reference Name`,`Nom de Referencia`
-`Reference Number`,`Número de Referencia`
-`Reference Type`,`Tipus de Referencia`
-`Reload App`,`Torna a carregar l'aplicació`
-`Report Error`,`Informar de l'error`
-`Report Issue`,`Informar del problema`
-`Reports`,`Informes`
-`Required Fields not Assigned`,`Camps obligatoris no assignats`
-`Reset`,`Reinicia`
-`Reset Filters`,`Reinicia els filtres`
-`Retained Earnings`,`Guanys retinguts`
-`Reverse Charge`,`Pagament revertit`
-`Reverse Chrg.`,`Pagament revertit.`
-`Reverted`,`Revertit`
-`Review Accounts`,`Revisar comptes`
-`Review your chart of accounts, add any account or tax heads as needed`,`Revisa el teu gràfic de comptes, afegeix un compte o taxa nous segons sigui necessari`
-`Role`,`Rol`
-`Roles`,`Rols`
-`Root Type`,`Tipus d'arrel`
-`Round Off`,`Arrodoniment desactivat`
-`Round Off Account`,`Round Off Account`
-`SMTP Host`,`SMTP Host`
-`SMTP Port`,`SMTP Port`
-`Salary`,`Salari`
-`Sales`,`Vendes`
-`Sales Expenses`,`Vendes`
-`Sales Items`,`Artícles venuts`
-`Sales Order`,`Ordres de venda`
-`Sales Order Settings`,`Ajustaments d'ordres de venda`
-`SalesInvoice`,
-`SalesInvoice Settings`,
-`SalesOrder`,
-`Save`,`Guardar`
-`Save & Close`,`Guardar i tancar`
-`Save Option`,`Opcions de guardat`
-`Save Template`,`Guardar plantilla`
-`Save as PDF`,`Guardar com a PDF`
-`Save as PDF Successful`,`Guardat com a PDF correctament`
-`Saving`,`Guardant`
-`Schedule`,`Programar`
-`Search...`,`Search...`
-`Secured Loans`,`Préstecs `
-`Securities and Deposits`,`Valors i dipòsits`
-`Select CoA`,`Selecciona CoA`
-`Select File`,`Selecciona un fitxer`
-`Select Folder`,`Selecciona una carpeta`
-`Select Image`,`Selecciona una imatge`
-`Select Logo`,`Selecciona un logotip`
-`Select Period`,`Seleccionar període`
-`Select Period...`,`Seleccionar període...`
-`Select a file for import`,`Selecciona un fitxer per importar`
-`Select a file to load the company transactions`,`Selecciona un fitxer per carregar les transaccions de l'empresa`
-`Select file`,`Selecciona un fitxer`
-`Select folder`,`Selecciona una carpeta`
-`Select your language`,`Selecciona la teva llengua`
-`Selected file`,`Fitxer seleccionat`
-`Send`,`Enviat`
-`Send anonymized usage data and error reports to help improve the product.`,`Envia dades d'ús anònims i informes d'error per ajudar a millorar el producte.`
-`Service`,`Servei`
-`Set Anonymized Telemetry`,`Estableix la telemetria anònima`
-`Set an Import Type`,`Estableix un tipus d'importació`
-`Set the display language.`,`Estableix l'idioma de visualització.`
-`Set the local code. This is used for number formatting.`,`Estableix el codi local. Això s'utilitza per formatar nombres.`
-`Sets how many digits are shown after the decimal point.`,`Estableix quants dígits es mostraran després del punt decimal.`
-`Sets the app-wide date display format.`,`Estableix el format de visualització de data per a tota l'aplicació.`
-`Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.`,`Estableix la precisió interna utilitzada per als càlculs monetaris. Per sobre de 6 hauria de ser suficient per a la majoria de les monedes.`
-`Setting Up...`,`Configurant...`
-`Settings`,`Configuració`
-`Settings changes will be visible on reload`,`Els canvis de configuració seran visibles en tornar a carregar`
-`Setup`,`Configuració`
-`Setup Complete`,`Configuració completa`
-`Setup Wizard`,`Asistent de configuració`
-`Setup system defaults like date format and display precision`,`Configura els valors predeterminats del sistema com la data, el format i la visualització`
-`Setup your company information, email, country and fiscal year`,`Configura la informació de la teva empresa, adreça electrònica, país i l'any fiscal`
-`Setup your opening balances before performing any accounting entries`,`Configureu els saldos d'obertura abans de realitzar qualsevol entrada comptable`
-`Setup your organization`,`Configura la teva empresa`
-`Setup your tax templates for your sales or purchase transactions`,`Configura les plantilles de taxes per a les vendes o compres`
-`Setup Your Workspace`,`Configura el teu espai de treball`
-`Show Me`,`Mostra'm`
-`Smallest Currency Fraction Value`,`Valor de fracció de la divisa més petit`
-`Softwares`,`Programari`
-`Something has gone terribly wrong. Please check the console and raise an issue.`,`Alguna cosa ha anat molt malament. Comprova la consola i envia un error.`
-`Source of Funds (Liabilities)`,`Font dels fons (Càrregues)`
-`Standard Chart of Accounts`,`Diagrama de comptes estàndard`
-`Start`,`Inici`
-`Start Time`,`Hora d'inici`
-`State`,`Estat`
-`State Tax`,`Taxes estatals`
-`State/UT Tax Paid`,`Taxes estatals pagades`
-`Status`,`Estat`
-`Stock Adjustment`,`Ajust de l'estoc`
-`Stock Assets`,`Estoc d'actius`
-`Stock Expenses`,`Despeses d'estoc`
-`Stock In Hand`,`Estoc disponible`
-`Stock Liabilities`,`Càrregues d'estoc`
-`Stock Received But Not Billed`,`Estoc rebut però no cobrat`
-`Subject`,`Subjecte`
-`Submit`,`Envia`
-`Submit on Import`,`Envia en importar`
-`Submitted`,`Enviat`
-`Subtotal`,`Subtotal`
-`Successfully created the following ${0} entries:`,`S'han creat correctament les següents ${0} entrades:`
-`Supplier`,`Proveïdor`
-`Supplier Created`,`Proveïdor creat`
-`Supplier Currency`,`Divisa del proveïdor`
-`Supplier Name`,`Nom del proveïdor`
-`Suppliers`,`Proveïdors`
-`Symbol`,`Símbol`
-`System`,`Sistema`
-`System Settings`,`Paràmetres del sistema`
-`System Setup`,`Ajustaments del sistema`
-`Tax`,`Taxes`
-`Tax Account`,`Compte de taxes`
-`Tax Assets`,`Taxes d'actius`
-`Tax Detail`,`Detall de taxes`
-`Tax ID`,`Identificador de taxes`
-`Taxable Value`,`Valor taxable`
-`Taxes`,`Taxes`
-`Telephone Expenses`,`Despeses de telefonia`
-`Template`,`Plantilla`
-`Temporary Accounts`,`Comptes temporals`
-`Temporary Opening`,`Obertura temporal`
-`Terms`,`Termes`
-`The following ${0} entries were created: ${1}`,`S'han creat les següents entrades ${0}: ${1}`
-`Theme Color`,`Color del tema`
-`This Month`,`Aquest mes`
-`This Quarter`,`Aquest trimestre`
-`This Year`,`Aquest any`
-`This action is permanent`,`Aquesta acció és permanent`
-`This action is permanent and will cancel the following payment: ${0}`,`Aquesta acció és permanent i cancel·larà el següent pagament: ${0}`
-`This action is permanent and will cancel the following payments: ${0}`,`Aquesta acció és permanent i cancel·larà el següent pagament: ${0}`
-`Title`,`Títol`
-`To`,`A`
-`To Account`,`Al compte`
-`To Date`,`A data`
-`To Do`,`Per fer`
-`Top Expenses`,`Despeses més quantioses`
-`Total Spending`,`Despeses totals`
-`Total Tax`,`Taxes totals`
-`Transfer`,`Transfereix`
-`Transfer Type`,`Tipus de transferència`
-`Travel Expenses`,`Despeses de viatge`
-`Trial Balance`,`Saldo de prova`
-`Type`,`Tipus`
-`Unit Type`,`Tipus d'unitat`
-`Unpaid`,`Per pagar`
-`Unsecured Loans`,`Préstecs sense col·lateral`
-`Update downloaded`,`Actualització descarregada`
-`User ID`,`Identificació d'usuari`
-`User Remark`,`Marca d'usuari`
-`Username`,`Nom d'usuari`
-`Utility Expenses`,`Despeses de serveis`
-`Value`,`Valor`
-`Value missing for ${0}`,`Falta el valor de ${0}`
-`Verify Imported Data`,`Verifica les dades importades`
-`Version ${0} available`,`La versió ${0} ja està disponible`
-`View Bills`,`Veure factures`
-`View Invoices`,`Veure albarans`
-`Welcome to Frappe Books`,`Benvingut a Frappe Books`
-`Write Off`,`Sinistre`
-`Write Off / Refund`,`Sinistre / Reemborsament`
-`Write Off Account`,`Compte de sinistres i reemborsaments`
-`Write Off Account not set. Please set Write Off Account in General Settings`,`El compte de sinistres i reemborsaments no s'ha configurat. Confura'l a Ajustaments Generals`
-`Write Off Entry`,`Entrada de sinistre o reemborsament`
-`Year`,`Any`
-`Yearly`,`Anual`
-`Yes`,`Sí`
-`Your Name`,`El teu nom`
-`name`,`Nom`
-`verify the imported data and click on`,`Verifica les dades importades i fes clic a`
\ No newline at end of file
+"${0} ${1} already exists.","${0} ${1} ja existeix.",
+"${0} ${1} has been modified after loading",,
+"${0} ${1} is linked with existing records.","${0} ${1} té relació amb un registre que ja existeix.",
+"${0} already exists.","${0} ja existeix.",
+"${0} filters applied","${0} filtres aplicats",
+"${0} rows",,
+"* required fields","* camps necessaris",
+0%,,
+03-23-2022,,
+03/23/2022,,
+"1 filter applied","1 filtre aplicat",
+2022-03-23,,
+"23 Mar, 2022",,
+23-03-2022,,
+23/03/2022,,
+9888900000,,
+Account,Compte,
+"Account Entries","Moviments del compte",
+"Account Name","Nom del compte",
+"Account Type","Tipus de compte",
+"Accounting Ledger Entry",,
+"Accounting Settings","Ajustaments de comptabilitat",
+Accounts,Accounts,
+"Accounts Payable","Comptes per pagaments",
+"Accounts Receivable","Comptes d’entrada",
+"Accumulated Depreciation","Accumulated Depreciation",
+"Add Account","Afegir compte",
+"Add Customers","Afegir clients",
+"Add Group","Afegir grup",
+"Add Items","Afegir ítems",
+"Add Row","Afegir columna",
+"Add Suppliers","Afegir proveïdor",
+"Add Taxes","Afegir taxes",
+"Add a few customers to create your first invoice","Afegeix alguns clients per a crear la teva primera factura",
+"Add a few suppliers to create your first bill","Afegeix alguns proveïdors per a crear la teva primera factura",
+"Add a filter","Afegir un filtre",
+"Add a remark",,
+"Add invoice terms",,
+"Add products or services that you buy from your suppliers","Afegeix productes o serveis que compris a proveïdors",
+"Add products or services that you sell to your customers","Afegeix productes o serveis que venguis a clients",
+Address,Direcció,
+"Address Display","Mostrar direcció",
+"Address Line 1","Direcció línea 1",
+"Address Line 2","Direcció línea 2",
+"Administrative Expenses","Despeses administratives",
+All,,
+"Allow Telemetry","Permetre telemetria",
+Amount,Quantitat,
+"Amount (Company Currency)","Quantitat (Moneda de la empresa)",
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Quantitat: ${0} i quantitat cancel·lada: ${1} és menor que la quantitat total que figura a les referències: ${2}.",
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","Quantitat: ${0} és menor que la quantitat total que figura a les referències: ${1}.",
+"An error occurred.","Hi ha hagut un error.",
+"Anonymized Telemetry","Telemetria anònima",
+"Application of Funds (Assets)","Aplicació de fons (Actius)",
+Arial,,
+"Ascending Order",,
+Asset,,
+"Assign Imported Labels","Asignar etiquetes importades",
+Back,Enrere,
+"Bad import data.","Dades importades amb errors.",
+Balance,Balanç,
+"Balance Sheet","Full de balanç",
+Bank,,
+"Bank Accounts","Comptes bancaris",
+"Bank Entry","Entrada bancària",
+"Bank Name","Nom del banc",
+"Bank Overdraft Account","Compte bancari d’exedents",
+"Base Error",,
+"Based On",,
+Basic,,
+"Basic I",,
+"Basic II",,
+Bill,Factura,
+"Bill Created","Factura creada",
+"Bill No","Factura No",
+Black,Negre,
+Blue,,
+Both,Ambdós,
+Buildings,Buildings,
+Business,,
+Cancel,Cancel·la,
+"Cancel ${0} ${1}?",,
+Cancelled,Cancel·lat,
+"Cannot Commit Error",,
+"Capital Equipments","Capital Equipments",
+"Capital Stock","Capital Stock",
+Cash,Efectiu,
+"Cash Entry","Entrades d'efectiu",
+"Cash In Hand","Efectiu disponible",
+Cashflow,Flux,
+"Central Tax",Tributacions,
+"Change File","Canviar fitxer",
+"Change Ref Type",,
+Chargeable,,
+"Chart Of Accounts Reviewed","Diagrama de comptes revisat",
+"Chart of Accounts","Diagrama de comptes",
+"Check for Updates","Comprova si hi ha actualitzacions",
+"Checking for updates","S'estan comprovant les actualitzacions",
+Cheque,Xec,
+"City / Town",Ciutat,
+Clear,,
+"Clearance Date","Data de neteja",
+"Click to create","Fes clic per crear",
+Close,Tancar,
+Closing,,
+"Closing (Cr)","Tancant (Cr)",
+"Closing (Dr)","Tancant (Dr)",
+Color,Color,
+"Commission on Sales","Comisions de venda",
+Common,Comuns,
+"Common Items","Elements comuns",
+"Company Address","Adreça de l'empresa",
+"Company Logo","Logotip de l'empresa",
+"Company Name","Nom de l'empresa",
+"Company Settings","Paràmetres de l'empresa",
+"Company Setup","Configuració de l'empresa",
+Completed,Completat,
+Condition,,
+"Consolidate Columns",,
+Contains,Conté,
+"Contra Entry","Entrades en contra",
+"Cost of Goods Sold","Cost dels béns venuts",
+"Could not import ${0} ${1}.","No s'ha pogut importar ${0} ${1}.",
+"Could not select file.","No s'ha pogut seleccionar l'fitxer.",
+Country,País,
+"Country Code",,
+"Country code used to initialize regional settings.",,
+Courier,,
+Cr.,,
+Create,Crear,
+"Create Bill","Crear factura",
+"Create Demo",,
+"Create Invoice","Crear alabarà",
+"Create Purchase",,
+"Create Sale",,
+"Create a new file and store it in your computer.","Crea un fitxer nou i emmagatzema'l a l'ordinador.",
+"Create a new file or select an existing one from your computer","Crea un fitxer nou o selecciona un existent des del teu ordinador",
+"Create your first bill and mail it to your supplier","Crea la primera factura i envia-la al proveïdor",
+"Create your first invoice and mail it to your customer","Crea la teva primera factura i envia-la al client",
+Created,,
+"Created By",,
+"Creating Items and Parties",,
+"Creating Journal Entries",,
+"Creating Purchase Invoices",,
+Credit,Crèdit,
+"Credit Card Entry","Entrada de targeta de crèdit",
+"Credit Note","Nota de crèdit",
+Creditors,Creditors,
+Currency,Divisa,
+"Currency Name","Nom de la divisa",
+Current,Actual,
+"Current Assets","Actius actuals",
+"Current Liabilities","`Obligacions actuals",
+"Custom Hex","Hexadecimal personalitzat",
+Customer,Customer,
+"Customer Created","Client creat",
+"Customer Currency","Divisa del client",
+Customers,Clients,
+Customise,Personalitzar,
+"Customize your invoices by adding a logo and address details","Personalitza les teves factures afegint-hi un logotip i l'adreça",
+Dashboard,Tauler,
+"Data Import","Importar dades",
+"Database Error",,
+"Database file: ${0}",,
+Date,Data,
+"Date Format","Format de la data",
+Day,,
+Debit,Dèbit,
+"Debit Note","Nota de dèbil",
+Debtors,Deutors,
+"Default Account","Compte per defecte",
+Delete,Eliminar,
+"Delete ${0} ${1}?",,
+"Delete ${0}?",,
+Depreciation,Depreciació,
+"Depreciation Entry","Entrada de depreciació",
+Description,Descripció,
+Details,Detalls,
+"Direct Expenses","Despeses directes",
+"Direct Income","Ingressos directes",
+"Disables telemetry. No data will be collected, you are completely invisble to us.",,
+"Display Logo in Invoice","Mostra el logotip a la factura",
+"Display Precision","Precisió de la pantalla",
+"Display Precision should have a value between 0 and 9.","Precisión de la pantalla ha de tenir un valor entre 0 i 9.",
+"Dividends Paid","Divindends pagats",
+Docs,,
+Documentation,Documentació,
+"Does Not Contain","No conté",
+"Don't Log Anything","No registrar",
+"Don't Log Usage","No registrar l'ús",
+"Download Update","Descarregar actualització",
+"Downloading update","Descarregant actualització",
+Dr.,,
+Draft,Esborrany,
+Duplicate,Duplicar,
+"Duplicate ${0} ${1}?","Duplicar ${0} ${1}?",
+"Duplicate Entry Error",,
+"Duties and Taxes","Deures i taxes",
+"Earnest Money","Paga i senyal",
+Edit,Editar,
+"Electronic Equipments","Equips electrònics",
+Email,"Correu electrònic",
+"Email Address","Correu electrònic",
+Empty,Buit,
+"Enables telemetry. Does not include usage patterns.","Habilita la telemetria. No inclou patrons d'ús.",
+"Enables telemetry. Includes usage patterns.","Habilita la telemetria. Inclou els patrons d'ús.",
+"Enter Country to load States",,
+"Enter State",,
+"Entertainment Expenses","Despeses d'entreteniment",
+"Entry No","Número de l'entrada",
+"Entry Type","Tipus d'entrada",
+Equity,Capital,
+Error,Error,
+Error:,Error:,
+"Exchange Gain/Loss","Canvi de guanys/pèrdues",
+"Exchange Rate","Taxa d'intercanvi",
+"Excise Entry","Entrada d'impostos especials",
+"Existing File","fitxer existent",
+Expense,Despesa,
+"Expense Account",,
+Expenses,Despeses,
+"Expenses Included In Valuation","Despeses incloses en el valor",
+Export,Exportar,
+"Export Successful","Exportació correcta",
+Fax,Fax,
+Field,,
+Fieldname,Nom,
+"File selection failed.","La selecció de l'fitxer ha fallat .",
+Filter,Filtre,
+"Fiscal Year",,
+"Fiscal Year End Date","Data de finalització de l'any fiscal",
+"Fiscal Year Start Date","Data d'inici de l'any fiscal",
+"Fixed Asset",,
+"Fixed Assets","Actius fixes",
+Font,Font,
+For,For,
+"Forbidden Error",,
+Fraction,Fracció,
+"Fraction Units","Unitats de fracció",
+"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
+"Freight and Forwarding Charges","Càrregues de transport i reenviaments",
+"From Account","Compte d'arribada",
+"From Date","Des de",
+"From Year",,
+"Full Name","Nom complet",
+"Furnitures and Fixtures","Mobiliari i reparacions",
+"GSTIN No.","GSTIN No.",
+GSTR1,GSTR1,
+GSTR2,GSTR2,
+"Gain/Loss on Asset Disposal","Guanys/pèrdues dels actius disposats",
+General,General,
+"General Ledger","Llibre de comptabilidad general",
+"Get Started",Introducció,
+Gram,,
+"Grand Total",Total,
+"Grand Total (Company Currency)","Total (Divisa de l'empresa)",
+"Greater Than","Més gran que",
+Green,,
+"Group By",,
+HSN/SAC,HSN/SAC,
+"HSN/SAC Code",,
+"Half Yearly","Mitja anual",
+"Half Years",,
+"Hello there! 👋","Hola! 👋",
+"Hex Value","Valor hexadecimal",
+"Hide Get Started","Amaga l'introducció",
+"Hide Group Amounts",,
+"Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.","Amaga la secció d'introducció de la barra lateral. El canvi serà efectiu quan reiniciis o refresquis l'aplicació.",
+Hour,,
+"How to Use Data Import","Com usar la importació de dades",
+"I can't find my language.","No trobo la meva llengua.",
+INR,,
+Image,Imatge,
+"Import Data","Importar dades",
+"Import Failed","L'importació ha fallat",
+"Import More","Importar-ne més",
+"Import Success","L'importació ha sigut un èxit",
+"Import Type","Tipus d'importació",
+"Importer Settings","Configuració de l'importació",
+"Include Cancelled",,
+Income,Ingressos,
+"Income Account",,
+Indigo,,
+"Indirect Expenses","Despeses indirectes",
+"Indirect Income","Ingressos indirectes",
+Inflow,Entrades,
+"Install Update","Instal·lar actualització",
+Inter,,
+"Intergrated Tax","Taxes integrades",
+"Internal Precision","Precisió interna",
+"Invalid value ${0} for ${1}",,
+Investments,Inversions,
+Invoice,Factura,
+"Invoice Created","Factura creada",
+"Invoice Date","Data de factura",
+"Invoice No","Factura No",
+"Invoice No.","Factura No.",
+"Invoice Setup","Configuració de la factura",
+"Invoice Value","Preu de la factura",
+Invoices,Factures,
+Is,És,
+"Is Empty","És buit",
+"Is Group","És un grup",
+"Is Not","No és",
+"Is Not Empty","No és buit",
+Item,Elements,
+"Item Description",,
+"Item Name","Nom de l'element",
+Items,Elements,
+"John Doe",,
+"Journal Entries",,
+"Journal Entry","Entrada del diari",
+"Journal Entry Account",,
+Kg,,
+"Know More","Saber-ne més",
+"Label Index","Índex d'etiquetes",
+Language,Idiom,
+"Ledger Entries","Entrades del llibre de comptabilitat",
+"Left Index",,
+"Legal Expenses","Despeses al llibre de comptabilitat",
+"Less Than","Menor que",
+Liability,,
+"Link Validation Error",,
+List,,
+"Load an existing .db file from your computer.","Carrega un fitxer .db existent des del teu ordinador.",
+"Loading Report...",,
+Loading...,Loading...,
+"Loans (Liabilities)","Préstecs (Càrregues)",
+"Loans and Advances (Assets)","Préstecs i avançaments (Actius)",
+Locale,Local,
+Logo,Logotip,
+"Make Entry",,
+"Make Payment","Fer pagaments",
+"Mandatory Error",,
+"Mar 23, 2022",,
+"Marketing Expenses","Despeses de màrqueting",
+Merriweather,,
+Meter,,
+Minimal,,
+"Miscellaneous Expenses","Despeses diverses",
+Modern,,
+Modified,,
+"Modified By",,
+Monthly,Mensual,
+Months,,
+Montserrat,,
+Name,Nom,
+Navigate,,
+"Net Total","Net Total",
+"Net Total (Company Currency)","Net Total (Divisa de la companyia)",
+"New ${0}",,
+"New Account","Compte nou",
+"New File","Nou fitxer",
+"New Journal Entry","Nova entrada de diari",
+"New Purchase",,
+"New Purchase Invoice",,
+"New Sale",,
+"New Sales Invoice",,
+"New version available","Nova versió disponible",
+Next,Següent,
+No,No,
+"No Data to Import","No hi ha dades a importar",
+"No Values to be Displayed",,
+"No entries found",,
+"No expenses in this period","No hi ha despeses en aquest periode",
+"No filters selected","No s'han seleccionat filtres",
+"No labels have been assigned.","No s'han assignat etiquetes",
+"No results found",,
+"No transactions yet","Encara no hi ha transaccions",
+"No updates available","No hi ha cap actualització disponible",
+None,Cap,
+"Not Found Error",,
+Notes,Notes,
+"Number Series","Sèries numèriques",
+"Number of ${0}",,
+"Office Equipments","Equipament d'officina",
+"Office Maintenance Expenses","Manteniment de material d'oficina",
+"Office Rent","Lloguer d'oficina",
+"Onboarding Complete","Incorporació completa",
+"Open Folder","Obrir carpeta",
+"Open Sans",,
+"Opening (Cr)","Obrint (Cr)",
+"Opening (Dr)","Obrint (Dr)",
+"Opening Balance Equity","Equitat de saldo d'obertura",
+"Opening Balances","Saldo d'obertura",
+"Opening Entry","Obertura d'entrada",
+Orange,,
+Organisation,Organització,
+Outflow,Despeses,
+"Outstanding Amount","Import excepcional",
+Oxygen,,
+"Pad Zeros","Convertir números en text",
+Page,,
+Paid,Pagat,
+Parent,Principal,
+"Parent Account","Compte principal",
+Party,Grup,
+"Patch Run",,
+Pay,Pagar,
+Payable,,
+Payment,Pagament,
+"Payment For","Pagament per",
+"Payment Method","Mètode de pagament",
+"Payment No","Pagament Número",
+"Payment Reference","Referència de pagament",
+"Payment Type","Tipus de pagament",
+"Payment amount cannot be ${0}.","La quantitat a pagar no pot ser ${0}.",
+"Payment amount cannot be less than zero.","La quantitat a pagar no pot ser zero.",
+"Payment amount cannot exceed ${0}.","La quantitat a pagar no pot ser superior a ${0}.",
+"Payment amount: ${0} should be greater than 0.","Quantitat a pagar: ${0} ha de ser superior a 0.",
+"Payment amount: ${0} should be less than Outstanding amount: ${1}.","Quantitat a pagar: ${0} ha de ser menor que l'import exepcional: ${1}.",
+Payments,Pagaments,
+"Payroll Payable","Nòmina pagable",
+Periodicity,Periodicitat,
+Phone,Telèfon,
+Pink,,
+Place,Lloc,
+"Place of supply","Lloc de subministrament",
+"Plants and Machineries","Plantes i màquines",
+"Please Wait",,
+"Please assign the following fields ${0}","Assigneu els camps següents ${0}",
+"Please fill all values","Empleneu tots els valors",
+"Please select a file with data to import.","Selecciona un fitxer amb les dades a importar.",
+"Please select a valid reference type.",,
+"Please select an option:","Selecciona una opció:",
+"Postal Code","Codi postal",
+"Postal Expenses","Expenses d'enviament",
+"Posting Date","Data d'enviament",
+Prefix,Prefix,
+"Prime Bank",,
+Print,Imprimir,
+"Print Settings","Ajustaments d'impressió",
+"Print and Stationery","Print and Stationery",
+Product,,
+"Profit And Loss","Guanys i pèrdues",
+"Profit and Loss","Guanys i pèrdues",
+Purchase,Compres,
+"Purchase Invoice",,
+"Purchase Invoice Item",,
+"Purchase Invoices",,
+"Purchase Item Created",,
+"Purchase Items","Comprar artícles",
+"Purchase Payments",,
+Purchases,Compres,
+Purple,,
+Quantity,Quantitats,
+Quarterly,Trimestral,
+Quarters,,
+Rate,Tarifa,
+"Rate (${0}) cannot be less zero.","La tarifa (${0}) no pot ser inferior a zero.",
+"Rate (Company Currency)","Tarifa (Divisa de la companyia)",
+"Rate can't be negative.","La tarifa no pot ser negativa.",
+Receivable,,
+Receive,Rebre,
+"Recent Invoices","Factures recents",
+Red,,
+"Ref Name",,
+"Ref Type",,
+"Ref. / Cheque No.","Ref. / Xec número.",
+"Ref. Date","Data Ref.",
+"Ref. Name","Nom Ref.",
+"Ref. Type","Tipus Ref.",
+Reference,,
+"Reference Date","Data de la Referencia",
+"Reference Number","Número de Referencia",
+"Reference Type","Tipus de Referencia",
+"Reload App","Torna a carregar l'aplicació",
+Report,,
+"Report Error","Informar de l'error",
+"Report Issue","Informar del problema",
+Reports,Informes,
+"Required Fields not Assigned","Camps obligatoris no assignats",
+Reset,Reinicia,
+"Retained Earnings","Guanys retinguts",
+"Reverse Chrg.","Pagament revertit.",
+Reverted,Revertit,
+Reverts,,
+"Review Accounts","Revisar comptes",
+"Review your chart of accounts, add any account or tax heads as needed",,
+"Right Index",,
+Role,Rol,
+"Root Type","Tipus d'arrel",
+"Round Off","Arrodoniment desactivat",
+"Round Off Account","Round Off Account",
+Salary,Salari,
+Sales,Vendes,
+"Sales Expenses",Vendes,
+"Sales Invoice",,
+"Sales Invoice Item",,
+"Sales Invoice Settings",,
+"Sales Invoices",,
+"Sales Invoie",,
+"Sales Item Created",,
+"Sales Items","Artícles venuts",
+"Sales Payments",,
+Save,Guardar,
+"Save Option","Opcions de guardat",
+"Save Template","Guardar plantilla",
+"Save as PDF","Guardar com a PDF",
+"Save as PDF Successful","Guardat com a PDF correctament",
+Saving,Guardant,
+Search,,
+"Secured Loans","Préstecs ",
+"Securities and Deposits","Valors i dipòsits",
+Select,,
+"Select CoA","Selecciona CoA",
+"Select Color",,
+"Select Country",,
+"Select File","Selecciona un fitxer",
+"Select Folder","Selecciona una carpeta",
+"Select Image","Selecciona una imatge",
+"Select Logo","Selecciona un logotip",
+"Select a file for import","Selecciona un fitxer per importar",
+"Select file","Selecciona un fitxer",
+"Select folder","Selecciona una carpeta",
+"Select your language","Selecciona la teva llengua",
+"Selected file","Fitxer seleccionat",
+"Send anonymized usage data and error reports to help improve the product.","Envia dades d'ús anònims i informes d'error per ajudar a millorar el producte.",
+Service,Servei,
+"Set Anonymized Telemetry","Estableix la telemetria anònima",
+"Set an Import Type","Estableix un tipus d'importació",
+"Set the display language.","Estableix l'idioma de visualització.",
+"Set the local code. This is used for number formatting.","Estableix el codi local. Això s'utilitza per formatar nombres.",
+"Sets how many digits are shown after the decimal point.","Estableix quants dígits es mostraran després del punt decimal.",
+"Sets the app-wide date display format.","Estableix el format de visualització de data per a tota l'aplicació.",
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Estableix la precisió interna utilitzada per als càlculs monetaris. Per sobre de 6 hauria de ser suficient per a la majoria de les monedes.",
+"Setting Up Instance",,
+"Setting Up...",Configurant...,
+Settings,Configuració,
+"Settings changes will be visible on reload","Els canvis de configuració seran visibles en tornar a carregar",
+Setup,Configuració,
+"Setup Complete","Configuració completa",
+"Setup Wizard","Asistent de configuració",
+"Setup Your Workspace","Configura el teu espai de treball",
+"Setup system defaults like date format and display precision","`Configura els valors predeterminats del sistema com la data"," el format i la visualització`"
+"Setup your company information, email, country and fiscal year",,
+"Setup your opening balances before performing any accounting entries","Configureu els saldos d'obertura abans de realitzar qualsevol entrada comptable",
+"Setup your organization","Configura la teva empresa",
+"Setup your tax templates for your sales or purchase transactions","Configura les plantilles de taxes per a les vendes o compres",
+"Show Me",Mostra'm,
+"Single Value",,
+"Smallest Currency Fraction Value","Valor de fracció de la divisa més petit",
+Softwares,Programari,
+"Something has gone terribly wrong. Please check the console and raise an issue.","Alguna cosa ha anat molt malament. Comprova la consola i envia un error.",
+"Source of Funds (Liabilities)","Font dels fons (Càrregues)",
+"Standard Chart of Accounts","Diagrama de comptes estàndard",
+Start,Inici,
+State,Estat,
+"State Tax","Taxes estatals",
+Status,Estat,
+Stock,,
+"Stock Adjustment","Ajust de l'estoc",
+"Stock Assets","Estoc d'actius",
+"Stock Expenses","Despeses d'estoc",
+"Stock In Hand","Estoc disponible",
+"Stock Liabilities","Càrregues d'estoc",
+"Stock Received But Not Billed","Estoc rebut però no cobrat",
+Submit,Envia,
+"Submit Journal Entry?",,
+"Submit Purchase Invoice?",,
+"Submit Sales Invoice?",,
+"Submit on Import","Envia en importar",
+Submitted,Enviat,
+Submitting,,
+Subtotal,Subtotal,
+"Successfully created the following ${0} entries:","S'han creat correctament les següents ${0} entrades:",
+Supplier,Proveïdor,
+"Supplier Created","Proveïdor creat",
+"Supplier Currency","Divisa del proveïdor",
+Suppliers,Proveïdors,
+Symbol,Símbol,
+System,Sistema,
+"System Settings","Paràmetres del sistema",
+"System Setup","Ajustaments del sistema",
+Tax,Taxes,
+"Tax Account","Compte de taxes",
+"Tax Assets","Taxes d'actius",
+"Tax Detail","Detall de taxes",
+"Tax ID","Identificador de taxes",
+"Tax Summary",,
+"Taxable Value","Valor taxable",
+Taxes,Taxes,
+Teal,,
+"Telephone Expenses","Despeses de telefonia",
+Template,Plantilla,
+Temporary,,
+"Temporary Accounts","Comptes temporals",
+"Temporary Opening","Obertura temporal",
+Terms,Termes,
+"The following ${0} entries were created: ${1}","S'han creat les següents entrades ${0}: ${1}",
+"Theme Color","Color del tema",
+"This Month","Aquest mes",
+"This Quarter","Aquest trimestre",
+"This Year","Aquest any",
+"This action is permanent","Aquesta acció és permanent",
+"This action is permanent and will cancel the following payment: ${0}","Aquesta acció és permanent i cancel·larà el següent pagament: ${0}",
+"This action is permanent and will cancel the following payments: ${0}","Aquesta acció és permanent i cancel·larà el següent pagament: ${0}",
+"This action is permanent and will delete associated ledger entries.",,
+"This action is permanent.",,
+"Times New Roman",,
+"To Account","Al compte",
+"To Account and From Account can't be the same: ${0}",,
+"To Date","A data",
+"To Year",,
+"Top Expenses","Despeses més quantioses",
+Total,,
+"Total Asset (Debit)",,
+"Total Credit",,
+"Total Debit",,
+"Total Debit: ${0} must be equal to Total Credit: ${1}",,
+"Total Equity (Credit)",,
+"Total Expense (Debit)",,
+"Total Income (Credit)",,
+"Total Liability (Credit)",,
+"Total Profit",,
+"Total Spending","Despeses totals",
+Transfer,Transfereix,
+"Transfer Type","Tipus de transferència",
+"Travel Expenses","Despeses de viatge",
+"Trial Balance","Saldo de prova",
+Type,Tipus,
+"Type to search...",,
+Unit,,
+"Unit Type","Tipus d'unitat",
+Unpaid,"Per pagar",
+"Unsecured Loans","Préstecs sense col·lateral",
+"Until Date",,
+"Update downloaded","Actualització descarregada",
+"User Remark","Marca d'usuari",
+"Utility Expenses","Despeses de serveis",
+"Validation Error",,
+Value,Valor,
+"Value missing for ${0}","Falta el valor de ${0}",
+"Verify Imported Data","Verifica les dades importades",
+Version,,
+"Version ${0} available","La versió ${0} ja està disponible",
+"View Purchases",,
+"View Sales",,
+"Welcome to Frappe Books","Benvingut a Frappe Books",
+"Write Off",Sinistre,
+"Write Off Account","Compte de sinistres i reemborsaments",
+"Write Off Account not set. Please set Write Off Account in General Settings","El compte de sinistres i reemborsaments no s'ha configurat. Confura'l a Ajustaments Generals",
+"Write Off Entry","Entrada de sinistre o reemborsament",
+Yearly,Anual,
+Years,,
+Yellow,,
+Yes,Sí,
+"Your Name","El teu nom",
+john@doe.com,,
+reports,,
+setup,,
+"verify the imported data and click on","Verifica les dades importades i fes clic a",
\ No newline at end of file
diff --git a/translations/de.csv b/translations/de.csv
index e93d94ba..7da59f9b 100644
--- a/translations/de.csv
+++ b/translations/de.csv
@@ -1,479 +1,652 @@
-`${0} ${1} already exists.`,`${0} ${1} existiert bereits.`
-`${0} ${1} is linked with existing records.`,`${0} ${1} ist mit bestehenden Datensätzen verknüpft.`
-`${0} filters applied`,`${0} Filter angewendet`
-`1 filter applied`,`1 Filter angewendet`
-`Accepted Quantity`,`Angenommene Menge`
-`Account`,`Konto`
-`Account Entries`,`Kontoeinträge`
-`Account Name`,`Name des Kontos`
-`Account Type`,`Konto-Typ`
-`Accounting Ledger Entries`,`Buchungssätze`
-`Accounting Settings`,`Buchhaltungseinstellungen`
-`Accounts`,`Konten`
-`Accounts Payable`,`Kreditoren`
-`Accounts Receivable`,`Debitoren`
-`Accumulated Depreciation`,`Kumulierte Abschreibung`
-`Add Account`,`Konto hinzufügen`
-`Add Customers`,`Kunden hinzufügen`
-`Add Group`,`Gruppe hinzufügen`
-`Add Items`,`Artikel hinzufügen`
-`Add Row`,`Zeile hinzufügen`
-`Add Suppliers`,`Lieferanten hinzufügen`
-`Add Taxes`,`Steuern hinzufügen`
-`Add a filter`,`Filter hinzufügen`
-`Address`,`Adresse`
-`Address Display`,`Adressanzeige`
-`Address Line 1`,`Anschrift Zeile 1`
-`Address Line 2`,`Anschrift Zeile 2`
-`Administrative Expenses`,`Verwaltungskosten`
-`Against Account`,`Gegenkonto`
-`All References`,`Alle Referenzen`
-`Amount`,`Betrag`
-`Amount (Company Currency)`,`Betrag (Währung des Unternehmens)`
-`Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.`,`Der Betrag: ${0} und Abschreibung: ${1} ist kleiner als der Gesamtbetrag, der den Referenzen zugeordnet ist: ${2}.`
-`Amount: ${0} is less than the total amount allocated to references: ${1}.`,`Betrag: ${0} ist kleiner als der Gesamtbetrag, der den Referenzen zugewiesen wurde: ${1}.`
-`An error occurred.`,`Es ist ein Fehler aufgetreten.`
-`Application of Funds (Assets)`,`Verwendung der Mittel (Aktiva)`
-`Are you sure you want to cancel ${0} ${1}?`,`Sind Sie sicher, dass Sie ${0} ${1} stornieren wollen?`
-`Are you sure you want to delete ${0} ${1}?`,`Sind Sie sicher, dass Sie ${0} ${1} löschen wollen?`
-`Are you sure you want to submit this Bill?`,`Sind Sie sicher, dass Sie diese Rechnung einreichen wollen?`
-`Are you sure you want to submit this Invoice?`,`Sind Sie sicher, dass Sie diese Rechnung einreichen möchten?`
-`Are you sure you want to submit this Journal Entry?`,`Sind Sie sicher, dass Sie diesen Journaleintrag abschicken wollen?`
-`Back`,`Zurück`
-`Balance`,`Kontostand`
-`Balance Sheet`,`Bilanz`
-`Bank Accounts`,`Bankkonten`
-`Bank Name`,`Bankname`
-`Bank Overdraft Account`,`Überziehungskonto`
-`Bill`,`Rechnung`
-`Bill Created`,`Rechnung erstellt`
-`Bill No`,`Rechnungsnummer`
-`Bills`,`Rechnungen`
-`Bills Settings`,`Einstellungen für Rechnungen`
-`Black`,`Schwarz`
-`Body`,`Körper`
-`Buildings`,`Gebäude`
-`CSV`,`CSV`
-`Can't open database file: ${0}. Please create a new file.`,`Die Datenbankdatei ${0} kann nicht geöffnet werden. Bitte erstellen Sie eine neue Datei.`
-`Cancel`,`Stornieren`
-`Cancelled`,`Storniert`
-`Capital Equipments`,`Kapitalausstattungen`
-`Capital Stock`,`Grundkapital`
-`Cash`,`Bargeld`
-`Cash In Hand`,`Kassenbestand`
-`Cashflow`,`Cashflow`
-`Central Tax`,`Zentrale Steuer`
-`Central Tax Paid`,`Gezahlte Zentralsteuer`
-`Chart Of Accounts Reviewed`,`Kontenplan überprüft`
-`Chart of Accounts`,`Kontenplan`
-`Checking for updates`,`Suche nach Updates`
-`City / Town`,`Stadt / Ortschaft`
-`Clearance Date`,`Datum der Freigabe`
-`Click to create`,`Klicken Sie zum Erstellen`
-`Close`,`Schließen`
-`Closing (Cr)`,`Abschluss (H)`
-`Closing (Dr)`,`Abschluss (S)`
-`Color`,`Farbe`
-`Commission on Sales`,`Umsatzprovision`
-`Common`,`Allgemein`
-`Company Address`,`Unternehmensadresse`
-`Company Logo`,`Unternehmenslogo`
-`Company Name`,`Firma`
-`Company Settings`,`Unternehmenseinstellungen`
-`Company Setup`,`Unternehmen einrichten`
-`Completed`,`Abgeschlossen`
-`Confirm Password`,`Passwort bestätigen`
-`Contains`,`Enthält`
-`Cost of Goods Sold`,`Umsatzkosten`
-`Country`,`Land`
-`Create`,`Erstellen.`
-`Create Bill`,`Rechnung erstellen`
-`Create Invoice`,`Rechnung erstellen`
-`Create a new file and store it in your computer.`,`Erstellen Sie eine neue Datei und speichern Sie sie auf Ihrem Computer.`
-`Create a new file or select an existing one from your computer`,`Erstellen Sie eine neue Datei oder wählen Sie eine vorhandene Datei von Ihrem Computer aus`
-`Credit`,`Haben`
-`Creditors`,`Kreditoren`
-`Currency`,`Währung`
-`Currency Name`,`Währungsname`
-`Current`,`Kontokorrent`
-`Current Assets`,`Umlaufvermögen`
-`Current Liabilities`,`Kurzfristige Verbindlichkeiten`
-`Custom Hex`,`Benutzerdefiniertes Hex`
-`Customer`,`Kunde`
-`Customer Created`,`Kunde erstellt`
-`Customer Currency`,`Kundenwährung`
-`Customer Name`,`Kundenname`
-`Customers`,`Kunden`
-`Customise`,`Anpassen`
-`Customize`,`Anpassen`
-`DB Connection Error`,`DB-Verbindungsfehler`
-`Dashboard`,`Dashboard`
-`Data Import`,`Datenimport`
-`Date`,`Datum`
-`Date Format`,`Datum Format`
-`Debit`,`Lastschrift`
-`Debtors`,`Debitoren`
-`Default Account`,`Standard-Konto`
-`Delete`,`Löschen`
-`Depreciation`,`Abschreibung`
-`Description`,`Beschreibung`
-`Details`,`Einzelheiten`
-`Direct Expenses`,`Direkte Ausgaben`
-`Direct Income`,`Direktes Einkommen`
-`Display Logo in Invoice`,`Logo in der Rechnung anzeigen`
-`Display Precision`,`Präzision anzeigen`
-`Display Precision should have a value between 0 and 9.`,`Die Anzeigegenauigkeit sollte einen Wert zwischen 0 und 9 haben.`
-`Dividends Paid`,`Ausgeschüttete Dividende`
-`Document ${0} ${1} has been modified after loading`,`Dokument ${0} ${1} wurde nach dem Laden geändert`
-`Document type ${0} is not submittable`,`Dokumenttyp ${0} ist nicht einreichbar`
-`Documentation`,`Dokumentation`
-`Does Not Contain`,`Enthält nicht`
-`Download Update`,`Update herunterladen`
-`Duties and Taxes`,`Zölle und Steuern`
-`Earnest Money`,`Earnest Money`
-`Edit`,`Bearbeiten`
-`Electronic Equipments`,`Elektronische Ausrüstungen`
-`Email`,`E-Mail`
-`Email Account`,`E-Mail-Konto`
-`Email Address`,`E-Mail-Adresse`
-`Empty`,`Leer`
-`Enable Notifications`,`Aktivieren von Benachrichtigungen`
-`Entertainment Expenses`,`Ausgaben für Unterhaltung`
-`Entry ID`,`Eintrags-ID`
-`Entry Type`,`Eintrag Typ`
-`Equity`,`Eigenkapital`
-`Error`,`Fehler`
-`Error:`,`Fehler:`
-`Event Settings`,`Ereignis-Einstellungen`
-`Exchange Gain/Loss`,`Wechselkursgewinne/-verluste`
-`Exchange Rate`,`Wechselkurse`
-`Existing File`,`Vorhandene Datei`
-`Expense`,`Ausgaben`
-`Expenses`,`Ausgaben`
-`Expenses Included In Valuation`,`In die Bewertung einbezogene Aufwendungen`
-`Export Failed`,`Export fehlgeschlagen`
-`Export Successful`,`Export erfolgreich`
-`Fax`,`Fax`
-`Fieldname`,`Feldname`
-`File Name`,`Datei Name`
-`File Path`,`Datei-Pfad`
-`File Size`,`Größe der Datei`
-`Filter`,`Filter`
-`Fiscal Year End Date`,`Enddatum des Geschäftsjahres`
-`Fiscal Year Start Date`,`Beginn des Haushaltsjahres`
-`Fixed Assets`,`Anlagevermögen`
-`Font`,`Schriftart`
-`For`,`Für`
-`Fraction`,`Bruchteil`
-`Fraction Units`,`Maßeinheit Bruchteil`
-`Freight and Forwarding Charges`,`Fracht- und Speditionskosten`
-`From`,`Von`
-`From Account`,`Von Konto`
-`From Date`,`Von Datum`
-`Fulfillment`,`Erfüllung`
-`Fulfillment Settings`,`Einstellungen für die Auftragsabwicklung`
-`Full Name`,`Vollständiger Name`
-`Furnitures and Fixtures`,`Mobiliar und Einrichtungsgegenstände`
-`GST Registration`,`GST-Registrierung`
-`GSTIN`,`GSTIN`
-`GSTIN No.`,`GSTIN-Nr.`
-`GSTIN of Supplier`,`GSTIN des Lieferanten`
-`GSTR 3B`,`GSTR 3B`
-`GSTR 3B Report`,`GSTR 3B-Bericht`
-`GSTR1`,`GSTR1`
-`GSTR2`,`GSTR2`
-`Gain/Loss on Asset Disposal`,`Gewinn/Verlust aus der Veräußerung von Vermögenswerten`
-`Gender`,`Geschlecht`
-`General`,`Allgemein`
-`General Ledger`,`Hauptbuch`
-`Get Started`,`Los geht's`
-`Grand Total`,`Gesamtbetrag`
-`Grand Total (Company Currency)`,`Gesamtbetrag (Währung des Unternehmens)`
-`Greater Than`,`Größer als`
-`HSN/SAC`,`HSN/SAC`
-`Hex Value`,`Hex-Wert`
-`Hide & Auto Report Errors`,`Fehler ausblenden und automatisch melden`
-`Hide Get Started`,`Ausblenden Los geht's`
-`Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.`,`Blendet den Abschnitt "Erste Schritte" in der Seitenleiste aus. Die Änderung wird beim Neustart oder beim Aktualisieren der App sichtbar.`
-`ID`,`ID`
-`Image`,`Bild`
-`Income`,`Einkommen`
-`Indirect Expenses`,`Indirekte Kosten`
-`Indirect Income`,`Indirektes Einkommen`
-`Inflow`,`Zufluss`
-`Install Update`,`Update installieren`
-`Intergrated Tax`,`Integrierte Steuer`
-`Intergrated Tax Paid`,`Integrierte Steuer gezahlt`
-`Internal Precision`,`Interne Präzision`
-`Investments`,`Investitionen`
-`Invoice`,`Rechnung`
-`Invoice Created`,`Rechnung erstellt`
-`Invoice Date`,`Rechnungsdatum`
-`Invoice No`,`Rechnungsnummer`
-`Invoice No.`,`Rechnungsnummer`
-`Invoice Number`,`Rechnungsnummer`
-`Invoice Setup`,`Rechnungen einrichten`
-`Invoice Value`,`Rechnungswert`
-`Invoices`,`Rechnungen`
-`Is`,`Ist`
-`Is Customer`,`Ist Kunde`
-`Is Empty`,`Ist leer`
-`Is Group`,`Ist-Gruppe`
-`Is Not`,`Ist nicht`
-`Is Not Empty`,`Ist nicht leer`
-`Is Supplier`,`Ist Lieferant`
-`Item`,`Artikel`
-`Item Created`,`Artikel erstellt`
-`Item Name`,`Artikel Name`
-`Items`,`Artikel`
-`JSON`,`JSON`
-`JSON Data`,`JSON-Daten`
-`Journal Entry`,`Journaleintrag`
-`Journal Entry Setting`,`Journaleinstellungen`
-`Ledger Entries`,`Hauptbucheinträge`
-`Ledger Entry`,`Hauptbucheintrag`
-`Legal Expenses`,`Rechtskosten`
-`Less Than`,`Weniger als`
-`Load an existing .db file from your computer.`,`Laden Sie eine vorhandene .db-Datei von Ihrem Computer.`
-`Loading...`,`Laden...`
-`Loans (Liabilities)`,`Darlehen (Passiva)`
-`Loans and Advances (Assets)`,`Kredite und Forderungen (Aktiva)`
-`Locale`,`Gebietsschema`
-`Logo`,`Logo`
-`MIME Type`,`MIME-Typ`
-`Make Payment`,`Zahlung vornehmen`
-`Marketing Expenses`,`Marketing-Ausgaben`
-`Message`,`Nachricht`
-`Miscellaneous Expenses`,`Verschiedene Ausgaben`
-`Mobile Number`,`Handynummer`
-`Month`,`Monat`
-`Name`,`Name`
-`Net Total`,`Netto Gesamt`
-`Net Total (Company Currency)`,`Netto Gesamt (Unternehmenswährung)`
-`New Account`,`Neues Konto`
-`New Bill`,`Neuer Gesetzentwurf`
-`New File`,`Neue Datei`
-`New Invoice`,`Neue Rechnung`
-`New Journal Entry`,`Neuer Journaleintrag`
-`New version available`,`Neue Version verfügbar`
-`No`,`Nein`
-`No expenses in this period`,`Keine Ausgaben in diesem Zeitraum`
-`No filters selected`,`Keine Filter ausgewählt`
-`No results found.`,`Keine Ergebnisse gefunden.`
-`No transactions yet`,`Noch keine Transaktionen`
-`No updates available`,`Keine Updates verfügbar`
-`Notes`,`Anmerkungen`
-`Number Series`,`Zahlenreihe`
-`Office Equipments`,`Büroausstattungen`
-`Office Maintenance Expenses`,`Kosten für die Instandhaltung des Büros`
-`Office Rent`,`Büromiete`
-`Onboarding Complete`,`Onboarding abgeschlossen`
-`Open Folder`,`Ordner öffnen`
-`Opening (Cr)`,`Eröffnung (H)`
-`Opening (Dr)`,`Eröffnung (S)`
-`Opening Balance Equity`,`Eröffnungsbilanz Eigenkapital`
-`Opening Balances`,`Eröffnungssalden`
-`Organisation`,`Organisation`
-`Outflow`,`Abfluss`
-`Outstanding Amount`,`Ausstehender Betrag`
-`PDF`,`PDF`
-`Paid`,`Bezahlt`
-`Parent`,`Elternteil`
-`Parent Account`,`Übergeordnetes Konto`
-`Party`,`Party`
-`Password`,`Passwort`
-`Payable Account`,`Verbindlichkeitenkonto`
-`Payment`,`Zahlung`
-`Payment Account`,`Zahlungskonto`
-`Payment For`,`Zahlung für`
-`Payment Method`,`Zahlungsmethode`
-`Payment Reference`,`Zahlungsreferenz`
-`Payment Settings`,`Zahlungseinstellungen`
-`Payment Type`,`Zahlungsart`
-`Payment amount cannot be ${0}.`,`Der Zahlungsbetrag kann nicht ${0} sein.`
-`Payment amount cannot be less than zero.`,`Der Zahlungsbetrag kann nicht kleiner als Null sein.`
-`Payment amount cannot exceed ${0}.`,`Der Zahlungsbetrag kann ${0} nicht überschreiten.`
-`Payment amount: ${0} should be greater than 0.`,`Zahlungsbetrag: ${0} sollte größer als 0 sein.`
-`Payment amount: ${0} should be less than Outstanding amount: ${1}.`,`Zahlungsbetrag: ${0} sollte kleiner sein als der ausstehende Betrag: ${1}.`
-`Payments`,`Zahlungen`
-`Payroll Payable`,`Gehaltsabrechnung Payable`
-`Periodicity`,`Periodizität`
-`Phone`,`Telefon`
-`Place`,`Ort`
-`Place of Supply`,`Ort der Lieferung`
-`Place of supply`,`Ort der Lieferung`
-`Plants and Machineries`,`Anlagen und Maschinen`
-`Please fill all values`,`Bitte alle Werte ausfüllen`
-`Please select an existing database or create a new one.`,`Bitte wählen Sie eine vorhandene Datenbank oder erstellen Sie eine neue.`
-`Please set GSTIN in General Settings.`,`Bitte stellen Sie die GSTIN in den Allgemeinen Einstellungen ein.`
-`Postal Code`,`Postleitzahl`
-`Postal Expenses`,`Portokosten`
-`Posting Date`,`Buchungsdatum`
-`Prefix`,`Vorsilbe`
-`Prevent errors from showing and automatically report all errors.`,`Verhindern Sie die Anzeige von Fehlern und melden Sie automatisch alle Fehler.`
-`Print`,`Drucken`
-`Print Format`,`Druckformat`
-`Print PDF`,`PDF drucken`
-`Print Settings`,`Druckeinstellungen`
-`Print and Stationery`,`Druck und Schreibwaren`
-`Profit And Loss`,`Gewinn und Verlust`
-`Profit and Loss`,`Gewinn und Verlust`
-`Purchase`,`Einkauf`
-`Purchase Order`,`Bestellung`
-`Purchase Order Settings`,`Bestellungseinstellungen`
-`Purchase Receipt`,`Kaufbeleg`
-`Purchase Receipt Settings`,`Einstellungen für Kaufbelege`
-`PurchaseInvoice`,`Einkaufsrechnung`
-`Purchases`,`Käufe`
-`Quantity`,`Menge`
-`Quantity (${0}) cannot be less than zero.`,`Die Menge (${0}) kann nicht kleiner als Null sein.`
-`Quotation`,`Angebot`
-`Quotation Settings`,`Angebotseinstellungen`
-`Rate`,`Preis`
-`Rate (${0}) cannot be less zero.`,`Der Preis (${0}) kann nicht negativ sein.`
-`Rate (Company Currency)`,`Kurs (Unternehmenswährung)`
-`Re-Open`,`Wiedereröffnen`
-`Receivable Account`,`Forderungskonto`
-`Recent Invoices`,`Neueste Rechnungen`
-`Reconcile`,`Abgleichen`
-`Ref. / Cheque No.`,`Ref. / Scheck-Nr.`
-`Ref. Date`,`Ref. Datum`
-`Ref. Name`,`Ref. Name`
-`Ref. Type`,`Ref. Typ`
-`Ref/Cheque ID`,`Referenz/Scheck-ID`
-`Reference Date`,`Stichtag`
-`Reference DocType`,`Referenz DocType`
-`Reference Field`,`Referenzfeld`
-`Reference Name`,`Referenz Name`
-`Reference Number`,`Referenznummer`
-`Reference Type`,`Referenztyp`
-`Reload App`,`App neu laden`
-`Report Error`,`Fehler melden`
-`Reports`,`Berichte`
-`Reset Filters`,`Filter zurücksetzen`
-`Retained Earnings`,`Einbehaltene Gewinne`
-`Reverse Charge`,`Reverse Charge`
-`Reverse Chrg.`,`Reverse Charge`
-`Reverted`,`Rückgängig gemacht`
-`Review Accounts`,`Konten überprüfen`
-`Role`,`Rolle`
-`Roles`,`Rollen`
-`Root Type`,`Wurzel-Typ`
-`Round Off`,`Abrunden`
-`Round Off Account`,`Konto für Rundungsdifferenzen`
-`SMTP Host`,`SMTP-Host`
-`SMTP Port`,`SMTP-Port`
-`Salary`,`Gehalt`
-`Sales`,`Vertrieb`
-`Sales Expenses`,`Vertriebskosten`
-`Sales Order`,`Kundenauftrag`
-`Sales Order Settings`,`Einstellungen zum Kundenauftrag`
-`SalesInvoice`,`Rechnung`
-`SalesInvoice Settings`,`Rechnungseinstellungen`
-`Save`,`Speichern`
-`Save & Close`,`Speichern & Schließen`
-`Save as PDF`,`Als PDF speichern`
-`Save as PDF Successful`,`PDF gespeichert`
-`Saving`,`Speichern`
-`Schedule`,`Zeitplan`
-`Secured Loans`,`Gesicherte Darlehen`
-`Securities and Deposits`,`Wertpapiere und Einlagen`
-`Select Folder`,`Ordner auswählen`
-`Select Image`,`Bild auswählen`
-`Select Logo`,`Logo auswählen`
-`Select a file to load the company transactions`,`Wählen Sie eine Datei zum Laden der Unternehmenstransaktionen`
-`Select file`,`Datei auswählen`
-`Select folder`,`Ordner auswählen`
-`Send`,`Senden`
-`Service`,`Dienst`
-`Set the local code. This is used for number formatting.`,`Legen Sie den lokalen Code fest, der für die Formatierung der Nummern verwendet wird.`
-`Sets how many digits are shown after the decimal point.`,`Legt fest, wie viele Ziffern nach dem Dezimalpunkt angezeigt werden.`
-`Sets the app-wide date display format.`,`Legt das app-weite Datumsanzeigeformat fest.`
-`Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.`,`Legt die interne Genauigkeit fest, die für monetäre Berechnungen verwendet wird. Ein Wert über 6 sollte für die meisten Währungen ausreichend sein.`
-`Setting Up...`,`Einrichten...`
-`Settings`,`Einstellungen`
-`Settings changes will be visible on reload`,`Änderungen der Einstellungen werden beim erneuten Laden sichtbar`
-`Setup`,`Einrichtung`
-`Setup Complete`,`Einrichtung abgeschlossen`
-`Setup Wizard`,`Einrichtungsassistent`
-`Setup your organization`,`Einrichtung Ihrer Organisation`
-`Setup Your Workspace`,`Einrichten Ihres Arbeitsbereichs`
-`Smallest Currency Fraction Value`,`Kleinster Wert eines Währungsbruchteils`
-`Softwares`,`Software`
-`Something has gone terribly wrong. Please check the console and raise an issue.`,`Etwas ist furchtbar schief gelaufen. Bitte prüfen Sie die Konsole und melden Sie ein Problem.`
-`Source of Funds (Liabilities)`,`Mittelherkunft (Passiva)`
-`Start Time`,`Startzeit`
-`State`,`Staat`
-`State Tax`,`Staatliche Steuer`
-`State/UT Tax Paid`,`Staat/UT Steuer gezahlt`
-`Status`,`Status`
-`Stock Adjustment`,`Bestandsanpassung`
-`Stock Assets`,`Lagerbestand`
-`Stock Expenses`,`Ausgaben für Aktien`
-`Stock In Hand`,`Vorräte`
-`Stock Liabilities`,`Lagerverbindlichkeiten`
-`Stock Received But Not Billed`,`Erhaltener, aber nicht fakturierter Bestand`
-`Subject`,`Betreff`
-`Submit`,`Einreichen`
-`Submitted`,`Eingereicht`
-`Subtotal`,`Zwischensumme`
-`Supplier`,`Anbieter`
-`Supplier Created`,`Lieferant erstellt`
-`Supplier Currency`,`Lieferantenwährung`
-`Supplier Name`,`Name des Lieferanten`
-`Suppliers`,`Lieferanten`
-`Symbol`,`Symbol`
-`System`,`System`
-`System Settings`,`Systemeinstellungen`
-`System Setup`,`System einrichten`
-`Tax`,`Steuer`
-`Tax Account`,`Steuerkonto`
-`Tax Assets`,`Steuerliche Vermögenswerte`
-`Tax Detail`,`Steuer Detail`
-`Tax ID`,`Steuer-ID`
-`Taxable Value`,`Steuerpflichtiger Wert`
-`Taxes`,`Steuern`
-`Telephone Expenses`,`Telefonkosten`
-`Template`,`Vorlage`
-`Template could not be saved.`,`Die Vorlage konnte nicht gespeichert werden.`
-`Template saved successfully.`,`Vorlage erfolgreich gespeichert.`
-`Temporary Accounts`,`Vorläufige Konten`
-`Temporary Opening`,`Vorübergehende Eröffnung`
-`Terms`,`Bedingungen`
-`Theme Color`,`Design-Farbe`
-`This action is permanent`,`Diese Aktion ist endgültig`
-`This action is permanent and will cancel the following payment: ${0}`,`Diese Aktion ist endgültig und storniert die folgende Zahlung: ${0}`
-`This action is permanent and will cancel the following payments: ${0}`,`Diese Aktion ist endgültig und storniert die folgenden Zahlungn: ${0}`
-`Title`,`Titel`
-`To`,`An`
-`To Account`,`Zu Konto`
-`To Date`,`Bis Datum`
-`To Do`,`To-Do`
-`Top Expenses`,`Top-Ausgaben`
-`Total Spending`,`Gesamtausgaben`
-`Total Tax`,`Gesamtsteuer`
-`Transfer Type`,`Art der Übertragung`
-`Travel Expenses`,`Reisekosten`
-`Trial Balance`,`Summenbilanz`
-`Type`,`Typ`
-`Unit Type`,`Einheit Typ`
-`Unpaid`,`Unbezahlt`
-`Unsecured Loans`,`Ungesicherte Darlehen`
-`Update downloaded`,`Update heruntergeladen`
-`User ID`,`Benutzer-ID`
-`User Remark`,`Benutzer Bemerkung`
-`Username`,`Benutzername`
-`Utility Expenses`,`Ausgaben für Versorgungsleistungen`
-`Value`,`Wert`
-`Value missing for ${0}`,`Wert fehlt für ${0}`
-`Version ${0} available`,`Version ${0} verfügbar`
-`View Bills`,`Rechnungen ansehen`
-`View Invoices`,`Rechnungen ansehen`
-`Welcome to Frappe Books`,`Willkommen bei Frappe Books`
-`Write Off`,`Abschreibung`
-`Write Off / Refund`,`Abschreibung/Erstattung`
-`Write Off Account`,`Abschreibungskonto`
-`Year`,`Jahr`
-`Yes`,`Ja`
-`Your Name`,`Ihr Name`
-`name`,`Name`
+"${0} ${1} already exists.","${0} ${1} existiert bereits.",
+"${0} ${1} has been modified after loading",,
+"${0} ${1} is linked with existing records.","${0} ${1} ist mit bestehenden Datensätzen verknüpft.",
+"${0} already exists.",,
+"${0} filters applied","${0} Filter angewendet",
+"${0} rows",,
+"* required fields",,
+0%,,
+03-23-2022,,
+03/23/2022,,
+"1 filter applied","1 Filter angewendet",
+2022-03-23,,
+"23 Mar, 2022",,
+23-03-2022,,
+23/03/2022,,
+9888900000,,
+Account,Konto,
+"Account Entries",Kontoeinträge,
+"Account Name","Name des Kontos",
+"Account Type",Konto-Typ,
+"Accounting Ledger Entry",,
+"Accounting Settings",Buchhaltungseinstellungen,
+Accounts,Konten,
+"Accounts Payable",Kreditoren,
+"Accounts Receivable",Debitoren,
+"Accumulated Depreciation","Kumulierte Abschreibung",
+"Add Account","Konto hinzufügen",
+"Add Customers","Kunden hinzufügen",
+"Add Group","Gruppe hinzufügen",
+"Add Items","Artikel hinzufügen",
+"Add Row","Zeile hinzufügen",
+"Add Suppliers","Lieferanten hinzufügen",
+"Add Taxes","Steuern hinzufügen",
+"Add a few customers to create your first invoice",,
+"Add a few suppliers to create your first bill",,
+"Add a filter","Filter hinzufügen",
+"Add a remark",,
+"Add invoice terms",,
+"Add products or services that you buy from your suppliers",,
+"Add products or services that you sell to your customers",,
+Address,Adresse,
+"Address Display",Adressanzeige,
+"Address Line 1","Anschrift Zeile 1",
+"Address Line 2","Anschrift Zeile 2",
+"Administrative Expenses",Verwaltungskosten,
+All,,
+"Allow Telemetry",,
+Amount,Betrag,
+"Amount (Company Currency)","Betrag (Währung des Unternehmens)",
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","`Der Betrag: ${0} und Abschreibung: ${1} ist kleiner als der Gesamtbetrag"," der den Referenzen zugeordnet ist: ${2}.`"
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","`Betrag: ${0} ist kleiner als der Gesamtbetrag"," der den Referenzen zugewiesen wurde: ${1}.`"
+"An error occurred.","Es ist ein Fehler aufgetreten.",
+"Anonymized Telemetry",,
+"Application of Funds (Assets)","Verwendung der Mittel (Aktiva)",
+Arial,,
+"Ascending Order",,
+Asset,,
+"Assign Imported Labels",,
+Back,Zurück,
+"Bad import data.",,
+Balance,Kontostand,
+"Balance Sheet",Bilanz,
+Bank,,
+"Bank Accounts",Bankkonten,
+"Bank Entry",,
+"Bank Name",Bankname,
+"Bank Overdraft Account",Überziehungskonto,
+"Base Error",,
+"Based On",,
+Basic,,
+"Basic I",,
+"Basic II",,
+Bill,Rechnung,
+"Bill Created","Rechnung erstellt",
+"Bill No",Rechnungsnummer,
+Black,Schwarz,
+Blue,,
+Both,,
+Buildings,Gebäude,
+Business,,
+Cancel,Stornieren,
+"Cancel ${0} ${1}?",,
+Cancelled,Storniert,
+"Cannot Commit Error",,
+"Capital Equipments",Kapitalausstattungen,
+"Capital Stock",Grundkapital,
+Cash,Bargeld,
+"Cash Entry",,
+"Cash In Hand",Kassenbestand,
+Cashflow,Cashflow,
+"Central Tax","Zentrale Steuer",
+"Change File",,
+"Change Ref Type",,
+Chargeable,,
+"Chart Of Accounts Reviewed","Kontenplan überprüft",
+"Chart of Accounts",Kontenplan,
+"Check for Updates",,
+"Checking for updates","Suche nach Updates",
+Cheque,,
+"City / Town","Stadt / Ortschaft",
+Clear,,
+"Clearance Date","Datum der Freigabe",
+"Click to create","Klicken Sie zum Erstellen",
+Close,Schließen,
+Closing,,
+"Closing (Cr)","Abschluss (H)",
+"Closing (Dr)","Abschluss (S)",
+Color,Farbe,
+"Commission on Sales",Umsatzprovision,
+Common,Allgemein,
+"Common Items",,
+"Company Address",Unternehmensadresse,
+"Company Logo",Unternehmenslogo,
+"Company Name",Firma,
+"Company Settings",Unternehmenseinstellungen,
+"Company Setup","Unternehmen einrichten",
+Completed,Abgeschlossen,
+Condition,,
+"Consolidate Columns",,
+Contains,Enthält,
+"Contra Entry",,
+"Cost of Goods Sold",Umsatzkosten,
+"Could not import ${0} ${1}.",,
+"Could not select file.",,
+Country,Land,
+"Country Code",,
+"Country code used to initialize regional settings.",,
+Courier,,
+Cr.,,
+Create,Erstellen.,
+"Create Bill","Rechnung erstellen",
+"Create Demo",,
+"Create Invoice","Rechnung erstellen",
+"Create Purchase",,
+"Create Sale",,
+"Create a new file and store it in your computer.","Erstellen Sie eine neue Datei und speichern Sie sie auf Ihrem Computer.",
+"Create a new file or select an existing one from your computer","Erstellen Sie eine neue Datei oder wählen Sie eine vorhandene Datei von Ihrem Computer aus",
+"Create your first bill and mail it to your supplier",,
+"Create your first invoice and mail it to your customer",,
+Created,,
+"Created By",,
+"Creating Items and Parties",,
+"Creating Journal Entries",,
+"Creating Purchase Invoices",,
+Credit,Haben,
+"Credit Card Entry",,
+"Credit Note",,
+Creditors,Kreditoren,
+Currency,Währung,
+"Currency Name",Währungsname,
+Current,Kontokorrent,
+"Current Assets",Umlaufvermögen,
+"Current Liabilities","Kurzfristige Verbindlichkeiten",
+"Custom Hex","Benutzerdefiniertes Hex",
+Customer,Kunde,
+"Customer Created","Kunde erstellt",
+"Customer Currency",Kundenwährung,
+Customers,Kunden,
+Customise,Anpassen,
+"Customize your invoices by adding a logo and address details",,
+Dashboard,Dashboard,
+"Data Import",Datenimport,
+"Database Error",,
+"Database file: ${0}",,
+Date,Datum,
+"Date Format","Datum Format",
+Day,,
+Debit,Lastschrift,
+"Debit Note",,
+Debtors,Debitoren,
+"Default Account",Standard-Konto,
+Delete,Löschen,
+"Delete ${0} ${1}?",,
+"Delete ${0}?",,
+Depreciation,Abschreibung,
+"Depreciation Entry",,
+Description,Beschreibung,
+Details,Einzelheiten,
+"Direct Expenses","Direkte Ausgaben",
+"Direct Income","Direktes Einkommen",
+"Disables telemetry. No data will be collected, you are completely invisble to us.",,
+"Display Logo in Invoice","Logo in der Rechnung anzeigen",
+"Display Precision","Präzision anzeigen",
+"Display Precision should have a value between 0 and 9.","Die Anzeigegenauigkeit sollte einen Wert zwischen 0 und 9 haben.",
+"Dividends Paid","Ausgeschüttete Dividende",
+Docs,,
+Documentation,Dokumentation,
+"Does Not Contain","Enthält nicht",
+"Don't Log Anything",,
+"Don't Log Usage",,
+"Download Update","Update herunterladen",
+"Downloading update",,
+Dr.,,
+Draft,,
+Duplicate,,
+"Duplicate ${0} ${1}?",,
+"Duplicate Entry Error",,
+"Duties and Taxes","Zölle und Steuern",
+"Earnest Money","Earnest Money",
+Edit,Bearbeiten,
+"Electronic Equipments","Elektronische Ausrüstungen",
+Email,E-Mail,
+"Email Address",E-Mail-Adresse,
+Empty,Leer,
+"Enables telemetry. Does not include usage patterns.",,
+"Enables telemetry. Includes usage patterns.",,
+"Enter Country to load States",,
+"Enter State",,
+"Entertainment Expenses","Ausgaben für Unterhaltung",
+"Entry No",,
+"Entry Type","Eintrag Typ",
+Equity,Eigenkapital,
+Error,Fehler,
+Error:,Fehler:,
+"Exchange Gain/Loss",Wechselkursgewinne/-verluste,
+"Exchange Rate",Wechselkurse,
+"Excise Entry",,
+"Existing File","Vorhandene Datei",
+Expense,Ausgaben,
+"Expense Account",,
+Expenses,Ausgaben,
+"Expenses Included In Valuation","In die Bewertung einbezogene Aufwendungen",
+Export,,
+"Export Successful","Export erfolgreich",
+Fax,Fax,
+Field,,
+Fieldname,Feldname,
+"File selection failed.",,
+Filter,Filter,
+"Fiscal Year",,
+"Fiscal Year End Date","Enddatum des Geschäftsjahres",
+"Fiscal Year Start Date","Beginn des Haushaltsjahres",
+"Fixed Asset",,
+"Fixed Assets",Anlagevermögen,
+Font,Schriftart,
+For,Für,
+"Forbidden Error",,
+Fraction,Bruchteil,
+"Fraction Units","Maßeinheit Bruchteil",
+"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
+"Freight and Forwarding Charges","Fracht- und Speditionskosten",
+"From Account","Von Konto",
+"From Date","Von Datum",
+"From Year",,
+"Full Name","Vollständiger Name",
+"Furnitures and Fixtures","Mobiliar und Einrichtungsgegenstände",
+"GSTIN No.",GSTIN-Nr.,
+GSTR1,GSTR1,
+GSTR2,GSTR2,
+"Gain/Loss on Asset Disposal","Gewinn/Verlust aus der Veräußerung von Vermögenswerten",
+General,Allgemein,
+"General Ledger",Hauptbuch,
+"Get Started","Los geht's",
+Gram,,
+"Grand Total",Gesamtbetrag,
+"Grand Total (Company Currency)","Gesamtbetrag (Währung des Unternehmens)",
+"Greater Than","Größer als",
+Green,,
+"Group By",,
+HSN/SAC,HSN/SAC,
+"HSN/SAC Code",,
+"Half Yearly",,
+"Half Years",,
+"Hello there! 👋",,
+"Hex Value",Hex-Wert,
+"Hide Get Started","Ausblenden Los geht's",
+"Hide Group Amounts",,
+"Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.","Blendet den Abschnitt ""Erste Schritte"" in der Seitenleiste aus. Die Änderung wird beim Neustart oder beim Aktualisieren der App sichtbar.",
+Hour,,
+"How to Use Data Import",,
+"I can't find my language.",,
+INR,,
+Image,Bild,
+"Import Data",,
+"Import Failed",,
+"Import More",,
+"Import Success",,
+"Import Type",,
+"Importer Settings",,
+"Include Cancelled",,
+Income,Einkommen,
+"Income Account",,
+Indigo,,
+"Indirect Expenses","Indirekte Kosten",
+"Indirect Income","Indirektes Einkommen",
+Inflow,Zufluss,
+"Install Update","Update installieren",
+Inter,,
+"Intergrated Tax","Integrierte Steuer",
+"Internal Precision","Interne Präzision",
+"Invalid value ${0} for ${1}",,
+Investments,Investitionen,
+Invoice,Rechnung,
+"Invoice Created","Rechnung erstellt",
+"Invoice Date",Rechnungsdatum,
+"Invoice No",Rechnungsnummer,
+"Invoice No.",Rechnungsnummer,
+"Invoice Setup","Rechnungen einrichten",
+"Invoice Value",Rechnungswert,
+Invoices,Rechnungen,
+Is,Ist,
+"Is Empty","Ist leer",
+"Is Group",Ist-Gruppe,
+"Is Not","Ist nicht",
+"Is Not Empty","Ist nicht leer",
+Item,Artikel,
+"Item Description",,
+"Item Name","Artikel Name",
+Items,Artikel,
+"John Doe",,
+"Journal Entries",,
+"Journal Entry",Journaleintrag,
+"Journal Entry Account",,
+Kg,,
+"Know More",,
+"Label Index",,
+Language,,
+"Ledger Entries",Hauptbucheinträge,
+"Left Index",,
+"Legal Expenses",Rechtskosten,
+"Less Than","Weniger als",
+Liability,,
+"Link Validation Error",,
+List,,
+"Load an existing .db file from your computer.","Laden Sie eine vorhandene .db-Datei von Ihrem Computer.",
+"Loading Report...",,
+Loading...,Laden...,
+"Loans (Liabilities)","Darlehen (Passiva)",
+"Loans and Advances (Assets)","Kredite und Forderungen (Aktiva)",
+Locale,Gebietsschema,
+Logo,Logo,
+"Make Entry",,
+"Make Payment","Zahlung vornehmen",
+"Mandatory Error",,
+"Mar 23, 2022",,
+"Marketing Expenses",Marketing-Ausgaben,
+Merriweather,,
+Meter,,
+Minimal,,
+"Miscellaneous Expenses","Verschiedene Ausgaben",
+Modern,,
+Modified,,
+"Modified By",,
+Monthly,,
+Months,,
+Montserrat,,
+Name,Name,
+Navigate,,
+"Net Total","Netto Gesamt",
+"Net Total (Company Currency)","Netto Gesamt (Unternehmenswährung)",
+"New ${0}",,
+"New Account","Neues Konto",
+"New File","Neue Datei",
+"New Journal Entry","Neuer Journaleintrag",
+"New Purchase",,
+"New Purchase Invoice",,
+"New Sale",,
+"New Sales Invoice",,
+"New version available","Neue Version verfügbar",
+Next,,
+No,Nein,
+"No Data to Import",,
+"No Values to be Displayed",,
+"No entries found",,
+"No expenses in this period","Keine Ausgaben in diesem Zeitraum",
+"No filters selected","Keine Filter ausgewählt",
+"No labels have been assigned.",,
+"No results found",,
+"No transactions yet","Noch keine Transaktionen",
+"No updates available","Keine Updates verfügbar",
+None,,
+"Not Found Error",,
+Notes,Anmerkungen,
+"Number Series",Zahlenreihe,
+"Number of ${0}",,
+"Office Equipments",Büroausstattungen,
+"Office Maintenance Expenses","Kosten für die Instandhaltung des Büros",
+"Office Rent",Büromiete,
+"Onboarding Complete","Onboarding abgeschlossen",
+"Open Folder","Ordner öffnen",
+"Open Sans",,
+"Opening (Cr)","Eröffnung (H)",
+"Opening (Dr)","Eröffnung (S)",
+"Opening Balance Equity","Eröffnungsbilanz Eigenkapital",
+"Opening Balances",Eröffnungssalden,
+"Opening Entry",,
+Orange,,
+Organisation,Organisation,
+Outflow,Abfluss,
+"Outstanding Amount","Ausstehender Betrag",
+Oxygen,,
+"Pad Zeros",,
+Page,,
+Paid,Bezahlt,
+Parent,Elternteil,
+"Parent Account","Übergeordnetes Konto",
+Party,Party,
+"Patch Run",,
+Pay,,
+Payable,,
+Payment,Zahlung,
+"Payment For","Zahlung für",
+"Payment Method",Zahlungsmethode,
+"Payment No",,
+"Payment Reference",Zahlungsreferenz,
+"Payment Type",Zahlungsart,
+"Payment amount cannot be ${0}.","Der Zahlungsbetrag kann nicht ${0} sein.",
+"Payment amount cannot be less than zero.","Der Zahlungsbetrag kann nicht kleiner als Null sein.",
+"Payment amount cannot exceed ${0}.","Der Zahlungsbetrag kann ${0} nicht überschreiten.",
+"Payment amount: ${0} should be greater than 0.","Zahlungsbetrag: ${0} sollte größer als 0 sein.",
+"Payment amount: ${0} should be less than Outstanding amount: ${1}.","Zahlungsbetrag: ${0} sollte kleiner sein als der ausstehende Betrag: ${1}.",
+Payments,Zahlungen,
+"Payroll Payable","Gehaltsabrechnung Payable",
+Periodicity,Periodizität,
+Phone,Telefon,
+Pink,,
+Place,Ort,
+"Place of supply","Ort der Lieferung",
+"Plants and Machineries","Anlagen und Maschinen",
+"Please Wait",,
+"Please assign the following fields ${0}",,
+"Please fill all values","Bitte alle Werte ausfüllen",
+"Please select a file with data to import.",,
+"Please select a valid reference type.",,
+"Please select an option:",,
+"Postal Code",Postleitzahl,
+"Postal Expenses",Portokosten,
+"Posting Date",Buchungsdatum,
+Prefix,Vorsilbe,
+"Prime Bank",,
+Print,Drucken,
+"Print Settings",Druckeinstellungen,
+"Print and Stationery","Druck und Schreibwaren",
+Product,,
+"Profit And Loss","Gewinn und Verlust",
+"Profit and Loss","Gewinn und Verlust",
+Purchase,Einkauf,
+"Purchase Invoice",,
+"Purchase Invoice Item",,
+"Purchase Invoices",,
+"Purchase Item Created",,
+"Purchase Items",,
+"Purchase Payments",,
+Purchases,Käufe,
+Purple,,
+Quantity,Menge,
+Quarterly,,
+Quarters,,
+Rate,Preis,
+"Rate (${0}) cannot be less zero.","Der Preis (${0}) kann nicht negativ sein.",
+"Rate (Company Currency)","Kurs (Unternehmenswährung)",
+"Rate can't be negative.",,
+Receivable,,
+Receive,,
+"Recent Invoices","Neueste Rechnungen",
+Red,,
+"Ref Name",,
+"Ref Type",,
+"Ref. / Cheque No.","Ref. / Scheck-Nr.",
+"Ref. Date","Ref. Datum",
+"Ref. Name","Ref. Name",
+"Ref. Type","Ref. Typ",
+Reference,,
+"Reference Date",Stichtag,
+"Reference Number",Referenznummer,
+"Reference Type",Referenztyp,
+"Reload App","App neu laden",
+Report,,
+"Report Error","Fehler melden",
+"Report Issue",,
+Reports,Berichte,
+"Required Fields not Assigned",,
+Reset,,
+"Retained Earnings","Einbehaltene Gewinne",
+"Reverse Chrg.","Reverse Charge",
+Reverted,"Rückgängig gemacht",
+Reverts,,
+"Review Accounts","Konten überprüfen",
+"Review your chart of accounts, add any account or tax heads as needed",,
+"Right Index",,
+Role,Rolle,
+"Root Type",Wurzel-Typ,
+"Round Off",Abrunden,
+"Round Off Account","Konto für Rundungsdifferenzen",
+Salary,Gehalt,
+Sales,Vertrieb,
+"Sales Expenses",Vertriebskosten,
+"Sales Invoice",,
+"Sales Invoice Item",,
+"Sales Invoice Settings",,
+"Sales Invoices",,
+"Sales Invoie",,
+"Sales Item Created",,
+"Sales Items",,
+"Sales Payments",,
+Save,Speichern,
+"Save Option",,
+"Save Template",,
+"Save as PDF","Als PDF speichern",
+"Save as PDF Successful","PDF gespeichert",
+Saving,Speichern,
+Search,,
+"Secured Loans","Gesicherte Darlehen",
+"Securities and Deposits","Wertpapiere und Einlagen",
+Select,,
+"Select CoA",,
+"Select Color",,
+"Select Country",,
+"Select File",,
+"Select Folder","Ordner auswählen",
+"Select Image","Bild auswählen",
+"Select Logo","Logo auswählen",
+"Select a file for import",,
+"Select file","Datei auswählen",
+"Select folder","Ordner auswählen",
+"Select your language",,
+"Selected file",,
+"Send anonymized usage data and error reports to help improve the product.",,
+Service,Dienst,
+"Set Anonymized Telemetry",,
+"Set an Import Type",,
+"Set the display language.",,
+"Set the local code. This is used for number formatting.","`Legen Sie den lokalen Code fest"," der für die Formatierung der Nummern verwendet wird.`"
+"Sets how many digits are shown after the decimal point.","`Legt fest"," wie viele Ziffern nach dem Dezimalpunkt angezeigt werden.`"
+"Sets the app-wide date display format.","Legt das app-weite Datumsanzeigeformat fest.",
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","`Legt die interne Genauigkeit fest"," die für monetäre Berechnungen verwendet wird. Ein Wert über 6 sollte für die meisten Währungen ausreichend sein.`"
+"Setting Up Instance",,
+"Setting Up...",Einrichten...,
+Settings,Einstellungen,
+"Settings changes will be visible on reload","Änderungen der Einstellungen werden beim erneuten Laden sichtbar",
+Setup,Einrichtung,
+"Setup Complete","Einrichtung abgeschlossen",
+"Setup Wizard",Einrichtungsassistent,
+"Setup Your Workspace","Einrichten Ihres Arbeitsbereichs",
+"Setup system defaults like date format and display precision",,
+"Setup your company information, email, country and fiscal year",,
+"Setup your opening balances before performing any accounting entries",,
+"Setup your organization","Einrichtung Ihrer Organisation",
+"Setup your tax templates for your sales or purchase transactions",,
+"Show Me",,
+"Single Value",,
+"Smallest Currency Fraction Value","Kleinster Wert eines Währungsbruchteils",
+Softwares,Software,
+"Something has gone terribly wrong. Please check the console and raise an issue.","Etwas ist furchtbar schief gelaufen. Bitte prüfen Sie die Konsole und melden Sie ein Problem.",
+"Source of Funds (Liabilities)","Mittelherkunft (Passiva)",
+"Standard Chart of Accounts",,
+Start,,
+State,Staat,
+"State Tax","Staatliche Steuer",
+Status,Status,
+Stock,,
+"Stock Adjustment",Bestandsanpassung,
+"Stock Assets",Lagerbestand,
+"Stock Expenses","Ausgaben für Aktien",
+"Stock In Hand",Vorräte,
+"Stock Liabilities",Lagerverbindlichkeiten,
+"Stock Received But Not Billed",`Erhaltener," aber nicht fakturierter Bestand`"
+Submit,Einreichen,
+"Submit Journal Entry?",,
+"Submit Purchase Invoice?",,
+"Submit Sales Invoice?",,
+"Submit on Import",,
+Submitted,Eingereicht,
+Submitting,,
+Subtotal,Zwischensumme,
+"Successfully created the following ${0} entries:",,
+Supplier,Anbieter,
+"Supplier Created","Lieferant erstellt",
+"Supplier Currency",Lieferantenwährung,
+Suppliers,Lieferanten,
+Symbol,Symbol,
+System,System,
+"System Settings",Systemeinstellungen,
+"System Setup","System einrichten",
+Tax,Steuer,
+"Tax Account",Steuerkonto,
+"Tax Assets","Steuerliche Vermögenswerte",
+"Tax Detail","Steuer Detail",
+"Tax ID",Steuer-ID,
+"Tax Summary",,
+"Taxable Value","Steuerpflichtiger Wert",
+Taxes,Steuern,
+Teal,,
+"Telephone Expenses",Telefonkosten,
+Template,Vorlage,
+Temporary,,
+"Temporary Accounts","Vorläufige Konten",
+"Temporary Opening","Vorübergehende Eröffnung",
+Terms,Bedingungen,
+"The following ${0} entries were created: ${1}",,
+"Theme Color",Design-Farbe,
+"This Month",,
+"This Quarter",,
+"This Year",,
+"This action is permanent","Diese Aktion ist endgültig",
+"This action is permanent and will cancel the following payment: ${0}","Diese Aktion ist endgültig und storniert die folgende Zahlung: ${0}",
+"This action is permanent and will cancel the following payments: ${0}","Diese Aktion ist endgültig und storniert die folgenden Zahlungn: ${0}",
+"This action is permanent and will delete associated ledger entries.",,
+"This action is permanent.",,
+"Times New Roman",,
+"To Account","Zu Konto",
+"To Account and From Account can't be the same: ${0}",,
+"To Date","Bis Datum",
+"To Year",,
+"Top Expenses",Top-Ausgaben,
+Total,,
+"Total Asset (Debit)",,
+"Total Credit",,
+"Total Debit",,
+"Total Debit: ${0} must be equal to Total Credit: ${1}",,
+"Total Equity (Credit)",,
+"Total Expense (Debit)",,
+"Total Income (Credit)",,
+"Total Liability (Credit)",,
+"Total Profit",,
+"Total Spending",Gesamtausgaben,
+Transfer,,
+"Transfer Type","Art der Übertragung",
+"Travel Expenses",Reisekosten,
+"Trial Balance",Summenbilanz,
+Type,Typ,
+"Type to search...",,
+Unit,,
+"Unit Type","Einheit Typ",
+Unpaid,Unbezahlt,
+"Unsecured Loans","Ungesicherte Darlehen",
+"Until Date",,
+"Update downloaded","Update heruntergeladen",
+"User Remark","Benutzer Bemerkung",
+"Utility Expenses","Ausgaben für Versorgungsleistungen",
+"Validation Error",,
+Value,Wert,
+"Value missing for ${0}","Wert fehlt für ${0}",
+"Verify Imported Data",,
+Version,,
+"Version ${0} available","Version ${0} verfügbar",
+"View Purchases",,
+"View Sales",,
+"Welcome to Frappe Books","Willkommen bei Frappe Books",
+"Write Off",Abschreibung,
+"Write Off Account",Abschreibungskonto,
+"Write Off Account not set. Please set Write Off Account in General Settings",,
+"Write Off Entry",,
+Yearly,,
+Years,,
+Yellow,,
+Yes,Ja,
+"Your Name","Ihr Name",
+john@doe.com,,
+reports,,
+setup,,
+"verify the imported data and click on",,
\ No newline at end of file
diff --git a/translations/fr.csv b/translations/fr.csv
index aeb2f173..134f3dd4 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -1,479 +1,652 @@
-`${0} ${1} already exists.`,`${0} ${1} existe déjà.`
-`${0} ${1} is linked with existing records.`,`${0} ${1} est lié à des enregistrements existants.`
-`${0} filters applied`,`${0} filtres appliqués`
-`1 filter applied`,`1 filtre appliqué`
-`Accepted Quantity`,`Quantité acceptée`
-`Account`,`Compte`
-`Account Entries`,`Entrées de compte`
-`Account Name`,`Nom du compte`
-`Account Type`,`Type de compte`
-`Accounting Ledger Entries`,`Écritures du grand livre comptable`
-`Accounting Settings`,`Paramètres de comptabilité`
-`Accounts`,`Comptes`
-`Accounts Payable`,`Comptes créditeurs`
-`Accounts Receivable`,`Comptes débiteurs`
-`Accumulated Depreciation`,`Amortissement cumulé`
-`Add Account`,`Ajouter un compte`
-`Add Customers`,`Ajouter des clients`
-`Add Group`,`Ajouter un groupe`
-`Add Items`,`Ajouter des éléments`
-`Add Row`,`Ajouter une rangée`
-`Add Suppliers`,`Ajouter des fournisseurs`
-`Add Taxes`,`Ajouter des taxes`
-`Add a filter`,`Ajouter un filtre`
-`Address`,`Adresse`
-`Address Display`,`Affichage de l'adresse`
-`Address Line 1`,`Ligne d'adresse 1`
-`Address Line 2`,`Ligne d'adresse 2`
-`Administrative Expenses`,`Dépenses administratives`
-`Against Account`,`Contre compte`
-`All References`,`Toutes les références`
-`Amount`,`Montant`
-`Amount (Company Currency)`,`Montant (devise de la société)`
-`Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.`,`Le montant : ${0} et write-off : ${1} est inférieur au montant total alloué aux références : ${2}.`
-`Amount: ${0} is less than the total amount allocated to references: ${1}.`,`Montant : ${0} est inférieur au montant total alloué aux références : ${1}.`
-`An error occurred.`,`Une erreur s'est produite.`
-`Application of Funds (Assets)`,`Application des fonds (actifs)`
-`Are you sure you want to cancel ${0} ${1}?`,`Vous êtes sûr de vouloir annuler ${0} ${1} ?`
-`Are you sure you want to delete ${0} ${1}?`,`Etes-vous sûr de vouloir supprimer ${0} ${1} ?`
-`Are you sure you want to submit this Bill?`,`Êtes-vous sûr de vouloir soumettre ce projet de loi ?`
-`Are you sure you want to submit this Invoice?`,`Êtes-vous sûr de vouloir soumettre cette facture ?`
-`Are you sure you want to submit this Journal Entry?`,`Êtes-vous sûr de vouloir soumettre cette entrée de journal ?`
-`Back`,`Dos`
-`Balance`,`Balance`
-`Balance Sheet`,`Bilan`
-`Bank Accounts`,`Comptes bancaires`
-`Bank Name`,`Nom de la banque`
-`Bank Overdraft Account`,`Compte de découvert bancaire`
-`Bill`,`Bill`
-`Bill Created`,`Projet de loi créé`
-`Bill No`,`Bill No`
-`Bills`,`Factures`
-`Bills Settings`,`Paramètres des factures`
-`Black`,`Noir`
-`Body`,`Corps`
-`Buildings`,`Bâtiments`
-`CSV`,`CSV`
-`Can't open database file: ${0}. Please create a new file.`,`Impossible d'ouvrir le fichier de la base de données : ${0}, veuillez créer un nouveau fichier.`
-`Cancel`,`Annuler`
-`Cancelled`,`Annulé`
-`Capital Equipments`,`Biens d'équipement`
-`Capital Stock`,`Capital social`
-`Cash`,`Espèces`
-`Cash In Hand`,`Liquidités en main`
-`Cashflow`,`Cashflow`
-`Central Tax`,`Impôt central`
-`Central Tax Paid`,`Impôt central payé`
-`Chart Of Accounts Reviewed`,`Révision du plan comptable`
-`Chart of Accounts`,`Plan comptable`
-`Checking for updates`,`Vérification des mises à jour`
-`City / Town`,`Ville / Village`
-`Clearance Date`,`Date d'autorisation`
-`Click to create`,`Cliquez pour créer`
-`Close`,`Fermer`
-`Closing (Cr)`,`Fermeture (Cr)`
-`Closing (Dr)`,`Fermeture (Dr)`
-`Color`,`Couleur`
-`Commission on Sales`,`Commission sur les ventes`
-`Common`,`Common`
-`Company Address`,`Adresse de la société`
-`Company Logo`,`Logo de l'entreprise`
-`Company Name`,`Nom de la société`
-`Company Settings`,`Paramètres de l'entreprise`
-`Company Setup`,`Création d'entreprise`
-`Completed`,`Complété`
-`Confirm Password`,`Confirmer le mot de passe`
-`Contains`,`Contient`
-`Cost of Goods Sold`,`Coût des marchandises vendues`
-`Country`,`Pays`
-`Create`,`Créer`
-`Create Bill`,`Créer une facture`
-`Create Invoice`,`Créer une facture`
-`Create a new file and store it in your computer.`,`Créez un nouveau fichier et stockez-le sur votre ordinateur.`
-`Create a new file or select an existing one from your computer`,`Créez un nouveau fichier ou sélectionnez un fichier existant sur votre ordinateur.`
-`Credit`,`Crédit`
-`Creditors`,`Créanciers`
-`Currency`,`Monnaie`
-`Currency Name`,`Nom de la monnaie`
-`Current`,`Actuel`
-`Current Assets`,`Actifs courants`
-`Current Liabilities`,`Passifs courants`
-`Custom Hex`,`Hexagone personnalisé`
-`Customer`,`Client`
-`Customer Created`,`Client créé`
-`Customer Currency`,`Monnaie du client`
-`Customer Name`,`Nom du client`
-`Customers`,`Clients`
-`Customise`,`Personnalisez`
-`Customize`,`Personnalisez`
-`DB Connection Error`,`Erreur de connexion à la base de données`
-`Dashboard`,`Tableau de bord`
-`Data Import`,`Importation de données`
-`Date`,`Date`
-`Date Format`,`Format de la date`
-`Debit`,`Débit`
-`Debtors`,`Débiteurs`
-`Default Account`,`Compte par défaut`
-`Delete`,`Supprimer`
-`Depreciation`,`Amortissement`
-`Description`,`Description`
-`Details`,`Détails`
-`Direct Expenses`,`Dépenses directes`
-`Direct Income`,`Revenu direct`
-`Display Logo in Invoice`,`Affichage du logo sur la facture`
-`Display Precision`,`Précision de l'affichage`
-`Display Precision should have a value between 0 and 9.`,`La précision de l'affichage doit avoir une valeur comprise entre 0 et 9.`
-`Dividends Paid`,`Dividendes versés`
-`Document ${0} ${1} has been modified after loading`,`Le document ${0} ${1} a été modifié après le chargement`
-`Document type ${0} is not submittable`,`Le type de document ${0} ne peut pas être soumis`
-`Documentation`,`Documentation`
-`Does Not Contain`,`Ne contient pas`
-`Download Update`,`Télécharger la mise à jour`
-`Duties and Taxes`,`Droits et taxes`
-`Earnest Money`,`Argent de garantie`
-`Edit`,`Modifier`
-`Electronic Equipments`,`Équipements électroniques`
-`Email`,`Courriel :`
-`Email Account`,`Compte de messagerie`
-`Email Address`,`Adresse électronique`
-`Empty`,`Vide`
-`Enable Notifications`,`Activer les notifications`
-`Entertainment Expenses`,`Dépenses de divertissement`
-`Entry ID`,`ID d'entrée`
-`Entry Type`,`Type d'entrée`
-`Equity`,`Actions`
-`Error`,`Erreur`
-`Error:`,`Erreur :`
-`Event Settings`,`Paramètres des événements`
-`Exchange Gain/Loss`,`Gain/perte de change`
-`Exchange Rate`,`Taux de change`
-`Existing File`,`Fichier existant`
-`Expense`,`Dépenses`
-`Expenses`,`Dépenses`
-`Expenses Included In Valuation`,`Dépenses incluses dans l'évaluation`
-`Export Failed`,`Échec de l'exportation`
-`Export Successful`,`Exportation réussie`
-`Fax`,`Fax`
-`Fieldname`,`Nom du champ`
-`File Name`,`Nom du fichier`
-`File Path`,`Chemin du fichier`
-`File Size`,`Taille du fichier`
-`Filter`,`Filtre`
-`Fiscal Year End Date`,`Date de fin d'exercice`
-`Fiscal Year Start Date`,`Date de début de l'exercice financier`
-`Fixed Assets`,`Actifs fixes`
-`Font`,`Police`
-`For`,`Pour`
-`Fraction`,`Fraction`
-`Fraction Units`,`Unités de fractionnement`
-`Freight and Forwarding Charges`,`Frais de fret et d'expédition`
-`From`,`De`
-`From Account`,`Du compte`
-`From Date`,`De la date`
-`Fulfillment`,`Remplissage`
-`Fulfillment Settings`,`Paramètres d'exécution`
-`Full Name`,`Nom complet`
-`Furnitures and Fixtures`,`Meubles et installations`
-`GST Registration`,`Inscription à la GST`
-`GSTIN`,`GSTIN`
-`GSTIN No.`,`N° GSTIN`
-`GSTIN of Supplier`,`GSTIN du fournisseur`
-`GSTR 3B`,`GSTR 3B`
-`GSTR 3B Report`,`Rapport GSTR 3B`
-`GSTR1`,`GSTR1`
-`GSTR2`,`GSTR2`
-`Gain/Loss on Asset Disposal`,`Gain/perte sur la cession d'actifs`
-`Gender`,`Genre`
-`General`,`Général`
-`General Ledger`,`Grand livre général`
-`Get Started`,`Commencez`
-`Grand Total`,`Total général`
-`Grand Total (Company Currency)`,`Total général (devise de la société)`
-`Greater Than`,`Plus grand que`
-`HSN/SAC`,`HSN/SAC`
-`Hex Value`,`Valeur hexagonale`
-`Hide & Auto Report Errors`,`Cacher et signaler automatiquement les erreurs`
-`Hide Get Started`,`Cacher Commencer`
-`Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.`,`Masque la section "Get Started" de la barre latérale. Le changement sera visible au redémarrage ou à l'actualisation de l'application.`
-`ID`,`ID`
-`Image`,`Image`
-`Income`,`Revenu`
-`Indirect Expenses`,`Dépenses indirectes`
-`Indirect Income`,`Revenu indirect`
-`Inflow`,`Arrivée d'eau`
-`Install Update`,`Installer la mise à jour`
-`Intergrated Tax`,`Taxe intégrée`
-`Intergrated Tax Paid`,`Taxe intégrée payée`
-`Internal Precision`,`Précision interne`
-`Investments`,`Investissements`
-`Invoice`,`Facture`
-`Invoice Created`,`Facture créée`
-`Invoice Date`,`Date de la facture`
-`Invoice No`,`N° de facture`
-`Invoice No.`,`N° de facture`
-`Invoice Number`,`Numéro de facture`
-`Invoice Setup`,`Configuration de la facture`
-`Invoice Value`,`Valeur de la facture`
-`Invoices`,`Factures`
-`Is`,`Est`
-`Is Customer`,`Est client`
-`Is Empty`,`Est vide`
-`Is Group`,`Est Groupe`
-`Is Not`,`N'est pas`
-`Is Not Empty`,`N'est pas vide`
-`Is Supplier`,`Est fournisseur`
-`Item`,`Article`
-`Item Created`,`Article créé`
-`Item Name`,`Nom de l'article`
-`Items`,`Articles`
-`JSON`,`JSON`
-`JSON Data`,`Données JSON`
-`Journal Entry`,`Entrée du journal`
-`Journal Entry Setting`,`Paramétrage de l'écriture du journal`
-`Ledger Entries`,`Écritures de grand livre`
-`Ledger Entry`,`Entrée du grand livre`
-`Legal Expenses`,`Frais juridiques`
-`Less Than`,`Moins de`
-`Load an existing .db file from your computer.`,`Chargez un fichier .db existant sur votre ordinateur.`
-`Loading...`,`Chargement...`
-`Loans (Liabilities)`,`Prêts (Passifs)`
-`Loans and Advances (Assets)`,`Prêts et avances (actifs)`
-`Locale`,`Locale`
-`Logo`,`Logo`
-`MIME Type`,`Type MIME`
-`Make Payment`,`Effectuer le paiement`
-`Marketing Expenses`,`Dépenses de marketing`
-`Message`,`Message`
-`Miscellaneous Expenses`,`Dépenses diverses`
-`Mobile Number`,`Numéro de téléphone mobile`
-`Month`,`Mois`
-`Name`,`Nom`
-`Net Total`,`Net Total`
-`Net Total (Company Currency)`,`Total net (devise de la société)`
-`New Account`,`Nouveau compte`
-`New Bill`,`Nouveau projet de loi`
-`New File`,`Nouveau dossier`
-`New Invoice`,`Nouvelle facture`
-`New Journal Entry`,`Nouvelle entrée dans le journal`
-`New version available`,`Nouvelle version disponible`
-`No`,`Non`
-`No expenses in this period`,`Aucune dépense dans cette période`
-`No filters selected`,`Aucun filtre sélectionné`
-`No results found.`,`Aucun résultat trouvé.`
-`No transactions yet`,`Aucune transaction pour le moment`
-`No updates available`,`Aucune mise à jour disponible`
-`Notes`,`Notes`
-`Number Series`,`Série de numéros`
-`Office Equipments`,`Equipements de bureau`
-`Office Maintenance Expenses`,`Frais d'entretien du bureau`
-`Office Rent`,`Location de bureaux`
-`Onboarding Complete`,`Embarquement terminé`
-`Open Folder`,`Ouvrir le dossier`
-`Opening (Cr)`,`Ouverture (Cr)`
-`Opening (Dr)`,`Ouverture (Dr)`
-`Opening Balance Equity`,`Solde d'ouverture Fonds propres`
-`Opening Balances`,`Soldes d'ouverture`
-`Organisation`,`Organisation`
-`Outflow`,`Débit sortant`
-`Outstanding Amount`,`Montant en souffrance`
-`PDF`,`PDF`
-`Paid`,`Payé`
-`Parent`,`Parent`
-`Parent Account`,`Compte parent`
-`Party`,`Fête`
-`Password`,`Mot de passe`
-`Payable Account`,`Compte à payer`
-`Payment`,`Paiement`
-`Payment Account`,`Compte de paiement`
-`Payment For`,`Paiement pour`
-`Payment Method`,`Mode de paiement`
-`Payment Reference`,`Référence de paiement`
-`Payment Settings`,`Paramètres de paiement`
-`Payment Type`,`Type de paiement`
-`Payment amount cannot be ${0}.`,`Le montant du paiement ne peut pas être ${0}.`
-`Payment amount cannot be less than zero.`,`Le montant du paiement ne peut être inférieur à zéro.`
-`Payment amount cannot exceed ${0}.`,`Le montant du paiement ne peut pas dépasser ${0}.`
-`Payment amount: ${0} should be greater than 0.`,`Le montant du paiement : ${0} doit être supérieur à 0.`
-`Payment amount: ${0} should be less than Outstanding amount: ${1}.`,`Montant du paiement : ${0} doit être inférieur au montant de l'encours : ${1}.`
-`Payments`,`Paiements`
-`Payroll Payable`,`Paie à payer`
-`Periodicity`,`Périodicité`
-`Phone`,`Téléphone`
-`Place`,`Lieu`
-`Place of Supply`,`Lieu d'approvisionnement`
-`Place of supply`,`Lieu d'approvisionnement`
-`Plants and Machineries`,`Usines et machineries`
-`Please fill all values`,`Veuillez remplir toutes les valeurs`
-`Please select an existing database or create a new one.`,`Veuillez sélectionner une base de données existante ou en créer une nouvelle.`
-`Please set GSTIN in General Settings.`,`Veuillez définir le GSTIN dans les paramètres généraux.`
-`Postal Code`,`Code postal`
-`Postal Expenses`,`Dépenses postales`
-`Posting Date`,`Date d'affichage`
-`Prefix`,`Préfixe`
-`Prevent errors from showing and automatically report all errors.`,`Empêcher les erreurs de s'afficher et signaler automatiquement toutes les erreurs.`
-`Print`,`Imprimer`
-`Print Format`,`Format d'impression`
-`Print PDF`,`Imprimer le PDF`
-`Print Settings`,`Paramètres d'impression`
-`Print and Stationery`,`Impression et papeterie`
-`Profit And Loss`,`Profits et pertes`
-`Profit and Loss`,`Profits et pertes`
-`Purchase`,`Achat`
-`Purchase Order`,`Bon de commande`
-`Purchase Order Settings`,`Paramètres de la commande d'achat`
-`Purchase Receipt`,`Reçu d'achat`
-`Purchase Receipt Settings`,`Paramètres des reçus d'achat`
-`PurchaseInvoice`,`AchatFacture`
-`Purchases`,`Achats`
-`Quantity`,`Quantité`
-`Quantity (${0}) cannot be less than zero.`,`La quantité (${0}) ne peut être inférieure à zéro.`
-`Quotation`,`Devis`
-`Quotation Settings`,`Paramètres de cotation`
-`Rate`,`Taux`
-`Rate (${0}) cannot be less zero.`,`Le taux (${0}) ne peut être inférieur à zéro.`
-`Rate (Company Currency)`,`Taux (devise de l'entreprise)`
-`Re-Open`,`Ré-ouvrir`
-`Receivable Account`,`Compte à recevoir`
-`Recent Invoices`,`Factures récentes`
-`Reconcile`,`Réconcilier`
-`Ref. / Cheque No.`,`Réf. / N° de chèque`
-`Ref. Date`,`Réf. Date`
-`Ref. Name`,`Réf. Nom`
-`Ref. Type`,`Réf. Type`
-`Ref/Cheque ID`,`Réf/Cheque ID`
-`Reference Date`,`Date de référence`
-`Reference DocType`,`Référence DocType`
-`Reference Field`,`Champ de référence`
-`Reference Name`,`Nom de référence`
-`Reference Number`,`Numéro de référence`
-`Reference Type`,`Type de référence`
-`Reload App`,`Recharge de l'application`
-`Report Error`,`Rapport d'erreur`
-`Reports`,`Rapports`
-`Reset Filters`,`Réinitialiser les filtres`
-`Retained Earnings`,`Bénéfices non distribués`
-`Reverse Charge`,`Reverse Charge`
-`Reverse Chrg.`,`Chrg. inversé`
-`Reverted`,`Rétabli`
-`Review Accounts`,`Comptes de révision`
-`Role`,`Rôle`
-`Roles`,`Rôles`
-`Root Type`,`Type de racine`
-`Round Off`,`Round Off`
-`Round Off Account`,`Compte d'arrondi`
-`SMTP Host`,`Hôte SMTP`
-`SMTP Port`,`Port SMTP`
-`Salary`,`Salaire`
-`Sales`,`Ventes`
-`Sales Expenses`,`Frais de vente`
-`Sales Order`,`Commande de vente`
-`Sales Order Settings`,`Paramètres de la commande client`
-`SalesInvoice`,`Facture de vente`
-`SalesInvoice Settings`,`Paramètres de la facture de vente`
-`Save`,`Sauvez`
-`Save & Close`,`Enregistrer et fermer`
-`Save as PDF`,`Enregistrer en PDF`
-`Save as PDF Successful`,`Enregistrer en PDF avec succès`
-`Saving`,`Sauver`
-`Schedule`,`Programme`
-`Secured Loans`,`Prêts garantis`
-`Securities and Deposits`,`Titres et dépôts`
-`Select Folder`,`Sélectionner le dossier`
-`Select Image`,`Sélectionner l'image`
-`Select Logo`,`Sélectionnez le logo`
-`Select a file to load the company transactions`,`Sélectionnez un fichier pour charger les transactions de l'entreprise`
-`Select file`,`Sélectionnez le fichier`
-`Select folder`,`Sélectionner le dossier`
-`Send`,`Envoyer`
-`Service`,`Service`
-`Set the local code. This is used for number formatting.`,`Définissez le code local, il est utilisé pour le formatage des numéros.`
-`Sets how many digits are shown after the decimal point.`,`Définit le nombre de chiffres affichés après le point décimal.`
-`Sets the app-wide date display format.`,`Définit le format d'affichage de la date pour l'ensemble de l'application.`
-`Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.`,`Définit la précision interne utilisée pour les calculs monétaires. Une précision supérieure à 6 devrait être suffisante pour la plupart des monnaies.`
-`Setting Up...`,`Mise en place...`
-`Settings`,`Paramètres`
-`Settings changes will be visible on reload`,`Les changements de paramètres seront visibles lors du rechargement`
-`Setup`,`Configuration`
-`Setup Complete`,`Configuration terminée`
-`Setup Wizard`,`Assistant de configuration`
-`Setup your organization`,`Configurer votre organisation`
-`Setup Your Workspace`,`Configurez votre espace de travail`
-`Smallest Currency Fraction Value`,`Valeur de la plus petite fraction de la monnaie`
-`Softwares`,`Logiciels`
-`Something has gone terribly wrong. Please check the console and raise an issue.`,`Quelque chose s'est terriblement mal passé. Veuillez vérifier la console et soulever un problème.`
-`Source of Funds (Liabilities)`,`Source des fonds (passif)`
-`Start Time`,`Heure de début`
-`State`,`État`
-`State Tax`,`Taxe d'État`
-`State/UT Tax Paid`,`Impôt payé par l'État/UT`
-`Status`,`Statut`
-`Stock Adjustment`,`Ajustement des stocks`
-`Stock Assets`,`Actifs en stock`
-`Stock Expenses`,`Frais d'actions`
-`Stock In Hand`,`Stock en main`
-`Stock Liabilities`,`Passif d'actions`
-`Stock Received But Not Billed`,`Stock reçu mais non facturé`
-`Subject`,`Sujet`
-`Submit`,`Soumettre`
-`Submitted`,`Soumis`
-`Subtotal`,`Sous-total`
-`Supplier`,`Fournisseur`
-`Supplier Created`,`Fournisseur créé`
-`Supplier Currency`,`Devise du fournisseur`
-`Supplier Name`,`Nom du fournisseur`
-`Suppliers`,`Fournisseurs`
-`Symbol`,`Symbole`
-`System`,`Système`
-`System Settings`,`Paramètres du système`
-`System Setup`,`Configuration du système`
-`Tax`,`Taxe`
-`Tax Account`,`Compte de taxes`
-`Tax Assets`,`Actifs fiscaux`
-`Tax Detail`,`Détail des taxes`
-`Tax ID`,`Numéro d'identification fiscale`
-`Taxable Value`,`Valeur imposable`
-`Taxes`,`Taxes`
-`Telephone Expenses`,`Frais de téléphone`
-`Template`,`Modèle`
-`Template could not be saved.`,`Le modèle n'a pas pu être sauvegardé.`
-`Template saved successfully.`,`Le modèle a été sauvegardé avec succès.`
-`Temporary Accounts`,`Comptes temporaires`
-`Temporary Opening`,`Ouverture temporaire`
-`Terms`,`Conditions`
-`Theme Color`,`Couleur du thème`
-`This action is permanent`,`Cette action est permanente`
-`This action is permanent and will cancel the following payment: ${0}`,`Cette action est permanente et annulera le paiement suivant : ${0}`
-`This action is permanent and will cancel the following payments: ${0}`,`Cette action est permanente et annulera les paiements suivants : ${0}`
-`Title`,`Titre`
-`To`,`A`
-`To Account`,`Au compte`
-`To Date`,`À ce jour`
-`To Do`,`A faire`
-`Top Expenses`,`Dépenses supérieures`
-`Total Spending`,`Dépenses totales`
-`Total Tax`,`Total des taxes`
-`Transfer Type`,`Type de transfert`
-`Travel Expenses`,`Frais de voyage`
-`Trial Balance`,`Balance de vérification`
-`Type`,`Type`
-`Unit Type`,`Type d'unité`
-`Unpaid`,`Impayé`
-`Unsecured Loans`,`Prêts non garantis`
-`Update downloaded`,`Mise à jour téléchargée`
-`User ID`,`ID utilisateur`
-`User Remark`,`Remarque de l'utilisateur`
-`Username`,`Nom d'utilisateur :`
-`Utility Expenses`,`Dépenses de services publics`
-`Value`,`Valeur`
-`Value missing for ${0}`,`Valeur manquante pour ${0}`
-`Version ${0} available`,`Version ${0} disponible`
-`View Bills`,`Voir les factures`
-`View Invoices`,`Afficher les factures`
-`Welcome to Frappe Books`,`Bienvenue chez Frappe Books`
-`Write Off`,`Radiation`
-`Write Off / Refund`,`Radiation / Remboursement`
-`Write Off Account`,`Compte de radiation`
-`Year`,`Année`
-`Yes`,`Oui`
-`Your Name`,`Votre nom`
-`name`,`nom`
\ No newline at end of file
+"${0} ${1} already exists.","${0} ${1} existe déjà.",
+"${0} ${1} has been modified after loading",,
+"${0} ${1} is linked with existing records.","${0} ${1} est lié à des enregistrements existants.",
+"${0} already exists.",,
+"${0} filters applied","${0} filtres appliqués",
+"${0} rows",,
+"* required fields",,
+0%,,
+03-23-2022,,
+03/23/2022,,
+"1 filter applied","1 filtre appliqué",
+2022-03-23,,
+"23 Mar, 2022",,
+23-03-2022,,
+23/03/2022,,
+9888900000,,
+Account,Compte,
+"Account Entries","Entrées de compte",
+"Account Name","Nom du compte",
+"Account Type","Type de compte",
+"Accounting Ledger Entry",,
+"Accounting Settings","Paramètres de comptabilité",
+Accounts,Comptes,
+"Accounts Payable","Comptes créditeurs",
+"Accounts Receivable","Comptes débiteurs",
+"Accumulated Depreciation","Amortissement cumulé",
+"Add Account","Ajouter un compte",
+"Add Customers","Ajouter des clients",
+"Add Group","Ajouter un groupe",
+"Add Items","Ajouter des éléments",
+"Add Row","Ajouter une rangée",
+"Add Suppliers","Ajouter des fournisseurs",
+"Add Taxes","Ajouter des taxes",
+"Add a few customers to create your first invoice",,
+"Add a few suppliers to create your first bill",,
+"Add a filter","Ajouter un filtre",
+"Add a remark",,
+"Add invoice terms",,
+"Add products or services that you buy from your suppliers",,
+"Add products or services that you sell to your customers",,
+Address,Adresse,
+"Address Display","Affichage de l'adresse",
+"Address Line 1","Ligne d'adresse 1",
+"Address Line 2","Ligne d'adresse 2",
+"Administrative Expenses","Dépenses administratives",
+All,,
+"Allow Telemetry",,
+Amount,Montant,
+"Amount (Company Currency)","Montant (devise de la société)",
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Le montant : ${0} et write-off : ${1} est inférieur au montant total alloué aux références : ${2}.",
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","Montant : ${0} est inférieur au montant total alloué aux références : ${1}.",
+"An error occurred.","Une erreur s'est produite.",
+"Anonymized Telemetry",,
+"Application of Funds (Assets)","Application des fonds (actifs)",
+Arial,,
+"Ascending Order",,
+Asset,,
+"Assign Imported Labels",,
+Back,Dos,
+"Bad import data.",,
+Balance,Balance,
+"Balance Sheet",Bilan,
+Bank,,
+"Bank Accounts","Comptes bancaires",
+"Bank Entry",,
+"Bank Name","Nom de la banque",
+"Bank Overdraft Account","Compte de découvert bancaire",
+"Base Error",,
+"Based On",,
+Basic,,
+"Basic I",,
+"Basic II",,
+Bill,Bill,
+"Bill Created","Projet de loi créé",
+"Bill No","Bill No",
+Black,Noir,
+Blue,,
+Both,,
+Buildings,Bâtiments,
+Business,,
+Cancel,Annuler,
+"Cancel ${0} ${1}?",,
+Cancelled,Annulé,
+"Cannot Commit Error",,
+"Capital Equipments","Biens d'équipement",
+"Capital Stock","Capital social",
+Cash,Espèces,
+"Cash Entry",,
+"Cash In Hand","Liquidités en main",
+Cashflow,Cashflow,
+"Central Tax","Impôt central",
+"Change File",,
+"Change Ref Type",,
+Chargeable,,
+"Chart Of Accounts Reviewed","Révision du plan comptable",
+"Chart of Accounts","Plan comptable",
+"Check for Updates",,
+"Checking for updates","Vérification des mises à jour",
+Cheque,,
+"City / Town","Ville / Village",
+Clear,,
+"Clearance Date","Date d'autorisation",
+"Click to create","Cliquez pour créer",
+Close,Fermer,
+Closing,,
+"Closing (Cr)","Fermeture (Cr)",
+"Closing (Dr)","Fermeture (Dr)",
+Color,Couleur,
+"Commission on Sales","Commission sur les ventes",
+Common,Common,
+"Common Items",,
+"Company Address","Adresse de la société",
+"Company Logo","Logo de l'entreprise",
+"Company Name","Nom de la société",
+"Company Settings","Paramètres de l'entreprise",
+"Company Setup","Création d'entreprise",
+Completed,Complété,
+Condition,,
+"Consolidate Columns",,
+Contains,Contient,
+"Contra Entry",,
+"Cost of Goods Sold","Coût des marchandises vendues",
+"Could not import ${0} ${1}.",,
+"Could not select file.",,
+Country,Pays,
+"Country Code",,
+"Country code used to initialize regional settings.",,
+Courier,,
+Cr.,,
+Create,Créer,
+"Create Bill","Créer une facture",
+"Create Demo",,
+"Create Invoice","Créer une facture",
+"Create Purchase",,
+"Create Sale",,
+"Create a new file and store it in your computer.","Créez un nouveau fichier et stockez-le sur votre ordinateur.",
+"Create a new file or select an existing one from your computer","Créez un nouveau fichier ou sélectionnez un fichier existant sur votre ordinateur.",
+"Create your first bill and mail it to your supplier",,
+"Create your first invoice and mail it to your customer",,
+Created,,
+"Created By",,
+"Creating Items and Parties",,
+"Creating Journal Entries",,
+"Creating Purchase Invoices",,
+Credit,Crédit,
+"Credit Card Entry",,
+"Credit Note",,
+Creditors,Créanciers,
+Currency,Monnaie,
+"Currency Name","Nom de la monnaie",
+Current,Actuel,
+"Current Assets","Actifs courants",
+"Current Liabilities","Passifs courants",
+"Custom Hex","Hexagone personnalisé",
+Customer,Client,
+"Customer Created","Client créé",
+"Customer Currency","Monnaie du client",
+Customers,Clients,
+Customise,Personnalisez,
+"Customize your invoices by adding a logo and address details",,
+Dashboard,"Tableau de bord",
+"Data Import","Importation de données",
+"Database Error",,
+"Database file: ${0}",,
+Date,Date,
+"Date Format","Format de la date",
+Day,,
+Debit,Débit,
+"Debit Note",,
+Debtors,Débiteurs,
+"Default Account","Compte par défaut",
+Delete,Supprimer,
+"Delete ${0} ${1}?",,
+"Delete ${0}?",,
+Depreciation,Amortissement,
+"Depreciation Entry",,
+Description,Description,
+Details,Détails,
+"Direct Expenses","Dépenses directes",
+"Direct Income","Revenu direct",
+"Disables telemetry. No data will be collected, you are completely invisble to us.",,
+"Display Logo in Invoice","Affichage du logo sur la facture",
+"Display Precision","Précision de l'affichage",
+"Display Precision should have a value between 0 and 9.","La précision de l'affichage doit avoir une valeur comprise entre 0 et 9.",
+"Dividends Paid","Dividendes versés",
+Docs,,
+Documentation,Documentation,
+"Does Not Contain","Ne contient pas",
+"Don't Log Anything",,
+"Don't Log Usage",,
+"Download Update","Télécharger la mise à jour",
+"Downloading update",,
+Dr.,,
+Draft,,
+Duplicate,,
+"Duplicate ${0} ${1}?",,
+"Duplicate Entry Error",,
+"Duties and Taxes","Droits et taxes",
+"Earnest Money","Argent de garantie",
+Edit,Modifier,
+"Electronic Equipments","Équipements électroniques",
+Email,"Courriel :",
+"Email Address","Adresse électronique",
+Empty,Vide,
+"Enables telemetry. Does not include usage patterns.",,
+"Enables telemetry. Includes usage patterns.",,
+"Enter Country to load States",,
+"Enter State",,
+"Entertainment Expenses","Dépenses de divertissement",
+"Entry No",,
+"Entry Type","Type d'entrée",
+Equity,Actions,
+Error,Erreur,
+Error:,"Erreur :",
+"Exchange Gain/Loss","Gain/perte de change",
+"Exchange Rate","Taux de change",
+"Excise Entry",,
+"Existing File","Fichier existant",
+Expense,Dépenses,
+"Expense Account",,
+Expenses,Dépenses,
+"Expenses Included In Valuation","Dépenses incluses dans l'évaluation",
+Export,,
+"Export Successful","Exportation réussie",
+Fax,Fax,
+Field,,
+Fieldname,"Nom du champ",
+"File selection failed.",,
+Filter,Filtre,
+"Fiscal Year",,
+"Fiscal Year End Date","Date de fin d'exercice",
+"Fiscal Year Start Date","Date de début de l'exercice financier",
+"Fixed Asset",,
+"Fixed Assets","Actifs fixes",
+Font,Police,
+For,Pour,
+"Forbidden Error",,
+Fraction,Fraction,
+"Fraction Units","Unités de fractionnement",
+"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
+"Freight and Forwarding Charges","Frais de fret et d'expédition",
+"From Account","Du compte",
+"From Date","De la date",
+"From Year",,
+"Full Name","Nom complet",
+"Furnitures and Fixtures","Meubles et installations",
+"GSTIN No.","N° GSTIN",
+GSTR1,GSTR1,
+GSTR2,GSTR2,
+"Gain/Loss on Asset Disposal","Gain/perte sur la cession d'actifs",
+General,Général,
+"General Ledger","Grand livre général",
+"Get Started",Commencez,
+Gram,,
+"Grand Total","Total général",
+"Grand Total (Company Currency)","Total général (devise de la société)",
+"Greater Than","Plus grand que",
+Green,,
+"Group By",,
+HSN/SAC,HSN/SAC,
+"HSN/SAC Code",,
+"Half Yearly",,
+"Half Years",,
+"Hello there! 👋",,
+"Hex Value","Valeur hexagonale",
+"Hide Get Started","Cacher Commencer",
+"Hide Group Amounts",,
+"Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.","Masque la section ""Get Started"" de la barre latérale. Le changement sera visible au redémarrage ou à l'actualisation de l'application.",
+Hour,,
+"How to Use Data Import",,
+"I can't find my language.",,
+INR,,
+Image,Image,
+"Import Data",,
+"Import Failed",,
+"Import More",,
+"Import Success",,
+"Import Type",,
+"Importer Settings",,
+"Include Cancelled",,
+Income,Revenu,
+"Income Account",,
+Indigo,,
+"Indirect Expenses","Dépenses indirectes",
+"Indirect Income","Revenu indirect",
+Inflow,"Arrivée d'eau",
+"Install Update","Installer la mise à jour",
+Inter,,
+"Intergrated Tax","Taxe intégrée",
+"Internal Precision","Précision interne",
+"Invalid value ${0} for ${1}",,
+Investments,Investissements,
+Invoice,Facture,
+"Invoice Created","Facture créée",
+"Invoice Date","Date de la facture",
+"Invoice No","N° de facture",
+"Invoice No.","N° de facture",
+"Invoice Setup","Configuration de la facture",
+"Invoice Value","Valeur de la facture",
+Invoices,Factures,
+Is,Est,
+"Is Empty","Est vide",
+"Is Group","Est Groupe",
+"Is Not","N'est pas",
+"Is Not Empty","N'est pas vide",
+Item,Article,
+"Item Description",,
+"Item Name","Nom de l'article",
+Items,Articles,
+"John Doe",,
+"Journal Entries",,
+"Journal Entry","Entrée du journal",
+"Journal Entry Account",,
+Kg,,
+"Know More",,
+"Label Index",,
+Language,,
+"Ledger Entries","Écritures de grand livre",
+"Left Index",,
+"Legal Expenses","Frais juridiques",
+"Less Than","Moins de",
+Liability,,
+"Link Validation Error",,
+List,,
+"Load an existing .db file from your computer.","Chargez un fichier .db existant sur votre ordinateur.",
+"Loading Report...",,
+Loading...,Chargement...,
+"Loans (Liabilities)","Prêts (Passifs)",
+"Loans and Advances (Assets)","Prêts et avances (actifs)",
+Locale,Locale,
+Logo,Logo,
+"Make Entry",,
+"Make Payment","Effectuer le paiement",
+"Mandatory Error",,
+"Mar 23, 2022",,
+"Marketing Expenses","Dépenses de marketing",
+Merriweather,,
+Meter,,
+Minimal,,
+"Miscellaneous Expenses","Dépenses diverses",
+Modern,,
+Modified,,
+"Modified By",,
+Monthly,,
+Months,,
+Montserrat,,
+Name,Nom,
+Navigate,,
+"Net Total","Net Total",
+"Net Total (Company Currency)","Total net (devise de la société)",
+"New ${0}",,
+"New Account","Nouveau compte",
+"New File","Nouveau dossier",
+"New Journal Entry","Nouvelle entrée dans le journal",
+"New Purchase",,
+"New Purchase Invoice",,
+"New Sale",,
+"New Sales Invoice",,
+"New version available","Nouvelle version disponible",
+Next,,
+No,Non,
+"No Data to Import",,
+"No Values to be Displayed",,
+"No entries found",,
+"No expenses in this period","Aucune dépense dans cette période",
+"No filters selected","Aucun filtre sélectionné",
+"No labels have been assigned.",,
+"No results found",,
+"No transactions yet","Aucune transaction pour le moment",
+"No updates available","Aucune mise à jour disponible",
+None,,
+"Not Found Error",,
+Notes,Notes,
+"Number Series","Série de numéros",
+"Number of ${0}",,
+"Office Equipments","Equipements de bureau",
+"Office Maintenance Expenses","Frais d'entretien du bureau",
+"Office Rent","Location de bureaux",
+"Onboarding Complete","Embarquement terminé",
+"Open Folder","Ouvrir le dossier",
+"Open Sans",,
+"Opening (Cr)","Ouverture (Cr)",
+"Opening (Dr)","Ouverture (Dr)",
+"Opening Balance Equity","Solde d'ouverture Fonds propres",
+"Opening Balances","Soldes d'ouverture",
+"Opening Entry",,
+Orange,,
+Organisation,Organisation,
+Outflow,"Débit sortant",
+"Outstanding Amount","Montant en souffrance",
+Oxygen,,
+"Pad Zeros",,
+Page,,
+Paid,Payé,
+Parent,Parent,
+"Parent Account","Compte parent",
+Party,Fête,
+"Patch Run",,
+Pay,,
+Payable,,
+Payment,Paiement,
+"Payment For","Paiement pour",
+"Payment Method","Mode de paiement",
+"Payment No",,
+"Payment Reference","Référence de paiement",
+"Payment Type","Type de paiement",
+"Payment amount cannot be ${0}.","Le montant du paiement ne peut pas être ${0}.",
+"Payment amount cannot be less than zero.","Le montant du paiement ne peut être inférieur à zéro.",
+"Payment amount cannot exceed ${0}.","Le montant du paiement ne peut pas dépasser ${0}.",
+"Payment amount: ${0} should be greater than 0.","Le montant du paiement : ${0} doit être supérieur à 0.",
+"Payment amount: ${0} should be less than Outstanding amount: ${1}.","Montant du paiement : ${0} doit être inférieur au montant de l'encours : ${1}.",
+Payments,Paiements,
+"Payroll Payable","Paie à payer",
+Periodicity,Périodicité,
+Phone,Téléphone,
+Pink,,
+Place,Lieu,
+"Place of supply","Lieu d'approvisionnement",
+"Plants and Machineries","Usines et machineries",
+"Please Wait",,
+"Please assign the following fields ${0}",,
+"Please fill all values","Veuillez remplir toutes les valeurs",
+"Please select a file with data to import.",,
+"Please select a valid reference type.",,
+"Please select an option:",,
+"Postal Code","Code postal",
+"Postal Expenses","Dépenses postales",
+"Posting Date","Date d'affichage",
+Prefix,Préfixe,
+"Prime Bank",,
+Print,Imprimer,
+"Print Settings","Paramètres d'impression",
+"Print and Stationery","Impression et papeterie",
+Product,,
+"Profit And Loss","Profits et pertes",
+"Profit and Loss","Profits et pertes",
+Purchase,Achat,
+"Purchase Invoice",,
+"Purchase Invoice Item",,
+"Purchase Invoices",,
+"Purchase Item Created",,
+"Purchase Items",,
+"Purchase Payments",,
+Purchases,Achats,
+Purple,,
+Quantity,Quantité,
+Quarterly,,
+Quarters,,
+Rate,Taux,
+"Rate (${0}) cannot be less zero.","Le taux (${0}) ne peut être inférieur à zéro.",
+"Rate (Company Currency)","Taux (devise de l'entreprise)",
+"Rate can't be negative.",,
+Receivable,,
+Receive,,
+"Recent Invoices","Factures récentes",
+Red,,
+"Ref Name",,
+"Ref Type",,
+"Ref. / Cheque No.","Réf. / N° de chèque",
+"Ref. Date","Réf. Date",
+"Ref. Name","Réf. Nom",
+"Ref. Type","Réf. Type",
+Reference,,
+"Reference Date","Date de référence",
+"Reference Number","Numéro de référence",
+"Reference Type","Type de référence",
+"Reload App","Recharge de l'application",
+Report,,
+"Report Error","Rapport d'erreur",
+"Report Issue",,
+Reports,Rapports,
+"Required Fields not Assigned",,
+Reset,,
+"Retained Earnings","Bénéfices non distribués",
+"Reverse Chrg.","Chrg. inversé",
+Reverted,Rétabli,
+Reverts,,
+"Review Accounts","Comptes de révision",
+"Review your chart of accounts, add any account or tax heads as needed",,
+"Right Index",,
+Role,Rôle,
+"Root Type","Type de racine",
+"Round Off","Round Off",
+"Round Off Account","Compte d'arrondi",
+Salary,Salaire,
+Sales,Ventes,
+"Sales Expenses","Frais de vente",
+"Sales Invoice",,
+"Sales Invoice Item",,
+"Sales Invoice Settings",,
+"Sales Invoices",,
+"Sales Invoie",,
+"Sales Item Created",,
+"Sales Items",,
+"Sales Payments",,
+Save,Sauvez,
+"Save Option",,
+"Save Template",,
+"Save as PDF","Enregistrer en PDF",
+"Save as PDF Successful","Enregistrer en PDF avec succès",
+Saving,Sauver,
+Search,,
+"Secured Loans","Prêts garantis",
+"Securities and Deposits","Titres et dépôts",
+Select,,
+"Select CoA",,
+"Select Color",,
+"Select Country",,
+"Select File",,
+"Select Folder","Sélectionner le dossier",
+"Select Image","Sélectionner l'image",
+"Select Logo","Sélectionnez le logo",
+"Select a file for import",,
+"Select file","Sélectionnez le fichier",
+"Select folder","Sélectionner le dossier",
+"Select your language",,
+"Selected file",,
+"Send anonymized usage data and error reports to help improve the product.",,
+Service,Service,
+"Set Anonymized Telemetry",,
+"Set an Import Type",,
+"Set the display language.",,
+"Set the local code. This is used for number formatting.","`Définissez le code local"," il est utilisé pour le formatage des numéros.`"
+"Sets how many digits are shown after the decimal point.","Définit le nombre de chiffres affichés après le point décimal.",
+"Sets the app-wide date display format.","Définit le format d'affichage de la date pour l'ensemble de l'application.",
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Définit la précision interne utilisée pour les calculs monétaires. Une précision supérieure à 6 devrait être suffisante pour la plupart des monnaies.",
+"Setting Up Instance",,
+"Setting Up...","Mise en place...",
+Settings,Paramètres,
+"Settings changes will be visible on reload","Les changements de paramètres seront visibles lors du rechargement",
+Setup,Configuration,
+"Setup Complete","Configuration terminée",
+"Setup Wizard","Assistant de configuration",
+"Setup Your Workspace","Configurez votre espace de travail",
+"Setup system defaults like date format and display precision",,
+"Setup your company information, email, country and fiscal year",,
+"Setup your opening balances before performing any accounting entries",,
+"Setup your organization","Configurer votre organisation",
+"Setup your tax templates for your sales or purchase transactions",,
+"Show Me",,
+"Single Value",,
+"Smallest Currency Fraction Value","Valeur de la plus petite fraction de la monnaie",
+Softwares,Logiciels,
+"Something has gone terribly wrong. Please check the console and raise an issue.","Quelque chose s'est terriblement mal passé. Veuillez vérifier la console et soulever un problème.",
+"Source of Funds (Liabilities)","Source des fonds (passif)",
+"Standard Chart of Accounts",,
+Start,,
+State,État,
+"State Tax","Taxe d'État",
+Status,Statut,
+Stock,,
+"Stock Adjustment","Ajustement des stocks",
+"Stock Assets","Actifs en stock",
+"Stock Expenses","Frais d'actions",
+"Stock In Hand","Stock en main",
+"Stock Liabilities","Passif d'actions",
+"Stock Received But Not Billed","Stock reçu mais non facturé",
+Submit,Soumettre,
+"Submit Journal Entry?",,
+"Submit Purchase Invoice?",,
+"Submit Sales Invoice?",,
+"Submit on Import",,
+Submitted,Soumis,
+Submitting,,
+Subtotal,Sous-total,
+"Successfully created the following ${0} entries:",,
+Supplier,Fournisseur,
+"Supplier Created","Fournisseur créé",
+"Supplier Currency","Devise du fournisseur",
+Suppliers,Fournisseurs,
+Symbol,Symbole,
+System,Système,
+"System Settings","Paramètres du système",
+"System Setup","Configuration du système",
+Tax,Taxe,
+"Tax Account","Compte de taxes",
+"Tax Assets","Actifs fiscaux",
+"Tax Detail","Détail des taxes",
+"Tax ID","Numéro d'identification fiscale",
+"Tax Summary",,
+"Taxable Value","Valeur imposable",
+Taxes,Taxes,
+Teal,,
+"Telephone Expenses","Frais de téléphone",
+Template,Modèle,
+Temporary,,
+"Temporary Accounts","Comptes temporaires",
+"Temporary Opening","Ouverture temporaire",
+Terms,Conditions,
+"The following ${0} entries were created: ${1}",,
+"Theme Color","Couleur du thème",
+"This Month",,
+"This Quarter",,
+"This Year",,
+"This action is permanent","Cette action est permanente",
+"This action is permanent and will cancel the following payment: ${0}","Cette action est permanente et annulera le paiement suivant : ${0}",
+"This action is permanent and will cancel the following payments: ${0}","Cette action est permanente et annulera les paiements suivants : ${0}",
+"This action is permanent and will delete associated ledger entries.",,
+"This action is permanent.",,
+"Times New Roman",,
+"To Account","Au compte",
+"To Account and From Account can't be the same: ${0}",,
+"To Date","À ce jour",
+"To Year",,
+"Top Expenses","Dépenses supérieures",
+Total,,
+"Total Asset (Debit)",,
+"Total Credit",,
+"Total Debit",,
+"Total Debit: ${0} must be equal to Total Credit: ${1}",,
+"Total Equity (Credit)",,
+"Total Expense (Debit)",,
+"Total Income (Credit)",,
+"Total Liability (Credit)",,
+"Total Profit",,
+"Total Spending","Dépenses totales",
+Transfer,,
+"Transfer Type","Type de transfert",
+"Travel Expenses","Frais de voyage",
+"Trial Balance","Balance de vérification",
+Type,Type,
+"Type to search...",,
+Unit,,
+"Unit Type","Type d'unité",
+Unpaid,Impayé,
+"Unsecured Loans","Prêts non garantis",
+"Until Date",,
+"Update downloaded","Mise à jour téléchargée",
+"User Remark","Remarque de l'utilisateur",
+"Utility Expenses","Dépenses de services publics",
+"Validation Error",,
+Value,Valeur,
+"Value missing for ${0}","Valeur manquante pour ${0}",
+"Verify Imported Data",,
+Version,,
+"Version ${0} available","Version ${0} disponible",
+"View Purchases",,
+"View Sales",,
+"Welcome to Frappe Books","Bienvenue chez Frappe Books",
+"Write Off",Radiation,
+"Write Off Account","Compte de radiation",
+"Write Off Account not set. Please set Write Off Account in General Settings",,
+"Write Off Entry",,
+Yearly,,
+Years,,
+Yellow,,
+Yes,Oui,
+"Your Name","Votre nom",
+john@doe.com,,
+reports,,
+setup,,
+"verify the imported data and click on",,
\ No newline at end of file
diff --git a/translations/pt.csv b/translations/pt.csv
index 37ef2bad..e429b1dc 100644
--- a/translations/pt.csv
+++ b/translations/pt.csv
@@ -1,479 +1,652 @@
-`${0} ${1} already exists.`,`${0} ${1} já existe.`
-`${0} ${1} is linked with existing records.`,`${0} ${1} está ligado aos registos existentes.`
-`${0} filters applied`,`${0} filtros aplicados`
-`1 filter applied`,`1 filtro aplicado`
-`Accepted Quantity`,`Quantidade Aceite`
-`Account`,`Conta`
-`Account Entries`,`Entradas de conta`
-`Account Name`,`Nome da conta`
-`Account Type`,`Tipo de conta`
-`Accounting Ledger Entries`,`Lançamentos de Ledger de Contabilidade`
-`Accounting Settings`,`Configurações de contabilidade`
-`Accounts`,`Contas`
-`Accounts Payable`,`Contas a pagar`
-`Accounts Receivable`,`Contas a Receber`
-`Accumulated Depreciation`,`Depreciação Acumulada`
-`Add Account`,`Adicionar conta`
-`Add Customers`,`Adicionar clientes`
-`Add Group`,`Adicionar grupo`
-`Add Items`,`Adicionar artigos`
-`Add Row`,`Adicionar Fileira`
-`Add Suppliers`,`Adicionar Fornecedores`
-`Add Taxes`,`Acrescentar Impostos`
-`Add a filter`,`Acrescentar um filtro`
-`Address`,`Endereço`
-`Address Display`,`Exibição de endereços`
-`Address Line 1`,`Linha de endereço 1`
-`Address Line 2`,`Linha de endereço 2`
-`Administrative Expenses`,`Despesas administrativas`
-`Against Account`,`Contra Conta`
-`All References`,`Todas as Referências`
-`Amount`,`Montante`
-`Amount (Company Currency)`,`Quantia (Moeda da empresa)`
-`Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.`,`Montante: ${0} e anulação: ${1} é menor do que o montante total atribuído às referências: ${2}.`
-`Amount: ${0} is less than the total amount allocated to references: ${1}.`,`Montante: ${0} é menor do que o montante total atribuído às referências: ${1}.`
-`An error occurred.`,`Ocorreu um erro.`
-`Application of Funds (Assets)`,`Aplicação de Fundos (Activos)`
-`Are you sure you want to cancel ${0} ${1}?`,`Tem a certeza de que quer cancelar ${0} ${1}?`
-`Are you sure you want to delete ${0} ${1}?`,`Tem a certeza que quer apagar ${0} ${1}?`
-`Are you sure you want to submit this Bill?`,`Tem a certeza de que quer apresentar esta Proposta de Lei?`
-`Are you sure you want to submit this Invoice?`,`Tem a certeza de que quer apresentar esta factura?`
-`Are you sure you want to submit this Journal Entry?`,`Tem a certeza de que quer submeter esta Entrada no Jornal?`
-`Back`,`Voltar`
-`Balance`,`Balanço`
-`Balance Sheet`,`Balanço`
-`Bank Accounts`,`Contas bancárias`
-`Bank Name`,`Nome do Banco`
-`Bank Overdraft Account`,`Conta de descoberto bancário`
-`Bill`,`Lei`
-`Bill Created`,`Projecto de Lei Criado`
-`Bill No`,`Projecto de Lei n`
-`Bills`,`Letras`
-`Bills Settings`,`Definições de facturas`
-`Black`,`Preto`
-`Body`,`Corpo`
-`Buildings`,`Edifícios`
-`CSV`,`CSV`
-`Can't open database file: ${0}. Please create a new file.`,`Não é possível abrir ficheiro de base de dados: ${0}, por favor crie um novo ficheiro.`
-`Cancel`,`Cancelar`
-`Cancelled`,`Cancelado`
-`Capital Equipments`,`Equipamentos de Capital`
-`Capital Stock`,`Capital social`
-`Cash`,`Dinheiro`
-`Cash In Hand`,`Dinheiro em Mão`
-`Cashflow`,`Cashflow`
-`Central Tax`,`Imposto Central`
-`Central Tax Paid`,`Imposto central pago`
-`Chart Of Accounts Reviewed`,`Plano de Contas Revisado`
-`Chart of Accounts`,`Plano de contas`
-`Checking for updates`,`Verificação de actualizações`
-`City / Town`,`Cidade / Cidade`
-`Clearance Date`,`Data de Apuramento`
-`Click to create`,`Clique para criar`
-`Close`,`Fechar`
-`Closing (Cr)`,`Encerramento (Cr)`
-`Closing (Dr)`,`Encerramento (Dr)`
-`Color`,`Cor`
-`Commission on Sales`,`Comissão de Vendas`
-`Common`,`Comum`
-`Company Address`,`Endereço da empresa`
-`Company Logo`,`Logótipo da empresa`
-`Company Name`,`Nome da empresa`
-`Company Settings`,`Configurações da empresa`
-`Company Setup`,`Constituição de empresa`
-`Completed`,`Concluído`
-`Confirm Password`,`Confirmar Palavra-passe`
-`Contains`,`Contém`
-`Cost of Goods Sold`,`Custo dos bens vendidos`
-`Country`,`País`
-`Create`,`Criar`
-`Create Bill`,`Criar conta`
-`Create Invoice`,`Criar Factura`
-`Create a new file and store it in your computer.`,`Crie um novo ficheiro e guarde-o no seu computador.`
-`Create a new file or select an existing one from your computer`,`Crie um novo ficheiro ou seleccione um já existente a partir do seu computador`
-`Credit`,`Crédito`
-`Creditors`,`Credores`
-`Currency`,`Moeda`
-`Currency Name`,`Nome da moeda`
-`Current`,`Actual`
-`Current Assets`,`Activos correntes`
-`Current Liabilities`,`Passivo corrente`
-`Custom Hex`,`Hextrus personalizados`
-`Customer`,`Cliente`
-`Customer Created`,`Cliente Criado`
-`Customer Currency`,`Moeda do cliente`
-`Customer Name`,`Nome do cliente`
-`Customers`,`Clientes`
-`Customise`,`Personalizar`
-`Customize`,`Personalizar`
-`DB Connection Error`,`Erro de Ligação DB`
-`Dashboard`,`Painel de instrumentos`
-`Data Import`,`Importação de dados`
-`Date`,`Data`
-`Date Format`,`Formato da data`
-`Debit`,`Débito`
-`Debtors`,`Devedores`
-`Default Account`,`Conta por defeito`
-`Delete`,`Eliminar`
-`Depreciation`,`Depreciação`
-`Description`,`Descrição`
-`Details`,`Detalhes`
-`Direct Expenses`,`Despesas directas`
-`Direct Income`,`Rendimento directo`
-`Display Logo in Invoice`,`Mostrar logótipo na factura`
-`Display Precision`,`Precisão de visualização`
-`Display Precision should have a value between 0 and 9.`,`Mostrar Precisão deve ter um valor entre 0 e 9.`
-`Dividends Paid`,`Dividendos pagos`
-`Document ${0} ${1} has been modified after loading`,`O documento ${0} ${1} foi modificado após o carregamento`
-`Document type ${0} is not submittable`,`O tipo de documento ${0} não pode ser submetido`
-`Documentation`,`Documentação`
-`Does Not Contain`,`Não Contém`
-`Download Update`,`Descarregar Actualização`
-`Duties and Taxes`,`Deveres e Impostos`
-`Earnest Money`,`Ganhar dinheiro`
-`Edit`,`Editar`
-`Electronic Equipments`,`Equipamentos electrónicos`
-`Email`,`Email`
-`Email Account`,`Conta de e-mail`
-`Email Address`,`Endereço de correio electrónico`
-`Empty`,`Vazio`
-`Enable Notifications`,`Habilitar Notificações`
-`Entertainment Expenses`,`Despesas de Entretenimento`
-`Entry ID`,`ID de entrada`
-`Entry Type`,`Tipo de entrada`
-`Equity`,`Equidade`
-`Error`,`Erro`
-`Error:`,`Erro:`
-`Event Settings`,`Definições de eventos`
-`Exchange Gain/Loss`,`Ganho/perda cambial`
-`Exchange Rate`,`Taxa de Câmbio`
-`Existing File`,`Arquivo Existente`
-`Expense`,`Despesa`
-`Expenses`,`Despesas`
-`Expenses Included In Valuation`,`Despesas Incluídas na Avaliação`
-`Export Failed`,`Exportação falhada`
-`Export Successful`,`Exportação bem sucedida`
-`Fax`,`Fax`
-`Fieldname`,`Fieldname`
-`File Name`,`Nome do ficheiro`
-`File Path`,`Caminho do ficheiro`
-`File Size`,`Tamanho do ficheiro`
-`Filter`,`Filtro`
-`Fiscal Year End Date`,`Data de Fim do Ano Fiscal`
-`Fiscal Year Start Date`,`Data de início do ano fiscal`
-`Fixed Assets`,`Bens fixos`
-`Font`,`Fonte`
-`For`,`Para`
-`Fraction`,`Fracção`
-`Fraction Units`,`Unidades de Fracção`
-`Freight and Forwarding Charges`,`Taxas de frete e de encaminhamento`
-`From`,`A partir de`
-`From Account`,`De Conta`
-`From Date`,`A partir de Data`
-`Fulfillment`,`Cumprimento`
-`Fulfillment Settings`,`Configurações de preenchimento`
-`Full Name`,`Nome completo`
-`Furnitures and Fixtures`,`Móveis e equipamentos`
-`GST Registration`,`Registo GST`
-`GSTIN`,`GSTIN`
-`GSTIN No.`,`GSTIN No.`
-`GSTIN of Supplier`,`GSTIN de Fornecedor`
-`GSTR 3B`,`GSTR 3B`
-`GSTR 3B Report`,`Relatório GSTR 3B`
-`GSTR1`,`GSTR1`
-`GSTR2`,`GSTR2`
-`Gain/Loss on Asset Disposal`,`Ganho/Perda na Alienação de Bens`
-`Gender`,`Género`
-`General`,`Geral`
-`General Ledger`,`General Ledger`
-`Get Started`,`Comece a trabalhar`
-`Grand Total`,`Total geral`
-`Grand Total (Company Currency)`,`Total Geral (Moeda da Empresa)`
-`Greater Than`,`Maior do que`
-`HSN/SAC`,`HSN/SAC`
-`Hex Value`,`Valor hexadecimal`
-`Hide & Auto Report Errors`,`Ocultar & Auto Comunicar Erros`
-`Hide Get Started`,`Esconder Começar a Esconder`
-`Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.`,`Esconde a secção "Começar" da barra lateral. A alteração será visível no reinício ou na actualização da aplicação.`
-`ID`,`ID`
-`Image`,`Imagem`
-`Income`,`Rendimento`
-`Indirect Expenses`,`Gastos Indirectos`
-`Indirect Income`,`Rendimento indirecto`
-`Inflow`,`Influxo`
-`Install Update`,`Instalar Actualização`
-`Intergrated Tax`,`Impostos entrelaçados`
-`Intergrated Tax Paid`,`Impostos pagos entre si`
-`Internal Precision`,`Precisão Interna`
-`Investments`,`Investimentos`
-`Invoice`,`Factura`
-`Invoice Created`,`Criada a factura`
-`Invoice Date`,`Data de facturação`
-`Invoice No`,`Factura n`
-`Invoice No.`,`N.º de facturação`
-`Invoice Number`,`Número da factura`
-`Invoice Setup`,`Configuração de facturas`
-`Invoice Value`,`Valor da factura`
-`Invoices`,`Facturas`
-`Is`,`É`
-`Is Customer`,`É Cliente`
-`Is Empty`,`Está Vazio`
-`Is Group`,`É Grupo`
-`Is Not`,`Não é`
-`Is Not Empty`,`Não Está Vazio`
-`Is Supplier`,`É fornecedor`
-`Item`,`Item`
-`Item Created`,`Artigo Criado`
-`Item Name`,`Nome do artigo`
-`Items`,`Artigos`
-`JSON`,`JSON`
-`JSON Data`,`Dados do JSON`
-`Journal Entry`,`Entrada no diário`
-`Journal Entry Setting`,`Definição de entradas no diário`
-`Ledger Entries`,`Entradas de Ledger`
-`Ledger Entry`,`Entrada de Ledger`
-`Legal Expenses`,`Despesas legais`
-`Less Than`,`Menos do que`
-`Load an existing .db file from your computer.`,`Carregue um ficheiro .db existente a partir do seu computador.`
-`Loading...`,`Carregamento...`
-`Loans (Liabilities)`,`Empréstimos (Passivo)`
-`Loans and Advances (Assets)`,`Empréstimos e Adiantamentos (Activos)`
-`Locale`,`Locale`
-`Logo`,`Logótipo`
-`MIME Type`,`Tipo MIME`
-`Make Payment`,`Fazer pagamento`
-`Marketing Expenses`,`Despesas de Marketing`
-`Message`,`Mensagem`
-`Miscellaneous Expenses`,`Despesas Diversas`
-`Mobile Number`,`Número de telemóvel`
-`Month`,`Mês`
-`Name`,`Nome`
-`Net Total`,`Total líquido`
-`Net Total (Company Currency)`,`Total líquido (Moeda da empresa)`
-`New Account`,`Nova conta`
-`New Bill`,`Nova Lei`
-`New File`,`Novo ficheiro`
-`New Invoice`,`Nova Factura`
-`New Journal Entry`,`Nova entrada no diário`
-`New version available`,`Nova versão disponível`
-`No`,`Não`
-`No expenses in this period`,`Sem despesas durante este período`
-`No filters selected`,`Sem filtros seleccionados`
-`No results found.`,`Não foram encontrados resultados.`
-`No transactions yet`,`Nenhuma transacção ainda`
-`No updates available`,`Não há actualizações disponíveis`
-`Notes`,`Notas`
-`Number Series`,`Série Numérica`
-`Office Equipments`,`Equipamentos de escritório`
-`Office Maintenance Expenses`,`Despesas de manutenção do escritório`
-`Office Rent`,`Aluguer de escritórios`
-`Onboarding Complete`,`A bordo Completo`
-`Open Folder`,`Pasta Aberta`
-`Opening (Cr)`,`Abertura (Cr)`
-`Opening (Dr)`,`Abertura (Dr)`
-`Opening Balance Equity`,`Saldo inicial Equidade`
-`Opening Balances`,`Balanços de abertura`
-`Organisation`,`Organização`
-`Outflow`,`Saída`
-`Outstanding Amount`,`Montante em Destaque`
-`PDF`,`PDF`
-`Paid`,`Pago`
-`Parent`,`Pai`
-`Parent Account`,`Conta dos Pais`
-`Party`,`Festa`
-`Password`,`Senha`
-`Payable Account`,`Conta a pagar`
-`Payment`,`Pagamento`
-`Payment Account`,`Conta de pagamento`
-`Payment For`,`Pagamento por`
-`Payment Method`,`Forma de pagamento`
-`Payment Reference`,`Referência de pagamento`
-`Payment Settings`,`Configurações de pagamento`
-`Payment Type`,`Tipo de pagamento`
-`Payment amount cannot be ${0}.`,`O montante do pagamento não pode ser de ${0}.`
-`Payment amount cannot be less than zero.`,`O montante de pagamento não pode ser inferior a zero.`
-`Payment amount cannot exceed ${0}.`,`O montante do pagamento não pode exceder ${0}.`
-`Payment amount: ${0} should be greater than 0.`,`Montante do pagamento: ${0} deve ser superior a 0.`
-`Payment amount: ${0} should be less than Outstanding amount: ${1}.`,`Montante do pagamento: ${0} deve ser inferior ao Montante por pagar: ${1}.`
-`Payments`,`Pagamentos`
-`Payroll Payable`,`Folha de pagamento a pagar`
-`Periodicity`,`Periodicidade`
-`Phone`,`Telefone`
-`Place`,`Lugar`
-`Place of Supply`,`Local de fornecimento`
-`Place of supply`,`Local de fornecimento`
-`Plants and Machineries`,`Fábricas e maquinarias`
-`Please fill all values`,`Por favor preencha todos os valores`
-`Please select an existing database or create a new one.`,`Por favor seleccione uma base de dados existente ou crie uma nova.`
-`Please set GSTIN in General Settings.`,`Por favor, defina GSTIN em Definições Gerais.`
-`Postal Code`,`Código Postal`
-`Postal Expenses`,`Despesas de correio`
-`Posting Date`,`Data de lançamento`
-`Prefix`,`Prefixo`
-`Prevent errors from showing and automatically report all errors.`,`Impedir que os erros sejam mostrados e reportar automaticamente todos os erros.`
-`Print`,`Imprimir`
-`Print Format`,`Formato de impressão`
-`Print PDF`,`Imprimir PDF`
-`Print Settings`,`Definições de impressão`
-`Print and Stationery`,`Impressão e papelaria`
-`Profit And Loss`,`Lucro e Perda`
-`Profit and Loss`,`Lucros e perdas`
-`Purchase`,`Compra`
-`Purchase Order`,`Ordem de compra`
-`Purchase Order Settings`,`Definições de Pedidos de Compra`
-`Purchase Receipt`,`Recibo de compra`
-`Purchase Receipt Settings`,`Definições de recibos de compra`
-`PurchaseInvoice`,`CompraFactura`
-`Purchases`,`Compras`
-`Quantity`,`Quantidade`
-`Quantity (${0}) cannot be less than zero.`,`A quantidade (${0}) não pode ser inferior a zero.`
-`Quotation`,`Citação`
-`Quotation Settings`,`Definições de cotações`
-`Rate`,`Taxa`
-`Rate (${0}) cannot be less zero.`,`A taxa (${0}) não pode ser menos zero.`
-`Rate (Company Currency)`,`Taxa (Moeda da empresa)`
-`Re-Open`,`Re-Open`
-`Receivable Account`,`Conta a receber`
-`Recent Invoices`,`Facturas recentes`
-`Reconcile`,`Reconciliar`
-`Ref. / Cheque No.`,`Ref. / Nº Cheque`
-`Ref. Date`,`Ref. Data`
-`Ref. Name`,`Ref. Nome`
-`Ref. Type`,`Ref. Tipo`
-`Ref/Cheque ID`,`Ref/Cheque ID`
-`Reference Date`,`Data de referência`
-`Reference DocType`,`Tipo DocType de referência`
-`Reference Field`,`Campo de referência`
-`Reference Name`,`Nome de referência`
-`Reference Number`,`Número de referência`
-`Reference Type`,`Tipo de referência`
-`Reload App`,`Recarregar aplicação`
-`Report Error`,`Comunicar erro`
-`Reports`,`Relatórios`
-`Reset Filters`,`Filtros de reinicialização`
-`Retained Earnings`,`Rendimentos retidos`
-`Reverse Charge`,`Carga inversa`
-`Reverse Chrg.`,`Reverter Chrg.`
-`Reverted`,`Revertido`
-`Review Accounts`,`Revisar contas`
-`Role`,`Papel`
-`Roles`,`Papéis`
-`Root Type`,`Tipo de Raiz`
-`Round Off`,`Arredondar`
-`Round Off Account`,`Conta de Arredondamento`
-`SMTP Host`,`Hospedeiro SMTP`
-`SMTP Port`,`Porto SMTP`
-`Salary`,`Salário`
-`Sales`,`Vendas`
-`Sales Expenses`,`Despesas de vendas`
-`Sales Order`,`Ordem de venda`
-`Sales Order Settings`,`Definições de ordens de venda`
-`SalesInvoice`,`SalesInvoice`
-`SalesInvoice Settings`,`Definições de facturação de vendas`
-`Save`,`Guardar`
-`Save & Close`,`Guardar e Fechar`
-`Save as PDF`,`Guardar como PDF`
-`Save as PDF Successful`,`Guardar como PDF Bem sucedido`
-`Saving`,`Salvar`
-`Schedule`,`Horário`
-`Secured Loans`,`Empréstimos Garantidos`
-`Securities and Deposits`,`Títulos e Depósitos`
-`Select Folder`,`Seleccione Pasta`
-`Select Image`,`Seleccionar imagem`
-`Select Logo`,`Seleccionar logótipo`
-`Select a file to load the company transactions`,`Seleccione um ficheiro para carregar as transacções da empresa`
-`Select file`,`Seleccionar ficheiro`
-`Select folder`,`Seleccionar pasta`
-`Send`,`Enviar`
-`Service`,`Serviço`
-`Set the local code. This is used for number formatting.`,`Definir o código local, este é utilizado para a formatação de números.`
-`Sets how many digits are shown after the decimal point.`,`Define quantos dígitos são mostrados após a vírgula decimal.`
-`Sets the app-wide date display format.`,`Define o formato de exibição da data em toda a aplicação.`
-`Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.`,`Define a precisão interna utilizada para os cálculos monetários. Acima de 6 deve ser suficiente para a maioria das moedas.`
-`Setting Up...`,`Montagem...`
-`Settings`,`Definições`
-`Settings changes will be visible on reload`,`As alterações de definições serão visíveis na recarga`
-`Setup`,`Configuração`
-`Setup Complete`,`Configuração Completa`
-`Setup Wizard`,`Assistente de Configuração`
-`Setup your organization`,`Configure a sua organização`
-`Setup Your Workspace`,`Configure o seu espaço de trabalho`
-`Smallest Currency Fraction Value`,`Menor valor de fracção da moeda`
-`Softwares`,`Aplicações informáticas`
-`Something has gone terribly wrong. Please check the console and raise an issue.`,`Algo correu terrivelmente mal. Por favor, verifique a consola e levante um problema.`
-`Source of Funds (Liabilities)`,`Fonte de Fundos (Passivo)`
-`Start Time`,`Hora de início`
-`State`,`Estado`
-`State Tax`,`Imposto de Estado`
-`State/UT Tax Paid`,`Estado/UT Imposto pago`
-`Status`,`Estado`
-`Stock Adjustment`,`Ajuste de stock`
-`Stock Assets`,`Activos em stock`
-`Stock Expenses`,`Despesas de stock`
-`Stock In Hand`,`Estoque em Mão`
-`Stock Liabilities`,`Passivos de Stock`
-`Stock Received But Not Billed`,`Estoque Recebido Mas Não Faturado`
-`Subject`,`Assunto`
-`Submit`,`Submeter`
-`Submitted`,`Submetido`
-`Subtotal`,`Subtotal`
-`Supplier`,`Fornecedor`
-`Supplier Created`,`Fornecedor Criado`
-`Supplier Currency`,`Moeda do Fornecedor`
-`Supplier Name`,`Nome do fornecedor`
-`Suppliers`,`Fornecedores`
-`Symbol`,`Símbolo`
-`System`,`Sistema`
-`System Settings`,`Configurações do sistema`
-`System Setup`,`Configuração do sistema`
-`Tax`,`Imposto`
-`Tax Account`,`Conta Fiscal`
-`Tax Assets`,`Bens fiscais`
-`Tax Detail`,`Pormenores fiscais`
-`Tax ID`,`Identificação fiscal`
-`Taxable Value`,`Valor tributável`
-`Taxes`,`Impostos`
-`Telephone Expenses`,`Gastos telefónicos`
-`Template`,`Modelo`
-`Template could not be saved.`,`O modelo não pôde ser salvo.`
-`Template saved successfully.`,`Modelo guardado com sucesso.`
-`Temporary Accounts`,`Contas temporárias`
-`Temporary Opening`,`Abertura Temporária`
-`Terms`,`Termos`
-`Theme Color`,`Tema Cor`
-`This action is permanent`,`Esta acção é permanente`
-`This action is permanent and will cancel the following payment: ${0}`,`Esta acção é permanente e irá cancelar o seguinte pagamento: ${0}`
-`This action is permanent and will cancel the following payments: ${0}`,`Esta acção é permanente e irá cancelar os seguintes pagamentos: ${0}`
-`Title`,`Título`
-`To`,`Para`
-`To Account`,`Para contabilizar`
-`To Date`,`Até à data`
-`To Do`,`A Fazer`
-`Top Expenses`,`Despesas de topo`
-`Total Spending`,`Gastos totais`
-`Total Tax`,`Imposto total`
-`Transfer Type`,`Tipo de transferência`
-`Travel Expenses`,`Despesas de viagem`
-`Trial Balance`,`Balanço do ensaio`
-`Type`,`Tipo`
-`Unit Type`,`Tipo de unidade`
-`Unpaid`,`Não pago`
-`Unsecured Loans`,`Empréstimos não garantidos`
-`Update downloaded`,`Actualização descarregada`
-`User ID`,`Identificação do utilizador`
-`User Remark`,`Observação do utilizador`
-`Username`,`Nome de utilizador`
-`Utility Expenses`,`Despesas de utilidades`
-`Value`,`Valor`
-`Value missing for ${0}`,`Valor em falta por ${0}`
-`Version ${0} available`,`Versão ${0} disponível`
-`View Bills`,`Ver facturas`
-`View Invoices`,`Ver facturas`
-`Welcome to Frappe Books`,`Bem-vindo à Frappe Books`
-`Write Off`,`Anular`
-`Write Off / Refund`,`Anulação / Reembolso`
-`Write Off Account`,`Anulação de conta`
-`Year`,`Ano`
-`Yes`,`Sim`
-`Your Name`,`O seu nome`
-`name`,`nome`
\ No newline at end of file
+"${0} ${1} already exists.","${0} ${1} já existe.",
+"${0} ${1} has been modified after loading",,
+"${0} ${1} is linked with existing records.","${0} ${1} está ligado aos registos existentes.",
+"${0} already exists.",,
+"${0} filters applied","${0} filtros aplicados",
+"${0} rows",,
+"* required fields",,
+0%,,
+03-23-2022,,
+03/23/2022,,
+"1 filter applied","1 filtro aplicado",
+2022-03-23,,
+"23 Mar, 2022",,
+23-03-2022,,
+23/03/2022,,
+9888900000,,
+Account,Conta,
+"Account Entries","Entradas de conta",
+"Account Name","Nome da conta",
+"Account Type","Tipo de conta",
+"Accounting Ledger Entry",,
+"Accounting Settings","Configurações de contabilidade",
+Accounts,Contas,
+"Accounts Payable","Contas a pagar",
+"Accounts Receivable","Contas a Receber",
+"Accumulated Depreciation","Depreciação Acumulada",
+"Add Account","Adicionar conta",
+"Add Customers","Adicionar clientes",
+"Add Group","Adicionar grupo",
+"Add Items","Adicionar artigos",
+"Add Row","Adicionar Fileira",
+"Add Suppliers","Adicionar Fornecedores",
+"Add Taxes","Acrescentar Impostos",
+"Add a few customers to create your first invoice",,
+"Add a few suppliers to create your first bill",,
+"Add a filter","Acrescentar um filtro",
+"Add a remark",,
+"Add invoice terms",,
+"Add products or services that you buy from your suppliers",,
+"Add products or services that you sell to your customers",,
+Address,Endereço,
+"Address Display","Exibição de endereços",
+"Address Line 1","Linha de endereço 1",
+"Address Line 2","Linha de endereço 2",
+"Administrative Expenses","Despesas administrativas",
+All,,
+"Allow Telemetry",,
+Amount,Montante,
+"Amount (Company Currency)","Quantia (Moeda da empresa)",
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Montante: ${0} e anulação: ${1} é menor do que o montante total atribuído às referências: ${2}.",
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","Montante: ${0} é menor do que o montante total atribuído às referências: ${1}.",
+"An error occurred.","Ocorreu um erro.",
+"Anonymized Telemetry",,
+"Application of Funds (Assets)","Aplicação de Fundos (Activos)",
+Arial,,
+"Ascending Order",,
+Asset,,
+"Assign Imported Labels",,
+Back,Voltar,
+"Bad import data.",,
+Balance,Balanço,
+"Balance Sheet",Balanço,
+Bank,,
+"Bank Accounts","Contas bancárias",
+"Bank Entry",,
+"Bank Name","Nome do Banco",
+"Bank Overdraft Account","Conta de descoberto bancário",
+"Base Error",,
+"Based On",,
+Basic,,
+"Basic I",,
+"Basic II",,
+Bill,Lei,
+"Bill Created","Projecto de Lei Criado",
+"Bill No","Projecto de Lei n",
+Black,Preto,
+Blue,,
+Both,,
+Buildings,Edifícios,
+Business,,
+Cancel,Cancelar,
+"Cancel ${0} ${1}?",,
+Cancelled,Cancelado,
+"Cannot Commit Error",,
+"Capital Equipments","Equipamentos de Capital",
+"Capital Stock","Capital social",
+Cash,Dinheiro,
+"Cash Entry",,
+"Cash In Hand","Dinheiro em Mão",
+Cashflow,Cashflow,
+"Central Tax","Imposto Central",
+"Change File",,
+"Change Ref Type",,
+Chargeable,,
+"Chart Of Accounts Reviewed","Plano de Contas Revisado",
+"Chart of Accounts","Plano de contas",
+"Check for Updates",,
+"Checking for updates","Verificação de actualizações",
+Cheque,,
+"City / Town","Cidade / Cidade",
+Clear,,
+"Clearance Date","Data de Apuramento",
+"Click to create","Clique para criar",
+Close,Fechar,
+Closing,,
+"Closing (Cr)","Encerramento (Cr)",
+"Closing (Dr)","Encerramento (Dr)",
+Color,Cor,
+"Commission on Sales","Comissão de Vendas",
+Common,Comum,
+"Common Items",,
+"Company Address","Endereço da empresa",
+"Company Logo","Logótipo da empresa",
+"Company Name","Nome da empresa",
+"Company Settings","Configurações da empresa",
+"Company Setup","Constituição de empresa",
+Completed,Concluído,
+Condition,,
+"Consolidate Columns",,
+Contains,Contém,
+"Contra Entry",,
+"Cost of Goods Sold","Custo dos bens vendidos",
+"Could not import ${0} ${1}.",,
+"Could not select file.",,
+Country,País,
+"Country Code",,
+"Country code used to initialize regional settings.",,
+Courier,,
+Cr.,,
+Create,Criar,
+"Create Bill","Criar conta",
+"Create Demo",,
+"Create Invoice","Criar Factura",
+"Create Purchase",,
+"Create Sale",,
+"Create a new file and store it in your computer.","Crie um novo ficheiro e guarde-o no seu computador.",
+"Create a new file or select an existing one from your computer","Crie um novo ficheiro ou seleccione um já existente a partir do seu computador",
+"Create your first bill and mail it to your supplier",,
+"Create your first invoice and mail it to your customer",,
+Created,,
+"Created By",,
+"Creating Items and Parties",,
+"Creating Journal Entries",,
+"Creating Purchase Invoices",,
+Credit,Crédito,
+"Credit Card Entry",,
+"Credit Note",,
+Creditors,Credores,
+Currency,Moeda,
+"Currency Name","Nome da moeda",
+Current,Actual,
+"Current Assets","Activos correntes",
+"Current Liabilities","Passivo corrente",
+"Custom Hex","Hextrus personalizados",
+Customer,Cliente,
+"Customer Created","Cliente Criado",
+"Customer Currency","Moeda do cliente",
+Customers,Clientes,
+Customise,Personalizar,
+"Customize your invoices by adding a logo and address details",,
+Dashboard,"Painel de instrumentos",
+"Data Import","Importação de dados",
+"Database Error",,
+"Database file: ${0}",,
+Date,Data,
+"Date Format","Formato da data",
+Day,,
+Debit,Débito,
+"Debit Note",,
+Debtors,Devedores,
+"Default Account","Conta por defeito",
+Delete,Eliminar,
+"Delete ${0} ${1}?",,
+"Delete ${0}?",,
+Depreciation,Depreciação,
+"Depreciation Entry",,
+Description,Descrição,
+Details,Detalhes,
+"Direct Expenses","Despesas directas",
+"Direct Income","Rendimento directo",
+"Disables telemetry. No data will be collected, you are completely invisble to us.",,
+"Display Logo in Invoice","Mostrar logótipo na factura",
+"Display Precision","Precisão de visualização",
+"Display Precision should have a value between 0 and 9.","Mostrar Precisão deve ter um valor entre 0 e 9.",
+"Dividends Paid","Dividendos pagos",
+Docs,,
+Documentation,Documentação,
+"Does Not Contain","Não Contém",
+"Don't Log Anything",,
+"Don't Log Usage",,
+"Download Update","Descarregar Actualização",
+"Downloading update",,
+Dr.,,
+Draft,,
+Duplicate,,
+"Duplicate ${0} ${1}?",,
+"Duplicate Entry Error",,
+"Duties and Taxes","Deveres e Impostos",
+"Earnest Money","Ganhar dinheiro",
+Edit,Editar,
+"Electronic Equipments","Equipamentos electrónicos",
+Email,Email,
+"Email Address","Endereço de correio electrónico",
+Empty,Vazio,
+"Enables telemetry. Does not include usage patterns.",,
+"Enables telemetry. Includes usage patterns.",,
+"Enter Country to load States",,
+"Enter State",,
+"Entertainment Expenses","Despesas de Entretenimento",
+"Entry No",,
+"Entry Type","Tipo de entrada",
+Equity,Equidade,
+Error,Erro,
+Error:,Erro:,
+"Exchange Gain/Loss","Ganho/perda cambial",
+"Exchange Rate","Taxa de Câmbio",
+"Excise Entry",,
+"Existing File","Arquivo Existente",
+Expense,Despesa,
+"Expense Account",,
+Expenses,Despesas,
+"Expenses Included In Valuation","Despesas Incluídas na Avaliação",
+Export,,
+"Export Successful","Exportação bem sucedida",
+Fax,Fax,
+Field,,
+Fieldname,Fieldname,
+"File selection failed.",,
+Filter,Filtro,
+"Fiscal Year",,
+"Fiscal Year End Date","Data de Fim do Ano Fiscal",
+"Fiscal Year Start Date","Data de início do ano fiscal",
+"Fixed Asset",,
+"Fixed Assets","Bens fixos",
+Font,Fonte,
+For,Para,
+"Forbidden Error",,
+Fraction,Fracção,
+"Fraction Units","Unidades de Fracção",
+"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
+"Freight and Forwarding Charges","Taxas de frete e de encaminhamento",
+"From Account","De Conta",
+"From Date","A partir de Data",
+"From Year",,
+"Full Name","Nome completo",
+"Furnitures and Fixtures","Móveis e equipamentos",
+"GSTIN No.","GSTIN No.",
+GSTR1,GSTR1,
+GSTR2,GSTR2,
+"Gain/Loss on Asset Disposal","Ganho/Perda na Alienação de Bens",
+General,Geral,
+"General Ledger","General Ledger",
+"Get Started","Comece a trabalhar",
+Gram,,
+"Grand Total","Total geral",
+"Grand Total (Company Currency)","Total Geral (Moeda da Empresa)",
+"Greater Than","Maior do que",
+Green,,
+"Group By",,
+HSN/SAC,HSN/SAC,
+"HSN/SAC Code",,
+"Half Yearly",,
+"Half Years",,
+"Hello there! 👋",,
+"Hex Value","Valor hexadecimal",
+"Hide Get Started","Esconder Começar a Esconder",
+"Hide Group Amounts",,
+"Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.","Esconde a secção ""Começar"" da barra lateral. A alteração será visível no reinício ou na actualização da aplicação.",
+Hour,,
+"How to Use Data Import",,
+"I can't find my language.",,
+INR,,
+Image,Imagem,
+"Import Data",,
+"Import Failed",,
+"Import More",,
+"Import Success",,
+"Import Type",,
+"Importer Settings",,
+"Include Cancelled",,
+Income,Rendimento,
+"Income Account",,
+Indigo,,
+"Indirect Expenses","Gastos Indirectos",
+"Indirect Income","Rendimento indirecto",
+Inflow,Influxo,
+"Install Update","Instalar Actualização",
+Inter,,
+"Intergrated Tax","Impostos entrelaçados",
+"Internal Precision","Precisão Interna",
+"Invalid value ${0} for ${1}",,
+Investments,Investimentos,
+Invoice,Factura,
+"Invoice Created","Criada a factura",
+"Invoice Date","Data de facturação",
+"Invoice No","Factura n",
+"Invoice No.","N.º de facturação",
+"Invoice Setup","Configuração de facturas",
+"Invoice Value","Valor da factura",
+Invoices,Facturas,
+Is,É,
+"Is Empty","Está Vazio",
+"Is Group","É Grupo",
+"Is Not","Não é",
+"Is Not Empty","Não Está Vazio",
+Item,Item,
+"Item Description",,
+"Item Name","Nome do artigo",
+Items,Artigos,
+"John Doe",,
+"Journal Entries",,
+"Journal Entry","Entrada no diário",
+"Journal Entry Account",,
+Kg,,
+"Know More",,
+"Label Index",,
+Language,,
+"Ledger Entries","Entradas de Ledger",
+"Left Index",,
+"Legal Expenses","Despesas legais",
+"Less Than","Menos do que",
+Liability,,
+"Link Validation Error",,
+List,,
+"Load an existing .db file from your computer.","Carregue um ficheiro .db existente a partir do seu computador.",
+"Loading Report...",,
+Loading...,Carregamento...,
+"Loans (Liabilities)","Empréstimos (Passivo)",
+"Loans and Advances (Assets)","Empréstimos e Adiantamentos (Activos)",
+Locale,Locale,
+Logo,Logótipo,
+"Make Entry",,
+"Make Payment","Fazer pagamento",
+"Mandatory Error",,
+"Mar 23, 2022",,
+"Marketing Expenses","Despesas de Marketing",
+Merriweather,,
+Meter,,
+Minimal,,
+"Miscellaneous Expenses","Despesas Diversas",
+Modern,,
+Modified,,
+"Modified By",,
+Monthly,,
+Months,,
+Montserrat,,
+Name,Nome,
+Navigate,,
+"Net Total","Total líquido",
+"Net Total (Company Currency)","Total líquido (Moeda da empresa)",
+"New ${0}",,
+"New Account","Nova conta",
+"New File","Novo ficheiro",
+"New Journal Entry","Nova entrada no diário",
+"New Purchase",,
+"New Purchase Invoice",,
+"New Sale",,
+"New Sales Invoice",,
+"New version available","Nova versão disponível",
+Next,,
+No,Não,
+"No Data to Import",,
+"No Values to be Displayed",,
+"No entries found",,
+"No expenses in this period","Sem despesas durante este período",
+"No filters selected","Sem filtros seleccionados",
+"No labels have been assigned.",,
+"No results found",,
+"No transactions yet","Nenhuma transacção ainda",
+"No updates available","Não há actualizações disponíveis",
+None,,
+"Not Found Error",,
+Notes,Notas,
+"Number Series","Série Numérica",
+"Number of ${0}",,
+"Office Equipments","Equipamentos de escritório",
+"Office Maintenance Expenses","Despesas de manutenção do escritório",
+"Office Rent","Aluguer de escritórios",
+"Onboarding Complete","A bordo Completo",
+"Open Folder","Pasta Aberta",
+"Open Sans",,
+"Opening (Cr)","Abertura (Cr)",
+"Opening (Dr)","Abertura (Dr)",
+"Opening Balance Equity","Saldo inicial Equidade",
+"Opening Balances","Balanços de abertura",
+"Opening Entry",,
+Orange,,
+Organisation,Organização,
+Outflow,Saída,
+"Outstanding Amount","Montante em Destaque",
+Oxygen,,
+"Pad Zeros",,
+Page,,
+Paid,Pago,
+Parent,Pai,
+"Parent Account","Conta dos Pais",
+Party,Festa,
+"Patch Run",,
+Pay,,
+Payable,,
+Payment,Pagamento,
+"Payment For","Pagamento por",
+"Payment Method","Forma de pagamento",
+"Payment No",,
+"Payment Reference","Referência de pagamento",
+"Payment Type","Tipo de pagamento",
+"Payment amount cannot be ${0}.","O montante do pagamento não pode ser de ${0}.",
+"Payment amount cannot be less than zero.","O montante de pagamento não pode ser inferior a zero.",
+"Payment amount cannot exceed ${0}.","O montante do pagamento não pode exceder ${0}.",
+"Payment amount: ${0} should be greater than 0.","Montante do pagamento: ${0} deve ser superior a 0.",
+"Payment amount: ${0} should be less than Outstanding amount: ${1}.","Montante do pagamento: ${0} deve ser inferior ao Montante por pagar: ${1}.",
+Payments,Pagamentos,
+"Payroll Payable","Folha de pagamento a pagar",
+Periodicity,Periodicidade,
+Phone,Telefone,
+Pink,,
+Place,Lugar,
+"Place of supply","Local de fornecimento",
+"Plants and Machineries","Fábricas e maquinarias",
+"Please Wait",,
+"Please assign the following fields ${0}",,
+"Please fill all values","Por favor preencha todos os valores",
+"Please select a file with data to import.",,
+"Please select a valid reference type.",,
+"Please select an option:",,
+"Postal Code","Código Postal",
+"Postal Expenses","Despesas de correio",
+"Posting Date","Data de lançamento",
+Prefix,Prefixo,
+"Prime Bank",,
+Print,Imprimir,
+"Print Settings","Definições de impressão",
+"Print and Stationery","Impressão e papelaria",
+Product,,
+"Profit And Loss","Lucro e Perda",
+"Profit and Loss","Lucros e perdas",
+Purchase,Compra,
+"Purchase Invoice",,
+"Purchase Invoice Item",,
+"Purchase Invoices",,
+"Purchase Item Created",,
+"Purchase Items",,
+"Purchase Payments",,
+Purchases,Compras,
+Purple,,
+Quantity,Quantidade,
+Quarterly,,
+Quarters,,
+Rate,Taxa,
+"Rate (${0}) cannot be less zero.","A taxa (${0}) não pode ser menos zero.",
+"Rate (Company Currency)","Taxa (Moeda da empresa)",
+"Rate can't be negative.",,
+Receivable,,
+Receive,,
+"Recent Invoices","Facturas recentes",
+Red,,
+"Ref Name",,
+"Ref Type",,
+"Ref. / Cheque No.","Ref. / Nº Cheque",
+"Ref. Date","Ref. Data",
+"Ref. Name","Ref. Nome",
+"Ref. Type","Ref. Tipo",
+Reference,,
+"Reference Date","Data de referência",
+"Reference Number","Número de referência",
+"Reference Type","Tipo de referência",
+"Reload App","Recarregar aplicação",
+Report,,
+"Report Error","Comunicar erro",
+"Report Issue",,
+Reports,Relatórios,
+"Required Fields not Assigned",,
+Reset,,
+"Retained Earnings","Rendimentos retidos",
+"Reverse Chrg.","Reverter Chrg.",
+Reverted,Revertido,
+Reverts,,
+"Review Accounts","Revisar contas",
+"Review your chart of accounts, add any account or tax heads as needed",,
+"Right Index",,
+Role,Papel,
+"Root Type","Tipo de Raiz",
+"Round Off",Arredondar,
+"Round Off Account","Conta de Arredondamento",
+Salary,Salário,
+Sales,Vendas,
+"Sales Expenses","Despesas de vendas",
+"Sales Invoice",,
+"Sales Invoice Item",,
+"Sales Invoice Settings",,
+"Sales Invoices",,
+"Sales Invoie",,
+"Sales Item Created",,
+"Sales Items",,
+"Sales Payments",,
+Save,Guardar,
+"Save Option",,
+"Save Template",,
+"Save as PDF","Guardar como PDF",
+"Save as PDF Successful","Guardar como PDF Bem sucedido",
+Saving,Salvar,
+Search,,
+"Secured Loans","Empréstimos Garantidos",
+"Securities and Deposits","Títulos e Depósitos",
+Select,,
+"Select CoA",,
+"Select Color",,
+"Select Country",,
+"Select File",,
+"Select Folder","Seleccione Pasta",
+"Select Image","Seleccionar imagem",
+"Select Logo","Seleccionar logótipo",
+"Select a file for import",,
+"Select file","Seleccionar ficheiro",
+"Select folder","Seleccionar pasta",
+"Select your language",,
+"Selected file",,
+"Send anonymized usage data and error reports to help improve the product.",,
+Service,Serviço,
+"Set Anonymized Telemetry",,
+"Set an Import Type",,
+"Set the display language.",,
+"Set the local code. This is used for number formatting.","`Definir o código local"," este é utilizado para a formatação de números.`"
+"Sets how many digits are shown after the decimal point.","Define quantos dígitos são mostrados após a vírgula decimal.",
+"Sets the app-wide date display format.","Define o formato de exibição da data em toda a aplicação.",
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Define a precisão interna utilizada para os cálculos monetários. Acima de 6 deve ser suficiente para a maioria das moedas.",
+"Setting Up Instance",,
+"Setting Up...",Montagem...,
+Settings,Definições,
+"Settings changes will be visible on reload","As alterações de definições serão visíveis na recarga",
+Setup,Configuração,
+"Setup Complete","Configuração Completa",
+"Setup Wizard","Assistente de Configuração",
+"Setup Your Workspace","Configure o seu espaço de trabalho",
+"Setup system defaults like date format and display precision",,
+"Setup your company information, email, country and fiscal year",,
+"Setup your opening balances before performing any accounting entries",,
+"Setup your organization","Configure a sua organização",
+"Setup your tax templates for your sales or purchase transactions",,
+"Show Me",,
+"Single Value",,
+"Smallest Currency Fraction Value","Menor valor de fracção da moeda",
+Softwares,"Aplicações informáticas",
+"Something has gone terribly wrong. Please check the console and raise an issue.","`Algo correu terrivelmente mal. Por favor"," verifique a consola e levante um problema.`"
+"Source of Funds (Liabilities)","Fonte de Fundos (Passivo)",
+"Standard Chart of Accounts",,
+Start,,
+State,Estado,
+"State Tax","Imposto de Estado",
+Status,Estado,
+Stock,,
+"Stock Adjustment","Ajuste de stock",
+"Stock Assets","Activos em stock",
+"Stock Expenses","Despesas de stock",
+"Stock In Hand","Estoque em Mão",
+"Stock Liabilities","Passivos de Stock",
+"Stock Received But Not Billed","Estoque Recebido Mas Não Faturado",
+Submit,Submeter,
+"Submit Journal Entry?",,
+"Submit Purchase Invoice?",,
+"Submit Sales Invoice?",,
+"Submit on Import",,
+Submitted,Submetido,
+Submitting,,
+Subtotal,Subtotal,
+"Successfully created the following ${0} entries:",,
+Supplier,Fornecedor,
+"Supplier Created","Fornecedor Criado",
+"Supplier Currency","Moeda do Fornecedor",
+Suppliers,Fornecedores,
+Symbol,Símbolo,
+System,Sistema,
+"System Settings","Configurações do sistema",
+"System Setup","Configuração do sistema",
+Tax,Imposto,
+"Tax Account","Conta Fiscal",
+"Tax Assets","Bens fiscais",
+"Tax Detail","Pormenores fiscais",
+"Tax ID","Identificação fiscal",
+"Tax Summary",,
+"Taxable Value","Valor tributável",
+Taxes,Impostos,
+Teal,,
+"Telephone Expenses","Gastos telefónicos",
+Template,Modelo,
+Temporary,,
+"Temporary Accounts","Contas temporárias",
+"Temporary Opening","Abertura Temporária",
+Terms,Termos,
+"The following ${0} entries were created: ${1}",,
+"Theme Color","Tema Cor",
+"This Month",,
+"This Quarter",,
+"This Year",,
+"This action is permanent","Esta acção é permanente",
+"This action is permanent and will cancel the following payment: ${0}","Esta acção é permanente e irá cancelar o seguinte pagamento: ${0}",
+"This action is permanent and will cancel the following payments: ${0}","Esta acção é permanente e irá cancelar os seguintes pagamentos: ${0}",
+"This action is permanent and will delete associated ledger entries.",,
+"This action is permanent.",,
+"Times New Roman",,
+"To Account","Para contabilizar",
+"To Account and From Account can't be the same: ${0}",,
+"To Date","Até à data",
+"To Year",,
+"Top Expenses","Despesas de topo",
+Total,,
+"Total Asset (Debit)",,
+"Total Credit",,
+"Total Debit",,
+"Total Debit: ${0} must be equal to Total Credit: ${1}",,
+"Total Equity (Credit)",,
+"Total Expense (Debit)",,
+"Total Income (Credit)",,
+"Total Liability (Credit)",,
+"Total Profit",,
+"Total Spending","Gastos totais",
+Transfer,,
+"Transfer Type","Tipo de transferência",
+"Travel Expenses","Despesas de viagem",
+"Trial Balance","Balanço do ensaio",
+Type,Tipo,
+"Type to search...",,
+Unit,,
+"Unit Type","Tipo de unidade",
+Unpaid,"Não pago",
+"Unsecured Loans","Empréstimos não garantidos",
+"Until Date",,
+"Update downloaded","Actualização descarregada",
+"User Remark","Observação do utilizador",
+"Utility Expenses","Despesas de utilidades",
+"Validation Error",,
+Value,Valor,
+"Value missing for ${0}","Valor em falta por ${0}",
+"Verify Imported Data",,
+Version,,
+"Version ${0} available","Versão ${0} disponível",
+"View Purchases",,
+"View Sales",,
+"Welcome to Frappe Books","Bem-vindo à Frappe Books",
+"Write Off",Anular,
+"Write Off Account","Anulação de conta",
+"Write Off Account not set. Please set Write Off Account in General Settings",,
+"Write Off Entry",,
+Yearly,,
+Years,,
+Yellow,,
+Yes,Sim,
+"Your Name","O seu nome",
+john@doe.com,,
+reports,,
+setup,,
+"verify the imported data and click on",,
\ No newline at end of file

From 0d6d5860d2638a9790341f2ec12b7109fb8817f0 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 13:35:58 +0530
Subject: [PATCH 138/163] fix: remove spurious dqs

---
 translations/ar.csv    |  6 +++---
 translations/ca-ES.csv |  4 ++--
 translations/de.csv    | 12 ++++++------
 translations/fr.csv    |  2 +-
 translations/pt.csv    |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/translations/ar.csv b/translations/ar.csv
index 56c03304..a48a58c1 100644
--- a/translations/ar.csv
+++ b/translations/ar.csv
@@ -226,7 +226,7 @@ Fax,فاكس,
 Field,,
 Fieldname,"اسم المجال",
 "File selection failed.","فشل اختيار الملف",
-Filter," التصفية`",
+Filter," التصفية",
 "Fiscal Year",,
 "Fiscal Year End Date","تاريخ نهاية السنة المالية",
 "Fiscal Year Start Date","تاريخ بدء السنة المالية",
@@ -447,7 +447,7 @@ Quantity,الكمية,
 Quarterly,,
 Quarters,,
 Rate,معدل,
-"Rate (${0}) cannot be less zero.","لا يمكن أن يكون `السعر (${0}) أقل من صفر.",
+"Rate (${0}) cannot be less zero.","لا يمكن أن يكون السعر (${0}) أقل من صفر.",
 "Rate (Company Currency)","السعر (عملة الشركة)",
 "Rate can't be negative.","لا يمكن أن يكون المعدل سالبًا",
 Receivable,,
@@ -472,7 +472,7 @@ Reports,التقارير,
 "Required Fields not Assigned","الحقول المطلوبة غير معيَّنة",
 Reset,إعادة,
 "Retained Earnings","الأرباح المحتجزة",
-"Reverse Chrg.","`الشحن العكسي",
+"Reverse Chrg.","الشحن العكسي",
 Reverted,"تم إرجاعه",
 Reverts,,
 "Review Accounts","مراجعة الحسابات",
diff --git a/translations/ca-ES.csv b/translations/ca-ES.csv
index 9488d648..e7f6e068 100644
--- a/translations/ca-ES.csv
+++ b/translations/ca-ES.csv
@@ -150,7 +150,7 @@ Currency,Divisa,
 "Currency Name","Nom de la divisa",
 Current,Actual,
 "Current Assets","Actius actuals",
-"Current Liabilities","`Obligacions actuals",
+"Current Liabilities","Obligacions actuals",
 "Custom Hex","Hexadecimal personalitzat",
 Customer,Customer,
 "Customer Created","Client creat",
@@ -532,7 +532,7 @@ Setup,Configuració,
 "Setup Complete","Configuració completa",
 "Setup Wizard","Asistent de configuració",
 "Setup Your Workspace","Configura el teu espai de treball",
-"Setup system defaults like date format and display precision","`Configura els valors predeterminats del sistema com la data"," el format i la visualització`"
+"Setup system defaults like date format and display precision","Configura els valors predeterminats del sistema com la data, el format i la visualització"
 "Setup your company information, email, country and fiscal year",,
 "Setup your opening balances before performing any accounting entries","Configureu els saldos d'obertura abans de realitzar qualsevol entrada comptable",
 "Setup your organization","Configura la teva empresa",
diff --git a/translations/de.csv b/translations/de.csv
index 7da59f9b..92e780c1 100644
--- a/translations/de.csv
+++ b/translations/de.csv
@@ -47,8 +47,8 @@ All,,
 "Allow Telemetry",,
 Amount,Betrag,
 "Amount (Company Currency)","Betrag (Währung des Unternehmens)",
-"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","`Der Betrag: ${0} und Abschreibung: ${1} ist kleiner als der Gesamtbetrag"," der den Referenzen zugeordnet ist: ${2}.`"
-"Amount: ${0} is less than the total amount allocated to references: ${1}.","`Betrag: ${0} ist kleiner als der Gesamtbetrag"," der den Referenzen zugewiesen wurde: ${1}.`"
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Der Betrag: ${0} und Abschreibung: ${1} ist kleiner als der Gesamtbetrag, der den Referenzen zugeordnet ist: ${2}."
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","Betrag: ${0} ist kleiner als der Gesamtbetrag, der den Referenzen zugewiesen wurde: ${1}."
 "An error occurred.","Es ist ein Fehler aufgetreten.",
 "Anonymized Telemetry",,
 "Application of Funds (Assets)","Verwendung der Mittel (Aktiva)",
@@ -520,10 +520,10 @@ Service,Dienst,
 "Set Anonymized Telemetry",,
 "Set an Import Type",,
 "Set the display language.",,
-"Set the local code. This is used for number formatting.","`Legen Sie den lokalen Code fest"," der für die Formatierung der Nummern verwendet wird.`"
-"Sets how many digits are shown after the decimal point.","`Legt fest"," wie viele Ziffern nach dem Dezimalpunkt angezeigt werden.`"
+"Set the local code. This is used for number formatting.","Legen Sie den lokalen Code fest, der für die Formatierung der Nummern verwendet wird."
+"Sets how many digits are shown after the decimal point.","Legt fest, wie viele Ziffern nach dem Dezimalpunkt angezeigt werden."
 "Sets the app-wide date display format.","Legt das app-weite Datumsanzeigeformat fest.",
-"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","`Legt die interne Genauigkeit fest"," die für monetäre Berechnungen verwendet wird. Ein Wert über 6 sollte für die meisten Währungen ausreichend sein.`"
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Legt die interne Genauigkeit fest, die für monetäre Berechnungen verwendet wird. Ein Wert über 6 sollte für die meisten Währungen ausreichend sein."
 "Setting Up Instance",,
 "Setting Up...",Einrichten...,
 Settings,Einstellungen,
@@ -554,7 +554,7 @@ Stock,,
 "Stock Expenses","Ausgaben für Aktien",
 "Stock In Hand",Vorräte,
 "Stock Liabilities",Lagerverbindlichkeiten,
-"Stock Received But Not Billed",`Erhaltener," aber nicht fakturierter Bestand`"
+"Stock Received But Not Billed","Erhaltener, aber nicht fakturierter Bestand"
 Submit,Einreichen,
 "Submit Journal Entry?",,
 "Submit Purchase Invoice?",,
diff --git a/translations/fr.csv b/translations/fr.csv
index 134f3dd4..50e3b03b 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -520,7 +520,7 @@ Service,Service,
 "Set Anonymized Telemetry",,
 "Set an Import Type",,
 "Set the display language.",,
-"Set the local code. This is used for number formatting.","`Définissez le code local"," il est utilisé pour le formatage des numéros.`"
+"Set the local code. This is used for number formatting.","Définissez le code local, il est utilisé pour le formatage des numéros."
 "Sets how many digits are shown after the decimal point.","Définit le nombre de chiffres affichés après le point décimal.",
 "Sets the app-wide date display format.","Définit le format d'affichage de la date pour l'ensemble de l'application.",
 "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Définit la précision interne utilisée pour les calculs monétaires. Une précision supérieure à 6 devrait être suffisante pour la plupart des monnaies.",
diff --git a/translations/pt.csv b/translations/pt.csv
index e429b1dc..e4975164 100644
--- a/translations/pt.csv
+++ b/translations/pt.csv
@@ -520,7 +520,7 @@ Service,Serviço,
 "Set Anonymized Telemetry",,
 "Set an Import Type",,
 "Set the display language.",,
-"Set the local code. This is used for number formatting.","`Definir o código local"," este é utilizado para a formatação de números.`"
+"Set the local code. This is used for number formatting.","Definir o código local"," este é utilizado para a formatação de números."
 "Sets how many digits are shown after the decimal point.","Define quantos dígitos são mostrados após a vírgula decimal.",
 "Sets the app-wide date display format.","Define o formato de exibição da data em toda a aplicação.",
 "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Define a precisão interna utilizada para os cálculos monetários. Acima de 6 deve ser suficiente para a maioria das moedas.",
@@ -541,7 +541,7 @@ Setup,Configuração,
 "Single Value",,
 "Smallest Currency Fraction Value","Menor valor de fracção da moeda",
 Softwares,"Aplicações informáticas",
-"Something has gone terribly wrong. Please check the console and raise an issue.","`Algo correu terrivelmente mal. Por favor"," verifique a consola e levante um problema.`"
+"Something has gone terribly wrong. Please check the console and raise an issue.","Algo correu terrivelmente mal. Por favor, verifique a consola e levante um problema."
 "Source of Funds (Liabilities)","Fonte de Fundos (Passivo)",
 "Standard Chart of Accounts",,
 Start,,

From 48103964349d35d050c37db76a1fdd39942a1957 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 14:35:19 +0530
Subject: [PATCH 139/163] incr: translate schema translateables

---
 fyo/core/dbHandler.ts           | 21 ++++++++++++++---
 fyo/utils/translation.ts        | 40 ++++++++++++++++++++++++++++++++-
 scripts/generateTranslations.ts | 17 ++++++--------
 src/utils/language.ts           |  1 +
 utils/translationHelpers.ts     |  1 +
 utils/types.ts                  |  1 +
 6 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/fyo/core/dbHandler.ts b/fyo/core/dbHandler.ts
index 65e5a5e1..3eab4495 100644
--- a/fyo/core/dbHandler.ts
+++ b/fyo/core/dbHandler.ts
@@ -3,9 +3,12 @@ import { Fyo } from 'fyo';
 import { DatabaseDemux } from 'fyo/demux/db';
 import { ValueError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
+import { translateSchema } from 'fyo/utils/translation';
 import { Field, RawValue, SchemaMap } from 'schemas/types';
 import { getMapFromList } from 'utils';
 import { DatabaseBase, DatabaseDemuxBase, GetAllOptions } from 'utils/db/types';
+import { schemaTranslateables } from 'utils/translationHelpers';
+import { LanguageMap } from 'utils/types';
 import { Converter } from './converter';
 import {
   DatabaseDemuxConstructor,
@@ -26,7 +29,7 @@ export class DatabaseHandler extends DatabaseBase {
   converter: Converter;
   #demux: DatabaseDemuxBase;
   dbPath?: string;
-  schemaMap: Readonly<SchemaMap> = {};
+  #schemaMap: SchemaMap = {};
   observer: Observable<never> = new Observable();
   fieldValueMap: Record<string, Record<string, Field>> = {};
 
@@ -42,6 +45,10 @@ export class DatabaseHandler extends DatabaseBase {
     }
   }
 
+  get schemaMap(): Readonly<SchemaMap> {
+    return this.#schemaMap;
+  }
+
   get isConnected() {
     return !!this.dbPath;
   }
@@ -61,7 +68,7 @@ export class DatabaseHandler extends DatabaseBase {
   }
 
   async init() {
-    this.schemaMap = (await this.#demux.getSchemaMap()) as Readonly<SchemaMap>;
+    this.#schemaMap = (await this.#demux.getSchemaMap()) as SchemaMap;
 
     for (const schemaName in this.schemaMap) {
       const fields = this.schemaMap[schemaName]!.fields!;
@@ -70,9 +77,17 @@ export class DatabaseHandler extends DatabaseBase {
     this.observer = new Observable();
   }
 
+  async translateSchemaMap(languageMap?: LanguageMap) {
+    if (languageMap) {
+      translateSchema(this.#schemaMap, languageMap, schemaTranslateables);
+    } else {
+      this.#schemaMap = (await this.#demux.getSchemaMap()) as SchemaMap;
+    }
+  }
+
   purgeCache() {
     this.dbPath = undefined;
-    this.schemaMap = {};
+    this.#schemaMap = {};
     this.fieldValueMap = {};
   }
 
diff --git a/fyo/utils/translation.ts b/fyo/utils/translation.ts
index 316cebbe..944c275a 100644
--- a/fyo/utils/translation.ts
+++ b/fyo/utils/translation.ts
@@ -1,4 +1,4 @@
-import { LanguageMap } from 'utils/types';
+import { LanguageMap, UnknownMap } from 'utils/types';
 import {
   getIndexFormat,
   getIndexList,
@@ -95,3 +95,41 @@ export function setLanguageMapOnTranslationString(
 ) {
   TranslationString.prototype.languageMap = languageMap;
 }
+
+export function translateSchema(
+  map: UnknownMap | UnknownMap[],
+  languageMap: LanguageMap,
+  translateables: string[]
+) {
+  if (Array.isArray(map)) {
+    for (const item of map) {
+      translateSchema(item, languageMap, translateables);
+    }
+    return;
+  }
+
+  if (typeof map !== 'object') {
+    return;
+  }
+
+  for (const key of Object.keys(map)) {
+    const value = map[key];
+    if (
+      typeof value === 'string' &&
+      translateables.includes(key) &&
+      languageMap[value]?.translation
+    ) {
+      map[key] = languageMap[value].translation;
+    }
+
+    if (typeof value !== 'object') {
+      continue;
+    }
+
+    translateSchema(
+      value as UnknownMap | UnknownMap[],
+      languageMap,
+      translateables
+    );
+  }
+}
diff --git a/scripts/generateTranslations.ts b/scripts/generateTranslations.ts
index 6df7f38e..6460141c 100644
--- a/scripts/generateTranslations.ts
+++ b/scripts/generateTranslations.ts
@@ -1,16 +1,17 @@
 import fs from 'fs/promises';
 import path from 'path';
+import { UnknownMap } from 'utils/types';
 import { generateCSV, parseCSV } from '../utils/csvParser';
 import {
   getIndexFormat,
   getWhitespaceSanitized,
+  schemaTranslateables,
 } from '../utils/translationHelpers';
 
 const translationsFolder = path.resolve(__dirname, '..', 'translations');
 const PATTERN = /(?<!\w)t`([^`]+)`/g;
 
 type Content = { fileName: string; content: string };
-type UnknownMap = Record<string, unknown>;
 
 function shouldIgnore(p: string, ignoreList: string[]): boolean {
   const name = p.split(path.sep).at(-1) ?? '';
@@ -229,11 +230,7 @@ async function getTStringsFromJsonFileList(
       .then((content) => {
         const schema = JSON.parse(content) as Record<string, unknown>;
         const tStrings: string[] = [];
-        pushTStringsFromSchema(schema, tStrings, [
-          'label',
-          'description',
-          'placeholder',
-        ]);
+        pushTStringsFromSchema(schema, tStrings, schemaTranslateables);
         return tStrings;
       })
       .then((ts) => {
@@ -250,11 +247,11 @@ async function getTStringsFromJsonFileList(
 function pushTStringsFromSchema(
   map: UnknownMap | UnknownMap[],
   array: string[],
-  translateable: string[]
+  translateables: string[]
 ) {
   if (Array.isArray(map)) {
     for (const item of map) {
-      pushTStringsFromSchema(item, array, translateable);
+      pushTStringsFromSchema(item, array, translateables);
     }
     return;
   }
@@ -265,7 +262,7 @@ function pushTStringsFromSchema(
 
   for (const key of Object.keys(map)) {
     const value = map[key];
-    if (translateable.includes(key) && typeof value === 'string') {
+    if (translateables.includes(key) && typeof value === 'string') {
       array.push(value);
     }
 
@@ -276,7 +273,7 @@ function pushTStringsFromSchema(
     pushTStringsFromSchema(
       value as UnknownMap | UnknownMap[],
       array,
-      translateable
+      translateables
     );
   }
 }
diff --git a/src/utils/language.ts b/src/utils/language.ts
index 5d67ae95..977547ee 100644
--- a/src/utils/language.ts
+++ b/src/utils/language.ts
@@ -65,6 +65,7 @@ async function fetchAndSetLanguageMap(code: string) {
     showToast({ type: 'error', message });
   } else {
     setLanguageMapOnTranslationString(languageMap);
+    fyo.db.translateSchemaMap(languageMap);
   }
 
   return success;
diff --git a/utils/translationHelpers.ts b/utils/translationHelpers.ts
index 84d7a995..a0ec73ed 100644
--- a/utils/translationHelpers.ts
+++ b/utils/translationHelpers.ts
@@ -1,3 +1,4 @@
+export const schemaTranslateables = ['label', 'description', 'placeholder'];
 export function getIndexFormat(inp: string | string[]) {
   // converts:
   // ['This is an ', ,' interpolated ',' string.'] and
diff --git a/utils/types.ts b/utils/types.ts
index 359e26ee..f3924494 100644
--- a/utils/types.ts
+++ b/utils/types.ts
@@ -1,3 +1,4 @@
+export type UnknownMap = Record<string, unknown>;
 export type Translation = { translation: string; context?: string };
 export type LanguageMap = Record<string, Translation>;
 

From 0951e11cb15df914ba371d7cf98c5654b68a937e Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 17:38:46 +0530
Subject: [PATCH 140/163] incr: move pdf printer to main - fix pdf printing

---
 main/registerIpcMainActionListeners.ts |  4 +-
 main/saveHtmlAsPdf.ts                  | 56 ++++++++++++++++++++++++
 schemas/app/PrintSettings.json         | 10 ++---
 src/pages/PrintView/PrintView.vue      | 29 ++++++++++++-
 src/print.html                         | 13 ------
 src/print.ts                           |  1 -
 src/saveHtmlAsPdf.ts                   | 59 --------------------------
 src/utils/ipcCalls.ts                  | 13 +++++-
 vue.config.js                          |  4 --
 9 files changed, 99 insertions(+), 90 deletions(-)
 create mode 100644 main/saveHtmlAsPdf.ts
 delete mode 100644 src/print.html
 delete mode 100644 src/print.ts
 delete mode 100644 src/saveHtmlAsPdf.ts

diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index 365971d1..a866446b 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -4,12 +4,12 @@ import fs from 'fs/promises';
 import path from 'path';
 import databaseManager from '../backend/database/manager';
 import { Main } from '../main';
-import saveHtmlAsPdf from '../src/saveHtmlAsPdf';
 import { DatabaseMethod } from '../utils/db/types';
 import { DatabaseResponse } from '../utils/ipc/types';
 import { IPC_ACTIONS } from '../utils/messages';
 import { getUrlAndTokenString, sendError } from './contactMothership';
 import { getLanguageMap } from './getLanguageMap';
+import { saveHtmlAsPdf } from './saveHtmlAsPdf';
 
 export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(IPC_ACTIONS.TOGGLE_MAXIMIZE_CURRENT_WINDOW, (event) => {
@@ -46,7 +46,7 @@ export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(
     IPC_ACTIONS.SAVE_HTML_AS_PDF,
     async (event, html, savePath) => {
-      return await saveHtmlAsPdf(html, savePath);
+      return await saveHtmlAsPdf(html, savePath, app);
     }
   );
 
diff --git a/main/saveHtmlAsPdf.ts b/main/saveHtmlAsPdf.ts
new file mode 100644
index 00000000..5f2f798c
--- /dev/null
+++ b/main/saveHtmlAsPdf.ts
@@ -0,0 +1,56 @@
+import { App, BrowserWindow } from 'electron';
+import fs from 'fs/promises';
+import path from 'path';
+
+const PRINT_OPTIONS = {
+  marginsType: 1, // no margin
+  pageSize: 'A4',
+  printBackground: true,
+  printBackgrounds: true,
+  printSelectionOnly: false,
+};
+
+export async function saveHtmlAsPdf(
+  html: string,
+  savePath: string,
+  app: App
+): Promise<boolean> {
+  /**
+   * Store received html as a file in a tempdir,
+   * this will be loaded into the print view
+   */
+  const tempRoot = app.getPath('temp');
+  const filename = path.parse(savePath).name;
+  const htmlPath = path.join(tempRoot, `${filename}.html`);
+  await fs.writeFile(htmlPath, html, { encoding: 'utf-8' });
+
+  const printWindow = getInitializedPrintWindow(htmlPath);
+
+  /**
+   * After the printWindow content is ready, save as pdf and
+   * then close the window and delete the temp html file.
+   */
+  return await new Promise((resolve) => {
+    printWindow.webContents.once('did-finish-load', () => {
+      printWindow.webContents.printToPDF(PRINT_OPTIONS).then((data) => {
+        fs.writeFile(savePath, data).then(() => {
+          printWindow.close();
+          fs.unlink(htmlPath).then(() => {
+            resolve(true);
+          });
+        });
+      });
+    });
+  });
+}
+
+function getInitializedPrintWindow(printFilePath: string) {
+  const printWindow = new BrowserWindow({
+    width: 595,
+    height: 842,
+    show: false,
+  });
+
+  printWindow.loadFile(printFilePath);
+  return printWindow;
+}
diff --git a/schemas/app/PrintSettings.json b/schemas/app/PrintSettings.json
index f8fa835b..53e95871 100644
--- a/schemas/app/PrintSettings.json
+++ b/schemas/app/PrintSettings.json
@@ -115,23 +115,19 @@
       "fieldtype": "Select",
       "options": [
         {
-          "value": "Inter",
-          "label": "Inter"
+          "value": "Arial",
+          "label": "Arial"
         },
         {
           "value": "Times New Roman",
           "label": "Times New Roman"
         },
-        {
-          "value": "Arial",
-          "label": "Arial"
-        },
         {
           "value": "Courier",
           "label": "Courier"
         }
       ],
-      "default": "Inter"
+      "default": "Arial"
     }
   ],
   "quickEditFields": [
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 155a0b63..87e9c895 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -56,6 +56,7 @@ import Button from 'src/components/Button.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import InvoiceTemplate from 'src/components/SalesInvoice/InvoiceTemplate.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm.vue';
+import { fyo } from 'src/initFyo';
 import { makePDF } from 'src/utils/ipcCalls';
 import { IPC_ACTIONS } from 'utils/messages';
 
@@ -77,6 +78,10 @@ export default {
   async mounted() {
     this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
     this.printSettings = await fyo.doc.getSingle('PrintSettings');
+
+    if (fyo.store.isDevelopment) {
+      window.pv = this;
+    }
   },
   computed: {
     printTemplate() {
@@ -84,13 +89,33 @@ export default {
     },
   },
   methods: {
+    constructPrintDocument() {
+      const html = document.createElement('html');
+      const head = document.createElement('head');
+      const body = document.createElement('body');
+      const style = document.getElementsByTagName('style');
+      const styleTags = Array.from(style)
+        .map((s) => s.outerHTML)
+        .join('\n');
+
+      head.innerHTML = [
+        '<meta charset="UTF-8">',
+        '<title>Print Window</title>',
+        styleTags,
+      ].join('\n');
+
+      body.innerHTML = this.$refs.printContainer.innerHTML;
+      html.append(head, body);
+      return html.outerHTML;
+    },
     async makePDF() {
       const savePath = await this.getSavePath();
       if (!savePath) return;
 
-      const html = this.$refs.printContainer.innerHTML;
-      fyo.telemetry.log(Verb.Exported, 'SalesInvoice', { extension: 'pdf' });
+
+      const html = this.constructPrintDocument()
       await makePDF(html, savePath);
+      fyo.telemetry.log(Verb.Exported, 'SalesInvoice', { extension: 'pdf' });
     },
     async getSavePath() {
       const options = {
diff --git a/src/print.html b/src/print.html
deleted file mode 100644
index ac820892..00000000
--- a/src/print.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="UTF-8">
-  <title>Print</title>
-</head>
-
-<body>
-  <div class="printTarget"></div>
-</body>
-
-</html>
diff --git a/src/print.ts b/src/print.ts
deleted file mode 100644
index 65ff9a5a..00000000
--- a/src/print.ts
+++ /dev/null
@@ -1 +0,0 @@
-import './styles/index.css';
diff --git a/src/saveHtmlAsPdf.ts b/src/saveHtmlAsPdf.ts
deleted file mode 100644
index ead6de7a..00000000
--- a/src/saveHtmlAsPdf.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { BrowserWindow } from 'electron';
-import fs from 'fs/promises';
-import { sleep } from 'utils';
-
-const PRINT_OPTIONS = {
-  marginsType: 1, // no margin
-  pageSize: 'A4',
-  printBackground: true,
-  printBackgrounds: true,
-  printSelectionOnly: false,
-};
-
-export default async function saveHtmlAsPdf(
-  html: string,
-  savePath: string
-): Promise<void> {
-  const printWindow = getInitializedPrintWindow();
-
-  printWindow.webContents.executeJavaScript(`
-    document.body.innerHTML = \`${html}\`;
-  `);
-
-  return await new Promise((resolve) => {
-    printWindow.webContents.on('did-finish-load', async () => {
-      await sleep(1); // Required else pdf'll be blank.
-
-      const data = await printWindow.webContents.printToPDF(PRINT_OPTIONS);
-      await fs.writeFile(savePath, data);
-
-      resolve();
-    });
-  });
-}
-
-function getInitializedPrintWindow() {
-  const printWindow = new BrowserWindow({
-    width: 595,
-    height: 842,
-    show: false,
-    webPreferences: {
-      contextIsolation: false,
-      nodeIntegration: false,
-    },
-  });
-  const printWindowUrl = getPrintWindowUrl();
-  printWindow.loadURL(printWindowUrl);
-  return printWindow;
-}
-
-function getPrintWindowUrl() {
-  // @ts-ignore
-  let url = global.WEBPACK_DEV_SERVER_URL as string | undefined;
-  if (url) {
-    url = url + 'print';
-  } else {
-    url = 'app://./print.html';
-  }
-  return url;
-}
diff --git a/src/utils/ipcCalls.ts b/src/utils/ipcCalls.ts
index cfc1becc..eeedca72 100644
--- a/src/utils/ipcCalls.ts
+++ b/src/utils/ipcCalls.ts
@@ -26,8 +26,17 @@ export async function showItemInFolder(filePath: string) {
 }
 
 export async function makePDF(html: string, savePath: string) {
-  await ipcRenderer.invoke(IPC_ACTIONS.SAVE_HTML_AS_PDF, html, savePath);
-  showExportInFolder(t`Save as PDF Successful`, savePath);
+  const success = await ipcRenderer.invoke(
+    IPC_ACTIONS.SAVE_HTML_AS_PDF,
+    html,
+    savePath
+  );
+
+  if (success) {
+    showExportInFolder(t`Save as PDF Successful`, savePath);
+  } else {
+    showToast({ message: t`Export Failed`, type: 'error' });
+  }
 }
 
 export async function runWindowAction(name: WindowAction) {
diff --git a/vue.config.js b/vue.config.js
index 77d81bc4..2057545a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -32,10 +32,6 @@ module.exports = {
       entry: 'src/renderer.ts',
       filename: 'index.html',
     },
-    print: {
-      entry: 'src/print.ts',
-      filename: 'print.html',
-    },
   },
   runtimeCompiler: true,
   lintOnSave: process.env.NODE_ENV !== 'production',

From 341c1bb63953aa8169d5f6ca82831424e68a8cdc Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 19 May 2022 23:55:01 +0530
Subject: [PATCH 141/163] incr: remove fs and path calls

---
 main/helpers.ts                         | 46 +++++++++++++++++++++++++
 main/registerIpcMainActionListeners.ts  |  9 +++++
 src/components/Controls/AttachImage.vue | 26 +++++++-------
 src/components/Sidebar.vue              |  8 ++---
 src/pages/DatabaseSelector.vue          | 44 ++++++-----------------
 utils/messages.ts                       |  1 +
 utils/translationHelpers.ts             | 16 ++++++---
 7 files changed, 95 insertions(+), 55 deletions(-)
 create mode 100644 main/helpers.ts

diff --git a/main/helpers.ts b/main/helpers.ts
new file mode 100644
index 00000000..6e674b17
--- /dev/null
+++ b/main/helpers.ts
@@ -0,0 +1,46 @@
+import { constants } from 'fs';
+import fs from 'fs/promises';
+import { ConfigFile, ConfigKeys } from 'fyo/core/types';
+import config from 'utils/config';
+
+interface ConfigFilesWithModified extends ConfigFile {
+  modified: string;
+}
+
+export async function setAndGetCleanedConfigFiles() {
+  const files = config.get(ConfigKeys.Files, []) as ConfigFile[];
+
+  const cleanedFileMap: Map<string, ConfigFile> = new Map();
+  for (const file of files) {
+    const exists = await fs
+      .access(file.dbPath, constants.W_OK)
+      .then(() => true)
+      .catch(() => false);
+
+    const key = `${file.companyName}-${file.dbPath}`;
+    if (!exists || cleanedFileMap.has(key)) {
+      continue;
+    }
+
+    cleanedFileMap.set(key, file);
+  }
+
+  const cleanedFiles = Array.from(cleanedFileMap.values());
+  config.set(ConfigKeys.Files, cleanedFiles);
+  return cleanedFiles;
+}
+
+export async function getConfigFilesWithModified(files: ConfigFile[]) {
+  const filesWithModified: ConfigFilesWithModified[] = [];
+  for (const { dbPath, id, companyName } of files) {
+    const { mtime } = await fs.stat(dbPath);
+    filesWithModified.push({
+      id,
+      dbPath,
+      companyName,
+      modified: mtime.toISOString(),
+    });
+  }
+
+  return filesWithModified;
+}
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index a866446b..ecc11d76 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -9,6 +9,10 @@ import { DatabaseResponse } from '../utils/ipc/types';
 import { IPC_ACTIONS } from '../utils/messages';
 import { getUrlAndTokenString, sendError } from './contactMothership';
 import { getLanguageMap } from './getLanguageMap';
+import {
+  getConfigFilesWithModified,
+  setAndGetCleanedConfigFiles,
+} from './helpers';
 import { saveHtmlAsPdf } from './saveHtmlAsPdf';
 
 export default function registerIpcMainActionListeners(main: Main) {
@@ -120,6 +124,11 @@ export default function registerIpcMainActionListeners(main: Main) {
     await fs.unlink(filePath);
   });
 
+  ipcMain.handle(IPC_ACTIONS.GET_DB_LIST, async (_) => {
+    const files = await setAndGetCleanedConfigFiles();
+    return await getConfigFilesWithModified(files);
+  });
+
   /**
    * Database Related Actions
    */
diff --git a/src/components/Controls/AttachImage.vue b/src/components/Controls/AttachImage.vue
index 201d976e..13f0ce9c 100644
--- a/src/components/Controls/AttachImage.vue
+++ b/src/components/Controls/AttachImage.vue
@@ -57,8 +57,6 @@
 
 <script>
 import { ipcRenderer } from 'electron';
-import fs from 'fs';
-import path from 'path';
 import { fyo } from 'src/initFyo';
 import { IPC_ACTIONS } from 'utils/messages';
 import Base from './Base';
@@ -82,24 +80,28 @@ export default {
         ],
       };
 
-      const { filePaths } = await ipcRenderer.invoke(
-        IPC_ACTIONS.GET_OPEN_FILEPATH,
+      const { name, success, data } = await ipcRenderer.invoke(
+        IPC_ACTIONS.GET_FILE,
         options
       );
-      if (filePaths && filePaths[0]) {
-        let dataURL = await this.getDataURL(filePaths[0]);
-        this.triggerChange(dataURL);
+
+      if (!success) {
+        return;
       }
+
+      const dataURL = await this.getDataURL(name, data);
+      this.triggerChange(dataURL);
     },
-    getDataURL(filePath) {
-      let typedArray = fs.readFileSync(filePath);
-      let extension = path.extname(filePath).slice(1);
-      let blob = new Blob([typedArray.buffer], { type: 'image/' + extension });
+    getDataURL(name, data) {
+      const extension = name.split('.').at(-1);
+      const blob = new Blob([data], { type: 'image/' + extension });
+
       return new Promise((resolve) => {
-        let fr = new FileReader();
+        const fr = new FileReader();
         fr.addEventListener('loadend', () => {
           resolve(fr.result);
         });
+
         fr.readAsDataURL(blob);
       });
     },
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index e3bb8d38..44f72b5a 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -102,7 +102,6 @@
   </div>
 </template>
 <script>
-import path from 'path';
 import Button from 'src/components/Button.vue';
 import { reportIssue } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
@@ -126,10 +125,6 @@ export default {
     appVersion() {
       return fyo.store.appVersion;
     },
-    dbPath() {
-      const splits = fyo.db.dbPath.split(path.sep);
-      return path.join(...splits.slice(splits.length - 2));
-    },
   },
   components: {
     WindowControls,
@@ -178,7 +173,8 @@ export default {
     itemActiveClass(item) {
       let { path: currentRoute, params } = this.$route;
       let routeMatch = currentRoute === item.route;
-      let schemaNameMatch = item.schemaName && params.schemaName === item.schemaName;
+      let schemaNameMatch =
+        item.schemaName && params.schemaName === item.schemaName;
       return routeMatch || schemaNameMatch ? 'bg-white text-blue-500' : '';
     },
     isActiveGroup(group) {
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 66f2d38d..a3232dc9 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -95,7 +95,7 @@
               {{ file.companyName }}
             </p>
             <p class="text-sm text-gray-600">
-              {{ file.modified }}
+              {{ formatDate(file.modified) }}
             </p>
           </div>
           <button
@@ -148,7 +148,6 @@
 <script>
 import { setupDummyInstance } from 'dummy';
 import { ipcRenderer } from 'electron';
-import fs from 'fs';
 import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
 import { addNewFile } from 'fyo/telemetry/helpers';
@@ -175,14 +174,17 @@ export default {
       files: [],
     };
   },
-  mounted() {
-    this.setFiles();
+  async mounted() {
+    await this.setFiles();
 
     if (fyo.store.isDevelopment) {
       window.ds = this;
     }
   },
   methods: {
+    formatDate(isoDate) {
+      return DateTime.fromISO(isoDate).toRelative();
+    },
     async deleteDb(i) {
       const file = this.files[i];
       const vm = this;
@@ -195,7 +197,7 @@ export default {
             label: this.t`Yes`,
             async action() {
               await deleteDb(file.dbPath);
-              vm.setFiles();
+              await vm.setFiles();
             },
           },
           {
@@ -230,18 +232,14 @@ export default {
         fyo.config.get(ConfigKeys.Files, []),
         filePath
       );
+
       fyo.purgeCache();
-      this.setFiles();
+      await this.setFiles();
 
       this.creatingDemo = false;
     },
-    setFiles() {
-      this.files = setAndGetCleanedConfigFiles();
-
-      for (const file of this.files) {
-        const stats = fs.statSync(file.dbPath);
-        file.modified = DateTime.fromJSDate(stats.mtime).toRelative();
-      }
+    async setFiles() {
+      this.files = await ipcRenderer.invoke(IPC_ACTIONS.GET_DB_LIST);
     },
     async newDatabase() {
       if (this.creatingDemo) {
@@ -297,24 +295,4 @@ export default {
     FeatherIcon,
   },
 };
-
-function setAndGetCleanedConfigFiles() {
-  const files = fyo.config
-    .get('files', [])
-    .filter(({ dbPath }) => fs.existsSync(dbPath));
-
-  const deduper = [];
-  const deduped = files.filter(({ companyName, dbPath }) => {
-    const key = `${companyName}-${dbPath}`;
-    if (deduper.includes(key)) {
-      return false;
-    }
-
-    deduper.push(key);
-    return true;
-  });
-
-  fyo.config.set(ConfigKeys.Files, deduped);
-  return deduped;
-}
 </script>
diff --git a/utils/messages.ts b/utils/messages.ts
index ba215949..1ac7fcad 100644
--- a/utils/messages.ts
+++ b/utils/messages.ts
@@ -26,6 +26,7 @@ export enum IPC_ACTIONS {
   GET_FILE = 'get-file',
   GET_CREDS = 'get-creds',
   GET_VERSION = 'get-version',
+  GET_DB_LIST = 'get-db-list',
   DELETE_FILE = 'delete-file',
   // Database messages
   DB_CREATE = 'db-create',
diff --git a/utils/translationHelpers.ts b/utils/translationHelpers.ts
index a0ec73ed..c354d7e5 100644
--- a/utils/translationHelpers.ts
+++ b/utils/translationHelpers.ts
@@ -1,9 +1,17 @@
+/**
+ * Properties of a schema which are to be translated,
+ * irrespective of nesting.
+ */
 export const schemaTranslateables = ['label', 'description', 'placeholder'];
+
 export function getIndexFormat(inp: string | string[]) {
-  // converts:
-  // ['This is an ', ,' interpolated ',' string.'] and
-  // 'This is an ${variableA} interpolated ${variableB} string.'
-  // to 'This is an ${0} interpolated ${1} string.'
+  /**
+   * converts:
+   * ['This is an ', ,' interpolated ',' string.'] and
+   * 'This is an ${variableA} interpolated ${variableB} string.'
+   * to 'This is an ${0} interpolated ${1} string.'
+   */
+
   let string: string | undefined = undefined;
   let snippets: string[] | undefined = undefined;
 

From 288499fd688f0d077b9a19d5246565bbd6523d93 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 20 May 2022 13:09:37 +0530
Subject: [PATCH 142/163] chore: bump electron

---
 package.json  |  2 +-
 vue.config.js |  1 -
 yarn.lock     | 18 +++++++++---------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 5a5d0077..fa60559b 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "autoprefixer": "^9",
     "babel-loader": "^8.2.3",
     "dotenv": "^16.0.0",
-    "electron": "^15.3.5",
+    "electron": "^18.0.0",
     "electron-builder": "^23.0.3",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
diff --git a/vue.config.js b/vue.config.js
index 2057545a..fc014927 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,6 @@ module.exports = {
       externals: ['knex', 'sqlite3'],
       nodeIntegration: true,
       mainProcessFile: 'main.ts',
-      // rendererProcessFile: 'src/renderer.js',
       disableMainProcessTypescript: false,
       mainProcessTypeChecking: true,
       chainWebpackRendererProcess: (config) => {
diff --git a/yarn.lock b/yarn.lock
index 6054d38f..96b31776 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1401,10 +1401,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.8.tgz#50d680c8a8a78fe30abe6906453b21ad8ab0ad7b"
   integrity sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==
 
-"@types/node@^14.6.2":
-  version "14.17.32"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.32.tgz#2ca61c9ef8c77f6fa1733be9e623ceb0d372ad96"
-  integrity sha512-JcII3D5/OapPGx+eJ+Ik1SQGyt6WvuqdRfh9jUwL6/iHGjmyOriBDciBUu7lEIBTL2ijxwrR70WUnw5AEDmFvQ==
+"@types/node@^16.11.26":
+  version "16.11.36"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.36.tgz#9ab9f8276987132ed2b225cace2218ba794fc751"
+  integrity sha512-FR5QJe+TaoZ2GsMHkjuwoNabr+UrJNRr2HNOo+r/7vhcuntM6Ee/pRPOnRhhL2XE9OOvX9VLEq+BcXl3VjNoWA==
 
 "@types/node@^17.0.23":
   version "17.0.23"
@@ -4999,13 +4999,13 @@ electron-updater@^4.3.9:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@^15.3.5:
-  version "15.3.5"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.5.tgz#62fc7d2289d3f47e9e05c0aa9bb6d929a6faf398"
-  integrity sha512-z0/7+p3uZYBmjf7UEVBfcMTVgW6ThGgfI4jdbQ1TH4XOLYkj560/abv91/s8kK0MZ7JQg4KRP1JwQZ4q6+BPFw==
+electron@^18.0.0:
+  version "18.2.4"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-18.2.4.tgz#3ea3392f008ea4bdf66b0e3b2e1769e04370323c"
+  integrity sha512-wSjU2N6kBGyGKb2GgBhujpfKtnmNr+gDaZZ6fMmlVMoPJ+GvuW0Zr1ImKPdb5zPXopPYmaURDSvHuAfSd4oHFA==
   dependencies:
     "@electron/get" "^1.13.0"
-    "@types/node" "^14.6.2"
+    "@types/node" "^16.11.26"
     extract-zip "^1.0.3"
 
 elliptic@^6.5.3:

From 969ec5d7cdffaf86b956c2dfe9e1b25847b0a61b Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 20 May 2022 13:10:21 +0530
Subject: [PATCH 143/163] chore: simple script to create profile log

---
 backend/database/manager.ts | 14 +++++++-------
 scripts/profile.sh          | 15 +++++++++++++++
 scripts/profile.ts          | 22 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100755 scripts/profile.sh
 create mode 100644 scripts/profile.ts

diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 2555a99a..772ec8a1 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -1,3 +1,4 @@
+import { constants } from 'fs';
 import fs from 'fs/promises';
 import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { getSchemas } from '../../schemas';
@@ -105,14 +106,13 @@ export class DatabaseManager extends DatabaseDemuxBase {
   }
 
   async #unlinkIfExists(dbPath: string) {
-    try {
-      fs.unlink(dbPath);
-    } catch (err) {
-      if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
-        return;
-      }
+    const exists = await fs
+      .access(dbPath, constants.W_OK)
+      .then(() => true)
+      .catch(() => false);
 
-      throw err;
+    if (exists) {
+      fs.unlink(dbPath);
     }
   }
 
diff --git a/scripts/profile.sh b/scripts/profile.sh
new file mode 100755
index 00000000..78f7fe6d
--- /dev/null
+++ b/scripts/profile.sh
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# https://nodejs.org/en/docs/guides/simple-profiling/
+
+export TS_NODE_COMPILER_OPTIONS='{"module":"commonjs"}'
+
+rm ./isolate-*-v8.log 2> /dev/null
+rm ./profiler-output.log 2> /dev/null
+
+echo "running profile.ts"
+node --require ts-node/register --require tsconfig-paths/register --prof ./scripts/profile.ts
+
+echo "processing tick file"
+node --prof-process ./isolate-*-v8.log > ./profiler-output.log && echo "generated profiler-output.log"
+rm ./isolate-*-v8.log
\ No newline at end of file
diff --git a/scripts/profile.ts b/scripts/profile.ts
new file mode 100644
index 00000000..34c4557e
--- /dev/null
+++ b/scripts/profile.ts
@@ -0,0 +1,22 @@
+import { DatabaseManager } from 'backend/database/manager';
+import { setupDummyInstance } from 'dummy';
+import { unlink } from 'fs/promises';
+import { Fyo } from 'fyo';
+import { DummyAuthDemux } from 'fyo/tests/helpers';
+import { getTestDbPath } from 'tests/helpers';
+
+async function run() {
+  const fyo = new Fyo({
+    DatabaseDemux: DatabaseManager,
+    AuthDemux: DummyAuthDemux,
+    isTest: true,
+    isElectron: false,
+  });
+  const dbPath = getTestDbPath();
+
+  await setupDummyInstance(dbPath, fyo, 1, 100);
+  await fyo.close();
+  await unlink(dbPath);
+}
+
+run();

From ca5514417ef962a89e4b598ed9c2b117c400ae33 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 20 May 2022 15:36:38 +0530
Subject: [PATCH 144/163] incr: improve db call error handling

---
 fyo/demux/db.ts                        | 111 +++++++++++--------------
 fyo/utils/errors.ts                    |   8 ++
 main/helpers.ts                        |  17 ++++
 main/registerIpcMainActionListeners.ts |  58 ++++---------
 utils/ipc/types.ts                     |   2 +-
 5 files changed, 90 insertions(+), 106 deletions(-)

diff --git a/fyo/demux/db.ts b/fyo/demux/db.ts
index d583c9ca..bad7d31c 100644
--- a/fyo/demux/db.ts
+++ b/fyo/demux/db.ts
@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron';
-import { DEFAULT_COUNTRY_CODE } from 'fyo/utils/consts';
+import { DatabaseError, NotImplemented } from 'fyo/utils/errors';
 import { SchemaMap } from 'schemas/types';
 import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { DatabaseResponse } from 'utils/ipc/types';
@@ -12,101 +12,86 @@ export class DatabaseDemux extends DatabaseDemuxBase {
     this.#isElectron = isElectron;
   }
 
+  async #handleDBCall(func: () => Promise<DatabaseResponse>): Promise<unknown> {
+    const response = await func();
+
+    if (response.error?.name) {
+      const { name, message, stack } = response.error;
+      const dberror = new DatabaseError(message);
+      dberror.name = name;
+      dberror.stack = stack;
+
+      throw dberror;
+    }
+
+    return response.data;
+  }
+
   async getSchemaMap(): Promise<SchemaMap> {
-    let response: DatabaseResponse;
     if (this.#isElectron) {
-      response = await ipcRenderer.invoke(IPC_ACTIONS.DB_SCHEMA);
-    } else {
-      // TODO: API Call
-      response = { error: '', data: undefined };
+      return (await this.#handleDBCall(async function dbFunc() {
+        return await ipcRenderer.invoke(IPC_ACTIONS.DB_SCHEMA);
+      })) as SchemaMap;
     }
 
-    if (response.error) {
-      throw new Error(response.error);
-    }
-
-    return response.data as SchemaMap;
+    throw new NotImplemented();
   }
 
   async createNewDatabase(
     dbPath: string,
     countryCode?: string
   ): Promise<string> {
-    let response: DatabaseResponse;
     if (this.#isElectron) {
-      response = await ipcRenderer.invoke(
-        IPC_ACTIONS.DB_CREATE,
-        dbPath,
-        countryCode
-      );
-    } else {
-      // TODO: API Call
-      response = { error: '', data: undefined };
+      return (await this.#handleDBCall(async function dbFunc() {
+        return await ipcRenderer.invoke(
+          IPC_ACTIONS.DB_CREATE,
+          dbPath,
+          countryCode
+        );
+      })) as string;
     }
 
-    if (response.error) {
-      throw new Error(response.error);
-    }
-
-    return (response.data ?? DEFAULT_COUNTRY_CODE) as string;
+    throw new NotImplemented();
   }
 
   async connectToDatabase(
     dbPath: string,
     countryCode?: string
   ): Promise<string> {
-    let response: DatabaseResponse;
     if (this.#isElectron) {
-      response = await ipcRenderer.invoke(
-        IPC_ACTIONS.DB_CONNECT,
-        dbPath,
-        countryCode
-      );
-    } else {
-      // TODO: API Call
-      response = { error: '', data: undefined };
+      return (await this.#handleDBCall(async function dbFunc() {
+        return await ipcRenderer.invoke(
+          IPC_ACTIONS.DB_CONNECT,
+          dbPath,
+          countryCode
+        );
+      })) as string;
     }
 
-    if (response.error) {
-      throw new Error(response.error);
-    }
-
-    return (response.data ?? DEFAULT_COUNTRY_CODE) as string;
+    throw new NotImplemented();
   }
 
   async call(method: DatabaseMethod, ...args: unknown[]): Promise<unknown> {
-    let response: DatabaseResponse;
     if (this.#isElectron) {
-      response = await ipcRenderer.invoke(IPC_ACTIONS.DB_CALL, method, ...args);
-    } else {
-      // TODO: API Call
-      response = { error: '', data: undefined };
+      return (await this.#handleDBCall(async function dbFunc() {
+        return await ipcRenderer.invoke(IPC_ACTIONS.DB_CALL, method, ...args);
+      })) as unknown;
     }
 
-    if (response.error) {
-      throw new Error(response.error);
-    }
-
-    return response.data;
+    throw new NotImplemented();
   }
 
   async callBespoke(method: string, ...args: unknown[]): Promise<unknown> {
-    let response: DatabaseResponse;
     if (this.#isElectron) {
-      response = await ipcRenderer.invoke(
-        IPC_ACTIONS.DB_BESPOKE,
-        method,
-        ...args
-      );
-    } else {
-      // TODO: API Call
-      response = { error: '', data: undefined };
+      return (await this.#handleDBCall(async function dbFunc() {
+        return await ipcRenderer.invoke(
+          IPC_ACTIONS.DB_BESPOKE,
+          method,
+          ...args
+        );
+      })) as unknown;
     }
 
-    if (response.error) {
-      throw new Error(response.error);
-    }
-
-    return response.data;
+    throw new NotImplemented();
   }
 }
diff --git a/fyo/utils/errors.ts b/fyo/utils/errors.ts
index 9ca6cdad..f323b644 100644
--- a/fyo/utils/errors.ts
+++ b/fyo/utils/errors.ts
@@ -78,6 +78,14 @@ export class CannotCommitError extends DatabaseError {
   }
 }
 
+export class NotImplemented extends BaseError {
+  constructor() {
+    super(501, '');
+    this.label = t`Not Implemented`;
+    this.name = 'NotImplemented';
+  }
+}
+
 export class ValueError extends ValidationError {}
 export class ConflictError extends ValidationError {}
 export class InvalidFieldError extends ValidationError {}
diff --git a/main/helpers.ts b/main/helpers.ts
index 6e674b17..34dda83b 100644
--- a/main/helpers.ts
+++ b/main/helpers.ts
@@ -2,6 +2,7 @@ import { constants } from 'fs';
 import fs from 'fs/promises';
 import { ConfigFile, ConfigKeys } from 'fyo/core/types';
 import config from 'utils/config';
+import { DatabaseResponse } from 'utils/ipc/types';
 
 interface ConfigFilesWithModified extends ConfigFile {
   modified: string;
@@ -44,3 +45,19 @@ export async function getConfigFilesWithModified(files: ConfigFile[]) {
 
   return filesWithModified;
 }
+
+export async function getErrorHandledReponse(func: () => Promise<unknown>) {
+  const response: DatabaseResponse = {};
+
+  try {
+    response.data = await func();
+  } catch (err) {
+    response.error = {
+      name: (err as Error).name,
+      message: (err as Error).message,
+      stack: (err as Error).stack,
+    };
+  }
+
+  return response;
+}
diff --git a/main/registerIpcMainActionListeners.ts b/main/registerIpcMainActionListeners.ts
index ecc11d76..ea6438b5 100644
--- a/main/registerIpcMainActionListeners.ts
+++ b/main/registerIpcMainActionListeners.ts
@@ -5,12 +5,12 @@ import path from 'path';
 import databaseManager from '../backend/database/manager';
 import { Main } from '../main';
 import { DatabaseMethod } from '../utils/db/types';
-import { DatabaseResponse } from '../utils/ipc/types';
 import { IPC_ACTIONS } from '../utils/messages';
 import { getUrlAndTokenString, sendError } from './contactMothership';
 import { getLanguageMap } from './getLanguageMap';
 import {
   getConfigFilesWithModified,
+  getErrorHandledReponse,
   setAndGetCleanedConfigFiles,
 } from './helpers';
 import { saveHtmlAsPdf } from './saveHtmlAsPdf';
@@ -136,68 +136,42 @@ export default function registerIpcMainActionListeners(main: Main) {
   ipcMain.handle(
     IPC_ACTIONS.DB_CREATE,
     async (_, dbPath: string, countryCode: string) => {
-      const response: DatabaseResponse = { error: '', data: undefined };
-      try {
-        response.data = await databaseManager.createNewDatabase(
-          dbPath,
-          countryCode
-        );
-      } catch (error) {
-        response.error = (error as Error).toString();
-      }
-
-      return response;
+      return await getErrorHandledReponse(async function dbFunc() {
+        return await databaseManager.createNewDatabase(dbPath, countryCode);
+      });
     }
   );
 
   ipcMain.handle(
     IPC_ACTIONS.DB_CONNECT,
     async (_, dbPath: string, countryCode?: string) => {
-      const response: DatabaseResponse = { error: '', data: undefined };
-      try {
-        response.data = await databaseManager.connectToDatabase(
-          dbPath,
-          countryCode
-        );
-      } catch (error) {
-        response.error = (error as Error).toString();
-      }
-
-      return response;
+      return await getErrorHandledReponse(async function dbFunc() {
+        return await databaseManager.connectToDatabase(dbPath, countryCode);
+      });
     }
   );
 
   ipcMain.handle(
     IPC_ACTIONS.DB_CALL,
     async (_, method: DatabaseMethod, ...args: unknown[]) => {
-      const response: DatabaseResponse = { error: '', data: undefined };
-      try {
-        response.data = await databaseManager.call(method, ...args);
-      } catch (error) {
-        response.error = (error as Error).toString();
-      }
-
-      return response;
+      return await getErrorHandledReponse(async function dbFunc() {
+        return await databaseManager.call(method, ...args);
+      });
     }
   );
 
   ipcMain.handle(
     IPC_ACTIONS.DB_BESPOKE,
     async (_, method: string, ...args: unknown[]) => {
-      const response: DatabaseResponse = { error: '', data: undefined };
-      try {
-        response.data = await databaseManager.callBespoke(method, ...args);
-      } catch (error) {
-        response.error = (error as Error).toString();
-      }
-
-      return response;
+      return await getErrorHandledReponse(async function dbFunc() {
+        return await databaseManager.callBespoke(method, ...args);
+      });
     }
   );
 
   ipcMain.handle(IPC_ACTIONS.DB_SCHEMA, async (_) => {
-    const response: DatabaseResponse = { error: '', data: undefined };
-    response.data = await databaseManager.getSchemaMap();
-    return response;
+    return await getErrorHandledReponse(async function dbFunc() {
+      return await databaseManager.getSchemaMap();
+    });
   });
 }
diff --git a/utils/ipc/types.ts b/utils/ipc/types.ts
index c86fc084..964ff796 100644
--- a/utils/ipc/types.ts
+++ b/utils/ipc/types.ts
@@ -1,4 +1,4 @@
 export interface DatabaseResponse {
-  error: string;
   data?: unknown;
+  error?: { message: string; name: string; stack?: string };
 }

From 905829ca2074cf0a392b7d15eaddec562d299156 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 20 May 2022 16:42:32 +0530
Subject: [PATCH 145/163] chore: switch to better-sqlite3

---
 backend/database/bespoke.ts             |   2 +-
 backend/database/core.ts                |  20 +-
 backend/database/manager.ts             |   2 +-
 backend/database/tests/testCore.spec.ts |   8 +-
 fyo/core/converter.ts                   |   2 +-
 fyo/demux/db.ts                         |   3 +-
 fyo/utils/errors.ts                     |  13 -
 package.json                            |  14 +-
 scripts/profile.sh                      |   9 +-
 scripts/runner.sh                       |  10 +
 src/errorHandling.ts                    |   7 +-
 yarn.lock                               | 725 +++++++++++++++++++++---
 12 files changed, 696 insertions(+), 119 deletions(-)
 create mode 100755 scripts/runner.sh

diff --git a/backend/database/bespoke.ts b/backend/database/bespoke.ts
index 76316dfc..a2655841 100644
--- a/backend/database/bespoke.ts
+++ b/backend/database/bespoke.ts
@@ -65,7 +65,7 @@ export class BespokeQueries {
       .select('name')
       .where('accountType', 'in', ['Cash', 'Bank'])
       .andWhere('isGroup', false);
-    const dateAsMonthYear = db.knex!.raw('strftime("%Y-%m", ??)', 'date');
+    const dateAsMonthYear = db.knex!.raw(`strftime('%Y-%m', ??)`, 'date');
     return await db.knex!('AccountingLedgerEntry')
       .where('reverted', false)
       .sum({
diff --git a/backend/database/core.ts b/backend/database/core.ts
index f5518bb3..bf6675ea 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -59,16 +59,10 @@ export default class DatabaseCore extends DatabaseBase {
     super();
     this.dbPath = dbPath ?? ':memory:';
     this.connectionParams = {
-      client: 'sqlite3',
+      client: 'better-sqlite3',
       connection: {
         filename: this.dbPath,
       },
-      pool: {
-        afterCreate(conn: { run: (query: string) => void }, done: () => void) {
-          conn.run('PRAGMA foreign_keys=ON');
-          done();
-        },
-      },
       useNullAsDefault: true,
       asyncStackTraces: process.env.NODE_ENV === 'development',
     };
@@ -77,7 +71,7 @@ export default class DatabaseCore extends DatabaseBase {
   static async getCountryCode(dbPath: string): Promise<string> {
     let countryCode = 'in';
     const db = new DatabaseCore(dbPath);
-    db.connect();
+    await db.connect();
 
     let query: { value: string }[] = [];
     try {
@@ -101,11 +95,12 @@ export default class DatabaseCore extends DatabaseBase {
     this.schemaMap = schemaMap;
   }
 
-  connect() {
+  async connect() {
     this.knex = knex(this.connectionParams);
     this.knex.on('query-error', (error) => {
       error.type = this.#getError(error);
     });
+    await this.knex.raw('PRAGMA foreign_keys=ON');
   }
 
   async close() {
@@ -113,8 +108,13 @@ export default class DatabaseCore extends DatabaseBase {
   }
 
   async commit() {
+    /**
+     * this auto commits, commit is not required
+     * will later wrap the outermost functions in
+     * transactions.
+     */
     try {
-      await this.knex!.raw('commit');
+      // await this.knex!.raw('commit');
     } catch (err) {
       const type = this.#getError(err as Error);
       if (type !== CannotCommitError) {
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 772ec8a1..6ba6487d 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -29,7 +29,7 @@ export class DatabaseManager extends DatabaseDemuxBase {
     countryCode ??= await DatabaseCore.getCountryCode(dbPath);
 
     this.db = new DatabaseCore(dbPath);
-    this.db.connect();
+    await this.db.connect();
 
     const schemaMap = getSchemas(countryCode);
     this.db.setSchemaMap(schemaMap);
diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index 42c18f89..59f9443a 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -35,8 +35,8 @@ describe('DatabaseCore: Connect Migrate Close', function () {
     assert.strictEqual(schemaMap, db.schemaMap);
   });
 
-  specify('connect', function () {
-    assert.doesNotThrow(() => db.connect());
+  specify('connect', async function () {
+    await assertDoesNotThrow(async () => await db.connect());
     assert.notStrictEqual(db.knex, undefined);
   });
 
@@ -54,7 +54,7 @@ describe('DatabaseCore: Migrate and Check Db', function () {
 
   this.beforeEach(async function () {
     db = new DatabaseCore();
-    db.connect();
+    await db.connect();
     db.setSchemaMap(schemaMap);
   });
 
@@ -147,7 +147,7 @@ describe('DatabaseCore: CRUD', function () {
 
   this.beforeEach(async function () {
     db = new DatabaseCore();
-    db.connect();
+    await db.connect();
     db.setSchemaMap(schemaMap);
     await db.migrate();
   });
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index d519427e..b56ba09b 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -261,7 +261,7 @@ function toDocCheck(value: RawValue, field: Field): boolean {
   }
 
   if (typeof value === 'string') {
-    return value === '1';
+    return !!parseFloat(value);
   }
 
   if (typeof value === 'number') {
diff --git a/fyo/demux/db.ts b/fyo/demux/db.ts
index bad7d31c..c9d050fe 100644
--- a/fyo/demux/db.ts
+++ b/fyo/demux/db.ts
@@ -17,8 +17,7 @@ export class DatabaseDemux extends DatabaseDemuxBase {
 
     if (response.error?.name) {
       const { name, message, stack } = response.error;
-      const dberror = new DatabaseError(message);
-      dberror.name = name;
+      const dberror = new DatabaseError(`${name}\n${message}`);
       dberror.stack = stack;
 
       throw dberror;
diff --git a/fyo/utils/errors.ts b/fyo/utils/errors.ts
index f323b644..7923ecb5 100644
--- a/fyo/utils/errors.ts
+++ b/fyo/utils/errors.ts
@@ -1,13 +1,9 @@
-import { t } from './translation';
-
 export class BaseError extends Error {
-  label: string;
   message: string;
   statusCode: number;
 
   constructor(statusCode: number, message: string) {
     super(message);
-    this.label = t`Base Error`;
     this.name = 'BaseError';
     this.statusCode = statusCode;
     this.message = message;
@@ -17,7 +13,6 @@ export class BaseError extends Error {
 export class ValidationError extends BaseError {
   constructor(message: string) {
     super(417, message);
-    this.label = t`Validation Error`;
     this.name = 'ValidationError';
   }
 }
@@ -25,7 +20,6 @@ export class ValidationError extends BaseError {
 export class NotFoundError extends BaseError {
   constructor(message: string) {
     super(404, message);
-    this.label = t`Not Found Error`;
     this.name = 'NotFoundError';
   }
 }
@@ -33,7 +27,6 @@ export class NotFoundError extends BaseError {
 export class ForbiddenError extends BaseError {
   constructor(message: string) {
     super(403, message);
-    this.label = t`Forbidden Error`;
     this.name = 'ForbiddenError';
   }
 }
@@ -41,7 +34,6 @@ export class ForbiddenError extends BaseError {
 export class DuplicateEntryError extends ValidationError {
   constructor(message: string) {
     super(message);
-    this.label = t`Duplicate Entry Error`;
     this.name = 'DuplicateEntryError';
   }
 }
@@ -49,7 +41,6 @@ export class DuplicateEntryError extends ValidationError {
 export class LinkValidationError extends ValidationError {
   constructor(message: string) {
     super(message);
-    this.label = t`Link Validation Error`;
     this.name = 'LinkValidationError';
   }
 }
@@ -57,7 +48,6 @@ export class LinkValidationError extends ValidationError {
 export class MandatoryError extends ValidationError {
   constructor(message: string) {
     super(message);
-    this.label = t`Mandatory Error`;
     this.name = 'MandatoryError';
   }
 }
@@ -65,7 +55,6 @@ export class MandatoryError extends ValidationError {
 export class DatabaseError extends BaseError {
   constructor(message: string) {
     super(500, message);
-    this.label = t`Database Error`;
     this.name = 'DatabaseError';
   }
 }
@@ -73,7 +62,6 @@ export class DatabaseError extends BaseError {
 export class CannotCommitError extends DatabaseError {
   constructor(message: string) {
     super(message);
-    this.label = t`Cannot Commit Error`;
     this.name = 'CannotCommitError';
   }
 }
@@ -81,7 +69,6 @@ export class CannotCommitError extends DatabaseError {
 export class NotImplemented extends BaseError {
   constructor() {
     super(501, '');
-    this.label = t`Not Implemented`;
     this.name = 'NotImplemented';
   }
 }
diff --git a/package.json b/package.json
index fa60559b..80abd23b 100644
--- a/package.json
+++ b/package.json
@@ -11,25 +11,26 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint",
+    "postinstall": "electron-rebuild",
+    "postuninstall": "electron-rebuild",
     "electron:build": "vue-cli-service electron:build",
     "electron:serve": "vue-cli-service electron:serve",
-    "postinstall": "electron-builder install-app-deps",
-    "postuninstall": "electron-builder install-app-deps",
-    "script:translate": "ts-node -O '{\"module\":\"commonjs\"}' scripts/generateTranslations.ts",
-    "test": "TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --reporter nyan --require ts-node/register --require tsconfig-paths/register ./**/tests/**/*.spec.ts --exit"
+    "script:translate": "scripts/runner.sh scripts/generateTranslations.ts",
+    "script:profile": "scripts/profile.sh",
+    "test": "scripts/runner.sh ./node_modules/.bin/mocha ./**/tests/**/*.spec.ts --exit"
   },
   "dependencies": {
     "@popperjs/core": "^2.10.2",
+    "better-sqlite3": "^7.5.3",
     "core-js": "^3.19.0",
     "csvjson-csv2json": "^5.0.6",
     "electron-store": "^8.0.1",
     "feather-icons": "^4.28.0",
-    "knex": "^0.95.12",
+    "knex": "^2.0.0",
     "lodash": "^4.17.21",
     "luxon": "^2.0.2",
     "node-fetch": "2",
     "pesa": "^1.1.11",
-    "sqlite3": "npm:@vscode/sqlite3@^5.0.7",
     "vue": "^3.2.30",
     "vue-router": "^4.0.12"
   },
@@ -57,6 +58,7 @@
     "electron-builder": "^23.0.3",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
+    "electron-rebuild": "^3.2.7",
     "electron-updater": "^4.3.9",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
diff --git a/scripts/profile.sh b/scripts/profile.sh
index 78f7fe6d..5a4cc4c5 100755
--- a/scripts/profile.sh
+++ b/scripts/profile.sh
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /usr/bin/env zsh
 
 # https://nodejs.org/en/docs/guides/simple-profiling/
 
@@ -7,9 +7,12 @@ export TS_NODE_COMPILER_OPTIONS='{"module":"commonjs"}'
 rm ./isolate-*-v8.log 2> /dev/null
 rm ./profiler-output.log 2> /dev/null
 
+export ELECTRON_RUN_AS_NODE=true
+alias electron_node=./node_modules/.bin/electron
+
 echo "running profile.ts"
-node --require ts-node/register --require tsconfig-paths/register --prof ./scripts/profile.ts
+electron_node --require ts-node/register --require tsconfig-paths/register --prof ./scripts/profile.ts
 
 echo "processing tick file"
-node --prof-process ./isolate-*-v8.log > ./profiler-output.log && echo "generated profiler-output.log"
+electron_node --prof-process ./isolate-*-v8.log > ./profiler-output.log && echo "generated profiler-output.log"
 rm ./isolate-*-v8.log
\ No newline at end of file
diff --git a/scripts/runner.sh b/scripts/runner.sh
new file mode 100755
index 00000000..11e8ae67
--- /dev/null
+++ b/scripts/runner.sh
@@ -0,0 +1,10 @@
+#! /usr/bin/env zsh
+
+# basically uses electron's node to prevent
+# mismatch in NODE_MODULE_VERSION when running
+# better-sqlite3
+
+export TS_NODE_COMPILER_OPTIONS='{"module":"commonjs"}'
+export ELECTRON_RUN_AS_NODE=true
+alias electron_node="./node_modules/.bin/electron --require ts-node/register --require tsconfig-paths/register"
+electron_node $@
\ No newline at end of file
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 4979816a..d4697659 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -3,7 +3,7 @@ import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { TelemetrySetting } from 'fyo/telemetry/types';
-import { BaseError, MandatoryError, ValidationError } from 'fyo/utils/errors';
+import { MandatoryError, ValidationError } from 'fyo/utils/errors';
 import { ErrorLog } from 'fyo/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { fyo } from './initFyo';
@@ -45,7 +45,7 @@ async function reportError(errorLogObj: ErrorLog, cb?: Function) {
 
 function getToastProps(errorLogObj: ErrorLog, canLog: boolean, cb?: Function) {
   const props: ToastOptions = {
-    message: t`Error: ` + errorLogObj.name,
+    message: errorLogObj.name ?? t`Error`,
     type: 'error',
   };
 
@@ -93,7 +93,6 @@ export function handleError(
 
   const errorLogObj = getErrorLogObject(error, more ?? {});
 
-  // @ts-ignore
   const canLog = getCanLog();
   if (canLog) {
     reportError(errorLogObj, cb);
@@ -106,7 +105,7 @@ export async function handleErrorWithDialog(error: Error, doc?: Doc) {
   const errorMessage = getErrorMessage(error, doc);
   handleError(false, error, { errorMessage, doc });
 
-  const name = (error as BaseError).label ?? error.name;
+  const name = error.name ?? t`Error`;
   await showMessageDialog({ message: name, detail: errorMessage });
   throw error;
 }
diff --git a/yarn.lock b/yarn.lock
index 96b31776..c665e250 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1107,6 +1107,13 @@
   dependencies:
     cross-spawn "^7.0.1"
 
+"@malept/cross-spawn-promise@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d"
+  integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 "@malept/flatpak-bundler@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858"
@@ -1194,6 +1201,11 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
+"@sindresorhus/is@^4.0.0":
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
+
 "@soda/friendly-errors-webpack-plugin@^1.7.1":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz#84751d82a93019d5c92c0cf0e45ac59087cd2240"
@@ -1216,6 +1228,18 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@szmarczak/http-timer@^4.0.5":
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
+  dependencies:
+    defer-to-connect "^2.0.0"
+
+"@tootallnate/once@1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+
 "@tootallnate/once@2":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
@@ -1254,6 +1278,16 @@
     "@types/connect" "*"
     "@types/node" "*"
 
+"@types/cacheable-request@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
+  integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
+  dependencies:
+    "@types/http-cache-semantics" "*"
+    "@types/keyv" "*"
+    "@types/node" "*"
+    "@types/responselike" "*"
+
 "@types/connect-history-api-fallback@*":
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
@@ -1344,6 +1378,11 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/http-cache-semantics@*":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
+
 "@types/http-proxy@^1.17.5":
   version "1.17.8"
   resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55"
@@ -1351,6 +1390,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/json-buffer@~3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
+  integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
+
 "@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
@@ -1361,6 +1405,13 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
+"@types/keyv@*":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
+  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/lodash@^4.14.179":
   version "4.14.179"
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.179.tgz#490ec3288088c91295780237d2497a3aa9dfb5c5"
@@ -1444,6 +1495,13 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
+"@types/responselike@*", "@types/responselike@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
+  integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==
+  dependencies:
+    "@types/node" "*"
+
 "@types/semver@^7.3.5":
   version "7.3.9"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
@@ -2288,6 +2346,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -2345,13 +2408,22 @@ address@^1.1.2:
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
+agentkeepalive@^4.1.3:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
+  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+  dependencies:
+    debug "^4.1.0"
+    depd "^1.1.2"
+    humanize-ms "^1.2.1"
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -2572,16 +2644,37 @@ app-builder-lib@23.0.3:
     semver "^7.3.5"
     temp-file "^3.4.0"
 
-aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
 arch@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
   integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
+are-we-there-yet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
+  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146"
+  integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
@@ -2863,6 +2956,14 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+better-sqlite3@^7.5.3:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-7.5.3.tgz#b42e02941f918cb8048971273abc458d937ab2b9"
+  integrity sha512-tNIrDsThpWT8j1mg+svI1pqCYROqNOWMbB2qXVg+TJqH9UR5XnbAHyRsLZoJagldGTTqJPj/sUPVOkW0GRpYqw==
+  dependencies:
+    bindings "^1.5.0"
+    prebuild-install "^7.1.0"
+
 bfj@^6.1.1:
   version "6.1.2"
   resolved "https://registry.yarnpkg.com/bfj/-/bfj-6.1.2.tgz#325c861a822bcb358a41c78a33b8e6e2086dde7f"
@@ -2900,7 +3001,7 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bl@^4.1.0:
+bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -3302,7 +3403,7 @@ cacache@^12.0.2, cacache@^12.0.3:
     unique-filename "^1.1.1"
     y18n "^4.0.0"
 
-cacache@^15.0.5:
+cacache@^15.0.5, cacache@^15.2.0:
   version "15.3.0"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
@@ -3353,6 +3454,11 @@ cache-loader@^4.1.0:
     neo-async "^2.6.1"
     schema-utils "^2.0.0"
 
+cacheable-lookup@^5.0.3:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
+  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
+
 cacheable-request@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
@@ -3366,6 +3472,19 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
+cacheable-request@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^4.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^6.0.1"
+    responselike "^2.0.0"
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -3727,6 +3846,11 @@ coa@^2.0.2:
     chalk "^2.4.1"
     q "^1.1.2"
 
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -3767,6 +3891,11 @@ color-string@^1.6.0, color-string@^1.9.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^3.0.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
@@ -3827,16 +3956,16 @@ commander@^5.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
 commander@^8.0.0, commander@^8.2.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
   integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
 
+commander@^9.1.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.2.0.tgz#6e21014b2ed90d8b7c9647230d8b7a94a4a419a9"
+  integrity sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==
+
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -3857,6 +3986,14 @@ component-emitter@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
+compress-brotli@^1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.8.tgz#0c0a60c97a989145314ec381e84e26682e7b38db"
+  integrity sha512-lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ==
+  dependencies:
+    "@types/json-buffer" "~3.0.0"
+    json-buffer "~3.0.1"
+
 compressible@~2.0.16:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
@@ -3938,6 +4075,11 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
+console-control-strings@^1.0.0, console-control-strings@^1.1.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -4390,20 +4532,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@4:
+debug@4, debug@4.3.4, debug@^4.3.3:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-debug@4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
 debug@4.3.3, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
@@ -4440,6 +4575,13 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
+decompress-response@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
+  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
+  dependencies:
+    mimic-response "^3.1.0"
+
 deep-equal@^1.0.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
@@ -4499,6 +4641,11 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
+defer-to-connect@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -4556,7 +4703,12 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-depd@~1.1.2:
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
+depd@^1.1.2, depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
@@ -4574,6 +4726,16 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
+detect-libc@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
+detect-libc@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
+  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -4972,6 +5134,26 @@ electron-publish@23.0.2:
     lazy-val "^1.0.5"
     mime "^2.5.2"
 
+electron-rebuild@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.7.tgz#0f56c1cc99a6fec0a5b990532283c2a8c838c19b"
+  integrity sha512-WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==
+  dependencies:
+    "@malept/cross-spawn-promise" "^2.0.0"
+    chalk "^4.0.0"
+    debug "^4.1.1"
+    detect-libc "^1.0.3"
+    fs-extra "^10.0.0"
+    got "^11.7.0"
+    lzma-native "^8.0.5"
+    node-abi "^3.0.0"
+    node-api-version "^0.1.4"
+    node-gyp "^8.4.0"
+    ora "^5.1.0"
+    semver "^7.3.5"
+    tar "^6.0.5"
+    yargs "^17.0.1"
+
 electron-store@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.0.1.tgz#9b598c1d2edeffebee9d8c1cd957ad368c528925"
@@ -5046,6 +5228,13 @@ encodeurl@^1.0.2, encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
+encoding@^0.1.12:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
 end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -5087,6 +5276,11 @@ env-paths@^2.2.0, env-paths@^2.2.1:
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
+err-code@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
@@ -5464,6 +5658,11 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+expand-template@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
+  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
+
 express@^4.16.3:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -5921,6 +6120,11 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-constants@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
 fs-extra@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
@@ -6008,6 +6212,34 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
 
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -6032,6 +6264,11 @@ get-own-enumerable-property-symbols@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
+get-package-type@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -6069,10 +6306,10 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
 
-getopts@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b"
-  integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA==
+getopts@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4"
+  integrity sha512-5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA==
 
 getpass@^0.1.1:
   version "0.1.7"
@@ -6081,6 +6318,11 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+github-from-package@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
+  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
+
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -6234,6 +6476,23 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
+got@^11.7.0:
+  version "11.8.3"
+  resolved "https://registry.yarnpkg.com/got/-/got-11.8.3.tgz#f496c8fdda5d729a90b4905d2b07dbd148170770"
+  integrity sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==
+  dependencies:
+    "@sindresorhus/is" "^4.0.0"
+    "@szmarczak/http-timer" "^4.0.5"
+    "@types/cacheable-request" "^6.0.1"
+    "@types/responselike" "^1.0.0"
+    cacheable-lookup "^5.0.3"
+    cacheable-request "^7.0.2"
+    decompress-response "^6.0.0"
+    http2-wrapper "^1.0.0-beta.5.2"
+    lowercase-keys "^2.0.0"
+    p-cancelable "^2.0.0"
+    responselike "^2.0.0"
+
 got@^9.6.0:
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
@@ -6261,6 +6520,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
 
+graceful-fs@^4.2.6:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -6331,6 +6595,11 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
+has-unicode@^2.0.0, has-unicode@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -6513,7 +6782,7 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
-http-cache-semantics@^4.0.0:
+http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
@@ -6571,6 +6840,15 @@ http-parser-js@>=0.5.1:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
   integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
 
+http-proxy-agent@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+  dependencies:
+    "@tootallnate/once" "1"
+    agent-base "6"
+    debug "4"
+
 http-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
@@ -6619,6 +6897,14 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
+http2-wrapper@^1.0.0-beta.5.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
+  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
+  dependencies:
+    quick-lru "^5.1.1"
+    resolve-alpn "^1.0.0"
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
@@ -6642,6 +6928,13 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
 iconv-corefoundation@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.6.tgz#27c135470237f6f8d13462fa1f5eaf250523c29a"
@@ -7041,6 +7334,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -7078,6 +7378,11 @@ is-interactive@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
   integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
+
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -7389,6 +7694,11 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
+json-buffer@3.0.1, json-buffer@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
+
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -7496,6 +7806,14 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
+keyv@^4.0.0:
+  version "4.2.9"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.2.9.tgz#b8f25d4968b583ed7f07fceadab646d4baadad6b"
+  integrity sha512-vqRBrN4xQHud7UMAGzGGFbt96MtGB9pb0OOg8Dhtq5RtiswCb1pCFq878iqC4hdeOP6eDPnCoFxA+2TXx427Ow==
+  dependencies:
+    compress-brotli "^1.3.8"
+    json-buffer "3.0.1"
+
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -7525,23 +7843,24 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-knex@^0.95.12:
-  version "0.95.12"
-  resolved "https://registry.yarnpkg.com/knex/-/knex-0.95.12.tgz#b250f6690dc643c17e59b82e5c8780f0ed82060a"
-  integrity sha512-/fdau7F372J/rZzMFjYo1trHs67kB13YtGErOe94Ev+OdilNEI2ddSE3O4Hb3EfgRtJUbhZWxp8T4PpDMtnjSg==
+knex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/knex/-/knex-2.0.0.tgz#84296ced7ef27e0f3b954302ac7d9da67c28b5d3"
+  integrity sha512-LchC8/GLfreMz8d4kCwh/ymXttsoJG8zO1O0AJBjnxdyr2oT/k2ik77hP1PpZkZH9mDQrq6WsQcIu18Pnqppzg==
   dependencies:
     colorette "2.0.16"
-    commander "^7.1.0"
-    debug "4.3.2"
+    commander "^9.1.0"
+    debug "4.3.4"
     escalade "^3.1.1"
     esm "^3.2.25"
-    getopts "2.2.5"
+    get-package-type "^0.1.0"
+    getopts "2.3.0"
     interpret "^2.2.0"
     lodash "^4.17.21"
     pg-connection-string "2.5.0"
-    rechoir "0.7.0"
+    rechoir "^0.8.0"
     resolve-from "^5.0.0"
-    tarn "^3.0.1"
+    tarn "^3.0.2"
     tildify "2.0.0"
 
 latest-version@^5.1.0:
@@ -7831,6 +8150,15 @@ luxon@^2.0.2:
   resolved "https://registry.yarnpkg.com/luxon/-/luxon-2.0.2.tgz#11f2cd4a11655fdf92e076b5782d7ede5bcdd133"
   integrity sha512-ZRioYLCgRHrtTORaZX1mx+jtxKtKuI5ZDvHNAmqpUzGqSrR+tL4FVLn/CUGMA3h0+AKD1MAxGI5GnCqR5txNqg==
 
+lzma-native@^8.0.5:
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665"
+  integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==
+  dependencies:
+    node-addon-api "^3.1.0"
+    node-gyp-build "^4.2.1"
+    readable-stream "^3.6.0"
+
 magic-string@^0.25.7:
   version "0.25.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
@@ -7858,6 +8186,28 @@ make-error@^1.1.1:
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
+make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
+  dependencies:
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^4.0.1"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^6.0.0"
+    minipass "^3.1.3"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^1.3.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.2"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -8045,6 +8395,11 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
+mimic-response@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
+  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
+
 mini-css-extract-plugin@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz#47f2cf07aa165ab35733b1fc97d4c46c0564339e"
@@ -8079,7 +8434,7 @@ minimatch@4.2.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
@@ -8091,6 +8446,17 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
+minipass-fetch@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
+  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
+  dependencies:
+    minipass "^3.1.0"
+    minipass-sized "^1.0.3"
+    minizlib "^2.0.0"
+  optionalDependencies:
+    encoding "^0.1.12"
+
 minipass-flush@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
@@ -8098,13 +8464,20 @@ minipass-flush@^1.0.5:
   dependencies:
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2:
+minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
     minipass "^3.0.0"
 
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
 minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732"
@@ -8112,7 +8485,14 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.1.1:
+minipass@^3.1.0, minipass@^3.1.3:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
+  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+  dependencies:
+    yallist "^4.0.0"
+
+minizlib@^2.0.0, minizlib@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -8144,6 +8524,11 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
 mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
@@ -8218,7 +8603,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.1.1:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -8287,6 +8672,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+napi-build-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
+  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -8297,6 +8687,11 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
+negotiator@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
 neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
@@ -8314,15 +8709,29 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+node-abi@^3.0.0, node-abi@^3.3.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.15.0.tgz#cd9ac8c58328129b49998cc6fa16aa5506152716"
+  integrity sha512-Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA==
+  dependencies:
+    semver "^7.3.5"
+
 node-addon-api@^1.6.3:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
-node-addon-api@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.2.0.tgz#117cbb5a959dff0992e1c586ae0393573e4d2a87"
-  integrity sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==
+node-addon-api@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
+node-api-version@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080"
+  integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==
+  dependencies:
+    semver "^7.3.5"
 
 node-emoji@^1.11.0:
   version "1.11.0"
@@ -8343,6 +8752,27 @@ node-forge@^0.10.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
+node-gyp-build@^4.2.1:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.4.0.tgz#42e99687ce87ddeaf3a10b99dc06abc11021f3f4"
+  integrity sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==
+
+node-gyp@^8.4.0:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
+  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
+  dependencies:
+    env-paths "^2.2.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^9.1.0"
+    nopt "^5.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
 node-ipc@^9.1.1:
   version "9.2.1"
   resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.2.1.tgz#b32f66115f9d6ce841dc4ec2009d6a733f98bb6b"
@@ -8386,6 +8816,13 @@ node-releases@^2.0.1:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
   integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
 
+nopt@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
+  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+  dependencies:
+    abbrev "1"
+
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -8438,6 +8875,11 @@ normalize-url@^4.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
+normalize-url@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+
 npm-conf@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
@@ -8460,6 +8902,26 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
+npmlog@^4.0.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
+npmlog@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
+
 nth-check@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -8479,6 +8941,11 @@ num2fraction@^1.2.2:
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -8653,7 +9120,7 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
-ora@^5.3.0, ora@^5.4.1:
+ora@^5.1.0, ora@^5.3.0, ora@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
   integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
@@ -8690,6 +9157,11 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
+p-cancelable@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -9460,6 +9932,25 @@ postcss@^8.3.5:
     picocolors "^1.0.0"
     source-map-js "^1.0.1"
 
+prebuild-install@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.0.tgz#991b6ac16c81591ba40a6d5de93fb33673ac1370"
+  integrity sha512-CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA==
+  dependencies:
+    detect-libc "^2.0.0"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
+    napi-build-utils "^1.0.1"
+    node-abi "^3.3.0"
+    npmlog "^4.0.1"
+    pump "^3.0.0"
+    rc "^1.2.7"
+    simple-get "^4.0.0"
+    tar-fs "^2.0.0"
+    tunnel-agent "^0.6.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -9525,6 +10016,14 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -9732,7 +10231,7 @@ raw-loader@^4.0.2:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-rc@^1.2.8:
+rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -9763,7 +10262,7 @@ read-pkg@^5.1.1:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -9801,12 +10300,12 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca"
-  integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q==
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
   dependencies:
-    resolve "^1.9.0"
+    resolve "^1.20.0"
 
 reduce-css-calc@^2.1.8:
   version "2.1.8"
@@ -9976,6 +10475,11 @@ requires-port@^1.0.0:
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
   integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
+resolve-alpn@^1.0.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
+  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
+
 resolve-cwd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -10003,7 +10507,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.14.2, resolve@^1.9.0:
+resolve@^1.10.0, resolve@^1.14.2:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -10036,6 +10540,13 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
+responselike@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723"
+  integrity sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==
+  dependencies:
+    lowercase-keys "^2.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -10352,7 +10863,7 @@ serve-static@1.14.2:
     parseurl "~1.3.3"
     send "0.17.2"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -10453,6 +10964,25 @@ signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.6.tgz#24e630c4b0f03fea446a2bd299e62b4a6ca8d0af"
   integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
 
+signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+simple-concat@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
+  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
+
+simple-get@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
+  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
+  dependencies:
+    decompress-response "^6.0.0"
+    once "^1.3.1"
+    simple-concat "^1.0.0"
+
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -10500,7 +11030,7 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-smart-buffer@^4.0.2:
+smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
@@ -10556,6 +11086,23 @@ sockjs@^0.3.21:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
+socks-proxy-agent@^6.0.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.0.tgz#f6b5229cc0cbd6f2f202d9695f09d871e951c85e"
+  integrity sha512-wWqJhjb32Q6GsrUqzuFkukxb/zzide5quXYcMVpIjxalDBBYy2nqKCFQ/9+Ie4dvOYSQdOk3hUlZSdzZOd3zMQ==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.3"
+    socks "^2.6.2"
+
+socks@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
+  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+  dependencies:
+    ip "^1.1.5"
+    smart-buffer "^4.2.0"
+
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -10703,13 +11250,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
-"sqlite3@npm:@vscode/sqlite3@^5.0.7":
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/@vscode/sqlite3/-/sqlite3-5.0.7.tgz#358df36bb0e9e735c54785e3e4b9b2dce1d32895"
-  integrity sha512-NlsOf+Hir2r4zopI1qMvzWXPwPJuFscirkmFTniTAT24Yz2FWcyZxzK7UT8iSNiTqOCPz48yF55ZVHaz7tTuVQ==
-  dependencies:
-    node-addon-api "^4.2.0"
-
 sshpk@^1.7.0:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -10732,7 +11272,7 @@ ssri@^6.0.1:
   dependencies:
     figgy-pudding "^3.5.1"
 
-ssri@^8.0.1:
+ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
@@ -10809,6 +11349,24 @@ string-argv@0.3.1:
   resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
   integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
 
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
@@ -10826,15 +11384,6 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -11073,7 +11622,28 @@ tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.0.2:
+tar-fs@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+  dependencies:
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.1.4"
+
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
+  dependencies:
+    bl "^4.0.3"
+    end-of-stream "^1.4.1"
+    fs-constants "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^3.1.1"
+
+tar@^6.0.2, tar@^6.0.5, tar@^6.1.2:
   version "6.1.11"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
   integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
@@ -11085,10 +11655,10 @@ tar@^6.0.2:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-tarn@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.1.tgz#ebac2c6dbc6977d34d4526e0a7814200386a8aec"
-  integrity sha512-6usSlV9KyHsspvwu2duKH+FMUhqJnAh6J5J/4MITl8s94iSUQTLkJggdiewKv4RyARQccnigV48Z+khiuVZDJw==
+tarn@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693"
+  integrity sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ==
 
 temp-file@^3.4.0:
   version "3.4.0"
@@ -12220,7 +12790,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@2.0.2, which@^2.0.1:
+which@2.0.2, which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
@@ -12234,6 +12804,13 @@ which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
+wide-align@^1.1.0, wide-align@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
+
 widest-line@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"

From 8e2c89b0ebb375c98885897c79296e51929bd622 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 20 May 2022 23:37:18 +0530
Subject: [PATCH 146/163] incr: remove some rando package

---
 package.json | 1 -
 yarn.lock    | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/package.json b/package.json
index 80abd23b..4627ae76 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "@popperjs/core": "^2.10.2",
     "better-sqlite3": "^7.5.3",
     "core-js": "^3.19.0",
-    "csvjson-csv2json": "^5.0.6",
     "electron-store": "^8.0.1",
     "feather-icons": "^4.28.0",
     "knex": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index c665e250..1665d47b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4496,11 +4496,6 @@ csstype@^2.6.8:
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.19.tgz#feeb5aae89020bb389e1f63669a5ed490e391caa"
   integrity sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==
 
-csvjson-csv2json@^5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/csvjson-csv2json/-/csvjson-csv2json-5.0.6.tgz#b056f77dd3c13a2f550ada1c31f05072aad6ff3a"
-  integrity sha512-to9QlVI4yQFPzSqi6XZ97lULKs5m3K8hlE/UkbvKSw81FfDwgV9MUtSbHFJ4SRT4IA7UPkuW2EqsH/MWN5YRow==
-
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"

From 401a86eeeb9b9551a194141f9e30bdb51670160c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 11:00:54 +0530
Subject: [PATCH 147/163] chore: bump pesa - fix isPesa impl

---
 backend/database/tests/testCore.spec.ts                   | 2 +-
 dummy/index.ts                                            | 4 ++++
 dummy/tests/testDummy.spec.ts                             | 4 ++--
 fyo/core/converter.ts                                     | 2 +-
 fyo/core/types.ts                                         | 2 +-
 fyo/model/doc.ts                                          | 2 +-
 fyo/model/helpers.ts                                      | 2 +-
 fyo/utils/format.ts                                       | 2 +-
 fyo/utils/index.ts                                        | 4 ++--
 models/Transactional/LedgerPosting.ts                     | 2 +-
 models/Transactional/types.ts                             | 2 +-
 .../AccountingLedgerEntry/AccountingLedgerEntry.ts        | 2 +-
 models/baseModels/Invoice/Invoice.ts                      | 2 +-
 models/baseModels/InvoiceItem/InvoiceItem.ts              | 2 +-
 models/baseModels/Item/Item.ts                            | 2 +-
 models/baseModels/JournalEntry/JournalEntry.ts            | 4 ++--
 .../baseModels/JournalEntryAccount/JournalEntryAccount.ts | 2 +-
 models/baseModels/Party/Party.ts                          | 2 +-
 models/baseModels/Payment/Payment.ts                      | 2 +-
 models/baseModels/PaymentFor/PaymentFor.ts                | 2 +-
 models/baseModels/TaxSummary/TaxSummary.ts                | 2 +-
 models/helpers.ts                                         | 2 +-
 package.json                                              | 2 +-
 src/utils/index.ts                                        | 2 +-
 yarn.lock                                                 | 8 ++++----
 25 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/backend/database/tests/testCore.spec.ts b/backend/database/tests/testCore.spec.ts
index 59f9443a..248a1a46 100644
--- a/backend/database/tests/testCore.spec.ts
+++ b/backend/database/tests/testCore.spec.ts
@@ -104,7 +104,7 @@ describe('DatabaseCore: Migrate and Check Db', function () {
         );
 
         assert.strictEqual(
-          column.type,
+          column.type.toLowerCase(),
           dbColType,
           `${schemaName}.${column.name}:: type check: ${column.type}, ${dbColType}`
         );
diff --git a/dummy/index.ts b/dummy/index.ts
index 7eff9882..17077a67 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -164,6 +164,10 @@ async function getPayments(fyo: Fyo, invoices: Invoice[]) {
       amount: invoice.outstandingAmount,
     });
 
+    if (doc.amount!.isZero()) {
+      continue;
+    }
+
     payments.push(doc);
   }
 
diff --git a/dummy/tests/testDummy.spec.ts b/dummy/tests/testDummy.spec.ts
index 4a1f37e3..a756b223 100644
--- a/dummy/tests/testDummy.spec.ts
+++ b/dummy/tests/testDummy.spec.ts
@@ -8,7 +8,7 @@ import 'mocha';
 import { getTestDbPath } from 'tests/helpers';
 import { setupDummyInstance } from '..';
 
-describe.skip('dummy', function () {
+describe('dummy', function () {
   const dbPath = getTestDbPath();
 
   let fyo: Fyo;
@@ -28,7 +28,7 @@ describe.skip('dummy', function () {
 
   specify('setupDummyInstance', async function () {
     await assertDoesNotThrow(async () => {
-      await setupDummyInstance(dbPath, fyo);
+      await setupDummyInstance(dbPath, fyo, 1, 25);
     }, 'setup instance failed');
 
     for (const item in purchaseItemPartyMap) {
diff --git a/fyo/core/converter.ts b/fyo/core/converter.ts
index b56ba09b..03c2ed58 100644
--- a/fyo/core/converter.ts
+++ b/fyo/core/converter.ts
@@ -3,7 +3,7 @@ import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import { ValueError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldTypeEnum, RawValue, TargetField } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 import { DatabaseHandler } from './dbHandler';
diff --git a/fyo/core/types.ts b/fyo/core/types.ts
index 98d11fc6..6afa05fa 100644
--- a/fyo/core/types.ts
+++ b/fyo/core/types.ts
@@ -1,5 +1,5 @@
 import { Doc } from 'fyo/model/doc';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { RawValue } from 'schemas/types';
 import { AuthDemuxBase } from 'utils/auth/types';
 import { DatabaseDemuxBase } from 'utils/db/types';
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 3dd9db93..2269a618 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -5,7 +5,7 @@ import { Verb } from 'fyo/telemetry/types';
 import { DEFAULT_USER } from 'fyo/utils/consts';
 import { ConflictError, MandatoryError, NotFoundError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import {
   Field,
   FieldTypeEnum,
diff --git a/fyo/model/helpers.ts b/fyo/model/helpers.ts
index be8f8271..927a8c93 100644
--- a/fyo/model/helpers.ts
+++ b/fyo/model/helpers.ts
@@ -2,7 +2,7 @@ import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
 import { isPesa } from 'fyo/utils';
 import { isEqual } from 'lodash';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 import { Doc } from './doc';
diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index edf49ae4..6abd0f47 100644
--- a/fyo/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -2,7 +2,7 @@ import { Fyo } from 'fyo';
 import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { DateTime } from 'luxon';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 import {
diff --git a/fyo/utils/index.ts b/fyo/utils/index.ts
index f2be03c0..647960e7 100644
--- a/fyo/utils/index.ts
+++ b/fyo/utils/index.ts
@@ -1,7 +1,7 @@
 import { Fyo } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { Action } from 'fyo/model/types';
-import { pesa } from 'pesa';
+import { Money } from 'pesa';
 import { Field, OptionField, SelectOption } from 'schemas/types';
 import { getIsNullOrUndef } from 'utils';
 
@@ -37,7 +37,7 @@ export function getDuplicates(array: unknown[]) {
 }
 
 export function isPesa(value: unknown): boolean {
-  return value instanceof pesa().constructor;
+  return value instanceof Money;
 }
 
 export function getActions(doc: Doc): Action[] {
diff --git a/models/Transactional/LedgerPosting.ts b/models/Transactional/LedgerPosting.ts
index dfd34d00..904a906c 100644
--- a/models/Transactional/LedgerPosting.ts
+++ b/models/Transactional/LedgerPosting.ts
@@ -3,7 +3,7 @@ import { ValidationError } from 'fyo/utils/errors';
 import { Account } from 'models/baseModels/Account/Account';
 import { AccountingLedgerEntry } from 'models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Transactional } from './Transactional';
 import { AccountBalanceChange, TransactionType } from './types';
 
diff --git a/models/Transactional/types.ts b/models/Transactional/types.ts
index dc58ee8b..721cf5a3 100644
--- a/models/Transactional/types.ts
+++ b/models/Transactional/types.ts
@@ -1,5 +1,5 @@
 import { Doc } from 'fyo/model/doc';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export interface LedgerPostingOptions {
   reference: Doc;
diff --git a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
index 91318f94..e556e95a 100644
--- a/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
+++ b/models/baseModels/AccountingLedgerEntry/AccountingLedgerEntry.ts
@@ -1,7 +1,7 @@
 import { Doc } from 'fyo/model/doc';
 import { ListViewSettings } from 'fyo/model/types';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export class AccountingLedgerEntry extends Doc {
   date?: string | Date;
diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index 650f50a6..7103db78 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -4,7 +4,7 @@ import { DefaultMap, FiltersMap, FormulaMap } from 'fyo/model/types';
 import { getExchangeRate } from 'models/helpers';
 import { Transactional } from 'models/Transactional/Transactional';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { getIsNullOrUndef } from 'utils';
 import { Party } from '../Party/Party';
 import { Payment } from '../Payment/Payment';
diff --git a/models/baseModels/InvoiceItem/InvoiceItem.ts b/models/baseModels/InvoiceItem/InvoiceItem.ts
index 6025f9ae..0ce0d2a9 100644
--- a/models/baseModels/InvoiceItem/InvoiceItem.ts
+++ b/models/baseModels/InvoiceItem/InvoiceItem.ts
@@ -2,7 +2,7 @@ import { DocValue } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap, ValidationMap } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Invoice } from '../Invoice/Invoice';
 
 export abstract class InvoiceItem extends Doc {
diff --git a/models/baseModels/Item/Item.ts b/models/baseModels/Item/Item.ts
index a7f07549..7ad8a6d1 100644
--- a/models/baseModels/Item/Item.ts
+++ b/models/baseModels/Item/Item.ts
@@ -9,7 +9,7 @@ import {
   ValidationMap,
 } from 'fyo/model/types';
 import { ValidationError } from 'fyo/utils/errors';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { AccountRootTypeEnum, AccountTypeEnum } from '../Account/types';
 
 export class Item extends Doc {
diff --git a/models/baseModels/JournalEntry/JournalEntry.ts b/models/baseModels/JournalEntry/JournalEntry.ts
index d53f8c57..1aeedf34 100644
--- a/models/baseModels/JournalEntry/JournalEntry.ts
+++ b/models/baseModels/JournalEntry/JournalEntry.ts
@@ -4,12 +4,12 @@ import {
   Action,
   DefaultMap,
   FiltersMap,
-  ListViewSettings
+  ListViewSettings,
 } from 'fyo/model/types';
 import { DateTime } from 'luxon';
 import { getLedgerLinkAction } from 'models/helpers';
 import { Transactional } from 'models/Transactional/Transactional';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { LedgerPosting } from '../../Transactional/LedgerPosting';
 
 export class JournalEntry extends Transactional {
diff --git a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
index af762e95..55945e21 100644
--- a/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
+++ b/models/baseModels/JournalEntryAccount/JournalEntryAccount.ts
@@ -1,6 +1,6 @@
 import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap } from 'fyo/model/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export class JournalEntryAccount extends Doc {
   getAutoDebitCredit(type: 'debit' | 'credit') {
diff --git a/models/baseModels/Party/Party.ts b/models/baseModels/Party/Party.ts
index 88591cc7..6dbeafca 100644
--- a/models/baseModels/Party/Party.ts
+++ b/models/baseModels/Party/Party.ts
@@ -11,7 +11,7 @@ import {
   validateEmail,
   validatePhoneNumber,
 } from 'fyo/model/validationFunction';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { PartyRole } from './types';
 
 export class Party extends Doc {
diff --git a/models/baseModels/Payment/Payment.ts b/models/baseModels/Payment/Payment.ts
index 2bceac5d..00f847c7 100644
--- a/models/baseModels/Payment/Payment.ts
+++ b/models/baseModels/Payment/Payment.ts
@@ -17,7 +17,7 @@ import { getLedgerLinkAction } from 'models/helpers';
 import { LedgerPosting } from 'models/Transactional/LedgerPosting';
 import { Transactional } from 'models/Transactional/Transactional';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Invoice } from '../Invoice/Invoice';
 import { Party } from '../Party/Party';
 import { PaymentFor } from '../PaymentFor/PaymentFor';
diff --git a/models/baseModels/PaymentFor/PaymentFor.ts b/models/baseModels/PaymentFor/PaymentFor.ts
index 9aeedcd1..52aec1e6 100644
--- a/models/baseModels/PaymentFor/PaymentFor.ts
+++ b/models/baseModels/PaymentFor/PaymentFor.ts
@@ -1,7 +1,7 @@
 import { Doc } from 'fyo/model/doc';
 import { FiltersMap, FormulaMap } from 'fyo/model/types';
 import { ModelNameEnum } from 'models/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { PartyRoleEnum } from '../Party/types';
 import { Payment } from '../Payment/Payment';
 
diff --git a/models/baseModels/TaxSummary/TaxSummary.ts b/models/baseModels/TaxSummary/TaxSummary.ts
index 9a751362..7ca232ba 100644
--- a/models/baseModels/TaxSummary/TaxSummary.ts
+++ b/models/baseModels/TaxSummary/TaxSummary.ts
@@ -1,6 +1,6 @@
 import { Doc } from 'fyo/model/doc';
 import { FormulaMap } from 'fyo/model/types';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 
 export class TaxSummary extends Doc {
   account?: string;
diff --git a/models/helpers.ts b/models/helpers.ts
index 8e9d6577..7485b0cb 100644
--- a/models/helpers.ts
+++ b/models/helpers.ts
@@ -3,7 +3,7 @@ import { Doc } from 'fyo/model/doc';
 import { Action, ColumnConfig } from 'fyo/model/types';
 import { NotFoundError } from 'fyo/utils/errors';
 import { DateTime } from 'luxon';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Router } from 'vue-router';
 import {
   AccountRootType,
diff --git a/package.json b/package.json
index 4627ae76..eec613da 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "lodash": "^4.17.21",
     "luxon": "^2.0.2",
     "node-fetch": "2",
-    "pesa": "^1.1.11",
+    "pesa": "^1.1.12",
     "vue": "^3.2.30",
     "vue-router": "^4.0.12"
   },
diff --git a/src/utils/index.ts b/src/utils/index.ts
index cae8c404..af6d3bd9 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -5,7 +5,7 @@ import { t } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { isPesa } from 'fyo/utils';
 import { DuplicateEntryError, LinkValidationError } from 'fyo/utils/errors';
-import Money from 'pesa/dist/types/src/money';
+import { Money } from 'pesa';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 
 export function stringifyCircular(
diff --git a/yarn.lock b/yarn.lock
index 1665d47b..7fa31303 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9403,10 +9403,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pesa@^1.1.11:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.11.tgz#85829e5aa11ea3e44d7c9ea4b500e4d6def6dc5f"
-  integrity sha512-eyl0lpdUIV0dNXVeTMnhBJj6u9GRIYwP+vFdUN+767Fv3PNQHPHAkCQJqDseGfEF75lhe23ZnfbA/uMidlq5/Q==
+pesa@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/pesa/-/pesa-1.1.12.tgz#905132abf9e1aa33eaf68cdea61c07ea2284d12d"
+  integrity sha512-OnbJne4T1vRXbBbvnRy3NZVI1hVmcDBsBZ2GcQk3KydbONuDUE7R3xB604bnXTgt44h2ujcVBJvMU9I7ObqBRQ==
 
 pg-connection-string@2.5.0:
   version "2.5.0"

From deefcd08f91feeaeca868c3862298e994627dfc8 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 11:51:06 +0530
Subject: [PATCH 148/163] incr: updates to dummy creation

---
 dummy/helpers.ts                       | 16 ++++++++++++++--
 dummy/index.ts                         |  6 +++++-
 fyo/core/types.ts                      |  2 +-
 fyo/telemetry/helpers.ts               |  1 +
 main/helpers.ts                        |  3 ++-
 src/App.vue                            | 22 +++++++++++-----------
 src/components/Loading.vue             |  2 ++
 src/components/once/TelemetryModal.vue |  5 ++++-
 src/pages/DatabaseSelector.vue         |  4 +++-
 src/utils/ipcCalls.ts                  |  2 +-
 src/utils/misc.ts                      | 24 ++++++++++++++++--------
 11 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/dummy/helpers.ts b/dummy/helpers.ts
index a6e837a1..b9f7a084 100644
--- a/dummy/helpers.ts
+++ b/dummy/helpers.ts
@@ -22,10 +22,22 @@ export const purchaseItemPartyMap: Record<string, string> = Object.keys(
   return acc;
 }, {} as Record<string, string>);
 
-export const flow = [0.25, 0.2, 0.35, 0.2, 0.1, 0.01, 0.01, 0.15, 0, 0.25, 0.3, 0.5];
+export const flow = [
+  0.35, // Jan
+  0.25, // Feb
+  0.15, // Mar
+  0.15, // Apr
+  0.25, // May
+  0.05, // Jun
+  0.05, // Jul
+  0.15, // Aug
+  0.25, // Sep
+  0.35, // Oct
+  0.45, // Nov
+  0.55, // Dec
+];
 export function getFlowConstant(months: number) {
   // Jan to December
-
   const d = DateTime.now().minus({ months });
   return flow[d.month - 1];
 }
diff --git a/dummy/index.ts b/dummy/index.ts
index 17077a67..45294324 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -28,6 +28,7 @@ export async function setupDummyInstance(
   baseCount: number = 1000,
   notifier?: Notifier
 ) {
+  fyo.purgeCache();
   notifier?.(fyo.t`Setting Up Instance`, -1);
   const options = {
     logo: null,
@@ -245,7 +246,10 @@ async function getSalesInvoices(
         quantity = Math.ceil(Math.random() * 3);
       }
 
-      const fc = flow[date.getMonth()];
+      let fc = flow[date.getMonth()];
+      if (baseCount < 500) {
+        fc += 1;
+      }
       const rate = fyo.pesa(item!.rate * (fc + 1)).clip(0);
       await doc.append('items', {});
       await doc.items!.at(-1)!.set({
diff --git a/fyo/core/types.ts b/fyo/core/types.ts
index 6afa05fa..c2ed757d 100644
--- a/fyo/core/types.ts
+++ b/fyo/core/types.ts
@@ -35,13 +35,13 @@ export enum ConfigKeys {
   Language = 'language',
   DeviceId = 'deviceId',
   Telemetry = 'telemetry',
-  OpenCount = 'openCount',
 }
 
 export interface ConfigFile {
   id: string;
   companyName: string;
   dbPath: string;
+  openCount: number;
 }
 
 export interface FyoConfig {
diff --git a/fyo/telemetry/helpers.ts b/fyo/telemetry/helpers.ts
index 967bf522..d834f151 100644
--- a/fyo/telemetry/helpers.ts
+++ b/fyo/telemetry/helpers.ts
@@ -85,6 +85,7 @@ export function addNewFile(
     companyName,
     dbPath,
     id: getId(),
+    openCount: 0,
   };
 
   files.push(newFile);
diff --git a/main/helpers.ts b/main/helpers.ts
index 34dda83b..461233d7 100644
--- a/main/helpers.ts
+++ b/main/helpers.ts
@@ -33,13 +33,14 @@ export async function setAndGetCleanedConfigFiles() {
 
 export async function getConfigFilesWithModified(files: ConfigFile[]) {
   const filesWithModified: ConfigFilesWithModified[] = [];
-  for (const { dbPath, id, companyName } of files) {
+  for (const { dbPath, id, companyName, openCount } of files) {
     const { mtime } = await fs.stat(dbPath);
     filesWithModified.push({
       id,
       dbPath,
       companyName,
       modified: mtime.toISOString(),
+      openCount,
     });
   }
 
diff --git a/src/App.vue b/src/App.vue
index 9cdcbb8e..a79c5118 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,12 +4,12 @@
     class="h-screen flex flex-col font-sans overflow-hidden antialiased"
   >
     <WindowsTitleBar v-if="platform === 'Windows'" />
-    
+
     <!-- Main Contents -->
     <Desk
       class="flex-1"
       v-if="activeScreen === 'Desk'"
-      @change-db-file="changeDbFile"
+      @change-db-file="showDbSelector"
     />
     <DatabaseSelector
       v-if="activeScreen === 'DatabaseSelector'"
@@ -18,9 +18,9 @@
     <SetupWizard
       v-if="activeScreen === 'SetupWizard'"
       @setup-complete="setupComplete"
-      @setup-canceled="changeDbFile"
+      @setup-canceled="showDbSelector"
     />
-    
+
     <!-- Render target for toasts -->
     <div
       id="toast-container"
@@ -29,7 +29,7 @@
     >
       <div id="toast-target" />
     </div>
-    
+
     <!-- Prompt to Set Telemetry -->
     <TelemetryModal />
   </div>
@@ -83,12 +83,12 @@ export default {
     this.activeScreen = 'DatabaseSelector';
   },
   methods: {
-    async setDesk() {
+    async setDesk(filePath) {
       this.activeScreen = 'Desk';
-      incrementOpenCount();
+      await this.setDeskRoute();
+      await incrementOpenCount(filePath);
       await startTelemetry();
       await checkForUpdates(false);
-      await this.setDeskRoute();
     },
     async fileSelected(filePath, isNew) {
       fyo.config.set(ConfigKeys.LastSelectedFilePath, filePath);
@@ -101,7 +101,7 @@ export default {
     async setupComplete(setupWizardOptions) {
       const filePath = fyo.config.get(ConfigKeys.LastSelectedFilePath);
       await setupInstance(filePath, setupWizardOptions, fyo);
-      await this.setDesk();
+      await this.setDesk(filePath);
     },
     async showSetupWizardOrDesk(filePath) {
       const countryCode = await fyo.db.connectToDatabase(filePath);
@@ -113,7 +113,7 @@ export default {
       }
 
       await initializeInstance(filePath, false, countryCode, fyo);
-      await this.setDesk();
+      await this.setDesk(filePath);
     },
     async setDeskRoute() {
       const { onboardingComplete } = await fyo.doc.getSingle('GetStarted');
@@ -125,7 +125,7 @@ export default {
         routeTo('/get-started');
       }
     },
-    async changeDbFile() {
+    async showDbSelector() {
       fyo.config.set('lastSelectedFilePath', null);
       fyo.telemetry.stop();
       fyo.purgeCache();
diff --git a/src/components/Loading.vue b/src/components/Loading.vue
index 0daa46cc..135fec9d 100644
--- a/src/components/Loading.vue
+++ b/src/components/Loading.vue
@@ -40,6 +40,7 @@
 
         <!-- Close Icon -->
         <feather-icon
+          v-if="showX"
           name="x"
           class="
             w-4
@@ -62,6 +63,7 @@ export default {
     percent: { type: Number, default: 0.5 },
     message: { type: String, default: '' },
     fullWidth: { type: Boolean, default: false },
+    showX: { type: Boolean, default: true },
   },
   data() {
     return {
diff --git a/src/components/once/TelemetryModal.vue b/src/components/once/TelemetryModal.vue
index 66f612a8..a3ce37ef 100644
--- a/src/components/once/TelemetryModal.vue
+++ b/src/components/once/TelemetryModal.vue
@@ -119,7 +119,10 @@ export default {
     },
 
     setOpen(telemetry) {
-      const openCount = fyo.config.get(ConfigKeys.OpenCount);
+      const openCount = fyo.config
+        .get(ConfigKeys.Files)
+        .map((f) => f.openCount)
+        .reduce((a, b) => (a ?? 0) + (b ?? 0));
       this.shouldOpen = !this.getIsSet(telemetry) && openCount >= 4;
     },
   },
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index a3232dc9..8e4a8f74 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -139,6 +139,7 @@
     <Loading
       v-if="creatingDemo"
       :open="creatingDemo"
+      :show-x="false"
       :full-width="true"
       :percent="creationPercent"
       :message="creationMessage"
@@ -214,12 +215,13 @@ export default {
       }
 
       this.creatingDemo = true;
+      const baseCount = fyo.store.isDevelopment ? 1000 : 150;
 
       const companyName = await setupDummyInstance(
         filePath,
         fyo,
         1,
-        1000,
+        baseCount,
         (message, percent) => {
           this.creationMessage = message;
           this.creationPercent = percent;
diff --git a/src/utils/ipcCalls.ts b/src/utils/ipcCalls.ts
index eeedca72..a045ebec 100644
--- a/src/utils/ipcCalls.ts
+++ b/src/utils/ipcCalls.ts
@@ -80,7 +80,7 @@ export async function getSavePath(name: string, extention: string) {
   let filePath = response.filePath;
 
   if (filePath && !filePath.endsWith(extention)) {
-    filePath = filePath + extention;
+    filePath = `${filePath}.${extention}`;
   }
 
   return { canceled, filePath };
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index 00100317..daafd67a 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -1,4 +1,4 @@
-import { ConfigKeys } from 'fyo/core/types';
+import { ConfigFile, ConfigKeys } from 'fyo/core/types';
 import { getSingleValue } from 'fyo/utils';
 import { DateTime } from 'luxon';
 import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
@@ -66,15 +66,23 @@ export async function getSetupComplete(): Promise<boolean> {
   ));
 }
 
-export function incrementOpenCount() {
-  let openCount = fyo.config.get(ConfigKeys.OpenCount);
-  if (typeof openCount !== 'number') {
-    openCount = 1;
-  } else {
-    openCount += 1;
+export async function incrementOpenCount(dbPath: string) {
+  const companyName = (await fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'companyName'
+  )) as string;
+  const files = fyo.config.get(ConfigKeys.Files) as ConfigFile[];
+  for (const file of files) {
+    if (file.companyName !== companyName || file.dbPath !== dbPath) {
+      continue;
+    }
+
+    file.openCount ??= 0;
+    file.openCount += 1;
+    break;
   }
 
-  fyo.config.set(ConfigKeys.OpenCount, openCount);
+  fyo.config.set(ConfigKeys.Files, files);
 }
 
 export async function startTelemetry() {

From 2c596b11c85f541712789914ae2539bc3a3089c5 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 13:39:07 +0530
Subject: [PATCH 149/163] incr: simplify telemetry - it's not opt-in anymore
 cause my job deps on it

---
 dummy/index.ts                               |   7 +-
 fyo/core/types.ts                            |   1 -
 fyo/model/doc.ts                             |   2 +
 fyo/telemetry/helpers.ts                     | 104 +++++------
 fyo/telemetry/telemetry.ts                   | 174 +++++++------------
 fyo/telemetry/types.ts                       |  53 ++----
 schemas/core/SystemSettings.json             |   6 +
 src/App.vue                                  |  15 +-
 src/components/once/TelemetryModal.vue       | 135 --------------
 src/errorHandling.ts                         |  50 ++----
 src/initFyo.ts                               |  10 +-
 src/pages/DatabaseSelector.vue               |  48 +++--
 src/pages/Settings/TabSystem.vue             |  51 ++----
 src/renderer.ts                              |   1 -
 src/renderer/registerIpcRendererListeners.ts |   3 +-
 src/router.ts                                |  24 ---
 src/setup/setupInstance.ts                   |  15 +-
 src/utils/misc.ts                            |  16 +-
 18 files changed, 224 insertions(+), 491 deletions(-)
 delete mode 100644 src/components/once/TelemetryModal.vue

diff --git a/dummy/index.ts b/dummy/index.ts
index 45294324..e01b7366 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -48,7 +48,12 @@ export async function setupDummyInstance(
   notifier?.(fyo.t`Creating Items and Parties`, -1);
   await generateStaticEntries(fyo);
   await generateDynamicEntries(fyo, years, baseCount, notifier);
-  return options.companyName;
+
+  const instanceId = (await fyo.getValue(
+    ModelNameEnum.SystemSettings,
+    'instanceId'
+  )) as string;
+  return { companyName: options.companyName, instanceId };
 }
 
 /**
diff --git a/fyo/core/types.ts b/fyo/core/types.ts
index c2ed757d..29e1bdfc 100644
--- a/fyo/core/types.ts
+++ b/fyo/core/types.ts
@@ -34,7 +34,6 @@ export enum ConfigKeys {
   LastSelectedFilePath = 'lastSelectedFilePath',
   Language = 'language',
   DeviceId = 'deviceId',
-  Telemetry = 'telemetry',
 }
 
 export interface ConfigFile {
diff --git a/fyo/model/doc.ts b/fyo/model/doc.ts
index 2269a618..069f2303 100644
--- a/fyo/model/doc.ts
+++ b/fyo/model/doc.ts
@@ -678,6 +678,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     await this.setAndSync('submitted', true);
     await this.trigger('afterSubmit');
 
+    this.fyo.telemetry.log(Verb.Submitted, this.schemaName);
     this.fyo.doc.observer.trigger(`submit:${this.schemaName}`, this.name);
   }
 
@@ -690,6 +691,7 @@ export class Doc extends Observable<DocValue | Doc[]> {
     await this.setAndSync('cancelled', true);
     await this.trigger('afterCancel');
 
+    this.fyo.telemetry.log(Verb.Cancelled, this.schemaName);
     this.fyo.doc.observer.trigger(`cancel:${this.schemaName}`, this.name);
   }
 
diff --git a/fyo/telemetry/helpers.ts b/fyo/telemetry/helpers.ts
index d834f151..0d5539f1 100644
--- a/fyo/telemetry/helpers.ts
+++ b/fyo/telemetry/helpers.ts
@@ -1,18 +1,9 @@
 import { Fyo } from 'fyo';
 import { ConfigFile, ConfigKeys } from 'fyo/core/types';
 import { DEFAULT_COUNTRY_CODE } from 'fyo/utils/consts';
-import { t } from 'fyo/utils/translation';
-import { Count, TelemetrySetting, UniqueId } from './types';
-
-export function getId(): string {
-  let id: string = '';
-
-  for (let i = 0; i < 4; i++) {
-    id += Math.random().toString(36).slice(2, 9);
-  }
-
-  return id;
-}
+import { ModelNameEnum } from 'models/types';
+import { getRandomString } from 'utils';
+import { UniqueId } from './types';
 
 export function getCountry(fyo: Fyo): string {
   return (
@@ -24,27 +15,10 @@ export function getLanguage(fyo: Fyo): string {
   return fyo.config.get('language') as string;
 }
 
-export async function getCounts(
-  interestingDocs: string[],
-  fyo: Fyo
-): Promise<Count> {
-  const countMap: Count = {};
-  if (fyo.db === undefined) {
-    return countMap;
-  }
-
-  for (const name of interestingDocs) {
-    const count: number = (await fyo.db.getAll(name)).length;
-    countMap[name] = count;
-  }
-
-  return countMap;
-}
-
 export function getDeviceId(fyo: Fyo): UniqueId {
   let deviceId = fyo.config.get(ConfigKeys.DeviceId) as string | undefined;
   if (deviceId === undefined) {
-    deviceId = getId();
+    deviceId = getRandomString();
     fyo.config.set(ConfigKeys.DeviceId, deviceId);
   }
 
@@ -53,69 +27,69 @@ export function getDeviceId(fyo: Fyo): UniqueId {
 
 export function getInstanceId(fyo: Fyo): UniqueId {
   const files = (fyo.config.get(ConfigKeys.Files) ?? []) as ConfigFile[];
+  const instanceId = fyo.singles.SystemSettings!.instanceId as string;
+  const dbPath = fyo.db.dbPath!;
+  const companyName = fyo.singles.AccountingSettings!.companyName as string;
 
-  const companyName = fyo.singles.AccountingSettings?.companyName as string;
-  if (companyName === undefined) {
-    return '';
-  }
-
-  const file = files.find((f) => f.companyName === companyName);
+  let file = files.find((f) => f.id === instanceId);
 
   if (file === undefined) {
-    return addNewFile(companyName, fyo, files);
+    file = addNewConfigFile(companyName, dbPath, instanceId, files, fyo);
   }
 
-  if (file.id === undefined) {
-    return setInstanceId(companyName, files, fyo);
+  if (!file.id) {
+    setIdOnConfigFile(instanceId, companyName, dbPath, files, fyo);
   }
 
-  return file.id;
+  return instanceId;
 }
 
-export function addNewFile(
+export function addNewConfigFile(
   companyName: string,
-  fyo: Fyo,
-  files?: ConfigFile[],
-  dbPath?: string
-): UniqueId {
-  files ??= fyo.config.get(ConfigKeys.Files, []) as ConfigFile[];
-  dbPath ??= fyo.config.get(ConfigKeys.LastSelectedFilePath, '') as string;
-
+  dbPath: string,
+  instanceId: string,
+  files: ConfigFile[],
+  fyo: Fyo
+): ConfigFile {
   const newFile: ConfigFile = {
     companyName,
     dbPath,
-    id: getId(),
+    id: instanceId,
     openCount: 0,
   };
 
   files.push(newFile);
   fyo.config.set(ConfigKeys.Files, files);
-  return newFile.id;
+  return newFile;
 }
 
-function setInstanceId(
+export async function getVersion(fyo: Fyo) {
+  const version = (await fyo.getValue(
+    ModelNameEnum.SystemSettings,
+    'version'
+  )) as string | undefined;
+
+  if (version) {
+    return version;
+  }
+
+  return fyo.store.appVersion;
+}
+
+function setIdOnConfigFile(
+  instanceId: string,
   companyName: string,
+  dbPath: string,
   files: ConfigFile[],
   fyo: Fyo
-): UniqueId {
-  let id = '';
+) {
   for (const file of files) {
-    if (file.id) {
+    if (file.companyName !== companyName || file.dbPath !== dbPath) {
       continue;
     }
 
-    file.id = getId();
-    if (file.companyName === companyName) {
-      id = file.id;
-    }
+    file.id = instanceId;
   }
 
   fyo.config.set(ConfigKeys.Files, files);
-  return id;
 }
-
-export const getTelemetryOptions = () => ({
-  [TelemetrySetting.allow]: t`Allow Telemetry`,
-  [TelemetrySetting.dontLogUsage]: t`Don't Log Usage`,
-  [TelemetrySetting.dontLogAnything]: t`Don't Log Anything`,
-});
diff --git a/fyo/telemetry/telemetry.ts b/fyo/telemetry/telemetry.ts
index 5c8e958e..46ccfc1f 100644
--- a/fyo/telemetry/telemetry.ts
+++ b/fyo/telemetry/telemetry.ts
@@ -1,53 +1,38 @@
 import { Fyo } from 'fyo';
-import { ConfigKeys } from 'fyo/core/types';
 import { cloneDeep } from 'lodash';
+import { DateTime } from 'luxon';
 import {
   getCountry,
-  getCounts,
   getDeviceId,
   getInstanceId,
   getLanguage,
+  getVersion,
 } from './helpers';
-import {
-  Noun,
-  NounEnum,
-  Platform,
-  Telemetry,
-  TelemetrySetting,
-  Verb,
-} from './types';
+import { Noun, Platform, Telemetry, Verb } from './types';
 
 /**
  * # Telemetry
+ * Used to check if people are using Books or not. All logging
+ * happens using navigator.sendBeacon
  *
  * ## `start`
- * Used to initialize state. It should be called before interaction.
+ * Used to initialize state. It should be called before any logging and after an
+ * instance has loaded.
  * It is called on three events:
- * 1. On db initialization which happens everytime a db is loaded or changed.
+ * 1. When Desk is opened, i.e. when the usage starts, this also sends a started
+ *    log.
  * 2. On visibility change if not started, eg: when user minimizeds Books and
  *      then comes back later.
- * 3. When `log` is called if not initialized.
+ * 3. When `log` is called, but telemetry wasn't initialized.
  *
  * ## `log`
- * Used to make entries in the `timeline` which happens only if telmetry
- * is set to 'Allow Telemetry`
- *
- * ## `error`
- * Called in errorHandling.ts and maintains a count of errors that were
- * thrown during usage.
+ * Used to log activity.
  *
  * ## `stop`
  * This is to be called when a session is being stopped. It's called on two events
  * 1. When the db is being changed.
  * 2. When the visiblity has changed which happens when either the app is being shut or
  *      the app is hidden.
- *
- * This function can't be async as it's called when visibility changes to 'hidden'
- * at which point async doesn't seem to work and hence count is captured on `start()`
- *
- * ## `finalLogAndStop`
- * Called when telemetry is set to "Don't Log Anything" so as to indicate cessation of
- * telemetry and not app usage.
  */
 
 export class TelemetryManager {
@@ -55,7 +40,6 @@ export class TelemetryManager {
   #token: string = '';
   #started = false;
   #telemetryObject: Partial<Telemetry> = {};
-  #interestingDocs: string[] = [];
   fyo: Fyo;
 
   constructor(fyo: Fyo) {
@@ -66,10 +50,6 @@ export class TelemetryManager {
     this.#telemetryObject.platform ||= value;
   }
 
-  set interestingDocs(schemaNames: string[]) {
-    this.#interestingDocs = schemaNames;
-  }
-
   get hasCreds() {
     return !!this.#url && !!this.#token;
   }
@@ -82,89 +62,57 @@ export class TelemetryManager {
     return cloneDeep(this.#telemetryObject);
   }
 
-  async start() {
+  async start(openCount?: number) {
     this.#telemetryObject.country ||= getCountry(this.fyo);
     this.#telemetryObject.language ??= getLanguage(this.fyo);
-    this.#telemetryObject.deviceId ||= getDeviceId(this.fyo);
-    this.#telemetryObject.instanceId ||= getInstanceId(this.fyo);
-    this.#telemetryObject.openTime ||= new Date().valueOf();
-    this.#telemetryObject.timeline ??= [];
-    this.#telemetryObject.errors ??= {};
-    this.#telemetryObject.counts ??= {};
+    this.#telemetryObject.device ||= getDeviceId(this.fyo);
+    this.#telemetryObject.instance ||= getInstanceId(this.fyo);
+    this.#telemetryObject.version ||= await getVersion(this.fyo);
+
     this.#started = true;
+    await this.#setCreds();
 
-    await this.#postStart();
-  }
-
-  async log(verb: Verb, noun: Noun, more?: Record<string, unknown>) {
-    if (!this.#started) {
-      await this.start();
+    if (typeof openCount === 'number') {
+      this.#telemetryObject.openCount = openCount;
+      this.log(Verb.Started, 'telemetry');
+    } else {
+      this.log(Verb.Resumed, 'telemetry');
     }
-
-    if (!this.#getCanLog()) {
-      return;
-    }
-
-    const time = new Date().valueOf();
-    if (this.#telemetryObject.timeline === undefined) {
-      this.#telemetryObject.timeline = [];
-    }
-
-    this.#telemetryObject.timeline.push({ time, verb, noun, more });
-  }
-
-  error(name: string) {
-    if (this.#telemetryObject.errors === undefined) {
-      this.#telemetryObject.errors = {};
-    }
-
-    this.#telemetryObject.errors[name] ??= 0;
-    this.#telemetryObject.errors[name] += 1;
   }
 
   stop() {
+    if (!this.started) {
+      return;
+    }
+
+    this.log(Verb.Stopped, 'telemetry');
     this.#started = false;
+    this.#clear();
+  }
 
-    this.#telemetryObject.version = this.fyo.store.appVersion ?? '';
-    this.#telemetryObject.closeTime = new Date().valueOf();
+  log(verb: Verb, noun: Noun, more?: Record<string, unknown>) {
+    if (!this.#started) {
+      this.start().then(() => this.#sendBeacon(verb, noun, more));
+      return;
+    }
 
+    this.#sendBeacon(verb, noun, more);
+  }
+
+  #sendBeacon(verb: Verb, noun: Noun, more?: Record<string, unknown>) {
+    if (!this.hasCreds) {
+      return;
+    }
+
+    const telemetryData: Telemetry = this.#getTelemtryData(verb, noun, more);
     const data = JSON.stringify({
       token: this.#token,
-      telemetryData: this.#telemetryObject,
+      telemetryData,
     });
 
-    this.#clear();
-
-    if (
-      this.fyo.config.get(ConfigKeys.Telemetry) ===
-      TelemetrySetting.dontLogAnything
-    ) {
-      return;
-    }
     navigator.sendBeacon(this.#url, data);
   }
 
-  finalLogAndStop() {
-    this.log(Verb.Stopped, NounEnum.Telemetry);
-    this.stop();
-  }
-
-  async #postStart() {
-    await this.#setCount();
-    await this.#setCreds();
-  }
-
-  async #setCount() {
-    if (!this.#getCanLog()) {
-      return;
-    }
-
-    this.#telemetryObject.counts = await getCounts(
-      this.#interestingDocs,
-      this.fyo
-    );
-  }
-
   async #setCreds() {
     if (this.hasCreds) {
       return;
@@ -175,21 +123,31 @@ export class TelemetryManager {
     this.#token = token;
   }
 
-  #getCanLog(): boolean {
-    const telemetrySetting = this.fyo.config.get(
-      ConfigKeys.Telemetry
-    ) as string;
-    return telemetrySetting === TelemetrySetting.allow;
+  #getTelemtryData(
+    verb: Verb,
+    noun: Noun,
+    more?: Record<string, unknown>
+  ): Telemetry {
+    return {
+      country: this.#telemetryObject.country!,
+      language: this.#telemetryObject.language!,
+      device: this.#telemetryObject.device!,
+      instance: this.#telemetryObject.instance!,
+      version: this.#telemetryObject.version!,
+      openCount: this.#telemetryObject.openCount!,
+      timestamp: DateTime.now().toMillis().toString(),
+      verb,
+      noun,
+      more,
+    };
   }
 
   #clear() {
-    // Delete only what varies
-    delete this.#telemetryObject.openTime;
-    delete this.#telemetryObject.closeTime;
-    delete this.#telemetryObject.errors;
-    delete this.#telemetryObject.counts;
-    delete this.#telemetryObject.timeline;
-    delete this.#telemetryObject.instanceId;
     delete this.#telemetryObject.country;
+    delete this.#telemetryObject.language;
+    delete this.#telemetryObject.device;
+    delete this.#telemetryObject.instance;
+    delete this.#telemetryObject.version;
+    delete this.#telemetryObject.openCount;
   }
 }
diff --git a/fyo/telemetry/types.ts b/fyo/telemetry/types.ts
index 16eded28..677e6905 100644
--- a/fyo/telemetry/types.ts
+++ b/fyo/telemetry/types.ts
@@ -1,50 +1,33 @@
 export type AppVersion = string;
 export type UniqueId = string;
-export type Timestamp = number;
+export type Timestamp = string;
 
-export interface InteractionEvent {
-  time: Timestamp;
-  verb: Verb;
-  noun: Noun;
-  more?: Record<string, unknown>;
-}
-
-export type Count = Record<string, number>;
 export type Platform = 'Windows' | 'Mac' | 'Linux';
 
-export interface Telemetry {
-  deviceId: UniqueId;
-  instanceId: UniqueId;
-  openTime: Timestamp;
-  platform?: Platform;
-  closeTime: Timestamp;
-  timeline?: InteractionEvent[];
-  counts?: Count;
-  errors: Record<string, number>;
-  country: string;
-  language: string;
-  version: AppVersion;
-}
-
 export enum Verb {
   Created = 'created',
   Deleted = 'deleted',
-  Navigated = 'navigated',
+  Submitted = 'submitted',
+  Cancelled = 'cancelled',
   Imported = 'imported',
   Exported = 'exported',
   Stopped = 'stopped',
-  Started = 'stopped',
+  Started = 'started',
+  Resumed = 'resumed',
 }
 
-export enum NounEnum {
-  Route = 'route',
-  Telemetry = 'telemetry',
-}
+export type Noun = string;
 
-export type Noun = string | NounEnum;
-
-export enum TelemetrySetting {
-  allow = 'allow',
-  dontLogUsage = 'dontLogUsage',
-  dontLogAnything = 'dontLogAnything',
+export interface Telemetry {
+  device: UniqueId;
+  instance: UniqueId;
+  platform?: Platform;
+  country: string;
+  language: string;
+  version: AppVersion;
+  timestamp: Timestamp;
+  openCount: number;
+  verb: Verb;
+  noun: Noun;
+  more?: Record<string, unknown>
 }
diff --git a/schemas/core/SystemSettings.json b/schemas/core/SystemSettings.json
index 9931c053..92c33fb8 100644
--- a/schemas/core/SystemSettings.json
+++ b/schemas/core/SystemSettings.json
@@ -95,6 +95,12 @@
       "label": "Version",
       "fieldtype": "Data",
       "readOnly": true
+    },
+    {
+      "fieldname": "instanceId",
+      "label": "Instance Id",
+      "fieldtype": "Data",
+      "readOnly": true
     }
   ],
   "quickEditFields": [
diff --git a/src/App.vue b/src/App.vue
index a79c5118..c3c13956 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,20 +29,12 @@
     >
       <div id="toast-target" />
     </div>
-
-    <!-- Prompt to Set Telemetry -->
-    <TelemetryModal />
   </div>
 </template>
 
 <script>
 import { ConfigKeys } from 'fyo/core/types';
-import {
-getSetupComplete,
-incrementOpenCount,
-startTelemetry
-} from 'src/utils/misc';
-import TelemetryModal from './components/once/TelemetryModal.vue';
+import { getSetupComplete, incrementOpenCount } from 'src/utils/misc';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
 import { fyo, initializeInstance } from './initFyo';
 import DatabaseSelector from './pages/DatabaseSelector.vue';
@@ -65,7 +57,6 @@ export default {
     SetupWizard,
     DatabaseSelector,
     WindowsTitleBar,
-    TelemetryModal,
   },
   async mounted() {
     fyo.telemetry.platform = this.platform;
@@ -86,8 +77,8 @@ export default {
     async setDesk(filePath) {
       this.activeScreen = 'Desk';
       await this.setDeskRoute();
-      await incrementOpenCount(filePath);
-      await startTelemetry();
+      const openCount = await incrementOpenCount(filePath);
+      await fyo.telemetry.start(openCount);
       await checkForUpdates(false);
     },
     async fileSelected(filePath, isNew) {
diff --git a/src/components/once/TelemetryModal.vue b/src/components/once/TelemetryModal.vue
deleted file mode 100644
index a3ce37ef..00000000
--- a/src/components/once/TelemetryModal.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <Modal :open-modal="shouldOpen" class="p-6 flex flex-col gap-3 text-gray-900">
-    <div class="flex justify-between">
-      <h1 class="font-bold text-md">{{ t`Set Anonymized Telemetry` }}</h1>
-      <button @click="shouldOpen = false">
-        <FeatherIcon name="x" class="w-5 h-5 text-gray-600" />
-      </button>
-    </div>
-    <p class="text-base mt-4">
-      {{ t`Hello there! 👋` }}
-    </p>
-    <p class="text-base">
-      {{
-        t`Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent
-        users. It will be really helpful if you switch it on, but we won't force you. 🙂`
-      }}
-    </p>
-    <p class="text-base mt-4">
-      {{ t`Please select an option:` }}
-    </p>
-    <FormControl
-      :df="df"
-      class="text-sm border rounded-md"
-      @change="
-        (v) => {
-          value = v;
-        }
-      "
-      :value="value"
-    />
-    <p class="text-base text-gray-800">{{ description }}</p>
-    <div class="flex flex-row w-full justify-between items-center mt-12">
-      <HowTo
-        link="https://github.com/frappe/books/wiki/Anonymized-Opt-In-Telemetry"
-        class="text-sm hover:text-gray-900 text-gray-800 py-1 justify-between"
-        :icon="false"
-        >{{ t`Know More` }}</HowTo
-      >
-
-      <Button
-        class="text-sm w-32"
-        type="primary"
-        :disabled="!isSet"
-        @click="saveClicked"
-        >{{ t`Save Option` }}</Button
-      >
-    </div>
-  </Modal>
-</template>
-
-<script>
-import { ConfigKeys } from 'fyo/core/types';
-import { getTelemetryOptions } from 'fyo/telemetry/helpers';
-import { TelemetrySetting } from 'fyo/telemetry/types';
-import { fyo } from 'src/initFyo';
-import Button from '../Button.vue';
-import FormControl from '../Controls/FormControl.vue';
-import FeatherIcon from '../FeatherIcon.vue';
-import HowTo from '../HowTo.vue';
-import Modal from '../Modal.vue';
-
-export default {
-  components: { Modal, FormControl, Button, HowTo, FeatherIcon },
-  data() {
-    return {
-      shouldOpen: false,
-      value: '',
-    };
-  },
-  computed: {
-    df() {
-      const telemetryOptions = getTelemetryOptions();
-      return {
-        fieldname: 'anonymizedTelemetry',
-        label: this.t`Anonymized Telemetry`,
-        fieldtype: 'Select',
-        options: Object.keys(telemetryOptions),
-        map: telemetryOptions,
-        default: 'allow',
-        description: this
-          .t`Send anonymized usage data and error reports to help improve the product.`,
-      };
-    },
-    description() {
-      if (!this.isSet) {
-        return '';
-      }
-
-      return {
-        [TelemetrySetting.allow]: this
-          .t`Enables telemetry. Includes usage patterns.`,
-        [TelemetrySetting.dontLogUsage]: this
-          .t`Enables telemetry. Does not include usage patterns.`,
-        [TelemetrySetting.dontLogAnything]: this
-          .t`Disables telemetry. No data will be collected, you are completely invisble to us.`,
-      }[this.value];
-    },
-    isSet() {
-      return this.getIsSet(this.value);
-    },
-  },
-  methods: {
-    saveClicked() {
-      if (this.value === TelemetrySetting.dontLogUsage) {
-        telemetry.finalLogAndStop();
-      } else {
-        telemetry.log(Verb.Started, NounEnum.Telemetry);
-      }
-
-      config.set(ConfigKeys.Telemetry, this.value);
-      this.shouldOpen = false;
-    },
-    getIsSet(value) {
-      return [
-        TelemetrySetting.allow,
-        TelemetrySetting.dontLogAnything,
-        TelemetrySetting.dontLogUsage,
-      ].includes(value);
-    },
-
-    setOpen(telemetry) {
-      const openCount = fyo.config
-        .get(ConfigKeys.Files)
-        .map((f) => f.openCount)
-        .reduce((a, b) => (a ?? 0) + (b ?? 0));
-      this.shouldOpen = !this.getIsSet(telemetry) && openCount >= 4;
-    },
-  },
-  mounted() {
-    const telemetry = fyo.config.get(ConfigKeys.Telemetry);
-    this.setOpen(telemetry);
-    this.value = telemetry;
-  },
-};
-</script>
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index d4697659..6b626662 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -1,9 +1,11 @@
 import { ipcRenderer } from 'electron';
 import { t } from 'fyo';
-import { ConfigKeys } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
-import { TelemetrySetting } from 'fyo/telemetry/types';
-import { MandatoryError, ValidationError } from 'fyo/utils/errors';
+import {
+  MandatoryError,
+  NotFoundError,
+  ValidationError,
+} from 'fyo/utils/errors';
 import { ErrorLog } from 'fyo/utils/types';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { fyo } from './initFyo';
@@ -11,13 +13,8 @@ import { getErrorMessage } from './utils';
 import { ToastOptions } from './utils/types';
 import { showMessageDialog, showToast } from './utils/ui';
 
-function getCanLog(): boolean {
-  const telemetrySetting = fyo.config.get(ConfigKeys.Telemetry);
-  return telemetrySetting !== TelemetrySetting.dontLogAnything;
-}
-
 function shouldNotStore(error: Error) {
-  return [MandatoryError, ValidationError].some(
+  return [MandatoryError, ValidationError, NotFoundError].some(
     (errorClass) => error instanceof errorClass
   );
 }
@@ -43,23 +40,14 @@ async function reportError(errorLogObj: ErrorLog, cb?: Function) {
   cb?.();
 }
 
-function getToastProps(errorLogObj: ErrorLog, canLog: boolean, cb?: Function) {
+function getToastProps(errorLogObj: ErrorLog, cb?: Function) {
   const props: ToastOptions = {
     message: errorLogObj.name ?? t`Error`,
     type: 'error',
+    actionText: t`Report Error`,
+    action: () => reportIssue(errorLogObj),
   };
 
-  // @ts-ignore
-  if (!canLog) {
-    Object.assign(props, {
-      actionText: t`Report Error`,
-      action: () => {
-        reportIssue(errorLogObj);
-        reportError(errorLogObj, cb);
-      },
-    });
-  }
-
   return props;
 }
 
@@ -76,13 +64,12 @@ export function getErrorLogObject(
   return errorLogObj;
 }
 
-export function handleError(
+export async function handleError(
   shouldLog: boolean,
   error: Error,
   more?: Record<string, unknown>,
   cb?: Function
 ) {
-  fyo.telemetry.error(error.name);
   if (shouldLog) {
     console.error(error);
   }
@@ -93,17 +80,14 @@ export function handleError(
 
   const errorLogObj = getErrorLogObject(error, more ?? {});
 
-  const canLog = getCanLog();
-  if (canLog) {
-    reportError(errorLogObj, cb);
-  } else {
-    showToast(getToastProps(errorLogObj, canLog, cb));
-  }
+  await reportError(errorLogObj, cb);
+  const toastProps = getToastProps(errorLogObj, cb);
+  await showToast(toastProps);
 }
 
 export async function handleErrorWithDialog(error: Error, doc?: Doc) {
   const errorMessage = getErrorMessage(error, doc);
-  handleError(false, error, { errorMessage, doc });
+  await handleError(false, error, { errorMessage, doc });
 
   const name = error.name ?? t`Error`;
   await showMessageDialog({ message: name, detail: errorMessage });
@@ -125,7 +109,7 @@ export function getErrorHandled(func: Function) {
     try {
       return await func(...args);
     } catch (error) {
-      handleError(false, error as Error, {
+      await handleError(false, error as Error, {
         functionName: func.name,
         functionArgs: args,
       });
@@ -143,9 +127,9 @@ export function getErrorHandledSync(func: Function) {
       handleError(false, error as Error, {
         functionName: func.name,
         functionArgs: args,
+      }).then(() => {
+        throw error;
       });
-
-      throw error;
     }
   };
 }
diff --git a/src/initFyo.ts b/src/initFyo.ts
index 1c02a3f8..5cc4ef48 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -1,7 +1,7 @@
 import { Fyo } from 'fyo';
 import { getRegionalModels, models } from 'models';
 import { ModelNameEnum } from 'models/types';
-import { getValueMapFromList } from 'utils';
+import { getRandomString, getValueMapFromList } from 'utils';
 
 export const fyo = new Fyo({ isTest: false, isElectron: true });
 
@@ -32,6 +32,7 @@ export async function initializeInstance(
   await setSingles(fyo);
   await setCreds(fyo);
   await setVersion(fyo);
+  await setInstanceId(fyo);
   await setCurrencySymbols(fyo);
 }
 
@@ -64,6 +65,13 @@ async function setVersion(fyo: Fyo) {
   }
 }
 
+async function setInstanceId(fyo: Fyo) {
+  const systemSettings = await fyo.doc.getSingle(ModelNameEnum.SystemSettings);
+  if (!systemSettings.instanceId) {
+    await systemSettings.setAndSync('instanceId', getRandomString());
+  }
+}
+
 async function setCurrencySymbols(fyo: Fyo) {
   const currencies = (await fyo.db.getAll(ModelNameEnum.Currency, {
     fields: ['name', 'symbol'],
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index 8e4a8f74..bd98f40a 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -119,21 +119,38 @@
 
       <!-- Language Selector -->
       <div
-        class="w-full flex justify-between items-center absolute px-6 py-6"
+        class="
+          w-full
+          flex
+          justify-between
+          items-center
+          absolute
+          px-6
+          py-6
+          text-gray-900
+        "
         style="top: 100%; transform: translateY(-100%)"
       >
-        <Button
-          class="text-sm w-40"
-          @click="createDemo"
-          :disabled="creatingDemo"
-          >{{ creatingDemo ? t`Please Wait` : t`Create Demo` }}</Button
-        >
-
         <LanguageSelector
           v-show="!creatingDemo"
-          class="w-40 bg-gray-100 rounded-md"
-          input-class="text-sm bg-transparent"
+          class="text-sm w-40 bg-gray-100 rounded-md"
+          input-class="py-1.5 bg-transparent"
         />
+        <button
+          class="
+            text-sm
+            bg-gray-100
+            hover:bg-gray-200
+            rounded-md
+            px-4
+            py-1.5
+            w-40
+          "
+          @click="createDemo"
+          :disabled="creatingDemo"
+        >
+          {{ creatingDemo ? t`Please Wait` : t`Create Demo` }}
+        </button>
       </div>
     </div>
     <Loading
@@ -153,7 +170,6 @@ import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
 import { addNewFile } from 'fyo/telemetry/helpers';
 import { DateTime } from 'luxon';
-import Button from 'src/components/Button.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import FeatherIcon from 'src/components/FeatherIcon.vue';
 import Loading from 'src/components/Loading.vue';
@@ -217,7 +233,7 @@ export default {
       this.creatingDemo = true;
       const baseCount = fyo.store.isDevelopment ? 1000 : 150;
 
-      const companyName = await setupDummyInstance(
+      const { companyName, instanceId } = await setupDummyInstance(
         filePath,
         fyo,
         1,
@@ -230,9 +246,10 @@ export default {
 
       addNewFile(
         companyName,
-        fyo,
-        fyo.config.get(ConfigKeys.Files, []),
-        filePath
+        filePath,
+        instanceId,
+        fyo.config.get(ConfigKeys.Files),
+        fyo
       );
 
       fyo.purgeCache();
@@ -292,7 +309,6 @@ export default {
   components: {
     LanguageSelector,
     WindowControls,
-    Button,
     Loading,
     FeatherIcon,
   },
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index 9e1f3bcb..7e76cf5f 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -8,26 +8,22 @@
       :emit-change="true"
       @change="forwardChangeEvent"
     />
-    <div class="flex flex-row justify-between items-center w-full">
-      <div class="flex items-center">
-        <FormControl
-          :df="df"
-          :value="telemetry"
-          @change="setValue"
-          class="text-sm py-0 w-44"
-          :label-right="false"
-        />
-        <div class="border-r h-6 mx-2" />
-        <LanguageSelector class="text-sm w-44" input-class="py-2" />
-      </div>
+    <div
+      class="flex flex-row justify-between items-center w-full text-gray-900"
+    >
+      <LanguageSelector
+        class="text-sm w-40 bg-gray-100 rounded-md"
+        input-class="py-1.5 bg-transparent"
+      />
       <button
         class="
-          text-gray-900 text-sm
+          text-sm
           bg-gray-100
           hover:bg-gray-200
           rounded-md
           px-4
           py-1.5
+          w-40
         "
         @click="checkForUpdates(true)"
       >
@@ -39,10 +35,7 @@
 
 <script>
 import { ConfigKeys } from 'fyo/core/types';
-import { getTelemetryOptions } from 'fyo/telemetry/helpers';
-import { NounEnum, TelemetrySetting, Verb } from 'fyo/telemetry/types';
 import { ModelNameEnum } from 'models/types';
-import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
 import { fyo } from 'src/initFyo';
@@ -52,7 +45,6 @@ import { getCountryInfo } from 'utils/misc';
 export default {
   name: 'TabSystem',
   components: {
-    FormControl,
     TwoColumnForm,
     LanguageSelector,
   },
@@ -67,22 +59,9 @@ export default {
     this.doc = fyo.singles.SystemSettings;
     this.companyName = fyo.singles.AccountingSettings.companyName;
     this.telemetry = fyo.config.get(ConfigKeys.Telemetry);
-    window.gci = getCountryInfo
+    window.gci = getCountryInfo;
   },
   computed: {
-    df() {
-      const telemetryOptions = getTelemetryOptions();
-      return {
-        fieldname: 'anonymizedTelemetry',
-        label: this.t`Anonymized Telemetry`,
-        fieldtype: 'Select',
-        options: Object.keys(telemetryOptions),
-        map: telemetryOptions,
-        default: 'allow',
-        description: this
-          .t`Send anonymized usage data and error reports to help improve the product.`,
-      };
-    },
     fields() {
       return fyo.schemaMap.SystemSettings.quickEditFields.map((f) =>
         fyo.getField(ModelNameEnum.SystemSettings, f)
@@ -91,16 +70,6 @@ export default {
   },
   methods: {
     checkForUpdates,
-    setValue(value) {
-      this.telemetry = value;
-      if (value === TelemetrySetting.dontLogAnything) {
-        fyo.telemetry.finalLogAndStop();
-      } else {
-        fyo.telemetry.log(Verb.Started, NounEnum.Telemetry);
-      }
-
-      fyo.config.set(ConfigKeys.Telemetry, value);
-    },
     forwardChangeEvent(...args) {
       this.$emit('change', ...args);
     },
diff --git a/src/renderer.ts b/src/renderer.ts
index 5caae725..bfd1d816 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -81,7 +81,6 @@ function setErrorHandlers(app: VueApp) {
       const { fullPath, params } = vm.$route;
       more.fullPath = fullPath;
       more.params = stringifyCircular(params ?? {});
-      more.data = stringifyCircular(vm.$data ?? {}, true, true);
       more.props = stringifyCircular(vm.$props ?? {}, true, true);
     }
 
diff --git a/src/renderer/registerIpcRendererListeners.ts b/src/renderer/registerIpcRendererListeners.ts
index 732225f1..1c5c5ed7 100644
--- a/src/renderer/registerIpcRendererListeners.ts
+++ b/src/renderer/registerIpcRendererListeners.ts
@@ -1,7 +1,6 @@
 import { ipcRenderer } from 'electron';
 import { handleError } from 'src/errorHandling';
 import { fyo } from 'src/initFyo';
-import { startTelemetry } from 'src/utils/misc';
 import { showToast } from 'src/utils/ui';
 import { IPC_CHANNELS, IPC_MESSAGES } from 'utils/messages';
 
@@ -57,7 +56,7 @@ export default function registerIpcRendererListeners() {
   document.addEventListener('visibilitychange', function () {
     const { visibilityState } = document;
     if (visibilityState === 'visible' && !fyo.telemetry.started) {
-      startTelemetry();
+      fyo.telemetry.start();
     }
 
     if (visibilityState !== 'hidden') {
diff --git a/src/router.ts b/src/router.ts
index 400fb116..ecd4971f 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -1,4 +1,3 @@
-import { NounEnum, Verb } from 'fyo/telemetry/types';
 import ChartOfAccounts from 'src/pages/ChartOfAccounts.vue';
 import Dashboard from 'src/pages/Dashboard/Dashboard.vue';
 import DataImport from 'src/pages/DataImport.vue';
@@ -11,7 +10,6 @@ import QuickEditForm from 'src/pages/QuickEditForm.vue';
 import Report from 'src/pages/Report.vue';
 import Settings from 'src/pages/Settings/Settings.vue';
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
-import { fyo } from './initFyo';
 
 const routes: RouteRecordRaw[] = [
   {
@@ -120,26 +118,4 @@ const routes: RouteRecordRaw[] = [
 
 const router = createRouter({ routes, history: createWebHistory() });
 
-function removeDetails(path: string) {
-  if (!path) {
-    return path;
-  }
-
-  const match = path.match(/edit=1/);
-  if (!match) {
-    return path;
-  }
-
-  return path.slice(0, match.index! + 4);
-}
-
-router.afterEach((to, from) => {
-  const more = {
-    from: removeDetails(from.fullPath),
-    to: removeDetails(to.fullPath),
-  };
-
-  fyo.telemetry.log(Verb.Navigated, NounEnum.Route, more);
-});
-
 export default router;
diff --git a/src/setup/setupInstance.ts b/src/setup/setupInstance.ts
index ba3a3e72..9d8920c5 100644
--- a/src/setup/setupInstance.ts
+++ b/src/setup/setupInstance.ts
@@ -2,15 +2,16 @@ import { Fyo } from 'fyo';
 import { ConfigFile, DocValueMap } from 'fyo/core/types';
 import { Doc } from 'fyo/model/doc';
 import { createNumberSeries } from 'fyo/model/naming';
-import { getId } from 'fyo/telemetry/helpers';
 import {
   DEFAULT_CURRENCY,
   DEFAULT_LOCALE,
   DEFAULT_SERIES_START,
 } from 'fyo/utils/consts';
 import { AccountingSettings } from 'models/baseModels/AccountingSettings/AccountingSettings';
+import { ModelNameEnum } from 'models/types';
 import { initializeInstance } from 'src/initFyo';
 import { createRegionalRecords } from 'src/regional';
+import { getRandomString } from 'utils';
 import { getCountryCodeFromCountry, getCountryInfo } from 'utils/misc';
 import { CountryInfo } from 'utils/types';
 import { CreateCOA } from './createCOA';
@@ -93,10 +94,12 @@ async function updateSystemSettings(
   const locale = countryOptions.locale ?? DEFAULT_LOCALE;
   const countryCode = getCountryCodeFromCountry(country);
   const systemSettings = await fyo.doc.getSingle('SystemSettings');
+  const instanceId = getRandomString();
 
   systemSettings.setAndSync({
     locale,
     currency,
+    instanceId,
     countryCode,
   });
 }
@@ -156,18 +159,22 @@ async function createAccountRecords(
 }
 
 async function completeSetup(companyName: string, fyo: Fyo) {
-  updateInitializationConfig(companyName, fyo);
+  await updateInitializationConfig(companyName, fyo);
   await fyo.singles.AccountingSettings!.setAndSync('setupComplete', true);
 }
 
-function updateInitializationConfig(companyName: string, fyo: Fyo) {
+async function updateInitializationConfig(companyName: string, fyo: Fyo) {
+  const instanceId = (await fyo.getValue(
+    ModelNameEnum.SystemSettings,
+    'instanceId'
+  )) as string;
   const dbPath = fyo.db.dbPath;
   const files = fyo.config.get('files', []) as ConfigFile[];
 
   files.forEach((file) => {
     if (file.dbPath === dbPath) {
       file.companyName = companyName;
-      file.id = getId();
+      file.id = instanceId;
     }
   });
 
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index daafd67a..e133d717 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -71,6 +71,8 @@ export async function incrementOpenCount(dbPath: string) {
     ModelNameEnum.AccountingSettings,
     'companyName'
   )) as string;
+  
+  let openCount = 0;
   const files = fyo.config.get(ConfigKeys.Files) as ConfigFile[];
   for (const file of files) {
     if (file.companyName !== companyName || file.dbPath !== dbPath) {
@@ -79,20 +81,10 @@ export async function incrementOpenCount(dbPath: string) {
 
     file.openCount ??= 0;
     file.openCount += 1;
+    openCount = file.openCount;
     break;
   }
 
   fyo.config.set(ConfigKeys.Files, files);
-}
-
-export async function startTelemetry() {
-  fyo.telemetry.interestingDocs = [
-    ModelNameEnum.Payment,
-    ModelNameEnum.SalesInvoice,
-    ModelNameEnum.PurchaseInvoice,
-    ModelNameEnum.JournalEntry,
-    ModelNameEnum.Party,
-    ModelNameEnum.Item,
-  ];
-  await fyo.telemetry.start();
+  return openCount;
 }

From 2392dbe2fd46f90cf1488ee80f1d7475836e3d36 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 14:58:33 +0530
Subject: [PATCH 150/163] fix: minor fixes to telemetry

---
 fyo/telemetry/helpers.ts   | 14 ++++++++++----
 fyo/telemetry/telemetry.ts | 14 +++++++-------
 fyo/telemetry/types.ts     |  4 ++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/fyo/telemetry/helpers.ts b/fyo/telemetry/helpers.ts
index 0d5539f1..caa9860c 100644
--- a/fyo/telemetry/helpers.ts
+++ b/fyo/telemetry/helpers.ts
@@ -25,11 +25,17 @@ export function getDeviceId(fyo: Fyo): UniqueId {
   return deviceId;
 }
 
-export function getInstanceId(fyo: Fyo): UniqueId {
-  const files = (fyo.config.get(ConfigKeys.Files) ?? []) as ConfigFile[];
-  const instanceId = fyo.singles.SystemSettings!.instanceId as string;
+export async function getInstanceId(fyo: Fyo): Promise<UniqueId> {
+  const instanceId = (await fyo.getValue(
+    ModelNameEnum.SystemSettings,
+    'instanceId'
+  )) as string;
+  const companyName = (await fyo.getValue(
+    ModelNameEnum.AccountingSettings,
+    'companyName'
+  )) as string;
   const dbPath = fyo.db.dbPath!;
-  const companyName = fyo.singles.AccountingSettings!.companyName as string;
+  const files = (fyo.config.get(ConfigKeys.Files) ?? []) as ConfigFile[];
 
   let file = files.find((f) => f.id === instanceId);
 
diff --git a/fyo/telemetry/telemetry.ts b/fyo/telemetry/telemetry.ts
index 46ccfc1f..0d8b913a 100644
--- a/fyo/telemetry/telemetry.ts
+++ b/fyo/telemetry/telemetry.ts
@@ -65,8 +65,8 @@ export class TelemetryManager {
   async start(openCount?: number) {
     this.#telemetryObject.country ||= getCountry(this.fyo);
     this.#telemetryObject.language ??= getLanguage(this.fyo);
-    this.#telemetryObject.device ||= getDeviceId(this.fyo);
-    this.#telemetryObject.instance ||= getInstanceId(this.fyo);
+    this.#telemetryObject.deviceId ||= getDeviceId(this.fyo);
+    this.#telemetryObject.instanceId ||= await getInstanceId(this.fyo);
     this.#telemetryObject.version ||= await getVersion(this.fyo);
 
     this.#started = true;
@@ -91,7 +91,7 @@ export class TelemetryManager {
   }
 
   log(verb: Verb, noun: Noun, more?: Record<string, unknown>) {
-    if (!this.#started) {
+    if (!this.#started && this.fyo.db.isConnected) {
       this.start().then(() => this.#sendBeacon(verb, noun, more));
       return;
     }
@@ -131,8 +131,8 @@ export class TelemetryManager {
     return {
       country: this.#telemetryObject.country!,
       language: this.#telemetryObject.language!,
-      device: this.#telemetryObject.device!,
-      instance: this.#telemetryObject.instance!,
+      deviceId: this.#telemetryObject.deviceId!,
+      instanceId: this.#telemetryObject.instanceId!,
       version: this.#telemetryObject.version!,
       openCount: this.#telemetryObject.openCount!,
       timestamp: DateTime.now().toMillis().toString(),
@@ -145,8 +145,8 @@ export class TelemetryManager {
   #clear() {
     delete this.#telemetryObject.country;
     delete this.#telemetryObject.language;
-    delete this.#telemetryObject.device;
-    delete this.#telemetryObject.instance;
+    delete this.#telemetryObject.deviceId;
+    delete this.#telemetryObject.instanceId;
     delete this.#telemetryObject.version;
     delete this.#telemetryObject.openCount;
   }
diff --git a/fyo/telemetry/types.ts b/fyo/telemetry/types.ts
index 677e6905..c091cdf8 100644
--- a/fyo/telemetry/types.ts
+++ b/fyo/telemetry/types.ts
@@ -19,8 +19,8 @@ export enum Verb {
 export type Noun = string;
 
 export interface Telemetry {
-  device: UniqueId;
-  instance: UniqueId;
+  deviceId: UniqueId;
+  instanceId: UniqueId;
   platform?: Platform;
   country: string;
   language: string;

From e943432d911e253cd0b3b740ee99e6f6952bc288 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 15:25:37 +0530
Subject: [PATCH 151/163] feat: add Dutch translations

---
 README.md             |  15 +-
 src/utils/language.ts |   1 +
 translations/nl.csv   | 477 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 486 insertions(+), 7 deletions(-)
 create mode 100644 translations/nl.csv

diff --git a/README.md b/README.md
index cdf413cc..b1e933ca 100644
--- a/README.md
+++ b/README.md
@@ -106,13 +106,14 @@ If you want to contribute code then you can fork this repo, make changes and rai
 
 ## Translation Contributors
 
-| Language | Contributors |
-|----|---|
-| French | [DeepL](https://www.deepl.com/) |
-| German | [DeepL](https://www.deepl.com/), [barredterra](https://github.com/barredterra) |
-| Portuguese | [DeepL](https://www.deepl.com/) |
-| Arabic | [taha2002](https://github.com/taha2002) |
-| Catalan | Dídac E. Jiménez |
+| Language   | Contributors                                                                   |
+| ---------- | ------------------------------------------------------------------------------ |
+| French     | [DeepL](https://www.deepl.com/)                                                |
+| German     | [DeepL](https://www.deepl.com/), [barredterra](https://github.com/barredterra) |
+| Portuguese | [DeepL](https://www.deepl.com/)                                                |
+| Arabic     | [taha2002](https://github.com/taha2002)                                        |
+| Catalan    | Dídac E. Jiménez                                                               |
+| Dutch      | [FastAct](https://github.com/FastAct)                                          |
 
 ## License
 
diff --git a/src/utils/language.ts b/src/utils/language.ts
index 977547ee..aaf7550f 100644
--- a/src/utils/language.ts
+++ b/src/utils/language.ts
@@ -13,6 +13,7 @@ export const languageCodeMap: Record<string, string> = {
   Portuguese: 'pt',
   Arabic: 'ar',
   Catalan: 'ca-ES',
+  Dutch: 'nl',
 };
 
 export async function setLanguageMap(
diff --git a/translations/nl.csv b/translations/nl.csv
new file mode 100644
index 00000000..d97901c9
--- /dev/null
+++ b/translations/nl.csv
@@ -0,0 +1,477 @@
+"${0} ${1} is linked with existing records.","${0} ${1} is gekoppeld aan bestaande records.",
+"${0} filters applied","${0} filters toegepast",
+"1 filter applied","1 filter toegepast",
+"Accepted Quantity","Aanvaarde Hoeveelheid",
+Account,Rekening,
+"Account Entries","Ingevoerde Rekening",
+"Account Name","Rekening Naam",
+"Account Type","Rekening Type",
+"Accounting Ledger Entries","Boekhouding Grootboek Invoeringen",
+"Accounting Settings","Boekhoud Instellingen",
+Accounts,Rekeningen,
+"Accounts Payable","Te Betalen Rekeningen",
+"Accounts Receivable","Te Ontvangen Rekeningen",
+"Accumulated Depreciation","Gecumuleerde Afschrijvingen",
+"Add Account","Rekening Toevoegen",
+"Add Customers","Klanten Toevoegen",
+"Add Group","Groep Toevoegen",
+"Add Items","Artikelen Toevoegen",
+"Add Row","Rij Toevoegen",
+"Add Suppliers","Leveranciers Toevoegen",
+"Add Taxes","Belastingen Toevoegen",
+"Add a filter","Filter toevoegen",
+Address,Adres,
+"Address Display","Adres Weergave",
+"Address Line 1","Adresregel 1",
+"Address Line 2","Adresregel 2",
+"Administrative Expenses","Administratieve Uitgaven",
+"Against Account","Tegen Rekening",
+"All References","Alle Referenties",
+Amount,Bedrag,
+"Amount (Company Currency)","Bedrag (Vennootschap Valuta)",
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Bedrag: ${0} en afschrijving: ${1} is minder dan het totale bedrag toegewezen aan referenties: ${2}.",
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","Bedrag: ${0} is minder dan het totale bedrag toegewezen aan referenties: ${1}.",
+"An error occurred.","Er is een fout opgetreden.",
+"Application of Funds (Assets)","Toepassing van fondsen (activa)",
+"Are you sure you want to cancel ${0} ${1}?","Weet u zeker dat u ${0} ${1} wilt annuleren?",
+"Are you sure you want to delete ${0} ${1}?","Weet u zeker dat u ${0} ${1} wilt verwijderen?",
+"Are you sure you want to submit this Bill?","Weet u zeker dat u deze Rekening wilt presenteren?",
+"Are you sure you want to submit this Invoice?","Weet u zeker dat u deze Factuur wilt presenteren?",
+"Are you sure you want to submit this Journal Entry?","Wil je deze Dagboekvermelding echt inzenden?",
+Back,Terug,
+Balance,Balans,
+"Balance Sheet","Balans Blad",
+"Bank Accounts",Bankrekeningen,
+"Bank Name","Naam Bank",
+"Bank Overdraft Account","Debetsaldo bank",
+Bill,Rekening,
+"Bill Created","Rekening Gemaakt",
+"Bill No","Rekening Nr.",
+Bills,Facturen,
+"Bills Settings","Factuur Instellingen",
+Black,Zwart,
+Body,Lichaam,
+Buildings,Gebouwen,
+CSV,CSV,
+"Can't open database file: ${0}. Please create a new file.","Database bestand: ${0} kan niet geopend worden. Gelieve een nieuw bestand aan te maken.",
+Cancel,Annuleren,
+Cancelled,Geannuleerd,
+"Capital Equipments","Kapitaal Uitrusting",
+"Capital Stock","Eigen Kapitaal",
+Cash,Contant,
+"Cash In Hand","Contant geld in Kas",
+Cashflow,Cashflow,
+"Central Tax","Centrale BTW",
+"Central Tax Paid","Centrale BTW Betaald",
+"Chart Of Accounts Reviewed","Rekeningstelsel Nagekeken",
+"Chart of Accounts",Rekeningstelsel,
+"Checking for updates","Controle op updates",
+"City / Town","Stad / Gemeente",
+"Clearance Date","Datum Goedkeuring",
+"Click to create","Klik om aan te maken",
+Close,Sluiten,
+"Closing (Cr)","Afsluiting (Cr)",
+"Closing (Dr)","Afsluiting (Dr)",
+Color,Kleur,
+"Commission on Sales","Commissie op Verkopen",
+Common,Algemeen,
+"Company Address","Adres Bedrijf",
+"Company Logo",Bedrijfslogo,
+"Company Name",Bedrijfsnaam,
+"Company Settings","Bedrijf Instellingen",
+"Company Setup","Oprichting Bedrijf",
+Completed,Voltooid,
+"Confirm Password","Bevestig Wachtwoord",
+Contains,Bevat,
+"Cost of Goods Sold","Kosten van Verkochte Goederen",
+Country,Land,
+Create,Maak,
+"Create Bill","Rekening Maken",
+"Create Invoice","Factuur Maken",
+"Create a new file and store it in your computer.","Maak een nieuw bestand aan en bewaar op uw computer.",
+"Create a new file or select an existing one from your computer","Maak een nieuw bestand aan of selecteer bestaand bestand op uw computer",
+Credit,Crediet,
+Creditors,Crediteuren,
+Currency,Valuta,
+"Currency Name","Valuta Naam",
+Current,Huidige,
+"Current Assets","Lopende Activa",
+"Current Liabilities","Kortlopende Schulden",
+"Custom Hex","Aangepaste Hex",
+Customer,Klant,
+"Customer Created","Klant Aangemaakt",
+"Customer Currency","Klant Valuta",
+"Customer Name","Naam Klant",
+Customers,Klanten,
+Customise,Aanpassen,
+Customize,"Pas aan",
+"DB Connection Error","DB Verbindingsfout",
+Dashboard,Dashboard,
+"Data Import",Gegevensinvoer,
+Date,Datum,
+"Date Format",Datumformaat,
+Debit,Debet,
+Debtors,Debiteuren,
+"Default Account","Standaard Rekening",
+Delete,Verwijder,
+Depreciation,Afschrijving,
+Description,Beschrijving,
+Details,Details,
+"Direct Expenses","Directe Uitgaven",
+"Direct Income","Directe Inkomsten",
+"Display Logo in Invoice","Logo Weergeven op Factuur",
+"Display Precision","Getal Weergave Nauwkeurigheid",
+"Display Precision should have a value between 0 and 9.","De nauwkeurigheid van de getallen moet een waarde tussen 0 en 9 hebben.",
+"Dividends Paid","Betaalde Dividenden",
+"Document ${0} ${1} has been modified after loading","Document ${0} ${1} is gewijzigd na het laden",
+"Document type ${0} is not submittable","Documenttype ${0} kan niet worden ingediend",
+Documentation,Documentatie,
+"Does Not Contain","Bevat Geen",
+"Download Update","Download Update",
+"Duties and Taxes","Rechten en Taksen",
+"Earnest Money",Waarborgsom,
+Edit,Bewerk,
+"Electronic Equipments","Elektronische Uitrusting",
+Email,"E-mail :",
+"Email Account","E-mail Account",
+"Email Address","E-mail Adres",
+Empty,Leeg,
+"Enable Notifications","Meldingen Activeren",
+"Entertainment Expenses","Uitgaven voor Ontspanning",
+"Entry ID","Ingang ID",
+"Entry Type","Type Invoer",
+Equity,Aandelen,
+Error,Fout,
+Error:,Fout:,
+"Event Settings","Gebeurtenis Instellingen",
+"Exchange Gain/Loss",Wisselkoerswinsten/-verliezen,
+"Exchange Rate",Wisselkoers,
+"Existing File","Fichier existant",
+Expense,Uitgave,
+Expenses,Uitgaven,
+"Expenses Included In Valuation","Uitgaven opgenomen in Waardering",
+"Export Failed","Export Mislukt",
+"Export Successful","Export Gelukt",
+Fax,Fax,
+Fieldname,Veldnaam,
+"File Name",Bestandsnaam,
+"File Path","Bestand Path",
+"File Size",Bestandsgrootte,
+Filter,Filter,
+"Fiscal Year End Date","Einddatum Boekjaar",
+"Fiscal Year Start Date","Begindatum Boekjaar",
+"Fixed Assets","Vaste Activa",
+Font,Lettertype,
+For,Voor,
+Fraction,Fractie,
+"Fraction Units","Fractie Eenheden",
+"Freight and Forwarding Charges","Vracht- en Expeditiekosten",
+From,Van,
+"From Account","Van Rekening",
+"From Date","Van Datum",
+Fulfillment,Afhandeling,
+"Fulfillment Settings",Verzendingsinstellingen,
+"Full Name","Volledige Naam",
+"Furnitures and Fixtures","Meubilair en Inrichting",
+"GST Registration","GST Registratie",
+GSTIN,GSTIN,
+"GSTIN No.","GSTIN Nr.",
+"GSTIN of Supplier","GSTIN van Leverancier",
+"GSTR 3B","GSTIN 3B",
+"GSTR 3B Report","GSTR 3B Rapport",
+GSTR1,GSTR1,
+GSTR2,GSTR2,
+"Gain/Loss on Asset Disposal","Winst/verlies op vervreemding van activa",
+Gender,Geslacht,
+General,Algemeen,
+"General Ledger","Algemeen Grootboek",
+"Get Started","Aan de slag",
+"Grand Total","Groot Totaal",
+"Grand Total (Company Currency)","Groot Totaal (Bedrijf Valuta)",
+"Greater Than","Groter dan",
+HSN/SAC,HSN/SAC,
+"Hex Value",Hex-waarde,
+"Hide & Auto Report Errors","Verberg & Rapporteer Automatisch Fouten",
+"Hide Get Started","Verberg Aan de slag",
+ID,ID,
+Image,Beeld,
+Income,Inkomen,
+"Indirect Expenses","Indirecte Uitgaven",
+"Indirect Income","Indirect Inkomen",
+Inflow,Instroom,
+"Install Update","Update Installeren",
+"Intergrated Tax","Inbegrepen BTW",
+"Intergrated Tax Paid","Betaalde Inbegrepen BTW",
+"Internal Precision","Interne Nauwkeurigheid",
+Investments,Investeringen,
+Invoice,Factuur,
+"Invoice Created","Factuur Aangemaakt",
+"Invoice Date",Factuurdatum,
+"Invoice No","Factuur Nr",
+"Invoice No.","Factuur Nr.",
+"Invoice Number",Factuurnummer,
+"Invoice Setup","Factuur Instellingen",
+"Invoice Value","Factuur Waarde",
+Invoices,Facturen,
+Is,Is,
+"Is Customer","Is Klant",
+"Is Empty","Is Leeg",
+"Is Group","Is Groep",
+"Is Not","Is Niet",
+"Is Not Empty","Is Niet Leeg",
+"Is Supplier","Is Leverancier",
+Item,Artikel,
+"Item Created","Artikel Aangemaakt",
+"Item Name","Naam Artikel",
+Items,Artikels,
+JSON,JSON,
+"JSON Data","JSON Data",
+"Journal Entry","Journaal Invoer",
+"Journal Entry Setting","Instelling Journaalpost",
+"Ledger Entries","Grootboek Invoeren",
+"Ledger Entry","Grootboek Invoer",
+"Legal Expenses","Juridische Kosten",
+"Less Than","Minder Dan",
+"Load an existing .db file from your computer.","Laad een bestaand .db bestand van uw computer.",
+Loading...,Laden...,
+"Loans (Liabilities)","Leningen (Passiva)",
+"Loans and Advances (Assets)","Leningen en Voorschotten (Activa)",
+Locale,Locatie,
+Logo,Logo,
+"MIME Type","MIME Type",
+"Make Payment","Betaling Verrichten",
+"Marketing Expenses","Marketing Uitgaven",
+Message,Bericht,
+"Miscellaneous Expenses","Diverse Uitgaven",
+"Mobile Number","Mobiel Nummer",
+Month,Maand,
+Name,Naam,
+"Net Total","Netto Totaal",
+"Net Total (Company Currency)","Netto Totaal (Vennootschap Valuta)",
+"New Account","Nieuwe Rekening",
+"New Bill","Nieuw Wetsvoorstel",
+"New File","Nieuw Dossier",
+"New Invoice","Nieuwe Factuur",
+"New Journal Entry","Nieuwe Journaalpost",
+"New version available","Nieuwe versie beschikbaar",
+No,Neen,
+"No expenses in this period","Geen uitgaven in deze periode",
+"No filters selected","Geen filters geselecteerd",
+"No results found.","Geen resultaten gevonden.",
+"No transactions yet","Nog geen transacties",
+"No updates available","Geen updates beschikbaar",
+Notes,Notities,
+"Number Series",Nummerreeks,
+"Office Equipments",Kantooruitrusting,
+"Office Maintenance Expenses","Uitgaven voor kantooronderhoud",
+"Office Rent","Kantoor Huren",
+"Onboarding Complete","Inwerken Voltooid",
+"Open Folder","Map Openen",
+"Opening (Cr)","Opening (Cr)",
+"Opening (Dr)","Opening (Dr)",
+"Opening Balance Equity","Openingssaldo Eigen vermogen",
+"Opening Balances",Openingssaldi,
+Organisation,Organisatie,
+Outflow,Uitstroom,
+"Outstanding Amount","Uitstaand Bedrag",
+PDF,PDF,
+Paid,Betaald,
+Parent,Hoofd,
+"Parent Account",Ouderrekening,
+Party,Partij,
+Password,Wachtwoord,
+"Payable Account","Betaalbare Rekening",
+Payment,Betaling,
+"Payment Account",Betaalrekening,
+"Payment For","Betaling Voor",
+"Payment Method",Betalingswijze,
+"Payment Reference",Betalingsreferentie,
+"Payment Settings",Betalingsinstellingen,
+"Payment Type",Betalingswijze,
+"Payment amount cannot be ${0}.","Het betalingsbedrag kan niet ${0} zijn.",
+"Payment amount cannot be less than zero.","Het bedrag van de betaling kan niet lager zijn dan nul.",
+"Payment amount cannot exceed ${0}.","Het bedrag kan niet hoger zijn dan ${0}.",
+"Payment amount: ${0} should be greater than 0.","Het bedrag van de betaling: ${0} moet groter zijn dan 0.",
+"Payment amount: ${0} should be less than Outstanding amount: ${1}.","Het bedrag van betaling: ${0} moet lager zijn dan het uitstaande bedrag: ${1}.",
+Payments,Betalingen,
+"Payroll Payable","Te Betalen Loon",
+Periodicity,Frequentie,
+Phone,Telefoon,
+Place,Plaats,
+"Place of Supply","Plaats van Levering",
+"Place of supply","Plaats van levering",
+"Plants and Machineries","Installaties en Machines",
+"Please fill all values","Gelieve alle waarden in te vullen",
+"Please select an existing database or create a new one.","Selecteer een bestaande database of maak een nieuwe aan.",
+"Please set GSTIN in General Settings.","Stel GSTIN in bij Algemene Instellingen.",
+"Postal Code",Postcode,
+"Postal Expenses",Portokosten,
+"Posting Date",Plaatsingsdatum,
+Prefix,Voorvoegsel,
+"Prevent errors from showing and automatically report all errors.","Voorkom dat fouten worden weergegeven en meld automatisch alle fouten.",
+Print,Afdrukken,
+"Print Format","Formaat afdrukken",
+"Print PDF","PDF Afdrukken",
+"Print Settings",Afdrukinstellingen,
+"Print and Stationery","Drukwerk en Briefpapier",
+"Profit And Loss","Winst En Verlies",
+"Profit and Loss","Winst en Verlies",
+Purchase,Aankoop,
+"Purchase Order",Inkooporder,
+"Purchase Order Settings","Inkooporder Instellingen",
+"Purchase Receipt",Aankoopbon,
+"Purchase Receipt Settings","Instellingen Aankoopbon",
+PurchaseInvoice,Aankoopfactuur,
+Purchases,Aankopen,
+Quantity,Hoeveelheid,
+"Quantity (${0}) cannot be less than zero.","De hoeveelheid (${0}) kan niet kleiner zijn dan nul.",
+Quotation,Offerte,
+"Quotation Settings","Offerte Instellingen",
+Rate,Koers,
+"Rate (${0}) cannot be less zero.","Koers (${0}) kan niet lager zijn dan nul.",
+"Rate (Company Currency)","Koers (Vennootschapsvaluta)",
+Re-Open,Heropen,
+"Receivable Account",Debiteurenrekening,
+"Recent Invoices","Laatste Facturen",
+Reconcile,Herberekenen,
+"Ref. / Cheque No.","Ref. / Cheque nr.",
+"Ref. Date","Ref. Datum",
+"Ref. Name","Réf. Naam",
+"Ref. Type","Réf. Type",
+"Ref/Cheque ID","Réf/Cheque ID",
+"Reference Date",Referentiedatum,
+"Reference DocType","Referentie DocType",
+"Reference Field",Referentieveld,
+"Reference Name",Referentienaam,
+"Reference Number",Referentienummer,
+"Reference Type","Referentie Type",
+"Reload App","Herlaad App",
+"Report Error","Fout Melden",
+Reports,Rapporten,
+"Reset Filters","Reset Filters",
+"Retained Earnings","Ingehouden Winst",
+"Reverse Charge","Omgekeerde Kosten",
+"Reverse Chrg.","Omgekeerde Kst.",
+Reverted,Hersteld,
+"Review Accounts","Rekeningen Nakijken",
+Role,Rol,
+Roles,Rollen,
+"Root Type","Root Type",
+"Round Off",Afronden,
+"Round Off Account","Rekening Afronden",
+"SMTP Host","SMTP Host",
+"SMTP Port","SMTP Poort",
+Salary,Salaris,
+Sales,Verkopen,
+"Sales Expenses",Verkoopkosten,
+"Sales Order",Verkooporder,
+"Sales Order Settings","Verkooporder Instellingen",
+SalesInvoice,Verkoopfactuur,
+"SalesInvoice Settings","Verkoopfactuur Instellingen",
+Save,"Sla op",
+"Save & Close","Opslaan en Sluiten",
+"Save as PDF","Opslaan als PDF",
+"Save as PDF Successful","Opslaan als PDF Gelukt",
+Saving...,Opslaan...,
+Schedule,Schema,
+"Secured Loans","Beveiligde Leningen",
+"Securities and Deposits","Effecten en Deposito's",
+"Select Folder","Selecteer Map",
+"Select Image","Selecteer Afbeelding",
+"Select Logo","Selecteer Logo",
+"Select a file to load the company transactions","Selecteer een bestand om de bedrijfstransacties te laden",
+"Select file","Selecteer Bestand",
+"Select folder","Selecteer Map",
+Send,Verzenden,
+Service,Service,
+"Set the local code. This is used for number formatting.","Stel de lokale code in. Dit wordt gebruikt voor nummeropmaak.",
+"Sets how many digits are shown after the decimal point.","Geeft aan hoeveel cijfers achter de komma worden weergegeven.",
+"Sets the app-wide date display format.","Stelt de app-brede datumweergave-indeling in.",
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Stelt de interne precisie in die gebruikt wordt voor monetaire berekeningen. Boven de 6 zou voldoende moeten zijn voor de meeste valuta's.",
+"Setting Up...",Instellen...,
+Settings,Instellingen,
+"Settings changes will be visible on reload","Wijzigingen in instellingen worden zichtbaar bij herladen",
+Setup,Configuratie,
+"Setup Complete","Configuratie voltooid",
+"Setup Wizard","Configuratie Wizard",
+"Setup your organization","Opzetten van uw organisatie",
+"Setup your workspace","Richt uw werkruimte in",
+"Smallest Currency Fraction Value","Kleinste Waarde van Muntfractie",
+Softwares,Software,
+"Something has gone terribly wrong. Please check the console and raise an issue.","Er is iets vreselijk misgegaan. Controleer de console en meld een probleem.",
+"Source of Funds (Liabilities)","Bron van Fondsen (Passiva)",
+"Start Time",Begintijd,
+State,Status,
+"State Tax",Staatsbelasting,
+"State/UT Tax Paid","Betaalde Belasting Staat/UT",
+Status,Status,
+"Stock Adjustment","Stock Aanpassing",
+"Stock Assets","Stock Activa",
+"Stock Expenses","Voorraad Uitgaven",
+"Stock In Hand","Voorraad in Hand",
+"Stock Liabilities",Voorraadverplichtingen,
+"Stock Received But Not Billed","Voorraad ontvangen maar niet gefactureerd",
+Subject,Onderwerp,
+Submit,Indienen,
+Submitted,Ingediend,
+Subtotal,Subtotaal,
+Supplier,Leverancier,
+"Supplier Created","Leverancier Aangemaakt",
+"Supplier Currency","Leverancier Valuta",
+"Supplier Name","Leverancier Naam",
+Suppliers,Leveranciers,
+Symbol,Symbool,
+System,Systeem,
+"System Settings","Systeem Instellingen",
+"System Setup","Systeem Configuratie",
+Tax,Belasting,
+"Tax Account",Belastingrekening,
+"Tax Assets","Belasting Activa",
+"Tax Detail",Belastingdetail,
+"Tax ID","Belasting ID",
+"Taxable Value","Belastbare Waarde",
+Taxes,Belastingen,
+"Telephone Expenses",Telefoonkosten,
+Template,Sjabloon,
+"Template could not be saved.","Sjabloon kon niet worden opgeslagen.",
+"Template saved successfully.","Sjabloon succesvol opgeslagen",
+"Temporary Accounts","Tijdelijke Rekeningen",
+"Temporary Opening","Tijdelijke Opening",
+Terms,Voorwaarden,
+"Theme Color",Themakleur,
+"This action is permanent","Deze actie is permanent",
+"This action is permanent and will cancel the following payment: ${0}","Deze actie is permanent en zal de volgende betaling annuleren: ${0}",
+"This action is permanent and will cancel the following payments: ${0}","Deze actie is permanent en zal de volgende betalingen annuleren: ${0}",
+Title,Titel,
+To,Tot,
+"To Account","Naar Rekening",
+"To Date","Tot Datum",
+"To Do","Te Doen",
+"Top Expenses","Hoogste Uitgaven",
+"Total Spending","Totale Uitgaven",
+"Total Tax","Totale Belasting",
+"Transfer Type","Overdracht Type",
+"Travel Expenses",Reisuitgaven,
+"Trial Balance",Proefbalans,
+Type,Type,
+"Unit Type","Type Eenheid",
+Unpaid,Onbetaald,
+"Unsecured Loans","Ongedekte Leningen",
+"Update downloaded","Update gedownload",
+"User ID",Gebruikers-ID,
+"User Remark","Gebruiker Opmerking",
+Username,Gebruikersnaam,
+"Utility Expenses","Uitgaven voor Nutsvoorzieningen",
+Value,Waarde,
+"Value missing for ${0}","Waarde ontbreekt voor ${0}",
+"Version ${0} available","Versie ${0} beschikbaar",
+"View Bills","Bekijk Rekeningen",
+"View Invoices","Bekijk Facturen",
+"Welcome to Frappe Books","Welkom bij Frappe Books",
+"Write Off",Afschrijven,
+"Write Off / Refund","Afschrijving / Terugbetaling",
+"Write Off Account","Rekening Afschrijven",
+Year,Jaar,
+Yes,Ja,
+"Your Name","Uw Naam",
+name,naam,
\ No newline at end of file

From 5027c0c81f4ae664f0b7c35d086da1c1561ee538 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 16:37:52 +0530
Subject: [PATCH 152/163] feat: add Spanish translations

---
 README.md             |   1 +
 src/utils/language.ts |   1 +
 translations/es.csv   | 629 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 631 insertions(+)
 create mode 100644 translations/es.csv

diff --git a/README.md b/README.md
index b1e933ca..45f87651 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,7 @@ If you want to contribute code then you can fork this repo, make changes and rai
 | Arabic     | [taha2002](https://github.com/taha2002)                                        |
 | Catalan    | Dídac E. Jiménez                                                               |
 | Dutch      | [FastAct](https://github.com/FastAct)                                          |
+| Spanish    | [talmax1124](https://github.com/talmax1124)                                    |
 
 ## License
 
diff --git a/src/utils/language.ts b/src/utils/language.ts
index aaf7550f..f9027b67 100644
--- a/src/utils/language.ts
+++ b/src/utils/language.ts
@@ -13,6 +13,7 @@ export const languageCodeMap: Record<string, string> = {
   Portuguese: 'pt',
   Arabic: 'ar',
   Catalan: 'ca-ES',
+  Spanish: 'es',
   Dutch: 'nl',
 };
 
diff --git a/translations/es.csv b/translations/es.csv
new file mode 100644
index 00000000..b6a21b48
--- /dev/null
+++ b/translations/es.csv
@@ -0,0 +1,629 @@
+"${0} ${1} already exists.",,
+"${0} ${1} has been modified after loading",,
+"${0} ${1} is linked with existing records.","${0} ${1} está vinculado con registros existentes.",
+"${0} already exists.","${0} ya existe.",
+"${0} filters applied","${0} filtros aplicados",
+"${0} rows",,
+"* required fields","* campos obligatorios",
+0%,,
+03-23-2022,,
+03/23/2022,,
+"1 filter applied","1 filtro aplicado",
+2022-03-23,,
+"23 Mar, 2022",,
+23-03-2022,,
+23/03/2022,,
+9888900000,,
+Account,Cuenta,
+"Account Entries","Asientos de cuenta",
+"Account Name","Nombre de la cuenta",
+"Account Type","Tipo de cuenta",
+"Accounting Ledger Entry",,
+"Accounting Settings","Configuración de Contabilidad",
+Accounts,Cuentas,
+"Accounts Payable","Cuentas por pagar",
+"Accounts Receivable","Cuentas por cobrar",
+"Accumulated Depreciation","Depreciación acumulada",
+"Add Account","Añadir cuenta",
+"Add Customers","Añadir Clientes",
+"Add Group","Añadir grupo",
+"Add Items","Añadir elementos",
+"Add Row","Añadir fila",
+"Add Suppliers","Agregar proveedores",
+"Add Taxes","Añadir impuestos",
+"Add a few customers to create your first invoice","Agregue algunos clientes para crear su primera factura",
+"Add a few suppliers to create your first bill","Agregue algunos proveedores para crear su primera factura",
+"Add a filter","Añadir un filtro",
+"Add a remark",,
+"Add invoice terms",,
+"Add products or services that you buy from your suppliers","Añade productos o servicios que compras a tus proveedores",
+"Add products or services that you sell to your customers","Añade productos o servicios que vendes a tus clientes",
+Address,Dirección,
+"Address Display","Visualización de dirección",
+"Address Line 1","Línea de dirección 1",
+"Address Line 2","Línea de dirección 2",
+"Administrative Expenses","Gastos Administrativos",
+All,,
+Amount,Cantidad,
+"Amount (Company Currency)","Cantidad (moneda de la empresa)",
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Cantidad: ${0} y cancelación: ${1} es menor que la cantidad total asignada a las referencias: ${2}.",
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","Cantidad: ${0} es menor que la cantidad total asignada a las referencias: ${1}.",
+"An error occurred.","Ocurrió un error.",
+"Application of Funds (Assets)","Aplicación de Fondos (Activos)",
+Arial,,
+"Ascending Order",,
+Asset,,
+"Assign Imported Labels","Asignar etiquetas importadas",
+Back,Atrás,
+"Bad import data.","Malos datos de importación.",
+Balance,Equilibrio',
+"Balance Sheet","Balance general",
+Bank,,
+"Bank Accounts","Cuentas Bancarias",
+"Bank Entry","Entrada bancaria",
+"Bank Name","Nombre del banco",
+"Bank Overdraft Account","Cuenta de sobregiro bancario",
+"Based On",,
+Basic,,
+"Basic I",,
+"Basic II",,
+Bill,Factura,
+"Bill Created","Factura creada",
+"Bill No","Número de factura",
+Black,Negro,
+Blue,,
+Both,Ambos,
+Buildings,Edificios,
+Business,,
+Cancel,Cancelar,
+"Cancel ${0} ${1}?",,
+Cancelled,Cancelado,
+"Capital Equipments","Equipos de capital",
+"Capital Stock","Capital Social",
+Cash,Efectivo,
+"Cash Entry","Entrada en efectivo",
+"Cash In Hand","Efectivo en mano",
+Cashflow,"Flujo de caja",
+"Central Tax","Impuesto Central",
+"Change File","Cambiar archivo",
+"Change Ref Type",,
+Chargeable,,
+"Chart Of Accounts Reviewed","Plan de cuentas revisado",
+"Chart of Accounts","Plan de cuentas",
+"Check for Updates","Buscar actualizaciones",
+"Checking for updates","Buscando actualizaciones",
+Cheque,Cheque,
+"City / Town","Ciudad / Pueblo",
+Clear,,
+"Clearance Date","Fecha de liquidación",
+"Click to create","Haga clic para crear",
+Close,Cerrar,
+Closing,,
+"Closing (Cr)","Cierre (Cr)",
+"Closing (Dr)","Cierre (Dr)",
+Color,Color,
+"Commission on Sales","Comisión sobre Ventas",
+Common,Común,
+"Common Items","Artículos comunes",
+"Company Address","Dirección de la empresa",
+"Company Logo","Logotipo de la empresa",
+"Company Name","Nombre de la empresa",
+"Company Settings","Configuración de la empresa",
+"Company Setup","Configuración de la empresa",
+Completed,Completado,
+Condition,,
+"Consolidate Columns",,
+Contains,Contiene,
+"Contra Entry","Entrada contraria",
+"Cost of Goods Sold","Costo de los bienes vendidos",
+"Could not import ${0} ${1}.","No se pudo importar ${0} ${1}.",
+"Could not select file.","No se pudo seleccionar el archivo.",
+Country,País,
+"Country Code",,
+"Country code used to initialize regional settings.",,
+Courier,,
+Cr.,,
+Create,Crear,
+"Create Bill","Crear Factura",
+"Create Demo",,
+"Create Invoice","Crear Factura",
+"Create Purchase",,
+"Create Sale",,
+"Create a new file and store it in your computer.","Cree un nuevo archivo y guárdelo en su computadora.",
+"Create a new file or select an existing one from your computer","Cree un archivo nuevo o seleccione uno existente de su computadora",
+"Create your first bill and mail it to your supplier","Cree su primera factura y envíela por correo a su proveedor",
+"Create your first invoice and mail it to your customer","Cree su primera factura y envíela por correo a su cliente",
+Created,,
+"Created By",,
+"Creating Items and Parties",,
+"Creating Journal Entries",,
+"Creating Purchase Invoices",,
+Credit,Crédito,
+"Credit Card Entry","Entrada de tarjeta de crédito",
+"Credit Note","Nota de crédito",
+Creditors,Acreedores,
+Currency,Moneda,
+"Currency Name","Nombre de la moneda",
+Current,Actual,
+"Current Assets","Activo corriente",
+"Current Liabilities","Pasivo corriente",
+"Custom Hex","Hex personalizado",
+Customer,Cliente,
+"Customer Created","Creado por el cliente",
+"Customer Currency","Moneda del cliente",
+Customers,Clientes,
+Customise,Personalizar,
+"Customize your invoices by adding a logo and address details","Personalice sus facturas agregando un logotipo y detalles de la dirección",
+Dashboard,Tablero,
+"Data Import","Importación de datos",
+"Database file: ${0}",,
+Date,Fecha,
+"Date Format","Formato de fecha",
+Day,,
+Debit,Débito,
+"Debit Note","Nota de débito",
+Debtors,Deudores,
+"Default Account","Cuenta predeterminada",
+Delete,Eliminar,
+"Delete ${0} ${1}?",,
+"Delete ${0}?",,
+Depreciation,Depreciación,
+"Depreciation Entry","Entrada de depreciación",
+Description,Descripción,
+Details,Detalles,
+"Direct Expenses","Gastos Directos",
+"Direct Income","Ingresos Directos",
+"Display Logo in Invoice","Mostrar logotipo en la factura",
+"Display Precision","Precisión de visualización",
+"Display Precision should have a value between 0 and 9.","La precisión de visualización debe tener un valor entre 0 y 9.",
+"Dividends Paid","Dividendos pagados",
+Docs,,
+Documentation,Documentación,
+"Does Not Contain","No contiene",
+"Download Update","Descargar actualización",
+"Downloading update","Descargando actualización",
+Dr.,,
+Draft,Borrador,
+Duplicate,Duplicar,
+"Duplicate ${0} ${1}?","¿Duplicar ${0} ${1}?",
+"Duties and Taxes","Derechos e impuestos",
+"Earnest Money","Dinero de arras'",
+Edit,Editar,
+"Electronic Equipments","Equipos electrónicos",
+Email,"Correo electrónico",
+"Email Address","Dirección de correo electrónico",
+Empty,Vacío,
+"Enter Country to load States",,
+"Enter State",,
+"Entertainment Expenses","Gastos de entretenimiento",
+"Entry No","Nº de entrada",
+"Entry Type","Tipo de entrada",
+Equity,Equidad,
+Error,Error,
+"Exchange Gain/Loss","Ganancia/pérdida cambiaria",
+"Exchange Rate","Tipo de cambio",
+"Excise Entry","Entrada de impuestos especiales",
+"Existing File","Archivo existente",
+Expense,Gasto,
+"Expense Account",,
+Expenses,Gastos,
+"Expenses Included In Valuation","Gastos incluidos en la valoración",
+Export,Exportar,
+"Export Failed","Exportación fallida",
+"Export Successful","Exportación exitosa",
+Fax,Fax,
+Field,,
+Fieldname,"Nombre de campo",
+"File selection failed.","Error en la selección de archivos.",
+Filter,Filtro,
+"Fiscal Year",,
+"Fiscal Year End Date","Fecha de finalización del año fiscal",
+"Fiscal Year Start Date","Fecha de inicio del año fiscal",
+"Fixed Asset",,
+"Fixed Assets","Activos fijos",
+Font,Fuente,
+For,Para,
+Fraction,Fracción,
+"Fraction Units","Unidades de fracción",
+"Freight and Forwarding Charges","Cargos de flete y expedición",
+"From Account","De la cuenta",
+"From Date","Desde la fecha",
+"From Year",,
+"Full Name","Nombre completo",
+"Furnitures and Fixtures","Mobiliario y Enseres",
+"GSTIN No.","Número GSTIN",
+GSTR1,GSTR1,
+GSTR2,GSTR2,
+"Gain/Loss on Asset Disposal","Ganancia/pérdida en la enajenación de activos",
+General,generales',
+"General Ledger","Libro mayor",
+"Get Started",Comenzar,
+Gram,,
+"Grand Total","Total general",
+"Grand Total (Company Currency)","Total general (moneda de la empresa)",
+"Greater Than","Mayor que",
+Green,,
+"Group By",,
+HSN/SAC,HSN/SAC,
+"HSN/SAC Code",,
+"Half Yearly",Semestral,
+"Half Years",,
+"Hex Value","Valor hexadecimal",
+"Hide Get Started","Ocultar Empezar",
+"Hide Group Amounts",,
+"Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.","`Oculta la sección Comenzar de la barra lateral. El cambio será visible al reiniciar o actualizar la aplicación.,,,,",
+Hour,,
+"How to Use Data Import","Cómo utilizar la importación de datos",
+"I can't find my language.","No puedo encontrar mi idioma.",
+INR,,
+Image,Imagen,
+"Import Data","Importar datos",
+"Import Failed","Importación fallida",
+"Import More","Importar más",
+"Import Success","Importación exitosa",
+"Import Type","Tipo de importación",
+"Importer Settings","Configuración del importador",
+"Include Cancelled",,
+Income,Ingresos,
+"Income Account",,
+Indigo,,
+"Indirect Expenses","Gastos Indirectos",
+"Indirect Income","Ingresos indirectos",
+Inflow,Afluencia,
+"Install Update","Instalar actualización",
+"Instance Id",,
+"Intergrated Tax","Impuesto Integrado",
+"Internal Precision","Precisión interna",
+"Invalid value ${0} for ${1}",,
+Investments,Inversiones,
+Invoice,Factura,
+"Invoice Created","Factura creada",
+"Invoice Date","Fecha de la factura",
+"Invoice No","Nº de factura",
+"Invoice No.","Número de factura",
+"Invoice Setup","Configuración de factura",
+"Invoice Value","Valor de la factura",
+Invoices,Facturas,
+Is,Es,
+"Is Empty","Está vacío",
+"Is Group","Es grupo",
+"Is Not","No es",
+"Is Not Empty","No está vacío",
+Item,Artículo,
+"Item Description",,
+"Item Name","Nombre del elemento",
+Items,Artículos,
+"John Doe",,
+"Journal Entries",,
+"Journal Entry","Entrada de diario",
+"Journal Entry Account",,
+Kg,,
+"Label Index","Índice de etiquetas",
+Language,Idioma,
+"Ledger Entries","Asientos contables",
+"Left Index",,
+"Legal Expenses","Gastos Legales",
+"Less Than","Menos de",
+Liability,,
+List,,
+"Load an existing .db file from your computer.","Cargue un archivo .db existente desde su computadora.",
+"Loading Report...",,
+Loading...,Cargando...,
+"Loans (Liabilities)","Préstamos (Pasivos)",
+"Loans and Advances (Assets)","Préstamos y anticipos (activos)",
+Locale,Local,
+Logo,Logotipo,
+"Make Entry",,
+"Make Payment","Hacer pago",
+"Mar 23, 2022",,
+"Marketing Expenses","Gastos de marketing",
+Merriweather,,
+Meter,,
+Minimal,,
+"Miscellaneous Expenses","Gastos Misceláneos",
+Modern,,
+Modified,,
+"Modified By",,
+Monthly,Mensual,
+Months,,
+Montserrat,,
+Name,Nombre,
+Navigate,,
+"Net Total","Total Neto",
+"Net Total (Company Currency)","Total neto (moneda de la empresa)",
+"New ${0}",,
+"New Account","Cuenta nueva",
+"New File","Nuevo archivo",
+"New Journal Entry","Nueva entrada de diario",
+"New Purchase",,
+"New Purchase Invoice",,
+"New Sale",,
+"New Sales Invoice",,
+"New version available","Nueva versión disponible",
+Next,Siguiente,
+No,No,
+"No Data to Import","No hay datos para importar",
+"No Values to be Displayed",,
+"No entries found",,
+"No expenses in this period","Sin gastos en este periodo",
+"No filters selected","No hay filtros seleccionados",
+"No labels have been assigned.","No se han asignado etiquetas.",
+"No results found",,
+"No transactions yet","No hay transacciones todavía",
+"No updates available","No hay actualizaciones disponibles",
+None,Ninguno,
+Notes,Notas,
+"Number Series","Serie de números",
+"Number of ${0}",,
+"Office Equipments","Equipos de oficina",
+"Office Maintenance Expenses","Gastos de mantenimiento de oficina",
+"Office Rent","Alquiler de oficina",
+"Onboarding Complete","Incorporación completa",
+"Open Folder","Abrir carpeta",
+"Open Sans",,
+"Opening (Cr)","Apertura (Cr)",
+"Opening (Dr)","Apertura (Dr)",
+"Opening Balance Equity","Patrimonio del saldo de apertura",
+"Opening Balances","Saldos de apertura",
+"Opening Entry","Entrada de apertura",
+Orange,,
+Organisation,Organización,
+Outflow,Salida,
+"Outstanding Amount","Cantidad pendiente",
+Oxygen,,
+"Pad Zeros","Pad ceros",
+Page,,
+Paid,Pagado,
+Parent,Padre,
+"Parent Account","Cuenta principal",
+Party,Fiesta,
+"Patch Run",,
+Pay,Pagar,
+Payable,,
+Payment,Pago,
+"Payment For","Pago por",
+"Payment Method","Método de pago",
+"Payment No","Nº de pago",
+"Payment Reference","Referencia de pago",
+"Payment Type","Tipo de pago",
+"Payment amount cannot be ${0}.","El monto del pago no puede ser ${0}.",
+"Payment amount cannot be less than zero.","El importe del pago no puede ser inferior a cero.",
+"Payment amount cannot exceed ${0}.","El monto del pago no puede exceder ${0}.",
+"Payment amount: ${0} should be greater than 0.","Importe del pago: ${0} debe ser mayor que 0.",
+"Payment amount: ${0} should be less than Outstanding amount: ${1}.","Importe del pago: ${0} debe ser menor que el importe pendiente: ${1}.",
+Payments,Pagos,
+"Payroll Payable","Nómina a pagar",
+Periodicity,Periodicidad,
+Phone,Teléfono,
+Pink,,
+Place,Lugar,
+"Place of supply","Lugar de suministro",
+"Plants and Machineries","Plantas y Maquinarias",
+"Please Wait",,
+"Please assign the following fields ${0}","Por favor asigne los siguientes campos ${0}",
+"Please fill all values","Por favor complete todos los valores",
+"Please select a file with data to import.","Seleccione un archivo con datos para importar.",
+"Please select a valid reference type.",,
+"Postal Code","Código Postal",
+"Postal Expenses","Gastos Postales",
+"Posting Date","Fecha de publicación",
+Prefix,Prefijo,
+"Prime Bank",,
+Print,Imprimir,
+"Print Settings","Configuración de impresión",
+"Print and Stationery","Impresión y Papelería",
+Product,,
+"Profit And Loss","Ganancias y pérdidas",
+"Profit and Loss","Ganancias y Pérdidas",
+Purchase,Comprar,
+"Purchase Invoice",,
+"Purchase Invoice Item",,
+"Purchase Invoices",,
+"Purchase Item Created",,
+"Purchase Items","Comprar artículos",
+"Purchase Payments",,
+Purchases,Compras,
+Purple,,
+Quantity,Cantidad,
+Quarterly,Trimestral,
+Quarters,,
+Rate,Tarifa,
+"Rate (${0}) cannot be less zero.","La tasa (${0}) no puede ser menos de cero.",
+"Rate (Company Currency)","Tarifa (moneda de la empresa)",
+"Rate can't be negative.","La tasa no puede ser negativa.",
+Receivable,,
+Receive,Recibir,
+"Recent Invoices","Facturas recientes",
+Red,,
+"Ref Name",,
+"Ref Type",,
+"Ref. / Cheque No.","Ref. / Número de cheque",
+"Ref. Date","Ref. Fecha",
+"Ref. Name","Ref. Nombre",
+"Ref. Type","Ref. Tipo",
+Reference,,
+"Reference Date","Fecha de referencia",
+"Reference Number","Número de referencia",
+"Reference Type","Tipo de referencia",
+"Reload App","Recargar aplicación",
+Report,,
+"Report Error","Informe de error",
+"Report Issue","Informe de problema",
+Reports,Informes,
+"Required Fields not Assigned","Campos obligatorios no asignados",
+Reset,Reiniciar,
+"Retained Earnings","Utilidades retenidas",
+"Reverse Chrg.","Carga inversa",
+Reverted,Revertido,
+Reverts,,
+"Review Accounts","Revisar Cuentas",
+"Review your chart of accounts, add any account or tax heads as needed",,
+"Right Index",,
+Role,Rol,
+"Root Type","Tipo de raíz",
+"Round Off",Redondear,
+"Round Off Account","Cuenta de redondeo",
+Salary,Salario,
+Sales,Ventas,
+"Sales Expenses","Gastos de Ventas",
+"Sales Invoice",,
+"Sales Invoice Item",,
+"Sales Invoice Settings",,
+"Sales Invoices",,
+"Sales Invoie",,
+"Sales Item Created",,
+"Sales Items","Artículos de venta",
+"Sales Payments",,
+Save,Guardar,
+"Save Template","Guardar plantilla",
+"Save as PDF","Guardar como PDF",
+"Save as PDF Successful","Guardar como PDF con éxito",
+Saving,,
+Search,,
+"Secured Loans","Préstamos garantizados",
+"Securities and Deposits","Valores y Depósitos",
+Select,,
+"Select CoA","Seleccionar CoA",
+"Select Color",,
+"Select Country",,
+"Select File","Seleccionar archivo",
+"Select Folder","Seleccionar carpeta",
+"Select Image","Seleccionar imagen",
+"Select Logo","Seleccionar logotipo",
+"Select a file for import","Seleccione un archivo para importar",
+"Select file","Seleccionar archivo",
+"Select folder","Seleccionar carpeta",
+"Select your language","Seleccione su idioma",
+"Selected file","Archivo seleccionado",
+Service,Servicio,
+"Set an Import Type","Establecer un tipo de importación",
+"Set the display language.","Establecer el idioma de visualización.",
+"Set the local code. This is used for number formatting.","`Establezca el código local. Esto se usa para formatear números.,,,,",
+"Sets how many digits are shown after the decimal point.","Establece cuántos dígitos se muestran después del punto decimal.",
+"Sets the app-wide date display format.","Establece el formato de visualización de la fecha en toda la aplicación.",
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","`Establece la precisión interna utilizada para los cálculos monetarios. Por encima de 6 debería ser suficiente para la mayoría de las monedas.,,,,",
+"Setting Up Instance",,
+"Setting Up...",Configurando...,
+Settings,Configuración,
+"Settings changes will be visible on reload","Los cambios de configuración serán visibles al recargar",
+Setup,Configuración,
+"Setup Complete","Configuración completa",
+"Setup Wizard","Asistente de configuración",
+"Setup Your Workspace",,
+"Setup system defaults like date format and display precision","Configurar valores predeterminados del sistema como formato de fecha y precisión de visualización",
+"Setup your company information, email, country and fiscal year",,
+"Setup your opening balances before performing any accounting entries","Configure sus saldos de apertura antes de realizar cualquier asiento contable",
+"Setup your organization","Configura tu organización",
+"Setup your tax templates for your sales or purchase transactions","Configure sus plantillas de impuestos para sus transacciones de compra o venta",
+"Show Me",Muéstrame',
+"Single Value",,
+"Smallest Currency Fraction Value","Valor de fracción de moneda más pequeño",
+Softwares,Software,
+"Something has gone terribly wrong. Please check the console and raise an issue.","`Algo ha ido terriblemente mal. Verifique la consola y plantee un problema.,,,,",
+"Source of Funds (Liabilities)","Fuente de los Fondos (Pasivos)",
+"Standard Chart of Accounts","Plan de cuentas estándar",
+Start,Comenzar,
+State,Estado,
+"State Tax","Impuesto estatal",
+Status,Estado,
+Stock,,
+"Stock Adjustment","Ajuste de existencias",
+"Stock Assets","Activos de acciones",
+"Stock Expenses","Gastos de existencias",
+"Stock In Hand","Stock en mano",
+"Stock Liabilities","Pasivos por acciones",
+"Stock Received But Not Billed","Stock recibido pero no facturado",
+Submit,Enviar,
+"Submit Journal Entry?",,
+"Submit Purchase Invoice?",,
+"Submit Sales Invoice?",,
+"Submit on Import","Enviar al importar",
+Submitted,Enviado,
+Submitting,,
+Subtotal,Subtotal,
+"Successfully created the following ${0} entries:","Se crearon con éxito las siguientes entradas ${0}:",
+Supplier,Proveedor,
+"Supplier Created","Proveedor creado",
+"Supplier Currency","Moneda del proveedor",
+Suppliers,Proveedores,
+Symbol,Símbolo,
+System,Sistema,
+"System Settings","Configuración del sistema",
+"System Setup","Configuración del sistema",
+Tax,Impuesto,
+"Tax Account","Cuenta fiscal",
+"Tax Assets","Activos Fiscales",
+"Tax Detail","Detalle fiscal",
+"Tax ID","Número de identificación fiscal",
+"Tax Summary",,
+"Taxable Value","Valor imponible",
+Taxes,Impuestos,
+Teal,,
+"Telephone Expenses","Gastos Telefónicos",
+Template,Plantilla,
+Temporary,,
+"Temporary Accounts","Cuentas Temporales",
+"Temporary Opening","Apertura Temporal",
+Terms,Términos,
+"The following ${0} entries were created: ${1}","Se crearon las siguientes ${0} entradas: ${1}",
+"Theme Color","Color del tema",
+"This Month","Este Mes",
+"This Quarter","Este Trimestre",
+"This Year","Este año",
+"This action is permanent","Esta acción es permanente",
+"This action is permanent and will cancel the following payment: ${0}","Esta acción es permanente y cancelará el siguiente pago: ${0}",
+"This action is permanent and will cancel the following payments: ${0}","Esta acción es permanente y cancelará los siguientes pagos: ${0}",
+"This action is permanent and will delete associated ledger entries.",,
+"This action is permanent.",,
+"Times New Roman",,
+"To Account","A la cuenta",
+"To Account and From Account can't be the same: ${0}",,
+"To Date","Hasta la fecha",
+"To Year",,
+"Top Expenses","Gastos principales",
+Total,,
+"Total Asset (Debit)",,
+"Total Credit",,
+"Total Debit",,
+"Total Debit: ${0} must be equal to Total Credit: ${1}",,
+"Total Equity (Credit)",,
+"Total Expense (Debit)",,
+"Total Income (Credit)",,
+"Total Liability (Credit)",,
+"Total Profit",,
+"Total Spending","Gasto total",
+Transfer,Transferir',
+"Transfer Type","Tipo de transferencia",
+"Travel Expenses","Gastos de viaje",
+"Trial Balance","Balance de prueba'",
+Type,Tipo,
+"Type to search...",,
+Unit,,
+"Unit Type","Tipo de unidad",
+Unpaid,"No pagado",
+"Unsecured Loans","Préstamos no garantizados",
+"Until Date",,
+"Update downloaded","Actualización descargada",
+"User Remark","Observación del usuario",
+"Utility Expenses","Gastos de servicios públicos",
+Value,Valor,
+"Value missing for ${0}","Valor faltante para ${0}",
+"Verify Imported Data","Verificar datos importados",
+Version,,
+"Version ${0} available","Versión ${0} disponible",
+"View Purchases",,
+"View Sales",,
+"Welcome to Frappe Books","Bienvenido a Libros Frappe",
+"Write Off",Cancelar,
+"Write Off Account","Cancelar cuenta",
+"Write Off Account not set. Please set Write Off Account in General Settings","Cuenta de anulación no establecida. Establezca Cancelar cuenta en Configuración general",
+"Write Off Entry","Cancelar entrada",
+Yearly,Anual,
+Years,,
+Yellow,,
+Yes,Sí,
+"Your Name","Tu nombre",
+john@doe.com,,
+reports,,
+setup,,
+"verify the imported data and click on","verifique los datos importados y haga clic en",
\ No newline at end of file

From aab4fde3279946b5fdbe81bfb1150e2c049be176 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 16:38:49 +0530
Subject: [PATCH 153/163] chore: regenerate translations - remove esp.csv cause
 es.csv

---
 translations/ar.csv    |  27 +-
 translations/ca-ES.csv |  29 +-
 translations/de.csv    |  39 +--
 translations/esp.csv   | 586 -----------------------------------------
 translations/fr.csv    |  29 +-
 translations/nl.csv    | 380 ++++++++++++++++++--------
 translations/pt.csv    |  29 +-
 7 files changed, 285 insertions(+), 834 deletions(-)
 delete mode 100644 translations/esp.csv

diff --git a/translations/ar.csv b/translations/ar.csv
index a48a58c1..d12fb7b1 100644
--- a/translations/ar.csv
+++ b/translations/ar.csv
@@ -44,13 +44,11 @@ Address,العنوان,
 "Address Line 2","سطر العنوان 2",
 "Administrative Expenses","مصاريف إدارية",
 All,,
-"Allow Telemetry",,
 Amount,المبلغ,
 "Amount (Company Currency)","المبلغ (عملة الشركة)",
 "Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","المبلغ: ${0} والشطب: $ {1} أقل من إجمالي المبلغ المخصص للمراجع: $ {2} .",
 "Amount: ${0} is less than the total amount allocated to references: ${1}.","المبلغ: ${0} أقل من إجمالي المبلغ المخصص للمراجع: $ {1} ",
 "An error occurred.","حدث خطأ",
-"Anonymized Telemetry",,
 "Application of Funds (Assets)","تطبيق الأموال (الأصول)",
 Arial,,
 "Ascending Order",,
@@ -65,7 +63,6 @@ Bank,,
 "Bank Entry",,
 "Bank Name","اسم البنك",
 "Bank Overdraft Account","حساب مصرفي السحب على المكشوف",
-"Base Error",,
 "Based On",,
 Basic,,
 "Basic I",,
@@ -81,7 +78,6 @@ Business,,
 Cancel,إلغاء,
 "Cancel ${0} ${1}?",,
 Cancelled,ملغاة,
-"Cannot Commit Error",,
 "Capital Equipments","معدات رأس المال",
 "Capital Stock","رأس المال",
 Cash,نقد,
@@ -160,7 +156,6 @@ Customise,تخصيص,
 "Customize your invoices by adding a logo and address details",,
 Dashboard,"لوحة القيادة",
 "Data Import","استيراد البيانات",
-"Database Error",,
 "Database file: ${0}",,
 Date,التاريخ,
 "Date Format","تنسيق التاريخ",
@@ -178,7 +173,6 @@ Description,الوصف,
 Details,التفاصيل,
 "Direct Expenses","المصاريف المباشرة",
 "Direct Income","الدخل المباشر",
-"Disables telemetry. No data will be collected, you are completely invisble to us.",,
 "Display Logo in Invoice","عرض الشعار في الفاتورة",
 "Display Precision","دقة العرض",
 "Display Precision should have a value between 0 and 9.","دقة العرض يجب أن تكون لها قيمة بين 0 و 9.",
@@ -186,15 +180,12 @@ Details,التفاصيل,
 Docs,,
 Documentation,التوثيق,
 "Does Not Contain","لا يحتوي",
-"Don't Log Anything",,
-"Don't Log Usage",,
 "Download Update","تنزيل التحديث",
 "Downloading update","جارٍ تنزيل التحديث",
 Dr.,,
 Draft,,
 Duplicate,,
 "Duplicate ${0} ${1}?",,
-"Duplicate Entry Error",,
 "Duties and Taxes","الرسوم والضرائب",
 "Earnest Money","كسب المال",
 Edit,تحرير,
@@ -202,8 +193,6 @@ Edit,تحرير,
 Email,"البريد الإلكتروني",
 "Email Address","عنوان البريد الإلكتروني",
 Empty,فارغ,
-"Enables telemetry. Does not include usage patterns.",,
-"Enables telemetry. Includes usage patterns.",,
 "Enter Country to load States",,
 "Enter State",,
 "Entertainment Expenses","مصاريف ترفيه",
@@ -211,7 +200,6 @@ Empty,فارغ,
 "Entry Type","نوع الإدخال",
 Equity,"حقوق الملكية",
 Error,خطأ,
-Error:,خطأ:,
 "Exchange Gain/Loss","مكاسب / خسارة الصرف",
 "Exchange Rate","سعر الصرف",
 "Excise Entry",,
@@ -221,6 +209,7 @@ Expense,المصاريف,
 Expenses,المصروفات,
 "Expenses Included In Valuation","المصروفات المدرجة في التقييم",
 Export,,
+"Export Failed",,
 "Export Successful","تم التصدير بنجاح",
 Fax,فاكس,
 Field,,
@@ -234,10 +223,8 @@ Filter," التصفية",
 "Fixed Assets","الأصول الثابتة",
 Font,الخط,
 For,"من أجل",
-"Forbidden Error",,
 Fraction,كسر,
 "Fraction Units","وحدات الكسر",
-"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
 "Freight and Forwarding Charges","مصاريف الشحن",
 "From Account","من الحساب",
 "From Date","من تاريخ",
@@ -261,7 +248,6 @@ HSN/SAC,,
 "HSN/SAC Code",,
 "Half Yearly",,
 "Half Years",,
-"Hello there! 👋",,
 "Hex Value",,
 "Hide Get Started","إخفاء قائمة البدء",
 "Hide Group Amounts",,
@@ -285,7 +271,7 @@ Indigo,,
 "Indirect Income","الدخل غير المباشر",
 Inflow,التدفق,
 "Install Update","تثبيت التحديث",
-Inter,,
+"Instance Id",,
 "Intergrated Tax","ضريبة متكاملة",
 "Internal Precision","الدقة الداخلية",
 "Invalid value ${0} for ${1}",,
@@ -312,7 +298,6 @@ Items,العناصر,
 "Journal Entry","إدخال دفتر اليومية",
 "Journal Entry Account",,
 Kg,,
-"Know More",,
 "Label Index","فهرس التسمية",
 Language,اللغة,
 "Ledger Entries","إدخالات دفتر الأستاذ",
@@ -320,7 +305,6 @@ Language,اللغة,
 "Legal Expenses","المصاريف القانونية",
 "Less Than","أقل من",
 Liability,,
-"Link Validation Error",,
 List,,
 "Load an existing .db file from your computer.","تحميل ملف .db موجود من جهاز الكمبيوتر الخاص بك.",
 "Loading Report...",,
@@ -331,7 +315,6 @@ Locale,اللغة,
 Logo,الشعار,
 "Make Entry",,
 "Make Payment","إجراء الدفع",
-"Mandatory Error",,
 "Mar 23, 2022",,
 "Marketing Expenses","مصاريف التسويق",
 Merriweather,,
@@ -369,7 +352,6 @@ No,لا,
 "No transactions yet","لا توجد معاملات حتى الآن",
 "No updates available","لا توجد تحديثات متاحة",
 None,"لا شيء",
-"Not Found Error",,
 Notes,ملاحظات,
 "Number Series","سلسلة الأرقام",
 "Number of ${0}",,
@@ -422,7 +404,6 @@ Place,مكان,
 "Please fill all values","الرجاء ملء جميع القيم",
 "Please select a file with data to import.","الرجاء تحديد ملف به بيانات للاستيراد.",
 "Please select a valid reference type.",,
-"Please select an option:",,
 "Postal Code","الرمز البريدي",
 "Postal Expenses","المصاريف البريدية",
 "Posting Date","تاريخ النشر",
@@ -494,7 +475,6 @@ Sales,المبيعات,
 "Sales Items","عناصر المبيعات",
 "Sales Payments",,
 Save,حفظ,
-"Save Option",,
 "Save Template","حفظ النموذج",
 "Save as PDF","حفظ كملف PDF",
 "Save as PDF Successful","PDF حفظ كملف ناجح",
@@ -515,9 +495,7 @@ Select,,
 "Select folder","تحديد مجلد",
 "Select your language","اختر لغتك",
 "Selected file","الملف المحدد",
-"Send anonymized usage data and error reports to help improve the product.",,
 Service,الخدمة,
-"Set Anonymized Telemetry",,
 "Set an Import Type","تعيين نوع الاستيراد",
 "Set the display language.","ضبط لغة العرض.",
 "Set the local code. This is used for number formatting.","اضبط الكود المحلي. يستخدم هذا لتنسيق الأرقام",
@@ -628,7 +606,6 @@ Unpaid,"غير مدفوعة الأجر",
 "Update downloaded","تم تنزيل التحديث",
 "User Remark","ملاحظة المستخدم",
 "Utility Expenses","نفقات المرافق",
-"Validation Error",,
 Value,القيمة,
 "Value missing for ${0}","القيمة مفقودة لـ ${0}",
 "Verify Imported Data","التحقق من البيانات المستوردة",
diff --git a/translations/ca-ES.csv b/translations/ca-ES.csv
index e7f6e068..9f0e69f2 100644
--- a/translations/ca-ES.csv
+++ b/translations/ca-ES.csv
@@ -44,13 +44,11 @@ Address,Direcció,
 "Address Line 2","Direcció línea 2",
 "Administrative Expenses","Despeses administratives",
 All,,
-"Allow Telemetry","Permetre telemetria",
 Amount,Quantitat,
 "Amount (Company Currency)","Quantitat (Moneda de la empresa)",
 "Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Quantitat: ${0} i quantitat cancel·lada: ${1} és menor que la quantitat total que figura a les referències: ${2}.",
 "Amount: ${0} is less than the total amount allocated to references: ${1}.","Quantitat: ${0} és menor que la quantitat total que figura a les referències: ${1}.",
 "An error occurred.","Hi ha hagut un error.",
-"Anonymized Telemetry","Telemetria anònima",
 "Application of Funds (Assets)","Aplicació de fons (Actius)",
 Arial,,
 "Ascending Order",,
@@ -65,7 +63,6 @@ Bank,,
 "Bank Entry","Entrada bancària",
 "Bank Name","Nom del banc",
 "Bank Overdraft Account","Compte bancari d’exedents",
-"Base Error",,
 "Based On",,
 Basic,,
 "Basic I",,
@@ -81,7 +78,6 @@ Business,,
 Cancel,Cancel·la,
 "Cancel ${0} ${1}?",,
 Cancelled,Cancel·lat,
-"Cannot Commit Error",,
 "Capital Equipments","Capital Equipments",
 "Capital Stock","Capital Stock",
 Cash,Efectiu,
@@ -160,7 +156,6 @@ Customise,Personalitzar,
 "Customize your invoices by adding a logo and address details","Personalitza les teves factures afegint-hi un logotip i l'adreça",
 Dashboard,Tauler,
 "Data Import","Importar dades",
-"Database Error",,
 "Database file: ${0}",,
 Date,Data,
 "Date Format","Format de la data",
@@ -178,7 +173,6 @@ Description,Descripció,
 Details,Detalls,
 "Direct Expenses","Despeses directes",
 "Direct Income","Ingressos directes",
-"Disables telemetry. No data will be collected, you are completely invisble to us.",,
 "Display Logo in Invoice","Mostra el logotip a la factura",
 "Display Precision","Precisió de la pantalla",
 "Display Precision should have a value between 0 and 9.","Precisión de la pantalla ha de tenir un valor entre 0 i 9.",
@@ -186,15 +180,12 @@ Details,Detalls,
 Docs,,
 Documentation,Documentació,
 "Does Not Contain","No conté",
-"Don't Log Anything","No registrar",
-"Don't Log Usage","No registrar l'ús",
 "Download Update","Descarregar actualització",
 "Downloading update","Descarregant actualització",
 Dr.,,
 Draft,Esborrany,
 Duplicate,Duplicar,
 "Duplicate ${0} ${1}?","Duplicar ${0} ${1}?",
-"Duplicate Entry Error",,
 "Duties and Taxes","Deures i taxes",
 "Earnest Money","Paga i senyal",
 Edit,Editar,
@@ -202,8 +193,6 @@ Edit,Editar,
 Email,"Correu electrònic",
 "Email Address","Correu electrònic",
 Empty,Buit,
-"Enables telemetry. Does not include usage patterns.","Habilita la telemetria. No inclou patrons d'ús.",
-"Enables telemetry. Includes usage patterns.","Habilita la telemetria. Inclou els patrons d'ús.",
 "Enter Country to load States",,
 "Enter State",,
 "Entertainment Expenses","Despeses d'entreteniment",
@@ -211,7 +200,6 @@ Empty,Buit,
 "Entry Type","Tipus d'entrada",
 Equity,Capital,
 Error,Error,
-Error:,Error:,
 "Exchange Gain/Loss","Canvi de guanys/pèrdues",
 "Exchange Rate","Taxa d'intercanvi",
 "Excise Entry","Entrada d'impostos especials",
@@ -221,6 +209,7 @@ Expense,Despesa,
 Expenses,Despeses,
 "Expenses Included In Valuation","Despeses incloses en el valor",
 Export,Exportar,
+"Export Failed",,
 "Export Successful","Exportació correcta",
 Fax,Fax,
 Field,,
@@ -234,10 +223,8 @@ Filter,Filtre,
 "Fixed Assets","Actius fixes",
 Font,Font,
 For,For,
-"Forbidden Error",,
 Fraction,Fracció,
 "Fraction Units","Unitats de fracció",
-"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
 "Freight and Forwarding Charges","Càrregues de transport i reenviaments",
 "From Account","Compte d'arribada",
 "From Date","Des de",
@@ -261,7 +248,6 @@ HSN/SAC,HSN/SAC,
 "HSN/SAC Code",,
 "Half Yearly","Mitja anual",
 "Half Years",,
-"Hello there! 👋","Hola! 👋",
 "Hex Value","Valor hexadecimal",
 "Hide Get Started","Amaga l'introducció",
 "Hide Group Amounts",,
@@ -285,7 +271,7 @@ Indigo,,
 "Indirect Income","Ingressos indirectes",
 Inflow,Entrades,
 "Install Update","Instal·lar actualització",
-Inter,,
+"Instance Id",,
 "Intergrated Tax","Taxes integrades",
 "Internal Precision","Precisió interna",
 "Invalid value ${0} for ${1}",,
@@ -312,7 +298,6 @@ Items,Elements,
 "Journal Entry","Entrada del diari",
 "Journal Entry Account",,
 Kg,,
-"Know More","Saber-ne més",
 "Label Index","Índex d'etiquetes",
 Language,Idiom,
 "Ledger Entries","Entrades del llibre de comptabilitat",
@@ -320,7 +305,6 @@ Language,Idiom,
 "Legal Expenses","Despeses al llibre de comptabilitat",
 "Less Than","Menor que",
 Liability,,
-"Link Validation Error",,
 List,,
 "Load an existing .db file from your computer.","Carrega un fitxer .db existent des del teu ordinador.",
 "Loading Report...",,
@@ -331,7 +315,6 @@ Locale,Local,
 Logo,Logotip,
 "Make Entry",,
 "Make Payment","Fer pagaments",
-"Mandatory Error",,
 "Mar 23, 2022",,
 "Marketing Expenses","Despeses de màrqueting",
 Merriweather,,
@@ -369,7 +352,6 @@ No,No,
 "No transactions yet","Encara no hi ha transaccions",
 "No updates available","No hi ha cap actualització disponible",
 None,Cap,
-"Not Found Error",,
 Notes,Notes,
 "Number Series","Sèries numèriques",
 "Number of ${0}",,
@@ -422,7 +404,6 @@ Place,Lloc,
 "Please fill all values","Empleneu tots els valors",
 "Please select a file with data to import.","Selecciona un fitxer amb les dades a importar.",
 "Please select a valid reference type.",,
-"Please select an option:","Selecciona una opció:",
 "Postal Code","Codi postal",
 "Postal Expenses","Expenses d'enviament",
 "Posting Date","Data d'enviament",
@@ -494,7 +475,6 @@ Sales,Vendes,
 "Sales Items","Artícles venuts",
 "Sales Payments",,
 Save,Guardar,
-"Save Option","Opcions de guardat",
 "Save Template","Guardar plantilla",
 "Save as PDF","Guardar com a PDF",
 "Save as PDF Successful","Guardat com a PDF correctament",
@@ -515,9 +495,7 @@ Select,,
 "Select folder","Selecciona una carpeta",
 "Select your language","Selecciona la teva llengua",
 "Selected file","Fitxer seleccionat",
-"Send anonymized usage data and error reports to help improve the product.","Envia dades d'ús anònims i informes d'error per ajudar a millorar el producte.",
 Service,Servei,
-"Set Anonymized Telemetry","Estableix la telemetria anònima",
 "Set an Import Type","Estableix un tipus d'importació",
 "Set the display language.","Estableix l'idioma de visualització.",
 "Set the local code. This is used for number formatting.","Estableix el codi local. Això s'utilitza per formatar nombres.",
@@ -532,7 +510,7 @@ Setup,Configuració,
 "Setup Complete","Configuració completa",
 "Setup Wizard","Asistent de configuració",
 "Setup Your Workspace","Configura el teu espai de treball",
-"Setup system defaults like date format and display precision","Configura els valors predeterminats del sistema com la data, el format i la visualització"
+"Setup system defaults like date format and display precision","Configura els valors predeterminats del sistema com la data, el format i la visualització",
 "Setup your company information, email, country and fiscal year",,
 "Setup your opening balances before performing any accounting entries","Configureu els saldos d'obertura abans de realitzar qualsevol entrada comptable",
 "Setup your organization","Configura la teva empresa",
@@ -628,7 +606,6 @@ Unpaid,"Per pagar",
 "Update downloaded","Actualització descarregada",
 "User Remark","Marca d'usuari",
 "Utility Expenses","Despeses de serveis",
-"Validation Error",,
 Value,Valor,
 "Value missing for ${0}","Falta el valor de ${0}",
 "Verify Imported Data","Verifica les dades importades",
diff --git a/translations/de.csv b/translations/de.csv
index 92e780c1..756208bc 100644
--- a/translations/de.csv
+++ b/translations/de.csv
@@ -44,13 +44,11 @@ Address,Adresse,
 "Address Line 2","Anschrift Zeile 2",
 "Administrative Expenses",Verwaltungskosten,
 All,,
-"Allow Telemetry",,
 Amount,Betrag,
 "Amount (Company Currency)","Betrag (Währung des Unternehmens)",
-"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Der Betrag: ${0} und Abschreibung: ${1} ist kleiner als der Gesamtbetrag, der den Referenzen zugeordnet ist: ${2}."
-"Amount: ${0} is less than the total amount allocated to references: ${1}.","Betrag: ${0} ist kleiner als der Gesamtbetrag, der den Referenzen zugewiesen wurde: ${1}."
+"Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Der Betrag: ${0} und Abschreibung: ${1} ist kleiner als der Gesamtbetrag, der den Referenzen zugeordnet ist: ${2}.",
+"Amount: ${0} is less than the total amount allocated to references: ${1}.","Betrag: ${0} ist kleiner als der Gesamtbetrag, der den Referenzen zugewiesen wurde: ${1}.",
 "An error occurred.","Es ist ein Fehler aufgetreten.",
-"Anonymized Telemetry",,
 "Application of Funds (Assets)","Verwendung der Mittel (Aktiva)",
 Arial,,
 "Ascending Order",,
@@ -65,7 +63,6 @@ Bank,,
 "Bank Entry",,
 "Bank Name",Bankname,
 "Bank Overdraft Account",Überziehungskonto,
-"Base Error",,
 "Based On",,
 Basic,,
 "Basic I",,
@@ -81,7 +78,6 @@ Business,,
 Cancel,Stornieren,
 "Cancel ${0} ${1}?",,
 Cancelled,Storniert,
-"Cannot Commit Error",,
 "Capital Equipments",Kapitalausstattungen,
 "Capital Stock",Grundkapital,
 Cash,Bargeld,
@@ -160,7 +156,6 @@ Customise,Anpassen,
 "Customize your invoices by adding a logo and address details",,
 Dashboard,Dashboard,
 "Data Import",Datenimport,
-"Database Error",,
 "Database file: ${0}",,
 Date,Datum,
 "Date Format","Datum Format",
@@ -178,7 +173,6 @@ Description,Beschreibung,
 Details,Einzelheiten,
 "Direct Expenses","Direkte Ausgaben",
 "Direct Income","Direktes Einkommen",
-"Disables telemetry. No data will be collected, you are completely invisble to us.",,
 "Display Logo in Invoice","Logo in der Rechnung anzeigen",
 "Display Precision","Präzision anzeigen",
 "Display Precision should have a value between 0 and 9.","Die Anzeigegenauigkeit sollte einen Wert zwischen 0 und 9 haben.",
@@ -186,15 +180,12 @@ Details,Einzelheiten,
 Docs,,
 Documentation,Dokumentation,
 "Does Not Contain","Enthält nicht",
-"Don't Log Anything",,
-"Don't Log Usage",,
 "Download Update","Update herunterladen",
 "Downloading update",,
 Dr.,,
 Draft,,
 Duplicate,,
 "Duplicate ${0} ${1}?",,
-"Duplicate Entry Error",,
 "Duties and Taxes","Zölle und Steuern",
 "Earnest Money","Earnest Money",
 Edit,Bearbeiten,
@@ -202,8 +193,6 @@ Edit,Bearbeiten,
 Email,E-Mail,
 "Email Address",E-Mail-Adresse,
 Empty,Leer,
-"Enables telemetry. Does not include usage patterns.",,
-"Enables telemetry. Includes usage patterns.",,
 "Enter Country to load States",,
 "Enter State",,
 "Entertainment Expenses","Ausgaben für Unterhaltung",
@@ -211,7 +200,6 @@ Empty,Leer,
 "Entry Type","Eintrag Typ",
 Equity,Eigenkapital,
 Error,Fehler,
-Error:,Fehler:,
 "Exchange Gain/Loss",Wechselkursgewinne/-verluste,
 "Exchange Rate",Wechselkurse,
 "Excise Entry",,
@@ -221,6 +209,7 @@ Expense,Ausgaben,
 Expenses,Ausgaben,
 "Expenses Included In Valuation","In die Bewertung einbezogene Aufwendungen",
 Export,,
+"Export Failed",,
 "Export Successful","Export erfolgreich",
 Fax,Fax,
 Field,,
@@ -234,10 +223,8 @@ Filter,Filter,
 "Fixed Assets",Anlagevermögen,
 Font,Schriftart,
 For,Für,
-"Forbidden Error",,
 Fraction,Bruchteil,
 "Fraction Units","Maßeinheit Bruchteil",
-"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
 "Freight and Forwarding Charges","Fracht- und Speditionskosten",
 "From Account","Von Konto",
 "From Date","Von Datum",
@@ -261,7 +248,6 @@ HSN/SAC,HSN/SAC,
 "HSN/SAC Code",,
 "Half Yearly",,
 "Half Years",,
-"Hello there! 👋",,
 "Hex Value",Hex-Wert,
 "Hide Get Started","Ausblenden Los geht's",
 "Hide Group Amounts",,
@@ -285,7 +271,7 @@ Indigo,,
 "Indirect Income","Indirektes Einkommen",
 Inflow,Zufluss,
 "Install Update","Update installieren",
-Inter,,
+"Instance Id",,
 "Intergrated Tax","Integrierte Steuer",
 "Internal Precision","Interne Präzision",
 "Invalid value ${0} for ${1}",,
@@ -312,7 +298,6 @@ Items,Artikel,
 "Journal Entry",Journaleintrag,
 "Journal Entry Account",,
 Kg,,
-"Know More",,
 "Label Index",,
 Language,,
 "Ledger Entries",Hauptbucheinträge,
@@ -320,7 +305,6 @@ Language,,
 "Legal Expenses",Rechtskosten,
 "Less Than","Weniger als",
 Liability,,
-"Link Validation Error",,
 List,,
 "Load an existing .db file from your computer.","Laden Sie eine vorhandene .db-Datei von Ihrem Computer.",
 "Loading Report...",,
@@ -331,7 +315,6 @@ Locale,Gebietsschema,
 Logo,Logo,
 "Make Entry",,
 "Make Payment","Zahlung vornehmen",
-"Mandatory Error",,
 "Mar 23, 2022",,
 "Marketing Expenses",Marketing-Ausgaben,
 Merriweather,,
@@ -369,7 +352,6 @@ No,Nein,
 "No transactions yet","Noch keine Transaktionen",
 "No updates available","Keine Updates verfügbar",
 None,,
-"Not Found Error",,
 Notes,Anmerkungen,
 "Number Series",Zahlenreihe,
 "Number of ${0}",,
@@ -422,7 +404,6 @@ Place,Ort,
 "Please fill all values","Bitte alle Werte ausfüllen",
 "Please select a file with data to import.",,
 "Please select a valid reference type.",,
-"Please select an option:",,
 "Postal Code",Postleitzahl,
 "Postal Expenses",Portokosten,
 "Posting Date",Buchungsdatum,
@@ -494,7 +475,6 @@ Sales,Vertrieb,
 "Sales Items",,
 "Sales Payments",,
 Save,Speichern,
-"Save Option",,
 "Save Template",,
 "Save as PDF","Als PDF speichern",
 "Save as PDF Successful","PDF gespeichert",
@@ -515,15 +495,13 @@ Select,,
 "Select folder","Ordner auswählen",
 "Select your language",,
 "Selected file",,
-"Send anonymized usage data and error reports to help improve the product.",,
 Service,Dienst,
-"Set Anonymized Telemetry",,
 "Set an Import Type",,
 "Set the display language.",,
-"Set the local code. This is used for number formatting.","Legen Sie den lokalen Code fest, der für die Formatierung der Nummern verwendet wird."
-"Sets how many digits are shown after the decimal point.","Legt fest, wie viele Ziffern nach dem Dezimalpunkt angezeigt werden."
+"Set the local code. This is used for number formatting.","Legen Sie den lokalen Code fest, der für die Formatierung der Nummern verwendet wird.",
+"Sets how many digits are shown after the decimal point.","Legt fest, wie viele Ziffern nach dem Dezimalpunkt angezeigt werden.",
 "Sets the app-wide date display format.","Legt das app-weite Datumsanzeigeformat fest.",
-"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Legt die interne Genauigkeit fest, die für monetäre Berechnungen verwendet wird. Ein Wert über 6 sollte für die meisten Währungen ausreichend sein."
+"Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Legt die interne Genauigkeit fest, die für monetäre Berechnungen verwendet wird. Ein Wert über 6 sollte für die meisten Währungen ausreichend sein.",
 "Setting Up Instance",,
 "Setting Up...",Einrichten...,
 Settings,Einstellungen,
@@ -554,7 +532,7 @@ Stock,,
 "Stock Expenses","Ausgaben für Aktien",
 "Stock In Hand",Vorräte,
 "Stock Liabilities",Lagerverbindlichkeiten,
-"Stock Received But Not Billed","Erhaltener, aber nicht fakturierter Bestand"
+"Stock Received But Not Billed","Erhaltener, aber nicht fakturierter Bestand",
 Submit,Einreichen,
 "Submit Journal Entry?",,
 "Submit Purchase Invoice?",,
@@ -628,7 +606,6 @@ Unpaid,Unbezahlt,
 "Update downloaded","Update heruntergeladen",
 "User Remark","Benutzer Bemerkung",
 "Utility Expenses","Ausgaben für Versorgungsleistungen",
-"Validation Error",,
 Value,Wert,
 "Value missing for ${0}","Wert fehlt für ${0}",
 "Verify Imported Data",,
diff --git a/translations/esp.csv b/translations/esp.csv
deleted file mode 100644
index a5b0da33..00000000
--- a/translations/esp.csv
+++ /dev/null
@@ -1,586 +0,0 @@
-`${0} ${1} already exists.`,`${0} ${1} ya existe.`,,,,
-`${0} ${1} is linked with existing records.`,`${0} ${1} está vinculado con registros existentes.`,,,,
-`${0} already exists.`,`${0} ya existe.`,,,,
-`${0} filters applied`,`${0} filtros aplicados`,,,,
-`* required fields`,`* campos obligatorios`,,,,
-`1 filter applied`,`1 filtro aplicado`,,,,
-`Accepted Quantity`,`Cantidad aceptada`,,,,
-`Account`,`Cuenta`,,,,
-`Account Entries`,`Asientos de cuenta`,,,,
-`Account Name`,`Nombre de la cuenta`,,,,
-`Account Type`,`Tipo de cuenta`,,,,
-`Accounting Ledger Entries`,`Asientos del libro mayor de contabilidad`,,,,
-`Accounting Settings`,`Configuración de Contabilidad`,,,,
-`Accounts`,`Cuentas`,,,,
-`Accounts Payable`,`Cuentas por pagar`,,,,
-`Accounts Receivable`,`Cuentas por cobrar`,,,,
-`Accumulated Depreciation`,`Depreciación acumulada`,,,,
-`Add Account`,`Añadir cuenta`,,,,
-`Add Customers`,`Añadir Clientes`,,,,
-`Add Group`,`Añadir grupo`,,,,
-`Add Items`,`Añadir elementos`,,,,
-`Add Row`,`Añadir fila`,,,,
-`Add Suppliers`,`Agregar proveedores`,,,,
-`Add Taxes`,`Añadir impuestos`,,,,
-`Add a few customers to create your first invoice`,`Agregue algunos clientes para crear su primera factura`,,,,
-`Add a few suppliers to create your first bill`,`Agregue algunos proveedores para crear su primera factura`,,,,
-`Add a filter`,`Añadir un filtro`,,,,
-`Add products or services that you buy from your suppliers`,`Añade productos o servicios que compras a tus proveedores`,,,,
-`Add products or services that you sell to your customers`,`Añade productos o servicios que vendes a tus clientes`,,,,
-`Address`,`Dirección`,,,,
-`Address Display`,`Visualización de dirección`,,,,
-`Address Line 1`,`Línea de dirección 1`,,,,
-`Address Line 2`,`Línea de dirección 2`,,,,
-`Administrative Expenses`,`Gastos Administrativos`,,,,
-`Against Account`,`Contra cuenta`,,,,
-`All References`,`Todas las referencias`,,,,
-`Allocated Amount`,`Cantidad asignada`,,,,
-`Allow Telemetry`,`Permitir telemetría`,,,,
-`Amount`,`Cantidad`,,,,
-`Amount (Company Currency)`,`Cantidad (moneda de la empresa)`,,,,
-`Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.`,`Cantidad: ${0} y cancelación: ${1} es menor que la cantidad total asignada a las referencias: ${2}.`,,,,
-`Amount: ${0} is less than the total amount allocated to references: ${1}.`,`Cantidad: ${0} es menor que la cantidad total asignada a las referencias: ${1}.`,,,,
-`An error occurred.`,`Ocurrió un error.`,,,,
-`Anonymized Telemetry`,`Telemetría Anonimizada`,,,,
-`Application of Funds (Assets)`,`Aplicación de Fondos (Activos)`,,,,
-`Are you sure you want to cancel ${0} ${1}?`,`¿Está seguro de que desea cancelar ${0} ${1}?`,,,,
-`Are you sure you want to delete ${0} ${1}?`,`¿Está seguro de que desea eliminar ${0} ${1}?`,,,,
-`Are you sure you want to submit this Bill?`,¿Está seguro de que desea enviar este proyecto de ley?',,,,
-`Are you sure you want to submit this Invoice?`,¿Está seguro de que desea enviar esta factura?',,,,
-`Are you sure you want to submit this Journal Entry?`,`¿Está seguro de que desea enviar esta entrada de diario?`,,,,
-`Assign Imported Labels`,`Asignar etiquetas importadas`,,,,
-`Back`,`Atrás`,,,,
-`Bad import data.`,`Malos datos de importación.`,,,,
-`Balance`,Equilibrio',,,,
-`Balance Sheet`,`Balance general`,,,,
-`Bank Accounts`,`Cuentas Bancarias`,,,,
-`Bank Entry`,`Entrada bancaria`,,,,
-`Bank Name`,`Nombre del banco`,,,,
-`Bank Overdraft Account`,`Cuenta de sobregiro bancario`,,,,
-`Bill`,`Factura`,,,,
-`Bill Created`,`Factura creada`,,,,
-`Bill No`,`Número de factura`,,,,
-`Bills`,`Facturas`,,,,
-`Bills Settings`,`Configuración de facturas`,,,,
-`Black`,`Negro`,,,,
-`Body`,`Cuerpo`,,,,
-`Both`,`Ambos`,,,,
-`Buildings`,`Edificios`,,,,
-`CSV`,`CSV`,,,,
-`Can't open database file: ${0}. Please create a new file.`,`No se puede abrir el archivo de la base de datos: ${0}. Cree un nuevo archivo.`,,,,
-`Cancel`,`Cancelar`,,,,
-`Cancelled`,`Cancelado`,,,,
-`Capital Equipments`,`Equipos de capital`,,,,
-`Capital Stock`,`Capital Social`,,,,
-`Cash`,`Efectivo`,,,,
-`Cash Entry`,`Entrada en efectivo`,,,,
-`Cash In Hand`,`Efectivo en mano`,,,,
-`Cashflow`,`Flujo de caja`,,,,
-`Central Tax`,`Impuesto Central`,,,,
-`Central Tax Paid`,`Impuesto Central Pagado`,,,,
-`Change File`,`Cambiar archivo`,,,,
-`Chart Of Accounts Reviewed`,`Plan de cuentas revisado`,,,,
-`Chart of Accounts`,`Plan de cuentas`,,,,
-`Check for Updates`,`Buscar actualizaciones`,,,,
-`Checking for updates`,`Buscando actualizaciones`,,,,
-`Cheque`,`Cheque`,,,,
-`City / Town`,`Ciudad / Pueblo`,,,,
-`Clearance Date`,`Fecha de liquidación`,,,,
-`Click to create`,`Haga clic para crear`,,,,
-`Close`,`Cerrar`,,,,
-`Closing (Cr)`,`Cierre (Cr)`,,,,
-`Closing (Dr)`,`Cierre (Dr)`,,,,
-`Color`,`Color`,,,,
-`Commission on Sales`,`Comisión sobre Ventas`,,,,
-`Common`,`Común`,,,,
-`Common Items`,`Artículos comunes`,,,,
-`Company Address`,`Dirección de la empresa`,,,,
-`Company Logo`,`Logotipo de la empresa`,,,,
-`Company Name`,`Nombre de la empresa`,,,,
-`Company Settings`,`Configuración de la empresa`,,,,
-`Company Setup`,`Configuración de la empresa`,,,,
-`Completed`,`Completado`,,,,
-`Confirm Password`,`Confirmar contraseña`,,,,
-`Contains`,`Contiene`,,,,
-`Contra Entry`,`Entrada contraria`,,,,
-`Cost of Goods Sold`,`Costo de los bienes vendidos`,,,,
-`Could not import ${0} ${1}.`,`No se pudo importar ${0} ${1}.`,,,,
-`Could not select file.`,`No se pudo seleccionar el archivo.`,,,,
-`Country`,`País`,,,,
-`Create`,`Crear`,,,,
-`Create Bill`,`Crear Factura`,,,,
-`Create Invoice`,`Crear Factura`,,,,
-`Create a new file and store it in your computer.`,`Cree un nuevo archivo y guárdelo en su computadora.`,,,,
-`Create a new file or select an existing one from your computer`,`Cree un archivo nuevo o seleccione uno existente de su computadora`,,,,
-`Create your first bill and mail it to your supplier`,`Cree su primera factura y envíela por correo a su proveedor`,,,,
-`Create your first invoice and mail it to your customer`,`Cree su primera factura y envíela por correo a su cliente`,,,,
-`Credit`,`Crédito`,,,,
-`Credit Card Entry`,`Entrada de tarjeta de crédito`,,,,
-`Credit Note`,`Nota de crédito`,,,,
-`Creditors`,`Acreedores`,,,,
-`Currency`,`Moneda`,,,,
-`Currency Name`,`Nombre de la moneda`,,,,
-`Current`,`Actual`,,,,
-`Current Assets`,`Activo corriente`,,,,
-`Current Liabilities`,`Pasivo corriente`,,,,
-`Custom Hex`,`Hex personalizado`,,,,
-`Customer`,`Cliente`,,,,
-`Customer Created`,`Creado por el cliente`,,,,
-`Customer Currency`,`Moneda del cliente`,,,,
-`Customer Name`,`Nombre del cliente`,,,,
-`Customers`,`Clientes`,,,,
-`Customise`,`Personalizar`,,,,
-`Customize`,`Personalizar`,,,,
-`Customize your invoices by adding a logo and address details`,`Personalice sus facturas agregando un logotipo y detalles de la dirección`,,,,
-`DB Connection Error`,`Error de conexión de base de datos`,,,,
-`Dashboard`,`Tablero`,,,,
-`Data Import`,`Importación de datos`,,,,
-`Date`,`Fecha`,,,,
-`Date Format`,`Formato de fecha`,,,,
-`Debit`,`Débito`,,,,
-`Debit Note`,`Nota de débito`,,,,
-`Debtors`,`Deudores`,,,,
-`Default Account`,`Cuenta predeterminada`,,,,
-`Delete`,`Eliminar`,,,,
-`Depreciation`,`Depreciación`,,,,
-`Depreciation Entry`,`Entrada de depreciación`,,,,
-`Description`,`Descripción`,,,,
-`Details`,`Detalles`,,,,
-`Direct Expenses`,`Gastos Directos`,,,,
-`Direct Income`,`Ingresos Directos`,,,,
-`Disables telemetry. No data will be collected,`Desactiva la telemetría. No se recogerán datos,,,,
-`Display Logo in Invoice`,`Mostrar logotipo en la factura`,,,,
-`Display Precision`,`Precisión de visualización`,,,,
-`Display Precision should have a value between 0 and 9.`,`La precisión de visualización debe tener un valor entre 0 y 9.`,,,,
-`Dividends Paid`,`Dividendos pagados`,,,,
-`Document ${0} ${1} has been modified after loading`,`El documento ${0} ${1} ha sido modificado después de cargarlo`,,,,
-`Document type ${0} is not submittable`,`El tipo de documento ${0} no se puede enviar`,,,,
-`Documentation`,`Documentación`,,,,
-`Does Not Contain`,`No contiene`,,,,
-`Don't Log Anything`,`No registrar nada`,,,,
-`Don't Log Usage`,`No registrar el uso`,,,,
-`Download Update`,`Descargar actualización`,,,,
-`Downloading update`,`Descargando actualización`,,,,
-`Draft`,`Borrador`,,,,
-`Duplicate`,`Duplicar`,,,,
-`Duplicate ${0} ${1}?`,`¿Duplicar ${0} ${1}?`,,,,
-`Duties and Taxes`,`Derechos e impuestos`,,,,
-`Earnest Money`,Dinero de arras',,,,
-`Edit`,`Editar`,,,,
-`Electronic Equipments`,`Equipos electrónicos`,,,,
-`Email`,`Correo electrónico`,,,,
-`Email Account`,`Cuenta de correo electrónico`,,,,
-`Email Address`,`Dirección de correo electrónico`,,,,
-`Empty`,`Vacío`,,,,
-`Enable Notifications`,`Habilitar notificaciones`,,,,
-`Enables telemetry. Does not include usage patterns.`,`Habilita la telemetría. No incluye patrones de uso.`,,,,
-`Enables telemetry. Includes usage patterns.`,`Habilita la telemetría. Incluye patrones de uso.,,,,
-`Entertainment Expenses`,`Gastos de entretenimiento`,,,,
-`Entry ID`,`ID de entrada`,,,,
-`Entry No`,`Nº de entrada`,,,,
-`Entry Type`,`Tipo de entrada`,,,,
-`Equity`,`Equidad`,,,,
-`Error`,`Error`,,,,
-`Error:`,`Error:`,,,,
-`Event Settings`,`Configuración de eventos`,,,,
-`Exchange Gain/Loss`,`Ganancia/pérdida cambiaria`,,,,
-`Exchange Rate`,`Tipo de cambio`,,,,
-`Excise Entry`,`Entrada de impuestos especiales`,,,,
-`Existing File`,`Archivo existente`,,,,
-`Expense`,`Gasto`,,,,
-`Expenses`,`Gastos`,,,,
-`Expenses Included In Valuation`,`Gastos incluidos en la valoración`,,,,
-`Export`,`Exportar`,,,,
-`Export Failed`,`Exportación fallida`,,,,
-`Export Successful`,`Exportación exitosa`,,,,
-`Fax`,`Fax`,,,,
-`Fieldname`,`Nombre de campo`,,,,
-`File Name`,`Nombre de archivo`,,,,
-`File Path`,`Ruta del archivo`,,,,
-`File Size`,`Tamaño del archivo`,,,,
-`File selection failed.`,`Error en la selección de archivos.`,,,,
-`Filter`,`Filtro`,,,,
-`Fiscal Year End Date`,`Fecha de finalización del año fiscal`,,,,
-`Fiscal Year Start Date`,`Fecha de inicio del año fiscal`,,,,
-`Fixed Assets`,`Activos fijos`,,,,
-`Font`,`Fuente`,,,,
-`For`,`Para`,,,,
-`Fraction`,`Fracción`,,,,
-`Fraction Units`,`Unidades de fracción`,,,,
-`Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on,`Frappe Books utiliza telemetría opcional. Esta es la única forma de saber si tenemos usuarios constantes. Será muy útil si lo enciendes.,,,,
-`Freight and Forwarding Charges`,`Cargos de flete y expedición`,,,,
-`From`,`Desde`,,,,
-`From Account`,`De la cuenta`,,,,
-`From Date`,`Desde la fecha`,,,,
-`Fulfillment`,`Cumplimiento`,,,,
-`Fulfillment Settings`,`Configuración de cumplimiento`,,,,
-`Full Name`,`Nombre completo`,,,,
-`Furnitures and Fixtures`,`Mobiliario y Enseres`,,,,
-`GST Registration`,`Registro de GST`,,,,
-`GSTIN`,`GSTIN`,,,,
-`GSTIN No.`,`Número GSTIN`,,,,
-`GSTIN of Supplier`,`GSTIN del proveedor`,,,,
-`GSTR 3B`,`GSTR 3B`,,,,
-`GSTR 3B Report`,`Informe GSTR 3B`,,,,
-`GSTR1`,`GSTR1`,,,,
-`GSTR2`,`GSTR2`,,,,
-`Gain/Loss on Asset Disposal`,`Ganancia/pérdida en la enajenación de activos`,,,,
-`Gender`,`Género`,,,,
-`General`,generales',,,,
-`General Ledger`,`Libro mayor`,,,,
-`Get Started`,`Comenzar`,,,,
-`Grand Total`,`Total general`,,,,
-`Grand Total (Company Currency)`,`Total general (moneda de la empresa)`,,,,
-`Greater Than`,`Mayor que`,,,,
-`HSN/SAC`,`HSN/SAC`,,,,
-`Half Yearly`,`Semestral`,,,,
-`Hello there! 👋`,¡Hola! 👋`,,,,
-`Hex Value`,`Valor hexadecimal`,,,,
-`Hide Get Started`,`Ocultar Empezar`,,,,
-`Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.`,`Oculta la sección Comenzar de la barra lateral. El cambio será visible al reiniciar o actualizar la aplicación.,,,,
-`How to Use Data Import`,`Cómo utilizar la importación de datos`,,,,
-`I can't find my language.`,`No puedo encontrar mi idioma.`,,,,
-`ID`,`ID`,,,,
-`Image`,`Imagen`,,,,
-`Import Data`,`Importar datos`,,,,
-`Import Failed`,`Importación fallida`,,,,
-`Import More`,`Importar más`,,,,
-`Import Success`,`Importación exitosa`,,,,
-`Import Type`,`Tipo de importación`,,,,
-`Importer Settings`,`Configuración del importador`,,,,
-`Income`,`Ingresos`,,,,
-`Indirect Expenses`,`Gastos Indirectos`,,,,
-`Indirect Income`,`Ingresos indirectos`,,,,
-`Inflow`,`Afluencia`,,,,
-`Install Update`,`Instalar actualización`,,,,
-`Intergrated Tax`,`Impuesto Integrado`,,,,
-`Intergrated Tax Paid`,`Impuestos Integrados Pagados`,,,,
-`Internal Precision`,`Precisión interna`,,,,
-`Investments`,`Inversiones`,,,,
-`Invoice`,`Factura`,,,,
-`Invoice Created`,`Factura creada`,,,,
-`Invoice Date`,`Fecha de la factura`,,,,
-`Invoice No`,`Nº de factura`,,,,
-`Invoice No.`,`Número de factura`,,,,
-`Invoice Number`,`Número de factura`,,,,
-`Invoice Setup`,`Configuración de factura`,,,,
-`Invoice Value`,`Valor de la factura`,,,,
-`Invoices`,`Facturas`,,,,
-`Is`,`Es`,,,,
-`Is Customer`,`Es cliente`,,,,
-`Is Empty`,`Está vacío`,,,,
-`Is Group`,`Es grupo`,,,,
-`Is Not`,`No es`,,,,
-`Is Not Empty`,`No está vacío`,,,,
-`Is Supplier`,`Es proveedor`,,,,
-`Item`,`Artículo`,,,,
-`Item Created`,`Artículo creado`,,,,
-`Item Name`,`Nombre del elemento`,,,,
-`Items`,`Artículos`,,,,
-`JSON`,`JSON`,,,,
-`JSON Data`,`Datos JSON`,,,,
-`Journal Entry`,`Entrada de diario`,,,,
-`Journal Entry Setting`,`Configuración de entrada de diario`,,,,
-`Know More`,`Saber más`,,,,
-`Label Index`,`Índice de etiquetas`,,,,
-`Language`,`Idioma`,,,,
-`Ledger Entries`,`Asientos contables`,,,,
-`Ledger Entry`,`Entrada del libro mayor`,,,,
-`Legal Expenses`,`Gastos Legales`,,,,
-`Less Than`,`Menos de`,,,,
-`Load an existing .db file from your computer.`,`Cargue un archivo .db existente desde su computadora.`,,,,
-`Loading...`,`Cargando...`,,,,
-`Loans (Liabilities)`,`Préstamos (Pasivos)`,,,,
-`Loans and Advances (Assets)`,`Préstamos y anticipos (activos)`,,,,
-`Locale`,`Local`,,,,
-`Logo`,`Logotipo`,,,,
-`MIME Type`,`Tipo MIME`,,,,
-`Make Payment`,`Hacer pago`,,,,
-`Marketing Expenses`,`Gastos de marketing`,,,,
-`Miscellaneous Expenses`,`Gastos Misceláneos`,,,,
-`Mobile Number`,`Número de móvil`,,,,
-`Month`,`Mes`,,,,
-`Monthly`,`Mensual`,,,,
-`Name`,`Nombre`,,,,
-`Net Total`,`Total Neto`,,,,
-`Net Total (Company Currency)`,`Total neto (moneda de la empresa)`,,,,
-`New Account`,`Cuenta nueva`,,,,
-`New Bill`,`Nueva Ley`,,,,
-`New File`,`Nuevo archivo`,,,,
-`New Invoice`,`Nueva Factura`,,,,
-`New Journal Entry`,`Nueva entrada de diario`,,,,
-`New version available`,`Nueva versión disponible`,,,,
-`Next`,`Siguiente`,,,,
-`No`,`No`,,,,
-`No Data to Import`,`No hay datos para importar`,,,,
-`No expenses in this period`,`Sin gastos en este periodo`,,,,
-`No filters selected`,`No hay filtros seleccionados`,,,,
-`No labels have been assigned.`,`No se han asignado etiquetas.`,,,,
-`No results found.`,`No se encontraron resultados.`,,,,
-`No transactions yet`,`No hay transacciones todavía`,,,,
-`No updates available`,`No hay actualizaciones disponibles`,,,,
-`None`,`Ninguno`,,,,
-`Notes`,`Notas`,,,,
-`Number Series`,`Serie de números`,,,,
-`Office Equipments`,`Equipos de oficina`,,,,
-`Office Maintenance Expenses`,`Gastos de mantenimiento de oficina`,,,,
-`Office Rent`,`Alquiler de oficina`,,,,
-`Onboarding Complete`,`Incorporación completa`,,,,
-`Open Folder`,`Abrir carpeta`,,,,
-`Opening (Cr)`,`Apertura (Cr)`,,,,
-`Opening (Dr)`,`Apertura (Dr)`,,,,
-`Opening Balance Equity`,`Patrimonio del saldo de apertura`,,,,
-`Opening Balances`,`Saldos de apertura`,,,,
-`Opening Entry`,`Entrada de apertura`,,,,
-`Organisation`,`Organización`,,,,
-`Outflow`,`Salida`,,,,
-`Outstanding Amount`,`Cantidad pendiente`,,,,
-`PDF`,`PDF`,,,,
-`Pad Zeros`,`Pad ceros`,,,,
-`Paid`,`Pagado`,,,,
-`Parent`,`Padre`,,,,
-`Parent Account`,`Cuenta principal`,,,,
-`Party`,`Fiesta`,,,,
-`Password`,`Contraseña`,,,,
-`Pay`,`Pagar`,,,,
-`Payable Account`,`Cuenta por pagar`,,,,
-`Payment`,`Pago`,,,,
-`Payment Account`,`Cuenta de pago`,,,,
-`Payment For`,`Pago por`,,,,
-`Payment Method`,`Método de pago`,,,,
-`Payment No`,`Nº de pago`,,,,
-`Payment Reference`,`Referencia de pago`,,,,
-`Payment Settings`,`Configuración de pago`,,,,
-`Payment Type`,`Tipo de pago`,,,,
-`Payment amount cannot be ${0}.`,`El monto del pago no puede ser ${0}.`,,,,
-`Payment amount cannot be less than zero.`,`El importe del pago no puede ser inferior a cero.`,,,,
-`Payment amount cannot exceed ${0}.`,`El monto del pago no puede exceder ${0}.`,,,,
-`Payment amount: ${0} should be greater than 0.`,`Importe del pago: ${0} debe ser mayor que 0.`,,,,
-`Payment amount: ${0} should be less than Outstanding amount: ${1}.`,`Importe del pago: ${0} debe ser menor que el importe pendiente: ${1}.`,,,,
-`Payments`,`Pagos`,,,,
-`Payroll Payable`,`Nómina a pagar`,,,,
-`Periodicity`,`Periodicidad`,,,,
-`Phone`,`Teléfono`,,,,
-`Place`,`Lugar`,,,,
-`Place of Supply`,`Lugar de suministro`,,,,
-`Place of supply`,`Lugar de suministro`,,,,
-`Plants and Machineries`,`Plantas y Maquinarias`,,,,
-`Please assign the following fields ${0}`,`Por favor asigne los siguientes campos ${0}`,,,,
-`Please fill all values`,`Por favor complete todos los valores`,,,,
-`Please select a file with data to import.`,`Seleccione un archivo con datos para importar.`,,,,
-`Please select an existing database or create a new one.`,`Seleccione una base de datos existente o cree una nueva.`,,,,
-`Please select an option:`,`Seleccione una opción:`,,,,
-`Please set GSTIN in General Settings.`,"`Por favor, establezca GSTIN en Configuración general.`",,,,
-`Postal Code`,`Código Postal`,,,,
-`Postal Expenses`,`Gastos Postales`,,,,
-`Posting Date`,`Fecha de publicación`,,,,
-`Prefix`,`Prefijo`,,,,
-`Print`,`Imprimir`,,,,
-`Print Format`,`Formato de impresión`,,,,
-`Print PDF`,`Imprimir PDF`,,,,
-`Print Settings`,`Configuración de impresión`,,,,
-`Print and Stationery`,`Impresión y Papelería`,,,,
-`Profit And Loss`,`Ganancias y pérdidas`,,,,
-`Profit and Loss`,`Ganancias y Pérdidas`,,,,
-`Purchase`,`Comprar`,,,,
-`Purchase Items`,`Comprar artículos`,,,,
-`Purchase Order`,`Orden de compra`,,,,
-`Purchase Order Settings`,`Configuración de orden de compra`,,,,
-`Purchase Receipt`,`Recibo de compra`,,,,
-`Purchase Receipt Settings`,`Configuración del recibo de compra`,,,,
-`PurchaseInvoice`,`Factura de compra`,,,,
-`PurchaseOrder`,`Orden de compra`,,,,
-`PurchaseReceipt`,`Recibo de compra`,,,,
-`Purchases`,`Compras`,,,,
-`Quantity`,`Cantidad`,,,,
-`Quantity (${0}) cannot be less than zero.`,`La cantidad (${0}) no puede ser menor que cero.`,,,,
-`Quarterly`,`Trimestral`,,,,
-`Quotation`,`Cotización`,,,,
-`Quotation Settings`,`Configuración de cotización`,,,,
-`Rate`,`Tarifa`,,,,
-`Rate (${0}) cannot be less zero.`,`La tasa (${0}) no puede ser menos de cero.`,,,,
-`Rate (Company Currency)`,`Tarifa (moneda de la empresa)`,,,,
-`Rate can't be negative.`,`La tasa no puede ser negativa.`,,,,
-`Re-Open`,`Reabrir`,,,,
-`Receivable Account`,`Cuenta por cobrar`,,,,
-`Receive`,`Recibir`,,,,
-`Recent Invoices`,`Facturas recientes`,,,,
-`Reconcile`,`Reconciliar`,,,,
-`Ref. / Cheque No.`,`Ref. / Número de cheque`,,,,
-`Ref. Date`,`Ref. Fecha`,,,,
-`Ref. Name`,`Ref. Nombre`,,,,
-`Ref. Type`,`Ref. Tipo`,,,,
-`Ref/Cheque ID`,`Ref/ID de cheque`,,,,
-`Reference Date`,`Fecha de referencia`,,,,
-`Reference DocType`,`Tipo de documento de referencia`,,,,
-`Reference Field`,`Campo de referencia`,,,,
-`Reference Name`,`Nombre de referencia`,,,,
-`Reference Number`,`Número de referencia`,,,,
-`Reference Type`,`Tipo de referencia`,,,,
-`Reload App`,`Recargar aplicación`,,,,
-`Report Error`,`Informe de error`,,,,
-`Report Issue`,`Informe de problema`,,,,
-`Reports`,`Informes`,,,,
-`Required Fields not Assigned`,`Campos obligatorios no asignados`,,,,
-`Reset`,`Reiniciar`,,,,
-`Reset Filters`,`Restablecer filtros`,,,,
-`Retained Earnings`,`Utilidades retenidas`,,,,
-`Reverse Charge`,`Cobro inverso`,,,,
-`Reverse Chrg.`,`Carga inversa`,,,,
-`Reverted`,`Revertido`,,,,
-`Review Accounts`,`Revisar Cuentas`,,,,
-`Review your chart of accounts,`Revise su catálogo de cuentas,,afegeix un compte o taxa nous segons sigui necessari`,,
-`Role`,`Rol`,,,,
-`Roles`,`Roles`,,,,
-`Root Type`,`Tipo de raíz`,,,,
-`Round Off`,`Redondear`,,,,
-`Round Off Account`,`Cuenta de redondeo`,,,,
-`SMTP Host`,`Host SMTP`,,,,
-`SMTP Port`,`Puerto SMTP`,,,,
-`Salary`,`Salario`,,,,
-`Sales`,`Ventas`,,,,
-`Sales Expenses`,`Gastos de Ventas`,,,,
-`Sales Items`,`Artículos de venta`,,,,
-`Sales Order`,`Orden de venta`,,,,
-`Sales Order Settings`,`Configuración de órdenes de venta`,,,,
-`SalesInvoice`,`Factura de Ventas`,,,,
-`SalesInvoice Settings`,`Configuración de Factura de Ventas`,,,,
-`SalesOrder`,`Orden de Venta`,,,,
-`Save`,`Guardar`,,,,
-`Save & Close`,`Guardar y cerrar`,,,,
-`Save Option`,`Guardar opción`,,,,
-`Save Template`,`Guardar plantilla`,,,,
-`Save as PDF`,`Guardar como PDF`,,,,
-`Save as PDF Successful`,`Guardar como PDF con éxito`,,,,
-`Saving...`,`Guardando...`,,,,
-`Schedule`,`Horario`,,,,
-`Search...`,`Buscar...`,,,,
-`Secured Loans`,`Préstamos garantizados`,,,,
-`Securities and Deposits`,`Valores y Depósitos`,,,,
-`Select CoA`,`Seleccionar CoA`,,,,
-`Select File`,`Seleccionar archivo`,,,,
-`Select Folder`,`Seleccionar carpeta`,,,,
-`Select Image`,`Seleccionar imagen`,,,,
-`Select Logo`,`Seleccionar logotipo`,,,,
-`Select Period`,`Seleccionar Período`,,,,
-`Select Period...`,`Seleccionar Periodo...`,,,,
-`Select a file for import`,`Seleccione un archivo para importar`,,,,
-`Select a file to load the company transactions`,`Seleccione un archivo para cargar las transacciones de la empresa`,,,,
-`Select file`,`Seleccionar archivo`,,,,
-`Select folder`,`Seleccionar carpeta`,,,,
-`Select your language`,`Seleccione su idioma`,,,,
-`Selected file`,`Archivo seleccionado`,,,,
-`Send`,`Enviar`,,,,
-`Send anonymized usage data and error reports to help improve the product.`,`Envíe datos de uso anónimos e informes de errores para ayudar a mejorar el producto.`,,,,
-`Service`,`Servicio`,,,,
-`Set Anonymized Telemetry`,`Establecer telemetría anonimizada`,,,,
-`Set an Import Type`,`Establecer un tipo de importación`,,,,
-`Set the display language.`,`Establecer el idioma de visualización.`,,,,
-`Set the local code. This is used for number formatting.`,`Establezca el código local. Esto se usa para formatear números.,,,,
-`Sets how many digits are shown after the decimal point.`,`Establece cuántos dígitos se muestran después del punto decimal.`,,,,
-`Sets the app-wide date display format.`,`Establece el formato de visualización de la fecha en toda la aplicación.`,,,,
-`Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.`,`Establece la precisión interna utilizada para los cálculos monetarios. Por encima de 6 debería ser suficiente para la mayoría de las monedas.,,,,
-`Setting Up...`,`Configurando...`,,,,
-`Settings`,`Configuración`,,,,
-`Settings changes will be visible on reload`,`Los cambios de configuración serán visibles al recargar`,,,,
-`Setup`,`Configuración`,,,,
-`Setup Complete`,`Configuración completa`,,,,
-`Setup Wizard`,`Asistente de configuración`,,,,
-`Setup system defaults like date format and display precision`,`Configurar valores predeterminados del sistema como formato de fecha y precisión de visualización`,,,,
-`Setup your company information,`Configurar la información de su empresa,,`Configura la informació de la teva empresa,adreça electrònica,país i l'any fiscal`
-`Setup your opening balances before performing any accounting entries`,`Configure sus saldos de apertura antes de realizar cualquier asiento contable`,,,,
-`Setup your organization`,`Configura tu organización`,,,,
-`Setup your tax templates for your sales or purchase transactions`,`Configure sus plantillas de impuestos para sus transacciones de compra o venta`,,,,
-`Setup your workspace`,`Configura tu espacio de trabajo`,,,,
-`Show Me`,Muéstrame',,,,
-`Smallest Currency Fraction Value`,`Valor de fracción de moneda más pequeño`,,,,
-`Softwares`,`Software`,,,,
-`Something has gone terribly wrong. Please check the console and raise an issue.`,`Algo ha ido terriblemente mal. Verifique la consola y plantee un problema.,,,,
-`Source of Funds (Liabilities)`,`Fuente de los Fondos (Pasivos)`,,,,
-`Standard Chart of Accounts`,`Plan de cuentas estándar`,,,,
-`Start`,`Comenzar`,,,,
-`Start Time`,`Hora de inicio`,,,,
-`State`,`Estado`,,,,
-`State Tax`,`Impuesto estatal`,,,,
-`State/UT Tax Paid`,`Impuesto estatal/UT pagado`,,,,
-`Status`,`Estado`,,,,
-`Stock Adjustment`,`Ajuste de existencias`,,,,
-`Stock Assets`,`Activos de acciones`,,,,
-`Stock Expenses`,`Gastos de existencias`,,,,
-`Stock In Hand`,`Stock en mano`,,,,
-`Stock Liabilities`,`Pasivos por acciones`,,,,
-`Stock Received But Not Billed`,`Stock recibido pero no facturado`,,,,
-`Subject`,`Asunto`,,,,
-`Submit`,`Enviar`,,,,
-`Submit on Import`,`Enviar al importar`,,,,
-`Submitted`,`Enviado`,,,,
-`Subtotal`,`Subtotal`,,,,
-`Successfully created the following ${0} entries:`,`Se crearon con éxito las siguientes entradas ${0}:`,,,,
-`Supplier`,`Proveedor`,,,,
-`Supplier Created`,`Proveedor creado`,,,,
-`Supplier Currency`,`Moneda del proveedor`,,,,
-`Supplier Name`,`Nombre del proveedor`,,,,
-`Suppliers`,`Proveedores`,,,,
-`Symbol`,`Símbolo`,,,,
-`System`,`Sistema`,,,,
-`System Settings`,`Configuración del sistema`,,,,
-`System Setup`,`Configuración del sistema`,,,,
-`Tax`,`Impuesto`,,,,
-`Tax Account`,`Cuenta fiscal`,,,,
-`Tax Assets`,`Activos Fiscales`,,,,
-`Tax Detail`,`Detalle fiscal`,,,,
-`Tax ID`,`Número de identificación fiscal`,,,,
-`Taxable Value`,`Valor imponible`,,,,
-`Taxes`,`Impuestos`,,,,
-`Telephone Expenses`,`Gastos Telefónicos`,,,,
-`Template`,`Plantilla`,,,,
-`Temporary Accounts`,`Cuentas Temporales`,,,,
-`Temporary Opening`,`Apertura Temporal`,,,,
-`Terms`,`Términos`,,,,
-`The following ${0} entries were created: ${1}`,`Se crearon las siguientes ${0} entradas: ${1}`,,,,
-`Theme Color`,`Color del tema`,,,,
-`This Month`,`Este Mes`,,,,
-`This Quarter`,`Este Trimestre`,,,,
-`This Year`,`Este año`,,,,
-`This action is permanent`,`Esta acción es permanente`,,,,
-`This action is permanent and will cancel the following payment: ${0}`,`Esta acción es permanente y cancelará el siguiente pago: ${0}`,,,,
-`This action is permanent and will cancel the following payments: ${0}`,`Esta acción es permanente y cancelará los siguientes pagos: ${0}`,,,,
-`Title`,`Título`,,,,
-`To`,`A`,,,,
-`To Account`,`A la cuenta`,,,,
-`To Date`,`Hasta la fecha`,,,,
-`To Do`,`Para hacer`,,,,
-`Top Expenses`,`Gastos principales`,,,,
-`Total Spending`,`Gasto total`,,,,
-`Total Tax`,`Impuesto Total`,,,,
-`Transfer`,Transferir',,,,
-`Transfer Type`,`Tipo de transferencia`,,,,
-`Travel Expenses`,`Gastos de viaje`,,,,
-`Trial Balance`,Balance de prueba',,,,
-`Type`,`Tipo`,,,,
-`Unit Type`,`Tipo de unidad`,,,,
-`Unpaid`,`No pagado`,,,,
-`Unsecured Loans`,`Préstamos no garantizados`,,,,
-`Update downloaded`,`Actualización descargada`,,,,
-`User ID`,`ID de usuario`,,,,
-`User Remark`,`Observación del usuario`,,,,
-`Username`,`Nombre de usuario`,,,,
-`Utility Expenses`,`Gastos de servicios públicos`,,,,
-`Value`,`Valor`,,,,
-`Value missing for ${0}`,`Valor faltante para ${0}`,,,,
-`Verify Imported Data`,`Verificar datos importados`,,,,
-`Version ${0} available`,`Versión ${0} disponible`,,,,
-`View Bills`,`Ver facturas`,,,,
-`View Invoices`,`Ver Facturas`,,,,
-`Welcome to Frappe Books`,`Bienvenido a Libros Frappe`,,,,
-`Write Off`,`Cancelar`,,,,
-`Write Off / Refund`,`Cancelar / Reembolsar`,,,,
-`Write Off Account`,`Cancelar cuenta`,,,,
-`Write Off Account not set. Please set Write Off Account in General Settings`,`Cuenta de anulación no establecida. Establezca Cancelar cuenta en Configuración general`,,,,
-`Write Off Entry`,`Cancelar entrada`,,,,
-`Year`,`Año`,,,,
-`Yearly`,`Anual`,,,,
-`Yes`,`Sí`,,,,
-`Your Name`,`Tu nombre`,,,,
-`name`,`nombre`,,,,
-`verify the imported data and click on`,`verifique los datos importados y haga clic en`,,,,
\ No newline at end of file
diff --git a/translations/fr.csv b/translations/fr.csv
index 50e3b03b..4b94373b 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -44,13 +44,11 @@ Address,Adresse,
 "Address Line 2","Ligne d'adresse 2",
 "Administrative Expenses","Dépenses administratives",
 All,,
-"Allow Telemetry",,
 Amount,Montant,
 "Amount (Company Currency)","Montant (devise de la société)",
 "Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Le montant : ${0} et write-off : ${1} est inférieur au montant total alloué aux références : ${2}.",
 "Amount: ${0} is less than the total amount allocated to references: ${1}.","Montant : ${0} est inférieur au montant total alloué aux références : ${1}.",
 "An error occurred.","Une erreur s'est produite.",
-"Anonymized Telemetry",,
 "Application of Funds (Assets)","Application des fonds (actifs)",
 Arial,,
 "Ascending Order",,
@@ -65,7 +63,6 @@ Bank,,
 "Bank Entry",,
 "Bank Name","Nom de la banque",
 "Bank Overdraft Account","Compte de découvert bancaire",
-"Base Error",,
 "Based On",,
 Basic,,
 "Basic I",,
@@ -81,7 +78,6 @@ Business,,
 Cancel,Annuler,
 "Cancel ${0} ${1}?",,
 Cancelled,Annulé,
-"Cannot Commit Error",,
 "Capital Equipments","Biens d'équipement",
 "Capital Stock","Capital social",
 Cash,Espèces,
@@ -160,7 +156,6 @@ Customise,Personnalisez,
 "Customize your invoices by adding a logo and address details",,
 Dashboard,"Tableau de bord",
 "Data Import","Importation de données",
-"Database Error",,
 "Database file: ${0}",,
 Date,Date,
 "Date Format","Format de la date",
@@ -178,7 +173,6 @@ Description,Description,
 Details,Détails,
 "Direct Expenses","Dépenses directes",
 "Direct Income","Revenu direct",
-"Disables telemetry. No data will be collected, you are completely invisble to us.",,
 "Display Logo in Invoice","Affichage du logo sur la facture",
 "Display Precision","Précision de l'affichage",
 "Display Precision should have a value between 0 and 9.","La précision de l'affichage doit avoir une valeur comprise entre 0 et 9.",
@@ -186,15 +180,12 @@ Details,Détails,
 Docs,,
 Documentation,Documentation,
 "Does Not Contain","Ne contient pas",
-"Don't Log Anything",,
-"Don't Log Usage",,
 "Download Update","Télécharger la mise à jour",
 "Downloading update",,
 Dr.,,
 Draft,,
 Duplicate,,
 "Duplicate ${0} ${1}?",,
-"Duplicate Entry Error",,
 "Duties and Taxes","Droits et taxes",
 "Earnest Money","Argent de garantie",
 Edit,Modifier,
@@ -202,8 +193,6 @@ Edit,Modifier,
 Email,"Courriel :",
 "Email Address","Adresse électronique",
 Empty,Vide,
-"Enables telemetry. Does not include usage patterns.",,
-"Enables telemetry. Includes usage patterns.",,
 "Enter Country to load States",,
 "Enter State",,
 "Entertainment Expenses","Dépenses de divertissement",
@@ -211,7 +200,6 @@ Empty,Vide,
 "Entry Type","Type d'entrée",
 Equity,Actions,
 Error,Erreur,
-Error:,"Erreur :",
 "Exchange Gain/Loss","Gain/perte de change",
 "Exchange Rate","Taux de change",
 "Excise Entry",,
@@ -221,6 +209,7 @@ Expense,Dépenses,
 Expenses,Dépenses,
 "Expenses Included In Valuation","Dépenses incluses dans l'évaluation",
 Export,,
+"Export Failed",,
 "Export Successful","Exportation réussie",
 Fax,Fax,
 Field,,
@@ -234,10 +223,8 @@ Filter,Filtre,
 "Fixed Assets","Actifs fixes",
 Font,Police,
 For,Pour,
-"Forbidden Error",,
 Fraction,Fraction,
 "Fraction Units","Unités de fractionnement",
-"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
 "Freight and Forwarding Charges","Frais de fret et d'expédition",
 "From Account","Du compte",
 "From Date","De la date",
@@ -261,7 +248,6 @@ HSN/SAC,HSN/SAC,
 "HSN/SAC Code",,
 "Half Yearly",,
 "Half Years",,
-"Hello there! 👋",,
 "Hex Value","Valeur hexagonale",
 "Hide Get Started","Cacher Commencer",
 "Hide Group Amounts",,
@@ -285,7 +271,7 @@ Indigo,,
 "Indirect Income","Revenu indirect",
 Inflow,"Arrivée d'eau",
 "Install Update","Installer la mise à jour",
-Inter,,
+"Instance Id",,
 "Intergrated Tax","Taxe intégrée",
 "Internal Precision","Précision interne",
 "Invalid value ${0} for ${1}",,
@@ -312,7 +298,6 @@ Items,Articles,
 "Journal Entry","Entrée du journal",
 "Journal Entry Account",,
 Kg,,
-"Know More",,
 "Label Index",,
 Language,,
 "Ledger Entries","Écritures de grand livre",
@@ -320,7 +305,6 @@ Language,,
 "Legal Expenses","Frais juridiques",
 "Less Than","Moins de",
 Liability,,
-"Link Validation Error",,
 List,,
 "Load an existing .db file from your computer.","Chargez un fichier .db existant sur votre ordinateur.",
 "Loading Report...",,
@@ -331,7 +315,6 @@ Locale,Locale,
 Logo,Logo,
 "Make Entry",,
 "Make Payment","Effectuer le paiement",
-"Mandatory Error",,
 "Mar 23, 2022",,
 "Marketing Expenses","Dépenses de marketing",
 Merriweather,,
@@ -369,7 +352,6 @@ No,Non,
 "No transactions yet","Aucune transaction pour le moment",
 "No updates available","Aucune mise à jour disponible",
 None,,
-"Not Found Error",,
 Notes,Notes,
 "Number Series","Série de numéros",
 "Number of ${0}",,
@@ -422,7 +404,6 @@ Place,Lieu,
 "Please fill all values","Veuillez remplir toutes les valeurs",
 "Please select a file with data to import.",,
 "Please select a valid reference type.",,
-"Please select an option:",,
 "Postal Code","Code postal",
 "Postal Expenses","Dépenses postales",
 "Posting Date","Date d'affichage",
@@ -494,7 +475,6 @@ Sales,Ventes,
 "Sales Items",,
 "Sales Payments",,
 Save,Sauvez,
-"Save Option",,
 "Save Template",,
 "Save as PDF","Enregistrer en PDF",
 "Save as PDF Successful","Enregistrer en PDF avec succès",
@@ -515,12 +495,10 @@ Select,,
 "Select folder","Sélectionner le dossier",
 "Select your language",,
 "Selected file",,
-"Send anonymized usage data and error reports to help improve the product.",,
 Service,Service,
-"Set Anonymized Telemetry",,
 "Set an Import Type",,
 "Set the display language.",,
-"Set the local code. This is used for number formatting.","Définissez le code local, il est utilisé pour le formatage des numéros."
+"Set the local code. This is used for number formatting.","Définissez le code local, il est utilisé pour le formatage des numéros.",
 "Sets how many digits are shown after the decimal point.","Définit le nombre de chiffres affichés après le point décimal.",
 "Sets the app-wide date display format.","Définit le format d'affichage de la date pour l'ensemble de l'application.",
 "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Définit la précision interne utilisée pour les calculs monétaires. Une précision supérieure à 6 devrait être suffisante pour la plupart des monnaies.",
@@ -628,7 +606,6 @@ Unpaid,Impayé,
 "Update downloaded","Mise à jour téléchargée",
 "User Remark","Remarque de l'utilisateur",
 "Utility Expenses","Dépenses de services publics",
-"Validation Error",,
 Value,Valeur,
 "Value missing for ${0}","Valeur manquante pour ${0}",
 "Verify Imported Data",,
diff --git a/translations/nl.csv b/translations/nl.csv
index d97901c9..31a38aca 100644
--- a/translations/nl.csv
+++ b/translations/nl.csv
@@ -1,12 +1,24 @@
+"${0} ${1} already exists.",,
+"${0} ${1} has been modified after loading",,
 "${0} ${1} is linked with existing records.","${0} ${1} is gekoppeld aan bestaande records.",
+"${0} already exists.",,
 "${0} filters applied","${0} filters toegepast",
+"${0} rows",,
+"* required fields",,
+0%,,
+03-23-2022,,
+03/23/2022,,
 "1 filter applied","1 filter toegepast",
-"Accepted Quantity","Aanvaarde Hoeveelheid",
+2022-03-23,,
+"23 Mar, 2022",,
+23-03-2022,,
+23/03/2022,,
+9888900000,,
 Account,Rekening,
 "Account Entries","Ingevoerde Rekening",
 "Account Name","Rekening Naam",
 "Account Type","Rekening Type",
-"Accounting Ledger Entries","Boekhouding Grootboek Invoeringen",
+"Accounting Ledger Entry",,
 "Accounting Settings","Boekhoud Instellingen",
 Accounts,Rekeningen,
 "Accounts Payable","Te Betalen Rekeningen",
@@ -19,78 +31,116 @@ Accounts,Rekeningen,
 "Add Row","Rij Toevoegen",
 "Add Suppliers","Leveranciers Toevoegen",
 "Add Taxes","Belastingen Toevoegen",
+"Add a few customers to create your first invoice",,
+"Add a few suppliers to create your first bill",,
 "Add a filter","Filter toevoegen",
+"Add a remark",,
+"Add invoice terms",,
+"Add products or services that you buy from your suppliers",,
+"Add products or services that you sell to your customers",,
 Address,Adres,
 "Address Display","Adres Weergave",
 "Address Line 1","Adresregel 1",
 "Address Line 2","Adresregel 2",
 "Administrative Expenses","Administratieve Uitgaven",
-"Against Account","Tegen Rekening",
-"All References","Alle Referenties",
+All,,
 Amount,Bedrag,
 "Amount (Company Currency)","Bedrag (Vennootschap Valuta)",
 "Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Bedrag: ${0} en afschrijving: ${1} is minder dan het totale bedrag toegewezen aan referenties: ${2}.",
 "Amount: ${0} is less than the total amount allocated to references: ${1}.","Bedrag: ${0} is minder dan het totale bedrag toegewezen aan referenties: ${1}.",
 "An error occurred.","Er is een fout opgetreden.",
 "Application of Funds (Assets)","Toepassing van fondsen (activa)",
-"Are you sure you want to cancel ${0} ${1}?","Weet u zeker dat u ${0} ${1} wilt annuleren?",
-"Are you sure you want to delete ${0} ${1}?","Weet u zeker dat u ${0} ${1} wilt verwijderen?",
-"Are you sure you want to submit this Bill?","Weet u zeker dat u deze Rekening wilt presenteren?",
-"Are you sure you want to submit this Invoice?","Weet u zeker dat u deze Factuur wilt presenteren?",
-"Are you sure you want to submit this Journal Entry?","Wil je deze Dagboekvermelding echt inzenden?",
+Arial,,
+"Ascending Order",,
+Asset,,
+"Assign Imported Labels",,
 Back,Terug,
+"Bad import data.",,
 Balance,Balans,
 "Balance Sheet","Balans Blad",
+Bank,,
 "Bank Accounts",Bankrekeningen,
+"Bank Entry",,
 "Bank Name","Naam Bank",
 "Bank Overdraft Account","Debetsaldo bank",
+"Based On",,
+Basic,,
+"Basic I",,
+"Basic II",,
 Bill,Rekening,
 "Bill Created","Rekening Gemaakt",
 "Bill No","Rekening Nr.",
-Bills,Facturen,
-"Bills Settings","Factuur Instellingen",
 Black,Zwart,
-Body,Lichaam,
+Blue,,
+Both,,
 Buildings,Gebouwen,
-CSV,CSV,
-"Can't open database file: ${0}. Please create a new file.","Database bestand: ${0} kan niet geopend worden. Gelieve een nieuw bestand aan te maken.",
+Business,,
 Cancel,Annuleren,
+"Cancel ${0} ${1}?",,
 Cancelled,Geannuleerd,
 "Capital Equipments","Kapitaal Uitrusting",
 "Capital Stock","Eigen Kapitaal",
 Cash,Contant,
+"Cash Entry",,
 "Cash In Hand","Contant geld in Kas",
 Cashflow,Cashflow,
 "Central Tax","Centrale BTW",
-"Central Tax Paid","Centrale BTW Betaald",
+"Change File",,
+"Change Ref Type",,
+Chargeable,,
 "Chart Of Accounts Reviewed","Rekeningstelsel Nagekeken",
 "Chart of Accounts",Rekeningstelsel,
+"Check for Updates",,
 "Checking for updates","Controle op updates",
+Cheque,,
 "City / Town","Stad / Gemeente",
+Clear,,
 "Clearance Date","Datum Goedkeuring",
 "Click to create","Klik om aan te maken",
 Close,Sluiten,
+Closing,,
 "Closing (Cr)","Afsluiting (Cr)",
 "Closing (Dr)","Afsluiting (Dr)",
 Color,Kleur,
 "Commission on Sales","Commissie op Verkopen",
 Common,Algemeen,
+"Common Items",,
 "Company Address","Adres Bedrijf",
 "Company Logo",Bedrijfslogo,
 "Company Name",Bedrijfsnaam,
 "Company Settings","Bedrijf Instellingen",
 "Company Setup","Oprichting Bedrijf",
 Completed,Voltooid,
-"Confirm Password","Bevestig Wachtwoord",
+Condition,,
+"Consolidate Columns",,
 Contains,Bevat,
+"Contra Entry",,
 "Cost of Goods Sold","Kosten van Verkochte Goederen",
+"Could not import ${0} ${1}.",,
+"Could not select file.",,
 Country,Land,
+"Country Code",,
+"Country code used to initialize regional settings.",,
+Courier,,
+Cr.,,
 Create,Maak,
 "Create Bill","Rekening Maken",
+"Create Demo",,
 "Create Invoice","Factuur Maken",
+"Create Purchase",,
+"Create Sale",,
 "Create a new file and store it in your computer.","Maak een nieuw bestand aan en bewaar op uw computer.",
 "Create a new file or select an existing one from your computer","Maak een nieuw bestand aan of selecteer bestaand bestand op uw computer",
+"Create your first bill and mail it to your supplier",,
+"Create your first invoice and mail it to your customer",,
+Created,,
+"Created By",,
+"Creating Items and Parties",,
+"Creating Journal Entries",,
+"Creating Purchase Invoices",,
 Credit,Crediet,
+"Credit Card Entry",,
+"Credit Note",,
 Creditors,Crediteuren,
 Currency,Valuta,
 "Currency Name","Valuta Naam",
@@ -101,20 +151,24 @@ Current,Huidige,
 Customer,Klant,
 "Customer Created","Klant Aangemaakt",
 "Customer Currency","Klant Valuta",
-"Customer Name","Naam Klant",
 Customers,Klanten,
 Customise,Aanpassen,
-Customize,"Pas aan",
-"DB Connection Error","DB Verbindingsfout",
+"Customize your invoices by adding a logo and address details",,
 Dashboard,Dashboard,
 "Data Import",Gegevensinvoer,
+"Database file: ${0}",,
 Date,Datum,
 "Date Format",Datumformaat,
+Day,,
 Debit,Debet,
+"Debit Note",,
 Debtors,Debiteuren,
 "Default Account","Standaard Rekening",
 Delete,Verwijder,
+"Delete ${0} ${1}?",,
+"Delete ${0}?",,
 Depreciation,Afschrijving,
+"Depreciation Entry",,
 Description,Beschrijving,
 Details,Details,
 "Direct Expenses","Directe Uitgaven",
@@ -123,170 +177,214 @@ Details,Details,
 "Display Precision","Getal Weergave Nauwkeurigheid",
 "Display Precision should have a value between 0 and 9.","De nauwkeurigheid van de getallen moet een waarde tussen 0 en 9 hebben.",
 "Dividends Paid","Betaalde Dividenden",
-"Document ${0} ${1} has been modified after loading","Document ${0} ${1} is gewijzigd na het laden",
-"Document type ${0} is not submittable","Documenttype ${0} kan niet worden ingediend",
+Docs,,
 Documentation,Documentatie,
 "Does Not Contain","Bevat Geen",
 "Download Update","Download Update",
+"Downloading update",,
+Dr.,,
+Draft,,
+Duplicate,,
+"Duplicate ${0} ${1}?",,
 "Duties and Taxes","Rechten en Taksen",
 "Earnest Money",Waarborgsom,
 Edit,Bewerk,
 "Electronic Equipments","Elektronische Uitrusting",
 Email,"E-mail :",
-"Email Account","E-mail Account",
 "Email Address","E-mail Adres",
 Empty,Leeg,
-"Enable Notifications","Meldingen Activeren",
+"Enter Country to load States",,
+"Enter State",,
 "Entertainment Expenses","Uitgaven voor Ontspanning",
-"Entry ID","Ingang ID",
+"Entry No",,
 "Entry Type","Type Invoer",
 Equity,Aandelen,
 Error,Fout,
-Error:,Fout:,
-"Event Settings","Gebeurtenis Instellingen",
 "Exchange Gain/Loss",Wisselkoerswinsten/-verliezen,
 "Exchange Rate",Wisselkoers,
+"Excise Entry",,
 "Existing File","Fichier existant",
 Expense,Uitgave,
+"Expense Account",,
 Expenses,Uitgaven,
 "Expenses Included In Valuation","Uitgaven opgenomen in Waardering",
+Export,,
 "Export Failed","Export Mislukt",
 "Export Successful","Export Gelukt",
 Fax,Fax,
+Field,,
 Fieldname,Veldnaam,
-"File Name",Bestandsnaam,
-"File Path","Bestand Path",
-"File Size",Bestandsgrootte,
+"File selection failed.",,
 Filter,Filter,
+"Fiscal Year",,
 "Fiscal Year End Date","Einddatum Boekjaar",
 "Fiscal Year Start Date","Begindatum Boekjaar",
+"Fixed Asset",,
 "Fixed Assets","Vaste Activa",
 Font,Lettertype,
 For,Voor,
 Fraction,Fractie,
 "Fraction Units","Fractie Eenheden",
 "Freight and Forwarding Charges","Vracht- en Expeditiekosten",
-From,Van,
 "From Account","Van Rekening",
 "From Date","Van Datum",
-Fulfillment,Afhandeling,
-"Fulfillment Settings",Verzendingsinstellingen,
+"From Year",,
 "Full Name","Volledige Naam",
 "Furnitures and Fixtures","Meubilair en Inrichting",
-"GST Registration","GST Registratie",
-GSTIN,GSTIN,
 "GSTIN No.","GSTIN Nr.",
-"GSTIN of Supplier","GSTIN van Leverancier",
-"GSTR 3B","GSTIN 3B",
-"GSTR 3B Report","GSTR 3B Rapport",
 GSTR1,GSTR1,
 GSTR2,GSTR2,
 "Gain/Loss on Asset Disposal","Winst/verlies op vervreemding van activa",
-Gender,Geslacht,
 General,Algemeen,
 "General Ledger","Algemeen Grootboek",
 "Get Started","Aan de slag",
+Gram,,
 "Grand Total","Groot Totaal",
 "Grand Total (Company Currency)","Groot Totaal (Bedrijf Valuta)",
 "Greater Than","Groter dan",
+Green,,
+"Group By",,
 HSN/SAC,HSN/SAC,
+"HSN/SAC Code",,
+"Half Yearly",,
+"Half Years",,
 "Hex Value",Hex-waarde,
-"Hide & Auto Report Errors","Verberg & Rapporteer Automatisch Fouten",
 "Hide Get Started","Verberg Aan de slag",
-ID,ID,
+"Hide Group Amounts",,
+"Hides the Get Started section from the sidebar. Change will be visible on restart or refreshing the app.",,
+Hour,,
+"How to Use Data Import",,
+"I can't find my language.",,
+INR,,
 Image,Beeld,
+"Import Data",,
+"Import Failed",,
+"Import More",,
+"Import Success",,
+"Import Type",,
+"Importer Settings",,
+"Include Cancelled",,
 Income,Inkomen,
+"Income Account",,
+Indigo,,
 "Indirect Expenses","Indirecte Uitgaven",
 "Indirect Income","Indirect Inkomen",
 Inflow,Instroom,
 "Install Update","Update Installeren",
+"Instance Id",,
 "Intergrated Tax","Inbegrepen BTW",
-"Intergrated Tax Paid","Betaalde Inbegrepen BTW",
 "Internal Precision","Interne Nauwkeurigheid",
+"Invalid value ${0} for ${1}",,
 Investments,Investeringen,
 Invoice,Factuur,
 "Invoice Created","Factuur Aangemaakt",
 "Invoice Date",Factuurdatum,
 "Invoice No","Factuur Nr",
 "Invoice No.","Factuur Nr.",
-"Invoice Number",Factuurnummer,
 "Invoice Setup","Factuur Instellingen",
 "Invoice Value","Factuur Waarde",
 Invoices,Facturen,
 Is,Is,
-"Is Customer","Is Klant",
 "Is Empty","Is Leeg",
 "Is Group","Is Groep",
 "Is Not","Is Niet",
 "Is Not Empty","Is Niet Leeg",
-"Is Supplier","Is Leverancier",
 Item,Artikel,
-"Item Created","Artikel Aangemaakt",
+"Item Description",,
 "Item Name","Naam Artikel",
 Items,Artikels,
-JSON,JSON,
-"JSON Data","JSON Data",
+"John Doe",,
+"Journal Entries",,
 "Journal Entry","Journaal Invoer",
-"Journal Entry Setting","Instelling Journaalpost",
+"Journal Entry Account",,
+Kg,,
+"Label Index",,
+Language,,
 "Ledger Entries","Grootboek Invoeren",
-"Ledger Entry","Grootboek Invoer",
+"Left Index",,
 "Legal Expenses","Juridische Kosten",
 "Less Than","Minder Dan",
+Liability,,
+List,,
 "Load an existing .db file from your computer.","Laad een bestaand .db bestand van uw computer.",
+"Loading Report...",,
 Loading...,Laden...,
 "Loans (Liabilities)","Leningen (Passiva)",
 "Loans and Advances (Assets)","Leningen en Voorschotten (Activa)",
 Locale,Locatie,
 Logo,Logo,
-"MIME Type","MIME Type",
+"Make Entry",,
 "Make Payment","Betaling Verrichten",
+"Mar 23, 2022",,
 "Marketing Expenses","Marketing Uitgaven",
-Message,Bericht,
+Merriweather,,
+Meter,,
+Minimal,,
 "Miscellaneous Expenses","Diverse Uitgaven",
-"Mobile Number","Mobiel Nummer",
-Month,Maand,
+Modern,,
+Modified,,
+"Modified By",,
+Monthly,,
+Months,,
+Montserrat,,
 Name,Naam,
+Navigate,,
 "Net Total","Netto Totaal",
 "Net Total (Company Currency)","Netto Totaal (Vennootschap Valuta)",
+"New ${0}",,
 "New Account","Nieuwe Rekening",
-"New Bill","Nieuw Wetsvoorstel",
 "New File","Nieuw Dossier",
-"New Invoice","Nieuwe Factuur",
 "New Journal Entry","Nieuwe Journaalpost",
+"New Purchase",,
+"New Purchase Invoice",,
+"New Sale",,
+"New Sales Invoice",,
 "New version available","Nieuwe versie beschikbaar",
+Next,,
 No,Neen,
+"No Data to Import",,
+"No Values to be Displayed",,
+"No entries found",,
 "No expenses in this period","Geen uitgaven in deze periode",
 "No filters selected","Geen filters geselecteerd",
-"No results found.","Geen resultaten gevonden.",
+"No labels have been assigned.",,
+"No results found",,
 "No transactions yet","Nog geen transacties",
 "No updates available","Geen updates beschikbaar",
+None,,
 Notes,Notities,
 "Number Series",Nummerreeks,
+"Number of ${0}",,
 "Office Equipments",Kantooruitrusting,
 "Office Maintenance Expenses","Uitgaven voor kantooronderhoud",
 "Office Rent","Kantoor Huren",
 "Onboarding Complete","Inwerken Voltooid",
 "Open Folder","Map Openen",
+"Open Sans",,
 "Opening (Cr)","Opening (Cr)",
 "Opening (Dr)","Opening (Dr)",
 "Opening Balance Equity","Openingssaldo Eigen vermogen",
 "Opening Balances",Openingssaldi,
+"Opening Entry",,
+Orange,,
 Organisation,Organisatie,
 Outflow,Uitstroom,
 "Outstanding Amount","Uitstaand Bedrag",
-PDF,PDF,
+Oxygen,,
+"Pad Zeros",,
+Page,,
 Paid,Betaald,
 Parent,Hoofd,
 "Parent Account",Ouderrekening,
 Party,Partij,
-Password,Wachtwoord,
-"Payable Account","Betaalbare Rekening",
+"Patch Run",,
+Pay,,
+Payable,,
 Payment,Betaling,
-"Payment Account",Betaalrekening,
 "Payment For","Betaling Voor",
 "Payment Method",Betalingswijze,
+"Payment No",,
 "Payment Reference",Betalingsreferentie,
-"Payment Settings",Betalingsinstellingen,
 "Payment Type",Betalingswijze,
 "Payment amount cannot be ${0}.","Het betalingsbedrag kan niet ${0} zijn.",
 "Payment amount cannot be less than zero.","Het bedrag van de betaling kan niet lager zijn dan nul.",
@@ -297,128 +395,156 @@ Payments,Betalingen,
 "Payroll Payable","Te Betalen Loon",
 Periodicity,Frequentie,
 Phone,Telefoon,
+Pink,,
 Place,Plaats,
-"Place of Supply","Plaats van Levering",
 "Place of supply","Plaats van levering",
 "Plants and Machineries","Installaties en Machines",
+"Please Wait",,
+"Please assign the following fields ${0}",,
 "Please fill all values","Gelieve alle waarden in te vullen",
-"Please select an existing database or create a new one.","Selecteer een bestaande database of maak een nieuwe aan.",
-"Please set GSTIN in General Settings.","Stel GSTIN in bij Algemene Instellingen.",
+"Please select a file with data to import.",,
+"Please select a valid reference type.",,
 "Postal Code",Postcode,
 "Postal Expenses",Portokosten,
 "Posting Date",Plaatsingsdatum,
 Prefix,Voorvoegsel,
-"Prevent errors from showing and automatically report all errors.","Voorkom dat fouten worden weergegeven en meld automatisch alle fouten.",
+"Prime Bank",,
 Print,Afdrukken,
-"Print Format","Formaat afdrukken",
-"Print PDF","PDF Afdrukken",
 "Print Settings",Afdrukinstellingen,
 "Print and Stationery","Drukwerk en Briefpapier",
+Product,,
 "Profit And Loss","Winst En Verlies",
 "Profit and Loss","Winst en Verlies",
 Purchase,Aankoop,
-"Purchase Order",Inkooporder,
-"Purchase Order Settings","Inkooporder Instellingen",
-"Purchase Receipt",Aankoopbon,
-"Purchase Receipt Settings","Instellingen Aankoopbon",
-PurchaseInvoice,Aankoopfactuur,
+"Purchase Invoice",,
+"Purchase Invoice Item",,
+"Purchase Invoices",,
+"Purchase Item Created",,
+"Purchase Items",,
+"Purchase Payments",,
 Purchases,Aankopen,
+Purple,,
 Quantity,Hoeveelheid,
-"Quantity (${0}) cannot be less than zero.","De hoeveelheid (${0}) kan niet kleiner zijn dan nul.",
-Quotation,Offerte,
-"Quotation Settings","Offerte Instellingen",
+Quarterly,,
+Quarters,,
 Rate,Koers,
 "Rate (${0}) cannot be less zero.","Koers (${0}) kan niet lager zijn dan nul.",
 "Rate (Company Currency)","Koers (Vennootschapsvaluta)",
-Re-Open,Heropen,
-"Receivable Account",Debiteurenrekening,
+"Rate can't be negative.",,
+Receivable,,
+Receive,,
 "Recent Invoices","Laatste Facturen",
-Reconcile,Herberekenen,
+Red,,
+"Ref Name",,
+"Ref Type",,
 "Ref. / Cheque No.","Ref. / Cheque nr.",
 "Ref. Date","Ref. Datum",
 "Ref. Name","Réf. Naam",
 "Ref. Type","Réf. Type",
-"Ref/Cheque ID","Réf/Cheque ID",
+Reference,,
 "Reference Date",Referentiedatum,
-"Reference DocType","Referentie DocType",
-"Reference Field",Referentieveld,
-"Reference Name",Referentienaam,
 "Reference Number",Referentienummer,
 "Reference Type","Referentie Type",
 "Reload App","Herlaad App",
+Report,,
 "Report Error","Fout Melden",
+"Report Issue",,
 Reports,Rapporten,
-"Reset Filters","Reset Filters",
+"Required Fields not Assigned",,
+Reset,,
 "Retained Earnings","Ingehouden Winst",
-"Reverse Charge","Omgekeerde Kosten",
 "Reverse Chrg.","Omgekeerde Kst.",
 Reverted,Hersteld,
+Reverts,,
 "Review Accounts","Rekeningen Nakijken",
+"Review your chart of accounts, add any account or tax heads as needed",,
+"Right Index",,
 Role,Rol,
-Roles,Rollen,
 "Root Type","Root Type",
 "Round Off",Afronden,
 "Round Off Account","Rekening Afronden",
-"SMTP Host","SMTP Host",
-"SMTP Port","SMTP Poort",
 Salary,Salaris,
 Sales,Verkopen,
 "Sales Expenses",Verkoopkosten,
-"Sales Order",Verkooporder,
-"Sales Order Settings","Verkooporder Instellingen",
-SalesInvoice,Verkoopfactuur,
-"SalesInvoice Settings","Verkoopfactuur Instellingen",
+"Sales Invoice",,
+"Sales Invoice Item",,
+"Sales Invoice Settings",,
+"Sales Invoices",,
+"Sales Invoie",,
+"Sales Item Created",,
+"Sales Items",,
+"Sales Payments",,
 Save,"Sla op",
-"Save & Close","Opslaan en Sluiten",
+"Save Template",,
 "Save as PDF","Opslaan als PDF",
 "Save as PDF Successful","Opslaan als PDF Gelukt",
-Saving...,Opslaan...,
-Schedule,Schema,
+Saving,,
+Search,,
 "Secured Loans","Beveiligde Leningen",
 "Securities and Deposits","Effecten en Deposito's",
+Select,,
+"Select CoA",,
+"Select Color",,
+"Select Country",,
+"Select File",,
 "Select Folder","Selecteer Map",
 "Select Image","Selecteer Afbeelding",
 "Select Logo","Selecteer Logo",
-"Select a file to load the company transactions","Selecteer een bestand om de bedrijfstransacties te laden",
+"Select a file for import",,
 "Select file","Selecteer Bestand",
 "Select folder","Selecteer Map",
-Send,Verzenden,
+"Select your language",,
+"Selected file",,
 Service,Service,
+"Set an Import Type",,
+"Set the display language.",,
 "Set the local code. This is used for number formatting.","Stel de lokale code in. Dit wordt gebruikt voor nummeropmaak.",
 "Sets how many digits are shown after the decimal point.","Geeft aan hoeveel cijfers achter de komma worden weergegeven.",
 "Sets the app-wide date display format.","Stelt de app-brede datumweergave-indeling in.",
 "Sets the internal precision used for monetary calculations. Above 6 should be sufficient for most currencies.","Stelt de interne precisie in die gebruikt wordt voor monetaire berekeningen. Boven de 6 zou voldoende moeten zijn voor de meeste valuta's.",
+"Setting Up Instance",,
 "Setting Up...",Instellen...,
 Settings,Instellingen,
 "Settings changes will be visible on reload","Wijzigingen in instellingen worden zichtbaar bij herladen",
 Setup,Configuratie,
 "Setup Complete","Configuratie voltooid",
 "Setup Wizard","Configuratie Wizard",
+"Setup Your Workspace",,
+"Setup system defaults like date format and display precision",,
+"Setup your company information, email, country and fiscal year",,
+"Setup your opening balances before performing any accounting entries",,
 "Setup your organization","Opzetten van uw organisatie",
-"Setup your workspace","Richt uw werkruimte in",
+"Setup your tax templates for your sales or purchase transactions",,
+"Show Me",,
+"Single Value",,
 "Smallest Currency Fraction Value","Kleinste Waarde van Muntfractie",
 Softwares,Software,
 "Something has gone terribly wrong. Please check the console and raise an issue.","Er is iets vreselijk misgegaan. Controleer de console en meld een probleem.",
 "Source of Funds (Liabilities)","Bron van Fondsen (Passiva)",
-"Start Time",Begintijd,
+"Standard Chart of Accounts",,
+Start,,
 State,Status,
 "State Tax",Staatsbelasting,
-"State/UT Tax Paid","Betaalde Belasting Staat/UT",
 Status,Status,
+Stock,,
 "Stock Adjustment","Stock Aanpassing",
 "Stock Assets","Stock Activa",
 "Stock Expenses","Voorraad Uitgaven",
 "Stock In Hand","Voorraad in Hand",
 "Stock Liabilities",Voorraadverplichtingen,
 "Stock Received But Not Billed","Voorraad ontvangen maar niet gefactureerd",
-Subject,Onderwerp,
 Submit,Indienen,
+"Submit Journal Entry?",,
+"Submit Purchase Invoice?",,
+"Submit Sales Invoice?",,
+"Submit on Import",,
 Submitted,Ingediend,
+Submitting,,
 Subtotal,Subtotaal,
+"Successfully created the following ${0} entries:",,
 Supplier,Leverancier,
 "Supplier Created","Leverancier Aangemaakt",
 "Supplier Currency","Leverancier Valuta",
-"Supplier Name","Leverancier Naam",
 Suppliers,Leveranciers,
 Symbol,Symbool,
 System,Systeem,
@@ -429,49 +555,75 @@ Tax,Belasting,
 "Tax Assets","Belasting Activa",
 "Tax Detail",Belastingdetail,
 "Tax ID","Belasting ID",
+"Tax Summary",,
 "Taxable Value","Belastbare Waarde",
 Taxes,Belastingen,
+Teal,,
 "Telephone Expenses",Telefoonkosten,
 Template,Sjabloon,
-"Template could not be saved.","Sjabloon kon niet worden opgeslagen.",
-"Template saved successfully.","Sjabloon succesvol opgeslagen",
+Temporary,,
 "Temporary Accounts","Tijdelijke Rekeningen",
 "Temporary Opening","Tijdelijke Opening",
 Terms,Voorwaarden,
+"The following ${0} entries were created: ${1}",,
 "Theme Color",Themakleur,
+"This Month",,
+"This Quarter",,
+"This Year",,
 "This action is permanent","Deze actie is permanent",
 "This action is permanent and will cancel the following payment: ${0}","Deze actie is permanent en zal de volgende betaling annuleren: ${0}",
 "This action is permanent and will cancel the following payments: ${0}","Deze actie is permanent en zal de volgende betalingen annuleren: ${0}",
-Title,Titel,
-To,Tot,
+"This action is permanent and will delete associated ledger entries.",,
+"This action is permanent.",,
+"Times New Roman",,
 "To Account","Naar Rekening",
+"To Account and From Account can't be the same: ${0}",,
 "To Date","Tot Datum",
-"To Do","Te Doen",
+"To Year",,
 "Top Expenses","Hoogste Uitgaven",
+Total,,
+"Total Asset (Debit)",,
+"Total Credit",,
+"Total Debit",,
+"Total Debit: ${0} must be equal to Total Credit: ${1}",,
+"Total Equity (Credit)",,
+"Total Expense (Debit)",,
+"Total Income (Credit)",,
+"Total Liability (Credit)",,
+"Total Profit",,
 "Total Spending","Totale Uitgaven",
-"Total Tax","Totale Belasting",
+Transfer,,
 "Transfer Type","Overdracht Type",
 "Travel Expenses",Reisuitgaven,
 "Trial Balance",Proefbalans,
 Type,Type,
+"Type to search...",,
+Unit,,
 "Unit Type","Type Eenheid",
 Unpaid,Onbetaald,
 "Unsecured Loans","Ongedekte Leningen",
+"Until Date",,
 "Update downloaded","Update gedownload",
-"User ID",Gebruikers-ID,
 "User Remark","Gebruiker Opmerking",
-Username,Gebruikersnaam,
 "Utility Expenses","Uitgaven voor Nutsvoorzieningen",
 Value,Waarde,
 "Value missing for ${0}","Waarde ontbreekt voor ${0}",
+"Verify Imported Data",,
+Version,,
 "Version ${0} available","Versie ${0} beschikbaar",
-"View Bills","Bekijk Rekeningen",
-"View Invoices","Bekijk Facturen",
+"View Purchases",,
+"View Sales",,
 "Welcome to Frappe Books","Welkom bij Frappe Books",
 "Write Off",Afschrijven,
-"Write Off / Refund","Afschrijving / Terugbetaling",
 "Write Off Account","Rekening Afschrijven",
-Year,Jaar,
+"Write Off Account not set. Please set Write Off Account in General Settings",,
+"Write Off Entry",,
+Yearly,,
+Years,,
+Yellow,,
 Yes,Ja,
 "Your Name","Uw Naam",
-name,naam,
\ No newline at end of file
+john@doe.com,,
+reports,,
+setup,,
+"verify the imported data and click on",,
\ No newline at end of file
diff --git a/translations/pt.csv b/translations/pt.csv
index e4975164..03d551af 100644
--- a/translations/pt.csv
+++ b/translations/pt.csv
@@ -44,13 +44,11 @@ Address,Endereço,
 "Address Line 2","Linha de endereço 2",
 "Administrative Expenses","Despesas administrativas",
 All,,
-"Allow Telemetry",,
 Amount,Montante,
 "Amount (Company Currency)","Quantia (Moeda da empresa)",
 "Amount: ${0} and writeoff: ${1} is less than the total amount allocated to references: ${2}.","Montante: ${0} e anulação: ${1} é menor do que o montante total atribuído às referências: ${2}.",
 "Amount: ${0} is less than the total amount allocated to references: ${1}.","Montante: ${0} é menor do que o montante total atribuído às referências: ${1}.",
 "An error occurred.","Ocorreu um erro.",
-"Anonymized Telemetry",,
 "Application of Funds (Assets)","Aplicação de Fundos (Activos)",
 Arial,,
 "Ascending Order",,
@@ -65,7 +63,6 @@ Bank,,
 "Bank Entry",,
 "Bank Name","Nome do Banco",
 "Bank Overdraft Account","Conta de descoberto bancário",
-"Base Error",,
 "Based On",,
 Basic,,
 "Basic I",,
@@ -81,7 +78,6 @@ Business,,
 Cancel,Cancelar,
 "Cancel ${0} ${1}?",,
 Cancelled,Cancelado,
-"Cannot Commit Error",,
 "Capital Equipments","Equipamentos de Capital",
 "Capital Stock","Capital social",
 Cash,Dinheiro,
@@ -160,7 +156,6 @@ Customise,Personalizar,
 "Customize your invoices by adding a logo and address details",,
 Dashboard,"Painel de instrumentos",
 "Data Import","Importação de dados",
-"Database Error",,
 "Database file: ${0}",,
 Date,Data,
 "Date Format","Formato da data",
@@ -178,7 +173,6 @@ Description,Descrição,
 Details,Detalhes,
 "Direct Expenses","Despesas directas",
 "Direct Income","Rendimento directo",
-"Disables telemetry. No data will be collected, you are completely invisble to us.",,
 "Display Logo in Invoice","Mostrar logótipo na factura",
 "Display Precision","Precisão de visualização",
 "Display Precision should have a value between 0 and 9.","Mostrar Precisão deve ter um valor entre 0 e 9.",
@@ -186,15 +180,12 @@ Details,Detalhes,
 Docs,,
 Documentation,Documentação,
 "Does Not Contain","Não Contém",
-"Don't Log Anything",,
-"Don't Log Usage",,
 "Download Update","Descarregar Actualização",
 "Downloading update",,
 Dr.,,
 Draft,,
 Duplicate,,
 "Duplicate ${0} ${1}?",,
-"Duplicate Entry Error",,
 "Duties and Taxes","Deveres e Impostos",
 "Earnest Money","Ganhar dinheiro",
 Edit,Editar,
@@ -202,8 +193,6 @@ Edit,Editar,
 Email,Email,
 "Email Address","Endereço de correio electrónico",
 Empty,Vazio,
-"Enables telemetry. Does not include usage patterns.",,
-"Enables telemetry. Includes usage patterns.",,
 "Enter Country to load States",,
 "Enter State",,
 "Entertainment Expenses","Despesas de Entretenimento",
@@ -211,7 +200,6 @@ Empty,Vazio,
 "Entry Type","Tipo de entrada",
 Equity,Equidade,
 Error,Erro,
-Error:,Erro:,
 "Exchange Gain/Loss","Ganho/perda cambial",
 "Exchange Rate","Taxa de Câmbio",
 "Excise Entry",,
@@ -221,6 +209,7 @@ Expense,Despesa,
 Expenses,Despesas,
 "Expenses Included In Valuation","Despesas Incluídas na Avaliação",
 Export,,
+"Export Failed",,
 "Export Successful","Exportação bem sucedida",
 Fax,Fax,
 Field,,
@@ -234,10 +223,8 @@ Filter,Filtro,
 "Fixed Assets","Bens fixos",
 Font,Fonte,
 For,Para,
-"Forbidden Error",,
 Fraction,Fracção,
 "Fraction Units","Unidades de Fracção",
-"Frappe Books uses opt-in telemetry. This is the only way for us to know if we have any consistent users. It will be really helpful if you switch it on, but we won't force you. 🙂",,
 "Freight and Forwarding Charges","Taxas de frete e de encaminhamento",
 "From Account","De Conta",
 "From Date","A partir de Data",
@@ -261,7 +248,6 @@ HSN/SAC,HSN/SAC,
 "HSN/SAC Code",,
 "Half Yearly",,
 "Half Years",,
-"Hello there! 👋",,
 "Hex Value","Valor hexadecimal",
 "Hide Get Started","Esconder Começar a Esconder",
 "Hide Group Amounts",,
@@ -285,7 +271,7 @@ Indigo,,
 "Indirect Income","Rendimento indirecto",
 Inflow,Influxo,
 "Install Update","Instalar Actualização",
-Inter,,
+"Instance Id",,
 "Intergrated Tax","Impostos entrelaçados",
 "Internal Precision","Precisão Interna",
 "Invalid value ${0} for ${1}",,
@@ -312,7 +298,6 @@ Items,Artigos,
 "Journal Entry","Entrada no diário",
 "Journal Entry Account",,
 Kg,,
-"Know More",,
 "Label Index",,
 Language,,
 "Ledger Entries","Entradas de Ledger",
@@ -320,7 +305,6 @@ Language,,
 "Legal Expenses","Despesas legais",
 "Less Than","Menos do que",
 Liability,,
-"Link Validation Error",,
 List,,
 "Load an existing .db file from your computer.","Carregue um ficheiro .db existente a partir do seu computador.",
 "Loading Report...",,
@@ -331,7 +315,6 @@ Locale,Locale,
 Logo,Logótipo,
 "Make Entry",,
 "Make Payment","Fazer pagamento",
-"Mandatory Error",,
 "Mar 23, 2022",,
 "Marketing Expenses","Despesas de Marketing",
 Merriweather,,
@@ -369,7 +352,6 @@ No,Não,
 "No transactions yet","Nenhuma transacção ainda",
 "No updates available","Não há actualizações disponíveis",
 None,,
-"Not Found Error",,
 Notes,Notas,
 "Number Series","Série Numérica",
 "Number of ${0}",,
@@ -422,7 +404,6 @@ Place,Lugar,
 "Please fill all values","Por favor preencha todos os valores",
 "Please select a file with data to import.",,
 "Please select a valid reference type.",,
-"Please select an option:",,
 "Postal Code","Código Postal",
 "Postal Expenses","Despesas de correio",
 "Posting Date","Data de lançamento",
@@ -494,7 +475,6 @@ Sales,Vendas,
 "Sales Items",,
 "Sales Payments",,
 Save,Guardar,
-"Save Option",,
 "Save Template",,
 "Save as PDF","Guardar como PDF",
 "Save as PDF Successful","Guardar como PDF Bem sucedido",
@@ -515,9 +495,7 @@ Select,,
 "Select folder","Seleccionar pasta",
 "Select your language",,
 "Selected file",,
-"Send anonymized usage data and error reports to help improve the product.",,
 Service,Serviço,
-"Set Anonymized Telemetry",,
 "Set an Import Type",,
 "Set the display language.",,
 "Set the local code. This is used for number formatting.","Definir o código local"," este é utilizado para a formatação de números."
@@ -541,7 +519,7 @@ Setup,Configuração,
 "Single Value",,
 "Smallest Currency Fraction Value","Menor valor de fracção da moeda",
 Softwares,"Aplicações informáticas",
-"Something has gone terribly wrong. Please check the console and raise an issue.","Algo correu terrivelmente mal. Por favor, verifique a consola e levante um problema."
+"Something has gone terribly wrong. Please check the console and raise an issue.","Algo correu terrivelmente mal. Por favor, verifique a consola e levante um problema.",
 "Source of Funds (Liabilities)","Fonte de Fundos (Passivo)",
 "Standard Chart of Accounts",,
 Start,,
@@ -628,7 +606,6 @@ Unpaid,"Não pago",
 "Update downloaded","Actualização descarregada",
 "User Remark","Observação do utilizador",
 "Utility Expenses","Despesas de utilidades",
-"Validation Error",,
 Value,Valor,
 "Value missing for ${0}","Valor em falta por ${0}",
 "Verify Imported Data",,

From 0e37f0073e866d1f3b9bbee822512409e4634489 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Mon, 23 May 2022 18:24:11 +0530
Subject: [PATCH 154/163] fix: fullscreen issue - use native trafficlights

---
 main.ts                               | 17 +++---
 src/components/Sidebar.vue            | 11 ++--
 src/components/WindowControls.vue     | 76 ---------------------------
 src/pages/DatabaseSelector.vue        |  3 --
 src/pages/Settings/Settings.vue       |  2 -
 src/pages/SetupWizard/SetupWizard.vue |  3 --
 6 files changed, 11 insertions(+), 101 deletions(-)
 delete mode 100644 src/components/WindowControls.vue

diff --git a/main.ts b/main.ts
index 87d8432c..81611149 100644
--- a/main.ts
+++ b/main.ts
@@ -72,20 +72,21 @@ export class Main {
 
   getOptions(): BrowserWindowConstructorOptions {
     const options: BrowserWindowConstructorOptions = {
-      vibrancy: 'sidebar',
-      transparent: this.isMac,
-      backgroundColor: '#80FFFFFF',
       width: this.WIDTH,
       height: this.HEIGHT,
+      minWidth: this.WIDTH,
+      minHeight: this.HEIGHT,
       title: this.title,
+      titleBarStyle: 'hidden',
+      trafficLightPosition: { x: 16, y: 16 },
       webPreferences: {
         contextIsolation: false, // TODO: Switch this off
-        nodeIntegration: process.env
-          .ELECTRON_NODE_INTEGRATION as unknown as boolean,
+        nodeIntegration: true,
       },
       frame: this.isLinux,
-      resizable: false,
+      resizable: true,
     };
+
     if (this.isDevelopment || this.isLinux) {
       Object.assign(options, { icon: this.icon });
     }
@@ -139,10 +140,6 @@ export class Main {
       this.mainWindow = null;
     });
 
-    this.mainWindow.on('will-resize', (e) => {
-      e.preventDefault();
-    });
-
     this.mainWindow.webContents.on('did-finish-load', () => {
       if (this.mainWindow === null) {
         return;
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 44f72b5a..e285c183 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,14 +1,13 @@
 <template>
   <div
-    class="pt-6 pb-2 px-2 h-full flex justify-between flex-col bg-gray-100"
+    class="p-2 h-full flex justify-between flex-col bg-gray-100"
     :class="{
       'window-drag': platform !== 'Windows',
     }"
   >
     <div class="window-no-drag">
-      <WindowControls v-if="platform === 'Mac'" class="px-3 mb-6" />
       <!-- Company name and DB Switcher -->
-      <div class="px-3 flex flex-row items-center justify-between mb-6">
+      <div class="px-2 flex flex-row items-center justify-between mb-6 mt-12">
         <h6
           class="
             text-xl
@@ -40,11 +39,11 @@
       <div class="mt-1 first:mt-0" v-for="group in groups" :key="group.label">
         <div
           class="
-            px-3
+            px-2
             py-2
             flex
             items-center
-            rounded-lg
+            rounded-md
             cursor-pointer
             hover:bg-white
           "
@@ -109,7 +108,6 @@ import { getSidebarConfig } from 'src/utils/sidebarConfig';
 import { routeTo } from 'src/utils/ui';
 import router from '../router';
 import Icon from './Icon.vue';
-import WindowControls from './WindowControls.vue';
 
 export default {
   components: [Button],
@@ -127,7 +125,6 @@ export default {
     },
   },
   components: {
-    WindowControls,
     Icon,
   },
   async mounted() {
diff --git a/src/components/WindowControls.vue b/src/components/WindowControls.vue
deleted file mode 100644
index 1df4a75d..00000000
--- a/src/components/WindowControls.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<template>
-  <div class="flex">
-    <div
-      @click="action('close')"
-      class="w-3 h-3 rounded-full"
-      :class="getColorClasses('close')"
-    ></div>
-    <div
-      @click="action('minimize')"
-      class="ml-2 w-3 h-3 rounded-full"
-      :class="getColorClasses('minimize')"
-    ></div>
-    <div
-      @click="action('maximize')"
-      class="ml-2 w-3 h-3 rounded-full"
-      :class="getColorClasses('maximize')"
-    ></div>
-  </div>
-</template>
-
-<script>
-import { runWindowAction } from 'src/utils/ipcCalls';
-
-export default {
-  name: 'WindowControls',
-  emits: ['close', 'minimize', 'maximize', 'unmaximize'],
-  props: {
-    buttons: {
-      type: Array,
-      default: () => ['close', 'minimize', 'maximize'],
-    },
-  },
-  data() {
-    return {
-      fullscreen: false,
-    };
-  },
-  methods: {
-    async action(name) {
-      if (!this.buttons.includes(name)) {
-        return;
-      }
-
-      const actionRan = await runWindowAction(name);
-
-      this.setFullscreen(actionRan);
-      this.$emit(actionRan);
-    },
-    setFullscreen(actionRan) {
-      if (actionRan === 'maximize') {
-        this.fullscreen = true;
-      } else if (actionRan === 'unmaximize') {
-        this.fullscreen = false;
-      }
-    },
-    getColorClasses(name) {
-      let minimize = 'bg-yellow-500 hover:bg-yellow-700';
-      if (this.fullscreen) {
-        minimize = 'bg-gray-500';
-      }
-
-      let classes = {
-        close: 'bg-red-500 hover:bg-red-700',
-        minimize,
-        maximize: 'bg-green-500 hover:bg-green-700',
-      }[name];
-
-      if (this.buttons.includes(name)) {
-        return classes;
-      }
-
-      return 'bg-gray-500';
-    },
-  },
-};
-</script>
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index bd98f40a..fc13162c 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -6,7 +6,6 @@
       'window-drag': platform !== 'Windows',
     }"
   >
-    <WindowControls v-if="platform === 'Mac'" class="absolute top-6 left-5" />
     <div
       class="w-full w-600 shadow rounded-lg border relative"
       style="height: 700px"
@@ -173,7 +172,6 @@ import { DateTime } from 'luxon';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import FeatherIcon from 'src/components/FeatherIcon.vue';
 import Loading from 'src/components/Loading.vue';
-import WindowControls from 'src/components/WindowControls.vue';
 import { fyo } from 'src/initFyo';
 import { deleteDb, getSavePath } from 'src/utils/ipcCalls';
 import { showMessageDialog } from 'src/utils/ui';
@@ -308,7 +306,6 @@ export default {
   },
   components: {
     LanguageSelector,
-    WindowControls,
     Loading,
     FeatherIcon,
   },
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index d10a03e7..e82c336f 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -50,7 +50,6 @@ import Icon from 'src/components/Icon.vue';
 import PageHeader from 'src/components/PageHeader.vue';
 import Row from 'src/components/Row.vue';
 import StatusBadge from 'src/components/StatusBadge.vue';
-import WindowControls from 'src/components/WindowControls.vue';
 import { showToast } from 'src/utils/ui';
 import { IPC_MESSAGES } from 'utils/messages';
 import { h, markRaw } from 'vue';
@@ -62,7 +61,6 @@ export default {
   name: 'Settings',
   components: {
     PageHeader,
-    WindowControls,
     StatusBadge,
     Button,
     Row,
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index 64cf4977..de9d954c 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -2,7 +2,6 @@
   <div
     class="py-10 flex-1 bg-white flex justify-center items-center window-drag"
   >
-    <WindowControls v-if="platform === 'Mac'" class="absolute top-6 left-5" />
 
     <!-- 0: Language Selection Slide -->
     <Slide
@@ -97,7 +96,6 @@ import { ipcRenderer } from 'electron';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import TwoColumnForm from 'src/components/TwoColumnForm';
-import WindowControls from 'src/components/WindowControls.vue';
 import { fyo } from 'src/initFyo';
 import { getErrorMessage } from 'src/utils';
 import { getSetupWizardDoc } from 'src/utils/misc';
@@ -128,7 +126,6 @@ export default {
     FormControl,
     Slide,
     LanguageSelector,
-    WindowControls,
   },
   async mounted() {
     if (fyo.config.get('language') !== undefined) {

From aa73a33669cea89f00cf4951c7d974d1893474a0 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 24 May 2022 00:02:28 +0530
Subject: [PATCH 155/163] incr: add docs to search - still incomplete, lotsa
 improvements left

---
 reports/index.ts             |  3 +-
 src/components/SearchBar.vue | 75 +++++++++++++++++++--------
 src/renderer.ts              |  3 ++
 src/utils/search.ts          | 99 ++++++++++++++++++++++++++++++------
 4 files changed, 143 insertions(+), 37 deletions(-)

diff --git a/reports/index.ts b/reports/index.ts
index c65e4657..562fcd90 100644
--- a/reports/index.ts
+++ b/reports/index.ts
@@ -3,6 +3,7 @@ import { GeneralLedger } from './GeneralLedger/GeneralLedger';
 import { GSTR1 } from './GoodsAndServiceTax/GSTR1';
 import { GSTR2 } from './GoodsAndServiceTax/GSTR2';
 import { ProfitAndLoss } from './ProfitAndLoss/ProfitAndLoss';
+import { Report } from './Report';
 import { TrialBalance } from './TrialBalance/TrialBalance';
 
 export const reports = {
@@ -12,4 +13,4 @@ export const reports = {
   TrialBalance,
   GSTR1,
   GSTR2,
-};
+} as Record<string, typeof Report>;
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 9b81117c..0e59a082 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -90,30 +90,49 @@ const keys = useKeys();
 
     <!-- Footer -->
     <hr />
-    <div class="m-1 flex justify-between items-center flex-col gap-2 text-sm select-none">
+    <div class="m-1 flex justify-between flex-col gap-2 text-sm select-none">
       <!-- Group Filters -->
-      <div class="flex flex-row gap-2">
-        <button
-          v-for="(g, i) in searchGroups"
-          :key="g"
-          class="border px-1 py-0.5 rounded-lg"
-          :class="getGroupFilterButtonClass(g)"
-          @click="groupFilters[g] = !groupFilters[g]"
-        >
-          {{ groupLabelMap[g]
-          }}<span
-            class="ml-2 whitespace-nowrap brightness-50 tracking-tighter"
-            :class="`text-${groupColorMap[g]}-500`"
-            >{{ modKey(String(i + 1)) }}</span
+      <div class="flex justify-between">
+        <div class="flex gap-2">
+          <button
+            v-for="(g, i) in searchGroups"
+            :key="g"
+            class="border px-1 py-0.5 rounded-lg"
+            :class="getGroupFilterButtonClass(g)"
+            @click="groupFilters[g] = !groupFilters[g]"
           >
+            {{ groupLabelMap[g]
+            }}<span
+              class="ml-2 whitespace-nowrap brightness-50 tracking-tighter"
+              :class="`text-${groupColorMap[g]}-500`"
+              >{{ modKey(String(i + 1)) }}</span
+            >
+          </button>
+        </div>
+        <button
+          class="
+            bg-gray-100
+            hover:bg-gray-200
+            px-2
+            py-0.5
+            rounded
+            text-gray-800
+          "
+        >
+          {{ t`More Filters` }}
         </button>
       </div>
 
       <!-- Keybindings Help -->
-      <div class="flex text-sm gap-8 text-gray-500">
-        <p>↑↓ {{ t`Navigate` }}</p>
-        <p>↩ {{ t`Select` }}</p>
-        <p><span class="tracking-tighter">esc</span> {{ t`Close` }}</p>
+      <div class="flex text-sm text-gray-500 justify-between">
+        <div class="flex gap-4">
+          <p>↑↓ {{ t`Navigate` }}</p>
+          <p>↩ {{ t`Select` }}</p>
+          <p><span class="tracking-tighter">esc</span> {{ t`Close` }}</p>
+        </div>
+        <p v-if="suggestions.length">
+          {{ t`${suggestions.length} out of ${totalLength} shown` }}
+        </p>
       </div>
     </div>
   </Modal>
@@ -122,7 +141,7 @@ const keys = useKeys();
 import { t } from 'fyo';
 import { fuzzyMatch } from 'src/utils';
 import { getBgTextColorClass } from 'src/utils/colors';
-import { getSearchList, searchGroups } from 'src/utils/search';
+import { docSearch, getSearchList, searchGroups } from 'src/utils/search';
 import { routeTo } from 'src/utils/ui';
 import { useKeys } from 'src/utils/vueUtils';
 import { getIsNullOrUndef } from 'utils/';
@@ -137,6 +156,8 @@ export default {
       openModal: false,
       inputValue: '',
       searchList: [],
+      docSearch: null,
+      totalLength: 0,
       groupFilters: {
         List: true,
         Report: true,
@@ -147,7 +168,10 @@ export default {
     };
   },
   components: { Modal },
-  mounted() {
+  async mounted() {
+    this.docSearch = docSearch;
+    await this.docSearch.fetchKeywords();
+
     this.makeSearchList();
     watch(this.keys, (keys) => {
       if (
@@ -297,7 +321,7 @@ export default {
         this.searchGroups.filter((g) => this.groupFilters[g])
       );
 
-      return this.searchList
+      const nonDocs = this.searchList
         .filter((si) => filters.has(si.group))
         .map((si) => ({
           ...fuzzyMatch(this.inputValue, `${si.label} ${si.group}`),
@@ -306,6 +330,15 @@ export default {
         .filter(({ isMatch }) => isMatch)
         .sort((a, b) => a.distance - b.distance)
         .map(({ si }) => si);
+
+      let docs = [];
+      if (this.groupFilters.Docs && this.inputValue) {
+        docs = this.docSearch.search(this.inputValue);
+      }
+
+      const all = [docs, nonDocs].flat();
+      this.totalLength = all.length;
+      return all.slice(0, 50);
     },
   },
 };
diff --git a/src/renderer.ts b/src/renderer.ts
index bfd1d816..1b3404e5 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,5 +1,6 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
+import { groupBy } from 'lodash';
 import { DateTime } from 'luxon';
 import { IPC_ACTIONS } from 'utils/messages';
 import { App as VueApp, createApp } from 'vue';
@@ -105,5 +106,7 @@ function setOnWindow() {
     window.fyo = fyo;
     // @ts-ignore
     window.DateTime = DateTime;
+    // @ts-ignore
+    window.groupBy = groupBy;
   }
 }
diff --git a/src/utils/search.ts b/src/utils/search.ts
index cf9fb875..3a8deb2e 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -1,9 +1,12 @@
 import { t } from 'fyo';
 import { DocValueMap } from 'fyo/core/types';
+import { Dictionary, groupBy } from 'lodash';
 import { ModelNameEnum } from 'models/types';
+import { reports } from 'reports';
 import { OptionField } from 'schemas/types';
 import { fyo } from 'src/initFyo';
 import { GetAllOptions } from 'utils/db/types';
+import { fuzzyMatch } from '.';
 import { routeTo } from './ui';
 
 export const searchGroups = ['Docs', 'List', 'Create', 'Report', 'Page'];
@@ -23,6 +26,11 @@ interface SearchItem {
   action?: () => void;
 }
 
+interface DocSearchItem extends SearchItem {
+  schemaLabel: string;
+  more: string[];
+}
+
 async function openQuickEditDoc(schemaName: string) {
   await routeTo(`/list/${schemaName}`);
   const doc = await fyo.doc.getNewDoc(schemaName);
@@ -122,15 +130,23 @@ function getCreateList(): SearchItem[] {
 }
 
 function getReportList(): SearchItem[] {
-  /*return Object.values(reports).map((report) => {
-    return {
-      label: report.title,
-      route: `/report/${report.method}`,
-      group: 'Report',
-    };
-  });
-  */
-  return [];
+  const hasGstin = !!fyo.singles?.AccountingSettings?.gstin;
+  return Object.keys(reports)
+    .filter((r) => {
+      const report = reports[r];
+      if (report.title.startsWith('GST') && !hasGstin) {
+        return false;
+      }
+      return true;
+    })
+    .map((r) => {
+      const report = reports[r];
+      return {
+        label: report.title,
+        route: `/report/${r}`,
+        group: 'Report',
+      };
+    });
 }
 
 function getListViewList(): SearchItem[] {
@@ -251,13 +267,62 @@ class Search {
     [ModelNameEnum.JournalEntry]: 50,
   };
 
+  #groupedKeywords?: Dictionary<Keyword[]>;
+
   constructor() {
     this.keywords = {};
   }
 
-  getSearchList() {
+  get groupedKeywords() {
+    if (!this.#groupedKeywords || !Object.keys(this.#groupedKeywords!).length) {
+      this.#groupedKeywords = this.getGroupedKeywords();
+    }
+
+    return this.#groupedKeywords!;
+  }
+
+  search(keyword: string /*, array: DocSearchItem[]*/): DocSearchItem[] {
+    const array: DocSearchItem[] = [];
+    if (!keyword) {
+      return [];
+    }
+
+    const groupedKeywords = this.groupedKeywords;
+    const keys = Object.keys(groupedKeywords).sort(
+      (a, b) => parseFloat(b) - parseFloat(a)
+    );
+
+    for (const key of keys) {
+      for (const kw of groupedKeywords[key]) {
+        let isMatch = false;
+        for (const word of kw.values) {
+          isMatch ||= fuzzyMatch(keyword, word).isMatch;
+          if (isMatch) {
+            break;
+          }
+        }
+
+        if (!isMatch) {
+          continue;
+        }
+
+        array.push({
+          label: kw.values[0],
+          schemaLabel: fyo.schemaMap[kw.meta.schemaName as string]?.label!,
+          more: kw.values.slice(1),
+          group: 'Docs',
+          action: () => {
+            console.log('selected', kw);
+          },
+        });
+      }
+    }
+    return array;
+  }
+
+  getGroupedKeywords() {
     const keywords = Object.values(this.keywords);
-    return keywords.map((kw) => kw.keywords).flat();
+    return groupBy(keywords.map((kw) => kw.keywords).flat(), 'priority');
   }
 
   async fetchKeywords() {
@@ -273,7 +338,7 @@ class Search {
       }
 
       const maps = await fyo.db.getAllRaw(searchable.schemaName, options);
-      this.addToSearchable(maps, searchable);
+      this.#addToSearchable(maps, searchable);
     }
 
     this.#setPriority();
@@ -332,7 +397,7 @@ class Search {
     }
   }
 
-  addToSearchable(maps: DocValueMap[], searchable: Searchable) {
+  #addToSearchable(maps: DocValueMap[], searchable: Searchable) {
     if (!maps.length) {
       return;
     }
@@ -376,5 +441,9 @@ class Search {
   }
 }
 
-//@ts-ignore
-window.sc = new Search();
+export const docSearch = new Search();
+
+if (fyo.store.isDevelopment) {
+  //@ts-ignore
+  window.search = docSearch;
+}

From 448068883e225058b8a1cffcff15e0de4afc9bca Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 24 May 2022 12:48:56 +0530
Subject: [PATCH 156/163] incr: version comparators

---
 utils/types.ts   |  8 +++++
 utils/version.ts | 93 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 utils/version.ts

diff --git a/utils/types.ts b/utils/types.ts
index f3924494..efc203e8 100644
--- a/utils/types.ts
+++ b/utils/types.ts
@@ -15,3 +15,11 @@ export interface CountryInfo {
   fiscal_year_end: string;
   locale: string;
 }
+
+
+export interface VersionParts {
+  major: number;
+  minor: number;
+  patch: number;
+  beta?: number;
+};
\ No newline at end of file
diff --git a/utils/version.ts b/utils/version.ts
new file mode 100644
index 00000000..007c0820
--- /dev/null
+++ b/utils/version.ts
@@ -0,0 +1,93 @@
+import { VersionParts } from './types';
+
+export class Version {
+  /**
+   * comparators for version strings of the form
+   * x.x.x[-beta.x]
+   */
+
+  static gte(a: string, b: string) {
+    return compare(a, b, (c) => c < 0);
+  }
+
+  static lte(a: string, b: string) {
+    return compare(a, b, (c) => c > 0);
+  }
+
+  static eq(a: string, b: string) {
+    return compare(a, b, (c) => c !== 0);
+  }
+
+  static gt(a: string, b: string) {
+    return Version.gte(a, b) && !Version.eq(a, b);
+  }
+
+  static lt(a: string, b: string) {
+    return Version.lte(a, b) && !Version.eq(a, b);
+  }
+}
+
+const seq = ['major', 'minor', 'patch', 'beta'] as (keyof VersionParts)[];
+
+function compare(a: string, b: string, isInvalid: (x: number) => boolean) {
+  const partsA = parseVersionString(a);
+  const partsB = parseVersionString(b);
+
+  for (const p of seq) {
+    const c = compareSingle(partsA, partsB, p);
+    if (isInvalid(c)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+function parseVersionString(a: string): VersionParts {
+  const parts = a.split('-');
+  const nonbeta = parts[0].split('.').map((n) => parseFloat(n));
+
+  const versionParts: VersionParts = {
+    major: nonbeta[0],
+    minor: nonbeta[1],
+    patch: nonbeta[2],
+  };
+
+  const beta = parseFloat(parts[1]?.split('.')?.[1]);
+  if (!Number.isNaN(beta)) {
+    versionParts.beta = beta;
+  }
+
+  if (Number.isNaN(beta) && parts[1]?.includes('beta')) {
+    versionParts.beta = 0;
+  }
+
+  return versionParts;
+}
+
+function compareSingle(
+  partsA: VersionParts,
+  partsB: VersionParts,
+  key: keyof VersionParts
+): number {
+  if (key !== 'beta') {
+    return partsA[key] - partsB[key];
+  }
+
+  if (typeof partsA.beta === 'number' && typeof partsB.beta === 'number') {
+    return partsA.beta - partsB.beta;
+  }
+
+  // A is not in beta
+  if (partsA.beta === undefined && typeof partsB.beta === 'number') {
+    return 1;
+  }
+
+  // B is not in beta
+  if (typeof partsA.beta === 'number' && partsB.beta === undefined) {
+    return -1;
+  }
+
+  // Both A and B are not in Beta
+  return 0;
+}

From 6ace4677e75a47ffd63a4f263026dc5c61273134 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 24 May 2022 17:04:41 +0530
Subject: [PATCH 157/163] incr: add patch for v0.4 to v0.5

---
 backend/database/manager.ts      | 117 ++++++++-----
 backend/patches/index.ts         |   2 +
 backend/patches/updateSchemas.ts | 285 +++++++++++++++++++++++++++++++
 utils/index.ts                   |  28 +++
 4 files changed, 389 insertions(+), 43 deletions(-)
 create mode 100644 backend/patches/updateSchemas.ts

diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 6ba6487d..27ba1eb8 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -1,5 +1,7 @@
 import { constants } from 'fs';
 import fs from 'fs/promises';
+import os from 'os';
+import path from 'path';
 import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { getSchemas } from '../../schemas';
 import { databaseMethodSet } from '../helpers';
@@ -26,18 +28,75 @@ export class DatabaseManager extends DatabaseDemuxBase {
   }
 
   async connectToDatabase(dbPath: string, countryCode?: string) {
-    countryCode ??= await DatabaseCore.getCountryCode(dbPath);
-
-    this.db = new DatabaseCore(dbPath);
-    await this.db.connect();
-
-    const schemaMap = getSchemas(countryCode);
-    this.db.setSchemaMap(schemaMap);
-
+    countryCode = await this._connect(dbPath, countryCode);
     await this.#migrate();
     return countryCode;
   }
 
+  async _connect(dbPath: string, countryCode?: string) {
+    countryCode ??= await DatabaseCore.getCountryCode(dbPath);
+    this.db = new DatabaseCore(dbPath);
+    await this.db.connect();
+    const schemaMap = getSchemas(countryCode);
+    this.db.setSchemaMap(schemaMap);
+    return countryCode;
+  }
+
+  async #migrate(): Promise<void> {
+    if (!this.#isInitialized) {
+      return;
+    }
+
+    const isFirstRun = await this.#getIsFirstRun();
+    if (isFirstRun) {
+      await this.db!.migrate();
+    }
+
+    /**
+     * This needs to be replaced with transactions
+     * TODO: Add transactions in core.ts
+     */
+    const dbPath = this.db!.dbPath;
+    const copyPath = await this.#makeTempCopy();
+    try {
+      await this.#runPatchesAndMigrate();
+    } catch (err) {
+      await this.db!.close();
+      await fs.copyFile(copyPath, dbPath);
+      await this._connect(dbPath);
+
+      throw err;
+    }
+
+    await fs.unlink(copyPath);
+  }
+
+  async #runPatchesAndMigrate() {
+    const patchesToExecute = await this.#getPatchesToExecute();
+    const preMigrationPatches = patchesToExecute.filter(
+      (p) => p.patch.beforeMigrate
+    );
+    const postMigrationPatches = patchesToExecute.filter(
+      (p) => !p.patch.beforeMigrate
+    );
+
+    await runPatches(preMigrationPatches, this);
+    await this.db!.migrate();
+    await runPatches(postMigrationPatches, this);
+  }
+
+  async #getPatchesToExecute(): Promise<Patch[]> {
+    if (this.db === undefined) {
+      return [];
+    }
+
+    const query: { name: string }[] = await this.db.knex!('PatchRun').select(
+      'name'
+    );
+    const executedPatches = query.map((q) => q.name);
+    return patches.filter((p) => !executedPatches.includes(p.name));
+  }
+
   async call(method: DatabaseMethod, ...args: unknown[]) {
     if (!this.#isInitialized) {
       return;
@@ -70,41 +129,6 @@ export class DatabaseManager extends DatabaseDemuxBase {
     return await queryFunction(this.db!, ...args);
   }
 
-  async #migrate(): Promise<void> {
-    if (!this.#isInitialized) {
-      return;
-    }
-
-    const isFirstRun = await this.#getIsFirstRun();
-    if (isFirstRun) {
-      await this.db!.migrate();
-    }
-
-    const patchesToExecute = await this.#getPatchesToExecute();
-    const preMigrationPatches = patchesToExecute.filter(
-      (p) => p.patch.beforeMigrate
-    );
-    const postMigrationPatches = patchesToExecute.filter(
-      (p) => !p.patch.beforeMigrate
-    );
-
-    await runPatches(preMigrationPatches, this);
-    await this.db!.migrate();
-    await runPatches(postMigrationPatches, this);
-  }
-
-  async #getPatchesToExecute(): Promise<Patch[]> {
-    if (this.db === undefined) {
-      return [];
-    }
-
-    const query: { name: string }[] = await this.db.knex!('PatchRun').select(
-      'name'
-    );
-    const executedPatches = query.map((q) => q.name);
-    return patches.filter((p) => !executedPatches.includes(p.name));
-  }
-
   async #unlinkIfExists(dbPath: string) {
     const exists = await fs
       .access(dbPath, constants.W_OK)
@@ -126,6 +150,13 @@ export class DatabaseManager extends DatabaseDemuxBase {
     );
     return tableList.length === 0;
   }
+
+  async #makeTempCopy() {
+    const src = this.db!.dbPath;
+    const dest = path.join(os.tmpdir(), 'temp.db');
+    await fs.copyFile(src, dest);
+    return dest;
+  }
 }
 
 export default new DatabaseManager();
diff --git a/backend/patches/index.ts b/backend/patches/index.ts
index 3630b598..5f917c47 100644
--- a/backend/patches/index.ts
+++ b/backend/patches/index.ts
@@ -1,6 +1,8 @@
 import { Patch } from '../database/types';
 import testPatch from './testPatch';
+import updateSchemas from './updateSchemas';
 
 export default [
   { name: 'testPatch', version: '0.5.0-beta.0', patch: testPatch },
+  { name: 'updateSchemas', version: '0.5.0-beta.0', patch: updateSchemas },
 ] as Patch[];
diff --git a/backend/patches/updateSchemas.ts b/backend/patches/updateSchemas.ts
new file mode 100644
index 00000000..516b5d03
--- /dev/null
+++ b/backend/patches/updateSchemas.ts
@@ -0,0 +1,285 @@
+import fs from 'fs/promises';
+import { RawValueMap } from 'fyo/core/types';
+import { Knex } from 'knex';
+import { ModelNameEnum } from 'models/types';
+import os from 'os';
+import path from 'path';
+import { SchemaMap } from 'schemas/types';
+import { changeKeys, deleteKeys, invertMap } from 'utils';
+import { getCountryCodeFromCountry } from 'utils/misc';
+import { Version } from 'utils/version';
+import { DatabaseManager } from '../database/manager';
+
+const ignoreColumns = ['keywords'];
+const columnMap = { creation: 'created', owner: 'createdBy' };
+const childTableColumnMap = {
+  parenttype: 'parentSchemaName',
+  parentfield: 'parentFieldname',
+};
+
+const defaultNumberSeriesMap = {
+  [ModelNameEnum.Payment]: 'PAY-',
+  [ModelNameEnum.JournalEntry]: 'JE-',
+  [ModelNameEnum.SalesInvoice]: 'SINV-',
+  [ModelNameEnum.PurchaseInvoice]: 'PINV-',
+} as Record<ModelNameEnum, string>;
+
+async function execute(dm: DatabaseManager) {
+  const sourceKnex = dm.db!.knex!;
+  const version = (
+    await sourceKnex('SingleValue')
+      .select('value')
+      .where({ fieldname: 'version' })
+  )?.[0]?.value;
+
+  /**
+   * Versions after this should have the new schemas
+   */
+
+  if (version && Version.gt(version, '0.4.3-beta.0')) {
+    return;
+  }
+
+  /**
+   * Initialize a different db to copy all the updated
+   * data into.
+   */
+  const countryCode = await getCountryCode(sourceKnex);
+  const destDm = await getDestinationDM(sourceKnex, countryCode);
+
+  /**
+   * Copy data from all the relevant tables
+   * the other tables will be empty cause unused.
+   */
+  await copyData(sourceKnex, destDm);
+
+  /**
+   * Version will update when migration completes, this
+   * is set to prevent this patch from running again.
+   */
+  await destDm.db!.update(ModelNameEnum.SystemSettings, {
+    version: '0.5.0-beta.0',
+  });
+
+  /**
+   * Replace the database with the new one.
+   */
+  await replaceDatabaseCore(dm, destDm);
+}
+
+async function replaceDatabaseCore(
+  dm: DatabaseManager,
+  destDm: DatabaseManager
+) {
+  const sourceDbPath = destDm.db!.dbPath; // new db with new schema
+  const destDbPath = dm.db!.dbPath; // old db to be replaced
+
+  await dm.db!.close();
+  await destDm.db!.close();
+
+  await fs.copyFile(sourceDbPath, destDbPath);
+  await dm._connect(destDbPath);
+}
+
+async function copyData(sourceKnex: Knex, destDm: DatabaseManager) {
+  const destKnex = destDm.db!.knex!;
+  const schemaMap = destDm.getSchemaMap();
+  await destKnex!.raw('PRAGMA foreign_keys=OFF');
+  await copySingleValues(sourceKnex, destKnex, schemaMap);
+  await copyParty(sourceKnex, destKnex);
+  await copyItem(sourceKnex, destKnex);
+  await copyChildTables(sourceKnex, destKnex, schemaMap);
+  await copyOtherTables(sourceKnex, destKnex);
+  await copyTransactionalTables(sourceKnex, destKnex);
+  await copyLedgerEntries(sourceKnex, destKnex);
+  await copyNumberSeries(sourceKnex, destKnex);
+  await destKnex!.raw('PRAGMA foreign_keys=ON');
+}
+
+async function copyNumberSeries(sourceKnex: Knex, destKnex: Knex) {
+  const values = (await sourceKnex(
+    ModelNameEnum.NumberSeries
+  )) as RawValueMap[];
+
+  const refMap = invertMap(defaultNumberSeriesMap);
+
+  for (const value of values) {
+    if (value.referenceType) {
+      continue;
+    }
+
+    const name = value.name as string;
+    const referenceType = refMap[name];
+    const indices = await sourceKnex.raw(
+      `
+      select cast(substr(name, ??) as int) as idx
+      from ?? 
+      order by idx desc 
+      limit 1`,
+      [name.length + 1, referenceType]
+    );
+
+    value.start = 1001;
+    value.current = indices[0]?.idx ?? value.current ?? value.start;
+    value.referenceType = referenceType;
+  }
+
+  await copyValues(destKnex, ModelNameEnum.NumberSeries, values);
+}
+
+async function copyLedgerEntries(sourceKnex: Knex, destKnex: Knex) {
+  const values = (await sourceKnex(
+    ModelNameEnum.AccountingLedgerEntry
+  )) as RawValueMap[];
+  await copyValues(destKnex, ModelNameEnum.AccountingLedgerEntry, values, [
+    'description',
+    'againstAccount',
+    'balance',
+  ]);
+}
+
+async function copyOtherTables(sourceKnex: Knex, destKnex: Knex) {
+  const schemaNames = [
+    ModelNameEnum.Account,
+    ModelNameEnum.Currency,
+    ModelNameEnum.Address,
+    ModelNameEnum.Color,
+    ModelNameEnum.Tax,
+  ];
+
+  for (const sn of schemaNames) {
+    const values = (await sourceKnex(sn)) as RawValueMap[];
+    await copyValues(destKnex, sn, values);
+  }
+}
+
+async function copyTransactionalTables(sourceKnex: Knex, destKnex: Knex) {
+  const schemaNames = [
+    ModelNameEnum.JournalEntry,
+    ModelNameEnum.Payment,
+    ModelNameEnum.SalesInvoice,
+    ModelNameEnum.PurchaseInvoice,
+  ];
+
+  for (const sn of schemaNames) {
+    const values = (await sourceKnex(sn)) as RawValueMap[];
+    values.forEach((v) => {
+      if (!v.submitted) {
+        v.submitted = 0;
+      }
+
+      if (!v.cancelled) {
+        v.cancelled = 0;
+      }
+
+      if (!v.numberSeries) {
+        v.numberSeries = defaultNumberSeriesMap[sn];
+      }
+    });
+    await copyValues(destKnex, sn, values, [], childTableColumnMap);
+  }
+}
+
+async function copyChildTables(
+  sourceKnex: Knex,
+  destKnex: Knex,
+  schemaMap: SchemaMap
+) {
+  const childSchemaNames = Object.keys(schemaMap).filter(
+    (sn) => schemaMap[sn]?.isChild
+  );
+
+  for (const sn of childSchemaNames) {
+    const values = (await sourceKnex(sn)) as RawValueMap[];
+    await copyValues(destKnex, sn, values, [], childTableColumnMap);
+  }
+}
+
+async function copyItem(sourceKnex: Knex, destKnex: Knex) {
+  const values = (await sourceKnex(ModelNameEnum.Item)) as RawValueMap[];
+  values.forEach((value) => {
+    value.for = 'Both';
+  });
+
+  await copyValues(destKnex, ModelNameEnum.Item, values);
+}
+
+async function copyParty(sourceKnex: Knex, destKnex: Knex) {
+  const values = (await sourceKnex(ModelNameEnum.Party)) as RawValueMap[];
+  values.forEach((value) => {
+    // customer will be mapped onto role
+    if (Number(value.supplier) === 1) {
+      value.customer = 'Supplier';
+    } else {
+      value.customer = 'Customer';
+    }
+  });
+
+  await copyValues(
+    destKnex,
+    ModelNameEnum.Party,
+    values,
+    ['supplier', 'addressDisplay'],
+    { customer: 'role' }
+  );
+}
+
+async function copySingleValues(
+  sourceKnex: Knex,
+  destKnex: Knex,
+  schemaMap: SchemaMap
+) {
+  const singleSchemaNames = Object.keys(schemaMap).filter(
+    (k) => schemaMap[k]?.isSingle
+  );
+  const singleValues = (await sourceKnex(ModelNameEnum.SingleValue).whereIn(
+    'parent',
+    singleSchemaNames
+  )) as RawValueMap[];
+
+  await copyValues(destKnex, ModelNameEnum.SingleValue, singleValues);
+}
+
+async function copyValues(
+  destKnex: Knex,
+  destTableName: string,
+  values: RawValueMap[],
+  keysToDelete: string[] = [],
+  keyMap: Record<string, string> = {}
+) {
+  keysToDelete = [...keysToDelete, ...ignoreColumns];
+  keyMap = { ...keyMap, ...columnMap };
+
+  values = values.map((sv) => deleteKeys(sv, keysToDelete));
+  values = values.map((sv) => changeKeys(sv, keyMap));
+
+  await destKnex.batchInsert(destTableName, values, 100);
+}
+
+async function getDestinationDM(knex: Knex, countryCode: string) {
+  /**
+   * This is where all the stuff from the old db will be copied.
+   * That won't be altered cause schema update will cause data loss.
+   */
+  const dbPath = path.join(os.tmpdir(), '__patch_db.db');
+  const dm = new DatabaseManager();
+  await dm.createNewDatabase(dbPath, countryCode);
+  return dm;
+}
+
+async function getCountryCode(knex: Knex) {
+  /**
+   * Need to account for schema changes, in 0.4.3-beta.0
+   */
+  const country = (
+    await knex('SingleValue').select('value').where({ fieldname: 'country' })
+  )?.[0]?.value;
+
+  if (!country) {
+    return '';
+  }
+
+  return getCountryCodeFromCountry(country);
+}
+
+export default { execute, beforeMigrate: true };
diff --git a/utils/index.ts b/utils/index.ts
index 029a38f7..c6f55b4d 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -125,3 +125,31 @@ export async function timeAsync<K, T>(
   console.timeEnd(name);
   return stuff;
 }
+
+export function changeKeys<T>(
+  source: Record<string, T>,
+  keyMap: Record<string, string | undefined>
+) {
+  const dest: Record<string, T> = {};
+  for (const key of Object.keys(source)) {
+    const newKey = keyMap[key] ?? key;
+    dest[newKey] = source[key];
+  }
+
+  return dest;
+}
+
+export function deleteKeys<T>(
+  source: Record<string, T>,
+  keysToDelete: string[]
+) {
+  const dest: Record<string, T> = {};
+  for (const key of Object.keys(source)) {
+    if (keysToDelete.includes(key)) {
+      continue;
+    }
+    dest[key] = source[key];
+  }
+
+  return dest;
+}

From a8904a085412f8140f3ec9ff9503dbbbb58c8788 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Tue, 24 May 2022 23:29:05 +0530
Subject: [PATCH 158/163] incr: error handle lastSelectedFilepath load

---
 src/App.vue                    | 21 ++++++++++++------
 src/errorHandling.ts           | 39 ++++++++++++++++++++++++++++++----
 src/pages/DatabaseSelector.vue |  4 ++--
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c3c13956..e3f486ac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,8 +34,10 @@
 
 <script>
 import { ConfigKeys } from 'fyo/core/types';
-import { getSetupComplete, incrementOpenCount } from 'src/utils/misc';
+import { ModelNameEnum } from 'models/types';
+import { incrementOpenCount } from 'src/utils/misc';
 import WindowsTitleBar from './components/WindowsTitleBar.vue';
+import { handleErrorWithDialog } from './errorHandling';
 import { fyo, initializeInstance } from './initFyo';
 import DatabaseSelector from './pages/DatabaseSelector.vue';
 import Desk from './pages/Desk.vue';
@@ -66,12 +68,16 @@ export default {
       null
     );
 
-    if (lastSelectedFilePath) {
-      await this.fileSelected(lastSelectedFilePath, false);
-      return;
+    if (!lastSelectedFilePath) {
+      return (this.activeScreen = 'DatabaseSelector');
     }
 
-    this.activeScreen = 'DatabaseSelector';
+    try {
+      await this.fileSelected(lastSelectedFilePath, false);
+    } catch (err) {
+      await handleErrorWithDialog(err, undefined, true, true);
+      this.activeScreen = 'DatabaseSelector';
+    }
   },
   methods: {
     async setDesk(filePath) {
@@ -96,7 +102,10 @@ export default {
     },
     async showSetupWizardOrDesk(filePath) {
       const countryCode = await fyo.db.connectToDatabase(filePath);
-      const setupComplete = await getSetupComplete();
+      const setupComplete = await fyo.getValue(
+        ModelNameEnum.AccountingSettings,
+        'setupComplete'
+      );
 
       if (!setupComplete) {
         this.activeScreen = 'SetupWizard';
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 6b626662..4c0b3ec7 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -7,10 +7,12 @@ import {
   ValidationError,
 } from 'fyo/utils/errors';
 import { ErrorLog } from 'fyo/utils/types';
+import { truncate } from 'lodash';
 import { IPC_ACTIONS, IPC_MESSAGES } from 'utils/messages';
 import { fyo } from './initFyo';
+import router from './router';
 import { getErrorMessage } from './utils';
-import { ToastOptions } from './utils/types';
+import { MessageDialogOptions, ToastOptions } from './utils/types';
 import { showMessageDialog, showToast } from './utils/ui';
 
 function shouldNotStore(error: Error) {
@@ -32,7 +34,6 @@ async function reportError(errorLogObj: ErrorLog, cb?: Function) {
   };
 
   if (fyo.store.isDevelopment) {
-    console.log('errorHandling');
     console.log(body);
   }
 
@@ -85,12 +86,39 @@ export async function handleError(
   await showToast(toastProps);
 }
 
-export async function handleErrorWithDialog(error: Error, doc?: Doc) {
+export async function handleErrorWithDialog(
+  error: Error,
+  doc?: Doc,
+  reportError?: false,
+  dontThrow?: false
+) {
   const errorMessage = getErrorMessage(error, doc);
   await handleError(false, error, { errorMessage, doc });
 
   const name = error.name ?? t`Error`;
-  await showMessageDialog({ message: name, detail: errorMessage });
+  const options: MessageDialogOptions = { message: name, detail: errorMessage };
+
+  if (reportError) {
+    options.detail = truncate(options.detail, { length: 128 });
+    options.buttons = [
+      {
+        label: t`Report`,
+        action() {
+          reportIssue(getErrorLogObject(error, { errorMessage }));
+        },
+      },
+      { label: t`OK`, action() {} },
+    ];
+  }
+
+  await showMessageDialog(options);
+  if (dontThrow) {
+    if (fyo.store.isDevelopment) {
+      console.error(error);
+    }
+    return;
+  }
+
   throw error;
 }
 
@@ -157,6 +185,9 @@ function getIssueUrlQuery(errorLogObj?: ErrorLog): string {
     body.push(`**Path**: \`${fullPath}\``);
   }
 
+  body.push(`**Version**: ${fyo.store.appVersion}`);
+  body.push(`**Route**: ${router.currentRoute.value.fullPath}`);
+
   const url = [baseUrl, `body=${body.join('\n')}`].join('&');
   return encodeURI(url);
 }
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index fc13162c..e2bb565d 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -167,7 +167,7 @@ import { setupDummyInstance } from 'dummy';
 import { ipcRenderer } from 'electron';
 import { t } from 'fyo';
 import { ConfigKeys } from 'fyo/core/types';
-import { addNewFile } from 'fyo/telemetry/helpers';
+import { addNewConfigFile } from 'fyo/telemetry/helpers';
 import { DateTime } from 'luxon';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
 import FeatherIcon from 'src/components/FeatherIcon.vue';
@@ -242,7 +242,7 @@ export default {
         }
       );
 
-      addNewFile(
+      addNewConfigFile(
         companyName,
         filePath,
         instanceId,

From 46dbb6348f61a0f1cfef31ad0ffd28296db7c679 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Wed, 25 May 2022 00:36:54 +0530
Subject: [PATCH 159/163] fix: updateSchemas works now, also proper cleanup

---
 backend/database/core.ts         |  14 +++
 backend/database/manager.ts      |  16 +--
 backend/database/types.ts        |   8 +-
 backend/patches/index.ts         |   7 +-
 backend/patches/updateSchemas.ts | 193 ++++++++++++++++++++++++-------
 dummy/index.ts                   |  56 ++++++---
 fyo/index.ts                     |  15 ++-
 main/helpers.ts                  |   4 +
 src/errorHandling.ts             |   9 +-
 src/renderer.ts                  |   4 +-
 src/utils/misc.ts                |  11 +-
 utils/misc.ts                    |   2 +-
 utils/version.ts                 |  12 +-
 13 files changed, 260 insertions(+), 91 deletions(-)

diff --git a/backend/database/core.ts b/backend/database/core.ts
index bf6675ea..41e0a590 100644
--- a/backend/database/core.ts
+++ b/backend/database/core.ts
@@ -416,6 +416,20 @@ export default class DatabaseCore extends DatabaseBase {
     return info.map((d) => d.name as string);
   }
 
+  async truncate(tableNames?: string[]) {
+    if (tableNames === undefined) {
+      const q = (await this.knex!.raw(`
+        select name from sqlite_schema
+        where type='table'
+        and name not like 'sqlite_%'`)) as { name: string }[];
+      tableNames = q.map((i) => i.name);
+    }
+
+    for (const name of tableNames) {
+      await this.knex!(name).del();
+    }
+  }
+
   async #getForeignKeys(schemaName: string): Promise<string[]> {
     const foreignKeyList: FieldValueMap[] = await this.knex!.raw(
       `PRAGMA foreign_key_list(${schemaName})`
diff --git a/backend/database/manager.ts b/backend/database/manager.ts
index 27ba1eb8..b36a47fe 100644
--- a/backend/database/manager.ts
+++ b/backend/database/manager.ts
@@ -1,6 +1,5 @@
 import { constants } from 'fs';
 import fs from 'fs/promises';
-import os from 'os';
 import path from 'path';
 import { DatabaseDemuxBase, DatabaseMethod } from 'utils/db/types';
 import { getSchemas } from '../../schemas';
@@ -53,26 +52,28 @@ export class DatabaseManager extends DatabaseDemuxBase {
     }
 
     /**
-     * This needs to be replaced with transactions
+     * This needs to be supplimented with transactions
      * TODO: Add transactions in core.ts
      */
     const dbPath = this.db!.dbPath;
     const copyPath = await this.#makeTempCopy();
+
     try {
       await this.#runPatchesAndMigrate();
     } catch (err) {
+      console.error(err);
       await this.db!.close();
       await fs.copyFile(copyPath, dbPath);
-      await this._connect(dbPath);
-
       throw err;
+    } finally {
+      await fs.unlink(copyPath);
     }
-
-    await fs.unlink(copyPath);
   }
 
   async #runPatchesAndMigrate() {
     const patchesToExecute = await this.#getPatchesToExecute();
+
+    patchesToExecute.sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
     const preMigrationPatches = patchesToExecute.filter(
       (p) => p.patch.beforeMigrate
     );
@@ -153,7 +154,8 @@ export class DatabaseManager extends DatabaseDemuxBase {
 
   async #makeTempCopy() {
     const src = this.db!.dbPath;
-    const dest = path.join(os.tmpdir(), 'temp.db');
+    const dir = path.parse(src).dir;
+    const dest = path.join(dir, '__premigratory_temp.db');
     await fs.copyFile(src, dest);
     return dest;
   }
diff --git a/backend/database/types.ts b/backend/database/types.ts
index 6ccd0cce..7b0c3e15 100644
--- a/backend/database/types.ts
+++ b/backend/database/types.ts
@@ -23,6 +23,7 @@ export interface Patch {
     execute: (dm: DatabaseManager) => Promise<void>;
     beforeMigrate?: boolean;
   };
+  priority?: number;
 }
 
 export type KnexColumnType =
@@ -45,9 +46,12 @@ export interface SqliteTableInfo {
   dflt_value: string | null;
 }
 
-export type BespokeFunction = (db:DatabaseCore, ...args: unknown[]) => Promise<unknown>
+export type BespokeFunction = (
+  db: DatabaseCore,
+  ...args: unknown[]
+) => Promise<unknown>;
 export type SingleValue<T> = {
   fieldname: string;
   parent: string;
   value: T;
-}[];
\ No newline at end of file
+}[];
diff --git a/backend/patches/index.ts b/backend/patches/index.ts
index 5f917c47..11b8768d 100644
--- a/backend/patches/index.ts
+++ b/backend/patches/index.ts
@@ -4,5 +4,10 @@ import updateSchemas from './updateSchemas';
 
 export default [
   { name: 'testPatch', version: '0.5.0-beta.0', patch: testPatch },
-  { name: 'updateSchemas', version: '0.5.0-beta.0', patch: updateSchemas },
+  {
+    name: 'updateSchemas',
+    version: '0.5.0-beta.0',
+    patch: updateSchemas,
+    priority: 100,
+  },
 ] as Patch[];
diff --git a/backend/patches/updateSchemas.ts b/backend/patches/updateSchemas.ts
index 516b5d03..e6e23b20 100644
--- a/backend/patches/updateSchemas.ts
+++ b/backend/patches/updateSchemas.ts
@@ -1,13 +1,12 @@
 import fs from 'fs/promises';
 import { RawValueMap } from 'fyo/core/types';
 import { Knex } from 'knex';
-import { ModelNameEnum } from 'models/types';
-import os from 'os';
 import path from 'path';
-import { SchemaMap } from 'schemas/types';
-import { changeKeys, deleteKeys, invertMap } from 'utils';
+import { changeKeys, deleteKeys, getIsNullOrUndef, invertMap } from 'utils';
 import { getCountryCodeFromCountry } from 'utils/misc';
 import { Version } from 'utils/version';
+import { ModelNameEnum } from '../../models/types';
+import { FieldTypeEnum, Schema, SchemaMap } from '../../schemas/types';
 import { DatabaseManager } from '../database/manager';
 
 const ignoreColumns = ['keywords'];
@@ -45,13 +44,20 @@ async function execute(dm: DatabaseManager) {
    * data into.
    */
   const countryCode = await getCountryCode(sourceKnex);
-  const destDm = await getDestinationDM(sourceKnex, countryCode);
+  const destDm = await getDestinationDM(dm.db!.dbPath, countryCode);
 
   /**
    * Copy data from all the relevant tables
    * the other tables will be empty cause unused.
    */
-  await copyData(sourceKnex, destDm);
+  try {
+    await copyData(sourceKnex, destDm);
+  } catch (err) {
+    const destPath = destDm.db!.dbPath;
+    destDm.db!.close();
+    await fs.unlink(destPath);
+    throw err;
+  }
 
   /**
    * Version will update when migration completes, this
@@ -71,14 +77,14 @@ async function replaceDatabaseCore(
   dm: DatabaseManager,
   destDm: DatabaseManager
 ) {
-  const sourceDbPath = destDm.db!.dbPath; // new db with new schema
-  const destDbPath = dm.db!.dbPath; // old db to be replaced
+  const newDbPath = destDm.db!.dbPath; // new db with new schema
+  const oldDbPath = dm.db!.dbPath; // old db to be replaced
 
   await dm.db!.close();
   await destDm.db!.close();
-
-  await fs.copyFile(sourceDbPath, destDbPath);
-  await dm._connect(destDbPath);
+  await fs.unlink(oldDbPath);
+  await fs.rename(newDbPath, oldDbPath);
+  await dm._connect(oldDbPath);
 }
 
 async function copyData(sourceKnex: Knex, destDm: DatabaseManager) {
@@ -86,17 +92,29 @@ async function copyData(sourceKnex: Knex, destDm: DatabaseManager) {
   const schemaMap = destDm.getSchemaMap();
   await destKnex!.raw('PRAGMA foreign_keys=OFF');
   await copySingleValues(sourceKnex, destKnex, schemaMap);
-  await copyParty(sourceKnex, destKnex);
-  await copyItem(sourceKnex, destKnex);
+  await copyParty(sourceKnex, destKnex, schemaMap[ModelNameEnum.Party]!);
+  await copyItem(sourceKnex, destKnex, schemaMap[ModelNameEnum.Item]!);
   await copyChildTables(sourceKnex, destKnex, schemaMap);
-  await copyOtherTables(sourceKnex, destKnex);
-  await copyTransactionalTables(sourceKnex, destKnex);
-  await copyLedgerEntries(sourceKnex, destKnex);
-  await copyNumberSeries(sourceKnex, destKnex);
+  await copyOtherTables(sourceKnex, destKnex, schemaMap);
+  await copyTransactionalTables(sourceKnex, destKnex, schemaMap);
+  await copyLedgerEntries(
+    sourceKnex,
+    destKnex,
+    schemaMap[ModelNameEnum.AccountingLedgerEntry]!
+  );
+  await copyNumberSeries(
+    sourceKnex,
+    destKnex,
+    schemaMap[ModelNameEnum.NumberSeries]!
+  );
   await destKnex!.raw('PRAGMA foreign_keys=ON');
 }
 
-async function copyNumberSeries(sourceKnex: Knex, destKnex: Knex) {
+async function copyNumberSeries(
+  sourceKnex: Knex,
+  destKnex: Knex,
+  schema: Schema
+) {
   const values = (await sourceKnex(
     ModelNameEnum.NumberSeries
   )) as RawValueMap[];
@@ -110,6 +128,11 @@ async function copyNumberSeries(sourceKnex: Knex, destKnex: Knex) {
 
     const name = value.name as string;
     const referenceType = refMap[name];
+    if (!referenceType) {
+      delete value.name;
+      continue;
+    }
+
     const indices = await sourceKnex.raw(
       `
       select cast(substr(name, ??) as int) as idx
@@ -124,36 +147,59 @@ async function copyNumberSeries(sourceKnex: Knex, destKnex: Knex) {
     value.referenceType = referenceType;
   }
 
-  await copyValues(destKnex, ModelNameEnum.NumberSeries, values);
+  await copyValues(
+    destKnex,
+    ModelNameEnum.NumberSeries,
+    values.filter((v) => v.name),
+    [],
+    {},
+    schema
+  );
 }
 
-async function copyLedgerEntries(sourceKnex: Knex, destKnex: Knex) {
+async function copyLedgerEntries(
+  sourceKnex: Knex,
+  destKnex: Knex,
+  schema: Schema
+) {
   const values = (await sourceKnex(
     ModelNameEnum.AccountingLedgerEntry
   )) as RawValueMap[];
-  await copyValues(destKnex, ModelNameEnum.AccountingLedgerEntry, values, [
-    'description',
-    'againstAccount',
-    'balance',
-  ]);
+  await copyValues(
+    destKnex,
+    ModelNameEnum.AccountingLedgerEntry,
+    values,
+    ['description', 'againstAccount', 'balance'],
+    {},
+    schema
+  );
 }
 
-async function copyOtherTables(sourceKnex: Knex, destKnex: Knex) {
+async function copyOtherTables(
+  sourceKnex: Knex,
+  destKnex: Knex,
+  schemaMap: SchemaMap
+) {
   const schemaNames = [
     ModelNameEnum.Account,
     ModelNameEnum.Currency,
     ModelNameEnum.Address,
     ModelNameEnum.Color,
     ModelNameEnum.Tax,
+    ModelNameEnum.PatchRun,
   ];
 
   for (const sn of schemaNames) {
     const values = (await sourceKnex(sn)) as RawValueMap[];
-    await copyValues(destKnex, sn, values);
+    await copyValues(destKnex, sn, values, [], {}, schemaMap[sn]);
   }
 }
 
-async function copyTransactionalTables(sourceKnex: Knex, destKnex: Knex) {
+async function copyTransactionalTables(
+  sourceKnex: Knex,
+  destKnex: Knex,
+  schemaMap: SchemaMap
+) {
   const schemaNames = [
     ModelNameEnum.JournalEntry,
     ModelNameEnum.Payment,
@@ -175,8 +221,23 @@ async function copyTransactionalTables(sourceKnex: Knex, destKnex: Knex) {
       if (!v.numberSeries) {
         v.numberSeries = defaultNumberSeriesMap[sn];
       }
+
+      if (v.customer) {
+        v.party = v.customer;
+      }
+
+      if (v.supplier) {
+        v.party = v.supplier;
+      }
     });
-    await copyValues(destKnex, sn, values, [], childTableColumnMap);
+    await copyValues(
+      destKnex,
+      sn,
+      values,
+      [],
+      childTableColumnMap,
+      schemaMap[sn]
+    );
   }
 }
 
@@ -191,20 +252,27 @@ async function copyChildTables(
 
   for (const sn of childSchemaNames) {
     const values = (await sourceKnex(sn)) as RawValueMap[];
-    await copyValues(destKnex, sn, values, [], childTableColumnMap);
+    await copyValues(
+      destKnex,
+      sn,
+      values,
+      [],
+      childTableColumnMap,
+      schemaMap[sn]
+    );
   }
 }
 
-async function copyItem(sourceKnex: Knex, destKnex: Knex) {
+async function copyItem(sourceKnex: Knex, destKnex: Knex, schema: Schema) {
   const values = (await sourceKnex(ModelNameEnum.Item)) as RawValueMap[];
   values.forEach((value) => {
     value.for = 'Both';
   });
 
-  await copyValues(destKnex, ModelNameEnum.Item, values);
+  await copyValues(destKnex, ModelNameEnum.Item, values, [], {}, schema);
 }
 
-async function copyParty(sourceKnex: Knex, destKnex: Knex) {
+async function copyParty(sourceKnex: Knex, destKnex: Knex, schema: Schema) {
   const values = (await sourceKnex(ModelNameEnum.Party)) as RawValueMap[];
   values.forEach((value) => {
     // customer will be mapped onto role
@@ -220,7 +288,8 @@ async function copyParty(sourceKnex: Knex, destKnex: Knex) {
     ModelNameEnum.Party,
     values,
     ['supplier', 'addressDisplay'],
-    { customer: 'role' }
+    { customer: 'role' },
+    schema
   );
 }
 
@@ -236,7 +305,6 @@ async function copySingleValues(
     'parent',
     singleSchemaNames
   )) as RawValueMap[];
-
   await copyValues(destKnex, ModelNameEnum.SingleValue, singleValues);
 }
 
@@ -245,7 +313,8 @@ async function copyValues(
   destTableName: string,
   values: RawValueMap[],
   keysToDelete: string[] = [],
-  keyMap: Record<string, string> = {}
+  keyMap: Record<string, string> = {},
+  schema?: Schema
 ) {
   keysToDelete = [...keysToDelete, ...ignoreColumns];
   keyMap = { ...keyMap, ...columnMap };
@@ -253,17 +322,30 @@ async function copyValues(
   values = values.map((sv) => deleteKeys(sv, keysToDelete));
   values = values.map((sv) => changeKeys(sv, keyMap));
 
+  if (schema) {
+    values.forEach((v) => notNullify(v, schema));
+  }
+
+  if (schema) {
+    const newKeys = schema?.fields.map((f) => f.fieldname);
+    values.forEach((v) => deleteOldKeys(v, newKeys));
+  }
+
   await destKnex.batchInsert(destTableName, values, 100);
 }
 
-async function getDestinationDM(knex: Knex, countryCode: string) {
+async function getDestinationDM(sourceDbPath: string, countryCode: string) {
   /**
    * This is where all the stuff from the old db will be copied.
    * That won't be altered cause schema update will cause data loss.
    */
-  const dbPath = path.join(os.tmpdir(), '__patch_db.db');
+
+  const dir = path.parse(sourceDbPath).dir;
+  const dbPath = path.join(dir, '__update_schemas_temp.db');
   const dm = new DatabaseManager();
-  await dm.createNewDatabase(dbPath, countryCode);
+  await dm._connect(dbPath, countryCode);
+  await dm.db!.migrate();
+  await dm.db!.truncate();
   return dm;
 }
 
@@ -282,4 +364,37 @@ async function getCountryCode(knex: Knex) {
   return getCountryCodeFromCountry(country);
 }
 
+function notNullify(map: RawValueMap, schema: Schema) {
+  for (const field of schema.fields) {
+    if (!field.required || !getIsNullOrUndef(map[field.fieldname])) {
+      continue;
+    }
+
+    switch (field.fieldtype) {
+      case FieldTypeEnum.Float:
+      case FieldTypeEnum.Int:
+      case FieldTypeEnum.Check:
+        map[field.fieldname] = 0;
+        break;
+      case FieldTypeEnum.Currency:
+        map[field.fieldname] = '0.00000000000';
+        break;
+      case FieldTypeEnum.Table:
+        continue;
+      default:
+        map[field.fieldname] = '';
+    }
+  }
+}
+
+function deleteOldKeys(map: RawValueMap, newKeys: string[]) {
+  for (const key of Object.keys(map)) {
+    if (newKeys.includes(key)) {
+      continue;
+    }
+
+    delete map[key];
+  }
+}
+
 export default { execute, beforeMigrate: true };
diff --git a/dummy/index.ts b/dummy/index.ts
index e01b7366..20441d54 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -97,10 +97,14 @@ async function getJournalEntries(fyo: Fyo, salesInvoices: SalesInvoice[]) {
   const date = DateTime.fromJSDate(lastInv).minus({ months: 6 }).toJSDate();
 
   // Bank Entry
-  let doc = fyo.doc.getNewDoc(ModelNameEnum.JournalEntry, {
-    date,
-    entryType: 'Bank Entry',
-  });
+  let doc = fyo.doc.getNewDoc(
+    ModelNameEnum.JournalEntry,
+    {
+      date,
+      entryType: 'Bank Entry',
+    },
+    false
+  );
   await doc.append('accounts', {
     account: 'Supreme Bank',
     debit: amount,
@@ -115,10 +119,14 @@ async function getJournalEntries(fyo: Fyo, salesInvoices: SalesInvoice[]) {
   entries.push(doc);
 
   // Cash Entry
-  doc = fyo.doc.getNewDoc(ModelNameEnum.JournalEntry, {
-    date,
-    entryType: 'Cash Entry',
-  });
+  doc = fyo.doc.getNewDoc(
+    ModelNameEnum.JournalEntry,
+    {
+      date,
+      entryType: 'Cash Entry',
+    },
+    false
+  );
   await doc.append('accounts', {
     account: 'Cash',
     debit: amount.percent(30),
@@ -143,7 +151,7 @@ async function getPayments(fyo: Fyo, invoices: Invoice[]) {
       continue;
     }
 
-    const doc = fyo.doc.getNewDoc(ModelNameEnum.Payment) as Payment;
+    const doc = fyo.doc.getNewDoc(ModelNameEnum.Payment, {}, false) as Payment;
     doc.party = invoice.party as string;
     doc.paymentType = invoice.isSales ? 'Receive' : 'Pay';
     doc.paymentMethod = 'Cash';
@@ -220,9 +228,13 @@ async function getSalesInvoices(
     );
     const customer = sample(customers);
 
-    const doc = fyo.doc.getNewDoc(ModelNameEnum.SalesInvoice, {
-      date,
-    }) as SalesInvoice;
+    const doc = fyo.doc.getNewDoc(
+      ModelNameEnum.SalesInvoice,
+      {
+        date,
+      },
+      false
+    ) as SalesInvoice;
 
     await doc.set('party', customer!.name);
     if (!doc.account) {
@@ -361,9 +373,13 @@ async function getSalesPurchaseInvoices(
      * For each supplier create a Purchase Invoice
      */
     for (const supplier in supplierGrouped) {
-      const doc = fyo.doc.getNewDoc(ModelNameEnum.PurchaseInvoice, {
-        date,
-      }) as PurchaseInvoice;
+      const doc = fyo.doc.getNewDoc(
+        ModelNameEnum.PurchaseInvoice,
+        {
+          date,
+        },
+        false
+      ) as PurchaseInvoice;
 
       await doc.set('party', supplier);
       if (!doc.account) {
@@ -413,9 +429,13 @@ async function getNonSalesPurchaseInvoices(
         continue;
       }
 
-      const doc = fyo.doc.getNewDoc(ModelNameEnum.PurchaseInvoice, {
-        date,
-      }) as PurchaseInvoice;
+      const doc = fyo.doc.getNewDoc(
+        ModelNameEnum.PurchaseInvoice,
+        {
+          date,
+        },
+        false
+      ) as PurchaseInvoice;
 
       const party = purchaseItemPartyMap[name];
       await doc.set('party', party);
diff --git a/fyo/index.ts b/fyo/index.ts
index e8e590af..aecfdcb8 100644
--- a/fyo/index.ts
+++ b/fyo/index.ts
@@ -182,13 +182,24 @@ export class Fyo {
     }
 
     let doc: Doc;
+    let value: DocValue | Doc[];
     try {
       doc = await this.doc.getDoc(schemaName, name);
+      value = doc.get(fieldname!);
     } catch (err) {
-      return undefined;
+      value = undefined;
     }
 
-    return doc.get(fieldname!);
+    if (value === undefined && schemaName === name) {
+      const sv = await this.db.getSingleValues({
+        fieldname: fieldname!,
+        parent: schemaName,
+      });
+
+      return sv?.[0]?.value;
+    }
+
+    return value;
   }
 
   purgeCache() {
diff --git a/main/helpers.ts b/main/helpers.ts
index 461233d7..5ab2e837 100644
--- a/main/helpers.ts
+++ b/main/helpers.ts
@@ -18,6 +18,10 @@ export async function setAndGetCleanedConfigFiles() {
       .then(() => true)
       .catch(() => false);
 
+    if (!file.companyName) {
+      continue;
+    }
+
     const key = `${file.companyName}-${file.dbPath}`;
     if (!exists || cleanedFileMap.has(key)) {
       continue;
diff --git a/src/errorHandling.ts b/src/errorHandling.ts
index 4c0b3ec7..374eb45e 100644
--- a/src/errorHandling.ts
+++ b/src/errorHandling.ts
@@ -180,13 +180,8 @@ function getIssueUrlQuery(errorLogObj?: ErrorLog): string {
     body.push('**Stack**:', '```', errorLogObj.stack, '```', '');
   }
 
-  const { fullPath } = (errorLogObj?.more as { fullPath?: string }) ?? {};
-  if (fullPath) {
-    body.push(`**Path**: \`${fullPath}\``);
-  }
-
-  body.push(`**Version**: ${fyo.store.appVersion}`);
-  body.push(`**Route**: ${router.currentRoute.value.fullPath}`);
+  body.push(`**Version**: \`${fyo.store.appVersion}\``);
+  body.push(`**Path**: \`${router.currentRoute.value.fullPath}\``);
 
   const url = [baseUrl, `body=${body.join('\n')}`].join('&');
   return encodeURI(url);
diff --git a/src/renderer.ts b/src/renderer.ts
index 1b3404e5..cac61c41 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -1,8 +1,8 @@
 import { ipcRenderer } from 'electron';
 import { ConfigKeys } from 'fyo/core/types';
-import { groupBy } from 'lodash';
 import { DateTime } from 'luxon';
 import { IPC_ACTIONS } from 'utils/messages';
+import { Version } from 'utils/version';
 import { App as VueApp, createApp } from 'vue';
 import App from './App.vue';
 import Badge from './components/Badge.vue';
@@ -107,6 +107,6 @@ function setOnWindow() {
     // @ts-ignore
     window.DateTime = DateTime;
     // @ts-ignore
-    window.groupBy = groupBy;
+    window.Version = Version;
   }
 }
diff --git a/src/utils/misc.ts b/src/utils/misc.ts
index e133d717..1fb102d8 100644
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@@ -1,5 +1,4 @@
 import { ConfigFile, ConfigKeys } from 'fyo/core/types';
-import { getSingleValue } from 'fyo/utils';
 import { DateTime } from 'luxon';
 import { SetupWizard } from 'models/baseModels/SetupWizard/SetupWizard';
 import { ModelNameEnum } from 'models/types';
@@ -58,20 +57,12 @@ export async function getSetupWizardDoc() {
   );
 }
 
-export async function getSetupComplete(): Promise<boolean> {
-  return !!(await getSingleValue(
-    'setupComplete',
-    ModelNameEnum.AccountingSettings,
-    fyo
-  ));
-}
-
 export async function incrementOpenCount(dbPath: string) {
   const companyName = (await fyo.getValue(
     ModelNameEnum.AccountingSettings,
     'companyName'
   )) as string;
-  
+
   let openCount = 0;
   const files = fyo.config.get(ConfigKeys.Files) as ConfigFile[];
   for (const file of files) {
diff --git a/utils/misc.ts b/utils/misc.ts
index 95c2b549..eb3593ad 100644
--- a/utils/misc.ts
+++ b/utils/misc.ts
@@ -1,4 +1,4 @@
-import countryInfo from 'fixtures/countryInfo.json';
+import countryInfo from '../fixtures/countryInfo.json';
 import { DateTime } from 'luxon';
 import { CountryInfoMap } from './types';
 
diff --git a/utils/version.ts b/utils/version.ts
index 007c0820..69c5f084 100644
--- a/utils/version.ts
+++ b/utils/version.ts
@@ -7,11 +7,19 @@ export class Version {
    */
 
   static gte(a: string, b: string) {
-    return compare(a, b, (c) => c < 0);
+    let valid = false;
+    return compare(a, b, (c) => {
+      if (c === 0) {
+        return false;
+      }
+
+      valid ||= c > 0;
+      return !valid;
+    });
   }
 
   static lte(a: string, b: string) {
-    return compare(a, b, (c) => c > 0);
+    return !Version.gt(a, b);
   }
 
   static eq(a: string, b: string) {

From 8ee4dded19de44fcaeb0f21cfcfce7c6a1582a8c Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 26 May 2022 00:28:54 +0530
Subject: [PATCH 160/163] incr(ui): mainly make the hrs touch the ends

---
 reports/AccountReport.ts                |   1 -
 reports/TrialBalance/TrialBalance.ts    |   1 -
 src/App.vue                             |   2 +-
 src/components/Controls/AttachImage.vue |   2 +-
 src/components/Modal.vue                |   2 +-
 src/components/TwoColumnForm.vue        |   7 +-
 src/pages/ChartOfAccounts.vue           |   4 +-
 src/pages/DatabaseSelector.vue          |   7 +-
 src/pages/InvoiceForm.vue               | 308 +++++++++++-------------
 src/pages/JournalEntryForm.vue          | 218 ++++++++---------
 src/pages/ListView/List.vue             |  22 +-
 src/pages/Settings/Settings.vue         |  72 +++---
 src/pages/Settings/TabInvoice.vue       |  37 ++-
 src/pages/Settings/TabSystem.vue        |   6 +-
 src/pages/SetupWizard/SetupWizard.vue   |  27 ++-
 src/pages/SetupWizard/Slide.vue         |  21 +-
 src/styles/index.css                    |   6 +-
 17 files changed, 355 insertions(+), 388 deletions(-)

diff --git a/reports/AccountReport.ts b/reports/AccountReport.ts
index 5b0eae1c..a6ab85bf 100644
--- a/reports/AccountReport.ts
+++ b/reports/AccountReport.ts
@@ -122,7 +122,6 @@ export abstract class AccountReport extends LedgerReport {
       align: 'left',
       width: ACC_NAME_WIDTH,
       bold: !al.level,
-      italics: al.isGroup,
       indent: al.level ?? 0,
     } as ReportCell;
 
diff --git a/reports/TrialBalance/TrialBalance.ts b/reports/TrialBalance/TrialBalance.ts
index 66c7c6f3..75be94ee 100644
--- a/reports/TrialBalance/TrialBalance.ts
+++ b/reports/TrialBalance/TrialBalance.ts
@@ -156,7 +156,6 @@ export class TrialBalance extends AccountReport {
       align: 'left',
       width: ACC_NAME_WIDTH,
       bold: !al.level,
-      italics: al.isGroup,
       indent: al.level ?? 0,
     } as ReportCell;
 
diff --git a/src/App.vue b/src/App.vue
index e3f486ac..21d041b4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -76,7 +76,7 @@ export default {
       await this.fileSelected(lastSelectedFilePath, false);
     } catch (err) {
       await handleErrorWithDialog(err, undefined, true, true);
-      this.activeScreen = 'DatabaseSelector';
+      await this.showDbSelector()
     }
   },
   methods: {
diff --git a/src/components/Controls/AttachImage.vue b/src/components/Controls/AttachImage.vue
index 13f0ce9c..818f07f0 100644
--- a/src/components/Controls/AttachImage.vue
+++ b/src/components/Controls/AttachImage.vue
@@ -9,7 +9,7 @@
       overflow-hidden
       cursor-pointer
     "
-    :class="{ 'w-20 h-20': size !== 'small', 'w-16 h-16': size === 'small' }"
+    :class="{ 'w-20 h-20': size !== 'small', 'w-12 h-12': size === 'small' }"
     @mouseover="showEdit = true"
     @mouseleave="showEdit = false"
     @click="openFileSelector"
diff --git a/src/components/Modal.vue b/src/components/Modal.vue
index ae31df8f..6b00bb9b 100644
--- a/src/components/Modal.vue
+++ b/src/components/Modal.vue
@@ -14,7 +14,7 @@
     style="background: rgba(0, 0, 0, 0.2); backdrop-filter: blur(4px)"
     v-if="openModal"
   >
-    <div class="bg-white rounded-lg shadow-2xl w-600" v-bind="$attrs">
+    <div class="bg-white rounded-lg shadow-2xl w-form" v-bind="$attrs">
       <slot></slot>
     </div>
   </div>
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 610231e0..84f805b1 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -46,8 +46,11 @@
       <!-- Regular Field Form -->
       <div
         v-else
-        class="grid"
-        :class="{ 'border-b': !noBorder }"
+        class="grid items-center"
+        :class="{
+          'border-b': !noBorder,
+          'h-12': !['AttachImage', 'Text'].includes(df.fieldtype),
+        }"
         :key="`${df.fieldname}-regular`"
         :style="style"
       >
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index e50d8426..68637a68 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -10,11 +10,9 @@
         <div
           class="
             mt-2
-            px-4
             py-2
             cursor-pointer
             hover:bg-gray-100
-            rounded-md
             group
             flex
             items-center
@@ -26,7 +24,7 @@
           ]"
           @click="onClick(account)"
         >
-          <component :is="getIconComponent(account)" />
+          <component :is="getIconComponent(account)" class="ml-2" />
           <div class="flex items-baseline">
             <div
               class="ml-3"
diff --git a/src/pages/DatabaseSelector.vue b/src/pages/DatabaseSelector.vue
index e2bb565d..f35579b0 100644
--- a/src/pages/DatabaseSelector.vue
+++ b/src/pages/DatabaseSelector.vue
@@ -7,7 +7,7 @@
     }"
   >
     <div
-      class="w-full w-600 shadow rounded-lg border relative"
+      class="w-full w-form shadow rounded-lg border relative"
       style="height: 700px"
     >
       <!-- Welcome to Frappe Books -->
@@ -132,7 +132,7 @@
       >
         <LanguageSelector
           v-show="!creatingDemo"
-          class="text-sm w-40 bg-gray-100 rounded-md"
+          class="text-sm w-28 bg-gray-100 rounded-md"
           input-class="py-1.5 bg-transparent"
         />
         <button
@@ -143,7 +143,8 @@
             rounded-md
             px-4
             py-1.5
-            w-40
+            w-28
+            h-8
           "
           @click="createDemo"
           :disabled="creatingDemo"
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 0f11d010..5ca11563 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -30,186 +30,152 @@
     </PageHeader>
 
     <!-- Invoice Form -->
-    <div class="flex justify-center flex-1 mb-8 mt-2" v-if="doc">
-      <div
-        class="
-          border
-          rounded-lg
-          shadow
-          h-full
-          flex flex-col
-          justify-between
-          w-600
-        "
-      >
-        <div>
-          <!-- Print Settings Info (Logo, Address, Etc)  -->
-          <div class="flex text-sm text-gray-900 p-6" v-if="printSettings">
-            <div class="w-1/3">
-              <div v-if="printSettings.displayLogo">
-                <img
-                  class="h-12 max-w-32 object-contain"
-                  :src="printSettings.logo"
-                />
-              </div>
-              <div class="text-xl text-gray-700 font-semibold" v-else>
-                {{ companyName }}
-              </div>
-            </div>
-            <div class="w-1/3">
-              <div>{{ printSettings.email }}</div>
-              <div class="mt-1">{{ printSettings.phone }}</div>
-            </div>
-            <div class="w-1/3">
-              <div v-if="address">{{ address.addressDisplay }}</div>
-            </div>
-          </div>
-          <hr />
+    <div
+      class="
+        border
+        rounded-lg
+        shadow
+        h-full
+        flex flex-col
+        mt-2
+        self-center
+        w-form
+        h-form
+      "
+      v-if="doc"
+    >
+      <div class="p-4 text-2xl font-semibold flex justify-between">
+        <h1>
+          {{ doc.notInserted ? t`New Entry` : doc.name }}
+        </h1>
+        <p class="text-gray-600">
+          {{
+            doc.schemaName === 'SalesInvoice'
+              ? t`Sales Invoice`
+              : t`Purchase Invoice`
+          }}
+        </p>
+      </div>
+      <hr />
 
-          <!-- Invoice Form Data Entry -->
-          <div class="m-6 flex flex-col gap-2">
-            <h1 class="text-2xl font-semibold">
-              {{
-                doc.notInserted
-                  ? doc.schemaName === 'SalesInvoice'
-                    ? t`New Sales Invoice`
-                    : t`New Purchase Invoice`
-                  : doc.name
-              }}
-            </h1>
-
-            <!-- First Row of Fields -->
-            <div class="flex flex-row justify-between gap-2">
-              <FormControl
-                class="bg-gray-100 rounded text-base w-1/3"
-                input-class="text-lg font-semibold bg-transparent"
-                :df="getField('party')"
-                :value="doc.party"
-                :placeholder="getField('party').label"
-                @change="(value) => doc.set('party', value)"
-                @new-doc="(party) => doc.set('party', party.name)"
-                :read-only="doc?.submitted"
-              />
-              <div class="w-1/3" />
-              <FormControl
-                class="w-1/3"
-                input-class="bg-gray-100 px-3 py-2 text-base text-right"
-                :df="getField('date')"
-                :value="doc.date"
-                :placeholder="'Date'"
-                @change="(value) => doc.set('date', value)"
-                :read-only="doc?.submitted"
-              />
-            </div>
-
-            <!-- Second Row of Fields -->
-            <div class="flex flex-row justify-between gap-2">
-              <FormControl
-                class="text-base bg-gray-100 rounded w-1/3"
-                input-class="px-3 py-2 text-base bg-transparent"
-                :df="getField('account')"
-                :value="doc.account"
-                :placeholder="'Account'"
-                @change="(value) => doc.set('account', value)"
-                :read-only="doc?.submitted"
-              />
-              <div class="w-1/3" />
-              <FormControl
-                class="text-base bg-gray-100 rounded w-1/3"
-                input-class="bg-transparent px-3 py-2 text-base text-right"
-                :df="getField('numberSeries')"
-                :value="doc.numberSeries"
-                @change="(value) => doc.set('numberSeries', value)"
-                :read-only="!doc.notInserted || doc?.submitted"
-              />
-            </div>
-          </div>
-          <hr />
-
-          <!-- Invoice Items Table -->
-          <Table
-            class="px-6 text-base mt-4"
-            :df="getField('items')"
-            :value="doc.items"
-            :showHeader="true"
-            :max-rows-before-overflow="4"
-            @change="(value) => doc.set('items', value)"
+      <div>
+        <!-- Invoice Form Data Entry -->
+        <div class="m-4 grid grid-cols-3 gap-4">
+          <FormControl
+            class="bg-gray-100 rounded text-base"
+            input-class="text-lg font-semibold bg-transparent"
+            :df="getField('party')"
+            :value="doc.party"
+            :placeholder="getField('party').label"
+            @change="(value) => doc.set('party', value)"
+            @new-doc="(party) => doc.set('party', party.name)"
+            :read-only="doc?.submitted"
+          />
+          <FormControl
+            input-class="bg-gray-100 px-3 py-2 text-base text-right"
+            :df="getField('date')"
+            :value="doc.date"
+            :placeholder="'Date'"
+            @change="(value) => doc.set('date', value)"
+            :read-only="doc?.submitted"
+          />
+          <FormControl
+            class="text-base bg-gray-100 rounded"
+            input-class="bg-transparent px-3 py-2 text-base text-right"
+            :df="getField('numberSeries')"
+            :value="doc.numberSeries"
+            @change="(value) => doc.set('numberSeries', value)"
+            :read-only="!doc.notInserted || doc?.submitted"
+          />
+          <FormControl
+            class="text-base bg-gray-100 rounded"
+            input-class="px-3 py-2 text-base bg-transparent"
+            :df="getField('account')"
+            :value="doc.account"
+            :placeholder="'Account'"
+            @change="(value) => doc.set('account', value)"
             :read-only="doc?.submitted"
           />
         </div>
+        <hr />
 
-        <!-- Invoice Form Footer -->
+        <!-- Invoice Items Table -->
+        <Table
+          class="text-base"
+          :df="getField('items')"
+          :value="doc.items"
+          :showHeader="true"
+          :max-rows-before-overflow="4"
+          @change="(value) => doc.set('items', value)"
+          :read-only="doc?.submitted"
+        />
+      </div>
 
-        <div v-if="doc.items?.length ?? 0">
-          <hr />
-          <div class="flex justify-between text-base m-6 gap-12">
-            <!-- Form Terms-->
-            <FormControl
-              class="w-1/2 self-end"
-              v-if="!doc?.submitted || doc.terms"
-              :df="getField('terms')"
-              :value="doc.terms"
-              input-class="bg-gray-100"
-              @change="(value) => doc.set('terms', value)"
-              :read-only="doc?.submitted"
-            />
+      <!-- Invoice Form Footer -->
 
-            <!-- Totals -->
-            <div class="w-1/2 gap-2 flex flex-col self-end ml-auto">
-              <!-- Subtotal -->
-              <div class="flex justify-between">
-                <div>{{ t`Subtotal` }}</div>
-                <div>{{ formattedValue('netTotal') }}</div>
+      <div v-if="doc.items?.length ?? 0" class="mt-auto">
+        <hr />
+        <div class="flex justify-between text-base m-6 gap-12">
+          <!-- Form Terms-->
+          <FormControl
+            class="w-1/2 self-end"
+            v-if="!doc?.submitted || doc.terms"
+            :df="getField('terms')"
+            :value="doc.terms"
+            input-class="bg-gray-100"
+            @change="(value) => doc.set('terms', value)"
+            :read-only="doc?.submitted"
+          />
+
+          <!-- Totals -->
+          <div class="w-1/2 gap-2 flex flex-col self-end ml-auto">
+            <!-- Subtotal -->
+            <div class="flex justify-between">
+              <div>{{ t`Subtotal` }}</div>
+              <div>{{ formattedValue('netTotal') }}</div>
+            </div>
+            <hr />
+
+            <!-- Taxes -->
+            <div
+              class="flex justify-between"
+              v-for="tax in doc.taxes"
+              :key="tax.name"
+            >
+              <div>{{ tax.account }}</div>
+              <div>
+                {{
+                  fyo.format(tax.amount, {
+                    fieldtype: 'Currency',
+                    currency: doc.currency,
+                  })
+                }}
               </div>
-              <hr />
+            </div>
+            <hr v-if="doc.taxes?.length" />
 
-              <!-- Taxes -->
-              <div
-                class="flex justify-between"
-                v-for="tax in doc.taxes"
-                :key="tax.name"
-              >
-                <div>{{ tax.account }}</div>
-                <div>
-                  {{
-                    fyo.format(tax.amount, {
-                      fieldtype: 'Currency',
-                      currency: doc.currency,
-                    })
-                  }}
-                </div>
-              </div>
-              <hr v-if="doc.taxes?.length" />
+            <!-- Grand Total -->
+            <div
+              class="
+                flex
+                justify-between
+                text-green-600
+                font-semibold
+                text-base
+              "
+            >
+              <div>{{ t`Grand Total` }}</div>
+              <div>{{ formattedValue('grandTotal') }}</div>
+            </div>
 
-              <!-- Grand Total -->
-              <div
-                class="
-                  flex
-                  justify-between
-                  text-green-600
-                  font-semibold
-                  text-base
-                "
-              >
-                <div>{{ t`Grand Total` }}</div>
-                <div>{{ formattedValue('grandTotal') }}</div>
-              </div>
-
-              <!-- Outstanding Amount -->
-              <hr v-if="doc.outstandingAmount > 0" />
-              <div
-                v-if="doc.outstandingAmount > 0"
-                class="
-                  flex
-                  justify-between
-                  text-red-600
-                  font-semibold
-                  text-base
-                "
-              >
-                <div>{{ t`Outstanding Amount` }}</div>
-                <div>{{ formattedValue('outstandingAmount') }}</div>
-              </div>
+            <!-- Outstanding Amount -->
+            <hr v-if="doc.outstandingAmount > 0" />
+            <div
+              v-if="doc.outstandingAmount > 0"
+              class="flex justify-between text-red-600 font-semibold text-base"
+            >
+              <div>{{ t`Outstanding Amount` }}</div>
+              <div>{{ formattedValue('outstandingAmount') }}</div>
             </div>
           </div>
         </div>
@@ -316,7 +282,7 @@ export default {
         this.schemaName === ModelNameEnum.SalesInvoice
           ? this.t`Submit Sales Invoice?`
           : this.t`Submit Purchase Invoice?`;
-      const ref = this
+      const ref = this;
       await showMessageDialog({
         message,
         buttons: [
diff --git a/src/pages/JournalEntryForm.vue b/src/pages/JournalEntryForm.vue
index d751cb86..5f5b9752 100644
--- a/src/pages/JournalEntryForm.vue
+++ b/src/pages/JournalEntryForm.vue
@@ -25,124 +25,116 @@
     </PageHeader>
 
     <!-- Journal Entry Form -->
-    <div v-if="doc" class="flex justify-center flex-1 mb-8 mt-2">
-      <div
-        class="
-          border
-          rounded-lg
-          shadow
-          h-full
-          flex flex-col
-          justify-between
-          w-600
-        "
-      >
-        <div>
-          <div class="m-6 flex flex-col gap-2">
-            <h1 class="text-2xl font-semibold">
-              {{ doc.notInserted ? t`New Journal Entry` : doc.name }}
-            </h1>
-
-            <!-- First Column of Fields -->
-            <div class="flex flex-row justify-between gap-2">
-              <FormControl
-                class="w-1/3"
-                :df="getField('entryType')"
-                :value="doc.entryType"
-                placeholder="Entry Type"
-                @change="(value) => doc.set('entryType', value)"
-                input-class="bg-gray-100 px-3 py-2 text-base"
-                :read-only="doc.submitted"
-                :class="doc.submitted && 'pointer-events-none'"
-              />
-              <FormControl
-                class="w-1/3"
-                :df="getField('referenceNumber')"
-                :value="doc.referenceNumber"
-                :placeholder="'Reference Number'"
-                @change="(value) => doc.set('referenceNumber', value)"
-                input-class="bg-gray-100 p-2 text-base"
-                :read-only="doc.submitted"
-                :class="doc.submitted && 'pointer-events-none'"
-              />
-              <FormControl
-                :df="getField('numberSeries')"
-                :value="doc.numberSeries"
-                @change="(value) => doc.set('numberSeries', value)"
-                class="bg-gray-100 rounded w-1/3"
-                input-class="p-2 text-base bg-transparent"
-                :read-only="!doc.notInserted || doc.submitted"
-                :class="doc.submitted && 'pointer-events-none'"
-              />
-            </div>
-
-            <!-- Second Row of Fields -->
-            <div class="flex flex-row justify-between gap-2">
-              <FormControl
-                class="w-1/3"
-                :df="getField('date')"
-                :value="doc.date"
-                :placeholder="'Date'"
-                @change="(value) => doc.set('date', value)"
-                input-class="bg-gray-100 px-3 py-2 text-base"
-                :read-only="doc.submitted"
-                :class="doc.submitted && 'pointer-events-none'"
-              />
-              <div class="w-1/3" />
-              <FormControl
-                class="w-1/3"
-                :df="getField('referenceDate')"
-                :value="doc.referenceDate"
-                :placeholder="'Reference Date'"
-                @change="(value) => doc.set('referenceDate', value)"
-                input-class="bg-gray-100 px-3 py-2 text-base"
-                :read-only="doc.submitted"
-                :class="doc.submitted && 'pointer-events-none'"
-              />
-            </div>
-          </div>
-          <hr />
-
-          <!-- Account Entries Table -->
-          <Table
-            class="mt-2 px-6 text-base"
-            :df="getField('accounts')"
-            :value="doc.accounts"
-            :showHeader="true"
-            :max-rows-before-overflow="6"
+    <div
+      class="
+        self-center
+        border
+        rounded-lg
+        shadow
+        flex flex-col
+        mt-2
+        w-form
+        h-form
+      "
+      v-if="doc"
+    >
+      <div class="p-4 text-2xl font-semibold flex justify-between">
+        <h1>
+          {{ doc.notInserted ? t`New Entry` : doc.name }}
+        </h1>
+        <p class="text-gray-600">
+          {{ t`Journal Entry` }}
+        </p>
+      </div>
+      <hr />
+      <div>
+        <div class="m-4 grid grid-cols-3 gap-y-4 gap-x-4">
+          <!-- First Column of Fields -->
+          <FormControl
+            :df="getField('numberSeries')"
+            :value="doc.numberSeries"
+            @change="(value) => doc.set('numberSeries', value)"
+            class="bg-gray-100 rounded"
+            input-class="p-2 text-base bg-transparent"
+            :read-only="!doc.notInserted || doc.submitted"
+            :class="doc.submitted && 'pointer-events-none'"
+          />
+          <FormControl
+            :df="getField('date')"
+            :value="doc.date"
+            :placeholder="'Date'"
+            @change="(value) => doc.set('date', value)"
+            input-class="bg-gray-100 px-3 py-2 text-base"
             :read-only="doc.submitted"
+            :class="doc.submitted && 'pointer-events-none'"
+          />
+          <FormControl
+            :df="getField('entryType')"
+            :value="doc.entryType"
+            placeholder="Entry Type"
+            @change="(value) => doc.set('entryType', value)"
+            input-class="bg-gray-100 px-3 py-2 text-base"
+            :read-only="doc.submitted"
+            :class="doc.submitted && 'pointer-events-none'"
+          />
+          <FormControl
+            :df="getField('referenceNumber')"
+            :value="doc.referenceNumber"
+            :placeholder="'Reference Number'"
+            @change="(value) => doc.set('referenceNumber', value)"
+            input-class="bg-gray-100 p-2 text-base"
+            :read-only="doc.submitted"
+            :class="doc.submitted && 'pointer-events-none'"
+          />
+          <FormControl
+            :df="getField('referenceDate')"
+            :value="doc.referenceDate"
+            :placeholder="'Reference Date'"
+            @change="(value) => doc.set('referenceDate', value)"
+            input-class="bg-gray-100 px-3 py-2 text-base"
+            :read-only="doc.submitted"
+            :class="doc.submitted && 'pointer-events-none'"
           />
         </div>
+        <hr />
 
-        <!-- Footer -->
-        <div v-if="doc.accounts?.length ?? 0">
-          <hr />
-          <div class="flex justify-between text-base m-6 gap-12">
-            <!-- User Remark -->
-            <FormControl
-              v-if="!doc.submitted || doc.userRemark"
-              class="w-1/2 self-end"
-              input-class="bg-gray-100"
-              :df="getField('userRemark')"
-              :value="doc.userRemark"
-              @change="(value) => doc.set('userRemark', value)"
-              :class="doc.submitted && 'pointer-events-none'"
-              :read-only="doc.submitted"
-            />
+        <!-- Account Entries Table -->
+        <Table
+          class="text-base"
+          :df="getField('accounts')"
+          :value="doc.accounts"
+          :showHeader="true"
+          :max-rows-before-overflow="6"
+          :read-only="doc.submitted"
+        />
+      </div>
 
-            <!-- Debit and Credit -->
-            <div
-              class="w-1/2 gap-2 flex flex-col self-end font-semibold ml-auto"
-            >
-              <div class="flex justify-between text-green-600">
-                <div>{{ t`Total Debit` }}</div>
-                <div>{{ totalDebit }}</div>
-              </div>
-              <hr />
-              <div class="flex justify-between text-red-600">
-                <div>{{ t`Total Credit` }}</div>
-                <div>{{ totalCredit }}</div>
-              </div>
+      <!-- Footer -->
+      <div v-if="doc.accounts?.length ?? 0" class="mt-auto">
+        <hr />
+        <div class="flex justify-between text-base m-6 gap-12">
+          <!-- User Remark -->
+          <FormControl
+            v-if="!doc.submitted || doc.userRemark"
+            class="w-1/2 self-end"
+            input-class="bg-gray-100"
+            :df="getField('userRemark')"
+            :value="doc.userRemark"
+            @change="(value) => doc.set('userRemark', value)"
+            :class="doc.submitted && 'pointer-events-none'"
+            :read-only="doc.submitted"
+          />
+
+          <!-- Debit and Credit -->
+          <div class="w-1/2 gap-2 flex flex-col self-end font-semibold ml-auto">
+            <div class="flex justify-between text-green-600">
+              <div>{{ t`Total Debit` }}</div>
+              <div>{{ totalDebit }}</div>
+            </div>
+            <hr />
+            <div class="flex justify-between text-red-600">
+              <div>{{ t`Total Credit` }}</div>
+              <div>{{ totalCredit }}</div>
             </div>
           </div>
         </div>
diff --git a/src/pages/ListView/List.vue b/src/pages/ListView/List.vue
index 19e2a019..330f3902 100644
--- a/src/pages/ListView/List.vue
+++ b/src/pages/ListView/List.vue
@@ -9,14 +9,13 @@
         gap="1rem"
       >
         <div
-          v-for="column in columns"
+          v-for="(column, i) in columns"
           :key="column.label"
-          class="py-4 truncate"
-          :class="
-            ['Int', 'Float', 'Currency'].includes(column.fieldtype)
-              ? 'text-right'
-              : ''
-          "
+          class="py-4 overflow-x-scroll whitespace-nowrap"
+          :class="{
+            'text-right': isNumeric(column.fieldtype),
+            'pr-4': i === columns.length - 1,
+          }"
         >
           {{ column.label }}
         </div>
@@ -39,14 +38,15 @@
             :columnCount="columns.length"
           >
             <ListCell
-              v-for="column in columns"
+              v-for="(column, c) in columns"
               :key="column.label"
               :class="{
-                'text-right': ['Float', 'Currency'].includes(column.fieldtype),
+                'text-right': isNumeric(column.fieldtype),
+                'pr-4': c === columns.length - 1,
               }"
               :doc="doc"
               :column="column"
-            ></ListCell>
+            />
           </Row>
         </div>
         <hr v-if="i !== dataSlice.length - 1" />
@@ -77,6 +77,7 @@ import Button from 'src/components/Button';
 import Paginator from 'src/components/Paginator.vue';
 import Row from 'src/components/Row';
 import { fyo } from 'src/initFyo';
+import { isNumeric } from 'src/utils';
 import { openQuickEdit, routeTo } from 'src/utils/ui';
 import { defineComponent } from 'vue';
 import ListCell from './ListCell';
@@ -138,6 +139,7 @@ export default defineComponent({
     this.setUpdateListeners();
   },
   methods: {
+    isNumeric,
     setPageIndices({ start, end }) {
       this.pageStart = start;
       this.pageEnd = end;
diff --git a/src/pages/Settings/Settings.vue b/src/pages/Settings/Settings.vue
index e82c336f..fef3bec5 100644
--- a/src/pages/Settings/Settings.vue
+++ b/src/pages/Settings/Settings.vue
@@ -1,44 +1,44 @@
 <template>
   <div class="flex flex-col overflow-hidden">
     <PageHeader :title="t`Settings`" />
-    <div class="flex justify-center flex-1 mb-8 mt-2">
-      <div
-        class="border rounded-lg shadow h-full flex flex-col justify-between"
-        style="width: 600px"
-      >
-        <div class="pb-2 mt-8">
-          <Row
-            :columnCount="tabs.length"
-            class="px-6 border-none w-full"
-            gap="0.5rem"
-          >
-            <div
-              v-for="(tab, i) in tabs"
-              :key="tab.label"
-              class="
-                p-2
-                rounded-md
-                hover:bg-white
-                flex flex-col
-                items-center
-                justify-center
-                cursor-pointer
-              "
-              :class="i === activeTab && 'text-blue-500'"
-              @click="activeTab = i"
-            >
-              <component
-                :is="getIconComponent(tab)"
-                :active="i === activeTab"
-              />
-              <div class="mt-2 text-xs">{{ tab.label }}</div>
-            </div>
-          </Row>
-        </div>
-        <div class="flex-1 p-6 overflow-y-auto">
-          <component :is="activeTabComponent" @change="handleChange" />
+    <div
+      class="
+        border
+        rounded-lg
+        shadow
+        h-full
+        flex flex-col
+        justify-between
+        self-center
+        mt-2
+        w-form
+        h-form
+      "
+    >
+      <!-- Icon Tab Bar -->
+      <div class="flex justify-around mb-4 mt-6">
+        <div
+          v-for="(tab, i) in tabs"
+          :key="tab.label"
+          class="
+            p-2
+            rounded-md
+            hover:bg-white
+            flex flex-col
+            items-center
+            justify-center
+            cursor-pointer
+          "
+          :class="i === activeTab && 'text-blue-500'"
+          @click="activeTab = i"
+        >
+          <component :is="getIconComponent(tab)" :active="i === activeTab" />
+          <div class="mt-2 text-xs">{{ tab.label }}</div>
         </div>
       </div>
+      <div class="flex-1 overflow-y-scroll">
+        <component :is="activeTabComponent" @change="handleChange" />
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index 4ecb1cc3..a6783f4d 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -1,6 +1,7 @@
 <template>
-  <div v-if="doc">
-    <div class="flex items-center">
+  <div v-if="doc" class="pb-4">
+    <hr />
+    <div class="flex items-center gap-4 p-4">
       <FormControl
         :df="getField('logo')"
         :value="doc.logo"
@@ -11,30 +12,18 @@
           }
         "
       />
-      <div class="ml-6 flex flex-col">
-        <span class="font-semibold">
+      <div class="flex flex-col">
+        <span
+          class="bg-transparent font-semibold text-xl text-gray-900 px-3 py-2"
+        >
           {{ companyName }}
         </span>
-        <span class="text-lg text-gray-700">
+        <span class="text-lg text-gray-800 px-3 py-2">
           {{ doc.email }}
         </span>
-        <FormControl
-          class="mt-2"
-          :df="getField('displayLogo')"
-          :value="doc.displayLogo"
-          :show-label="true"
-          @change="
-            (value) => {
-              doc.setAndSync('displayLogo', value);
-              forwardChangeEvent(getField('displayLogo'));
-            }
-          "
-          size="small"
-        />
       </div>
     </div>
     <TwoColumnForm
-      class="mt-6"
       :doc="doc"
       :fields="fields"
       :autosave="true"
@@ -78,9 +67,13 @@ export default {
   },
   computed: {
     fields() {
-      return ['template', 'color', 'font', 'email', 'phone', 'address'].map(
-        (field) => this.getField(field)
-      );
+      const fields = ['template', 'color', 'font', 'email', 'phone', 'address'];
+
+      if (this.doc.logo) {
+        fields.unshift('displayLogo');
+      }
+
+      return fields.map((field) => this.getField(field));
     },
   },
   methods: {
diff --git a/src/pages/Settings/TabSystem.vue b/src/pages/Settings/TabSystem.vue
index 7e76cf5f..cffcd8d5 100644
--- a/src/pages/Settings/TabSystem.vue
+++ b/src/pages/Settings/TabSystem.vue
@@ -9,11 +9,11 @@
       @change="forwardChangeEvent"
     />
     <div
-      class="flex flex-row justify-between items-center w-full text-gray-900"
+      class="flex flex-row justify-between items-center w-full text-gray-900 p-6"
     >
       <LanguageSelector
         class="text-sm w-40 bg-gray-100 rounded-md"
-        input-class="py-1.5 bg-transparent"
+        input-class="bg-transparent"
       />
       <button
         class="
@@ -22,7 +22,7 @@
           hover:bg-gray-200
           rounded-md
           px-4
-          py-1.5
+          h-8
           w-40
         "
         @click="checkForUpdates(true)"
diff --git a/src/pages/SetupWizard/SetupWizard.vue b/src/pages/SetupWizard/SetupWizard.vue
index de9d954c..bb8494aa 100644
--- a/src/pages/SetupWizard/SetupWizard.vue
+++ b/src/pages/SetupWizard/SetupWizard.vue
@@ -2,7 +2,6 @@
   <div
     class="py-10 flex-1 bg-white flex justify-center items-center window-drag"
   >
-
     <!-- 0: Language Selection Slide -->
     <Slide
       @primary-clicked="handlePrimary"
@@ -44,22 +43,23 @@
 
       <template #content>
         <div v-if="doc">
-          <div class="flex items-center px-6 py-5 mb-8 bg-brand rounded-xl">
+          <!-- Image Section -->
+          <div class="flex items-center p-4 gap-4">
             <FormControl
               :df="getField('logo')"
               :value="doc.logo"
               @change="(value) => setValue('logo', value)"
             />
-            <div class="ml-2">
+            <div>
               <FormControl
                 ref="companyField"
                 :df="getField('companyName')"
                 :value="doc.companyName"
                 @change="(value) => setValue('companyName', value)"
-                :input-class="
-                  () => [
-                    'bg-transparent font-semibold text-xl text-white placeholder-blue-400 focus:outline-none focus:bg-blue-600 px-3 rounded py-1',
-                  ]
+                input-class="
+                  bg-transparent
+                  font-semibold
+                  text-xl
                 "
                 :autofocus="true"
               />
@@ -67,16 +67,17 @@
                 :df="getField('email')"
                 :value="doc.email"
                 @change="(value) => setValue('email', value)"
-                :input-class="
-                  () => [
-                    'text-base bg-transparent text-white placeholder-blue-400 focus:bg-blue-600 focus:outline-none rounded px-3 py-1',
-                  ]
+                input-class="
+                  text-base
+                  bg-transparent
                 "
               />
             </div>
           </div>
+
           <p
-            class="px-3 -mt-6 text-sm absolute text-red-400 w-full"
+            class="-mt-6 text-sm absolute text-red-400 w-full"
+            style="left: 7.75rem"
             v-if="emailError"
           >
             {{ emailError }}
@@ -95,7 +96,7 @@
 import { ipcRenderer } from 'electron';
 import FormControl from 'src/components/Controls/FormControl.vue';
 import LanguageSelector from 'src/components/Controls/LanguageSelector.vue';
-import TwoColumnForm from 'src/components/TwoColumnForm';
+import TwoColumnForm from 'src/components/TwoColumnForm.vue';
 import { fyo } from 'src/initFyo';
 import { getErrorMessage } from 'src/utils';
 import { getSetupWizardDoc } from 'src/utils/misc';
diff --git a/src/pages/SetupWizard/Slide.vue b/src/pages/SetupWizard/Slide.vue
index 59e63987..87e8135d 100644
--- a/src/pages/SetupWizard/Slide.vue
+++ b/src/pages/SetupWizard/Slide.vue
@@ -1,18 +1,27 @@
 <template>
-  <div class="w-600 shadow rounded-lg border relative" style="height: 700px">
-    <div class="px-6 py-8">
-      <h1 class="text-2xl font-semibold"><slot name="title"></slot></h1>
+  <div class="w-form shadow rounded-lg border relative" style="height: 700px">
+    <!-- Slide Title -->
+    <div class="px-6 py-10">
+      <h1 class="text-2xl font-semibold select-none">
+        <slot name="title"></slot>
+      </h1>
     </div>
+    <hr />
 
-    <div class="px-6 window-no-drag">
+    <!-- Slide Content -->
+    <div class="window-no-drag">
       <slot name="content"></slot>
     </div>
 
+    <!-- Slide Buttons -->
     <div
-      class="flex justify-between px-6 pb-6 window-no-drag absolute w-600"
+      class="flex justify-between px-6 pb-6 window-no-drag absolute w-form"
       style="top: 100%; transform: translateY(-100%)"
     >
-      <Button class="text-sm text-grey-900 w-28" @click="$emit('secondary-clicked')">
+      <Button
+        class="text-sm text-grey-900 w-28"
+        @click="$emit('secondary-clicked')"
+      >
         <slot name="secondaryButton"></slot>
       </Button>
       <Button
diff --git a/src/styles/index.css b/src/styles/index.css
index 345ab652..7d14fe1a 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -53,10 +53,14 @@ html {
   display: none;
 }
 
-.w-600 {
+.w-form {
   width: 600px;
 }
 
+.h-form {
+  height: 800px;
+}
+
 .w-sidebar {
   width: 12rem;
 }

From a09fa62f5ffd26891d4a6850bf590f892f856ae3 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 26 May 2022 15:41:15 +0530
Subject: [PATCH 161/163] incr: image in dummy values - remove getSingle -
 remove SalesInvoiceSettings cause unused

---
 dummy/index.ts                        | 30 +++++++++++++
 dummy/logo.ts                         |  1 +
 fyo/core/docHandler.ts                | 16 ++++---
 fyo/index.ts                          |  2 +-
 models/baseModels/Account/Account.ts  |  4 +-
 models/types.ts                       |  1 -
 schemas/app/SalesInvoiceSettings.json | 64 ---------------------------
 schemas/schemas.ts                    |  2 -
 src/App.vue                           |  4 +-
 src/components/Sidebar.vue            |  2 +-
 src/initFyo.ts                        | 10 ++---
 src/pages/ChartOfAccounts.vue         |  2 +-
 src/pages/GetStarted.vue              |  8 ++--
 src/pages/InvoiceForm.vue             |  4 +-
 src/pages/PrintView/PrintView.vue     |  2 +-
 src/pages/Settings/TabInvoice.vue     |  4 +-
 src/setup/setupInstance.ts            |  6 +--
 17 files changed, 63 insertions(+), 99 deletions(-)
 create mode 100644 dummy/logo.ts
 delete mode 100644 schemas/app/SalesInvoiceSettings.json

diff --git a/dummy/index.ts b/dummy/index.ts
index 20441d54..90d19084 100644
--- a/dummy/index.ts
+++ b/dummy/index.ts
@@ -17,6 +17,7 @@ import {
   purchaseItemPartyMap,
 } from './helpers';
 import items from './items.json';
+import logo from './logo';
 import parties from './parties.json';
 
 type Notifier = (stage: string, percent: number) => void;
@@ -48,6 +49,7 @@ export async function setupDummyInstance(
   notifier?.(fyo.t`Creating Items and Parties`, -1);
   await generateStaticEntries(fyo);
   await generateDynamicEntries(fyo, years, baseCount, notifier);
+  await setOtherSettings(fyo);
 
   const instanceId = (await fyo.getValue(
     ModelNameEnum.SystemSettings,
@@ -56,6 +58,34 @@ export async function setupDummyInstance(
   return { companyName: options.companyName, instanceId };
 }
 
+async function setOtherSettings(fyo: Fyo) {
+  const doc = await fyo.doc.getDoc(ModelNameEnum.PrintSettings);
+  const address = fyo.doc.getNewDoc(ModelNameEnum.Address);
+  await address.setAndSync({
+    addressLine1: '1st Column, Fitzgerald Bridge',
+    city: 'Pune',
+    state: 'Maharashtra',
+    pos: 'Maharashtra',
+    postalCode: '411001',
+    country: 'India',
+  });
+
+  await doc.setAndSync({
+    color: '#F687B3',
+    template: 'Business',
+    displayLogo: true,
+    phone: '+91 8983-000418',
+    logo,
+    address: address.name,
+  });
+
+  const acc = await fyo.doc.getDoc(ModelNameEnum.AccountingSettings);
+  await acc.setAndSync({
+    gstin: '27LIN180000A1Z5',
+  });
+  console.log(acc.gstin, await fyo.db.getSingleValues('gstin'));
+}
+
 /**
  *  warning: long functions ahead!
  */
diff --git a/dummy/logo.ts b/dummy/logo.ts
new file mode 100644
index 00000000..d2d2d6ad
--- /dev/null
+++ b/dummy/logo.ts
@@ -0,0 +1 @@
+export default `data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEASABIAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAEsASwDAREAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD+S6v38/CAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD6K+Av7JH7Sv7T97dWfwF+DPjf4kpYTx22o6to2mra+GNLupQrRWureLtYm03wtpVzIjCSO31HWLaZ4Q0yoYkd14sXmOBwKTxeJpULq8Yylecl3jTipVJLzUWj3Mm4Zz7iGco5NlWLx6g1GpVpU+XD05PaNTE1XTw9OTWqjOrFtapWTZ9i6p/wRY/4KRaZYXt8nwAtNYl0tFfVNJ8P/ABY+Det67p6urvGJdIsPH0t7cSyhG8m2sI7y6mwWihdUdl86PE2SyaX1xx5vhlPD4mMH/wBvOjZersl3PqanhRx3ThOf9ixqumk6lKhmWV1q0L7XpQxrnJu2kYKcn0TSdvzl+IXw2+IXwm8U3/gj4oeCPFfw98YaXsN/4Z8Z6DqfhzW7aOUt5Fw+natbWty1pcqjSWl4kb2t3Fia2mliZXPs0a9HEU1VoVadanLadKcZxfdc0W1ddVutmj4XG4DHZbiJ4TMMJicDiqfx4fFUalCrFPaXJUjGXLK14yScZLWLa1OKrU5AoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA+vP2aP28f2rv2PdK8VaJ+zn8Vf+Fd6Z421DTdV8T23/AAg/w38W/wBp3+kW1zaafP53jrwf4nuLL7Pb3dxH5Wny2kMvmb545HRGXzsdlOX5lKnLG4f20qSlGm/a16fKpNNq1KpTTu0t7vsfT5BxjxJwvTxNHIsx+o08XOnUxEfqeAxPtJ0oyjB3xmFxEocsZSVoOKd7tNpH9H3/AARH/wCCgv7Xn7Xnx++LHgn9oj4uf8LC8MeGfg9J4p0TTP8AhAvhj4T+xa8vjTwtpIvvtvgfwX4a1C5xp+pXtv8AZbu7ns/33mm38+OKSP4vijJ8uy7B4erg8P7GpPE+zlL21epeHsqkrWq1ZpaxTuknpvY/dfCXjbifibOsywmeZn9ew+Hyt4ijT+pZfhuSt9bw1Ln58JhMPOXuVJx5ZSlDW/LdJr+mSvhz99P56/8Agud+3H+1J+x1qv7NFt+zj8UP+FdQfEHT/i1P4vT/AIQr4d+Lv7Xl8MXPw5j0Nt3jvwl4new+wpr2rDbpjWS3P2vN4LgwWxh+w4VyrAZlHHPG0PbOjLDqn+9rU+X2irc/8KpTvfkj8V7W0td3/EvF/i/iLhepkEcizD6isbDMnil9UwOJ9q8PLAqi/wDbMNiHDkVap/D5Obm97mtG34J23/Bb3/gp1BPHLL+0jBeRoSWtrn4NfARYJhgjbI1p8L7W5ABIYeVcRNkDLFcqfrXwtkTX+5NeaxOLv+Ndr8D8bj4t+ICabz5TS+zLKsmSfry5fGX3SR+iH7Jf/BxT8SdM8TaR4Y/bD8DeHPFHgm/uLayu/id8NdJuNA8YeGhK3lya1rfhIXl5oXizT4nMb3dn4dh8K6laWn2q6sbfXruO10e48bMODaEqcqmW1Z06qTaoV5KdOf8AdjUsp02+jm6kW7JuCvJfccNeOOPp4ilh+KMHQxGEnKMJZhgKbo4qhfR1a2G5pUcTBO3NGgsNUjHmlCNaSjSl/VJqHivw347+EGpeNPB2taf4j8KeKvh5qPiDw5r+k3CXWm6xo2reHp73TtRsrhPllt7q1mjljPDANtdVcMo+CVOdLExpVIuFSnWjCcJK0oyjNKUWu6aP6KniaGMyypi8LVhXw2JwM69CtTlzU6tKpQc4ThJbxlFpr8dT/Ltr92P89T6x/Zl/bj/ak/Y6g8ZW37OPxQ/4V1B8QZdBn8Xp/wAIV8O/F39ry+GE1ePQ23eO/CXid7D7CmvasNumNZLc/a83guDBbGHz8dlWAzJ0njaHtnRU1T/e1qfL7Tl5/wCFUp3vyR+K9raWu7/ScP8AF/EXC6xUcizD6isa6LxS+qYHE+1eHVVUX/tmGxDhyKtU/h8nNze9zWjb+jn/AIIl/wDBQz9sH9rr9pP4l+AP2hvi9/wsHwl4f+B2r+MNI0n/AIQD4X+E/sniO18e+ANFg1H7f4H8FeGtTuNmma3qlt9kur2axb7V5z2rXENvLF8XxRk+W5dgqFbB4b2NSeKjTlL21epeDo1pONqtWcV70Yu6Selr2bP3Xwm434o4mz7MMFneZ/XcNQyiriqVP6ll+G5a8cZgqSnz4TCYepK1OrUjyym4e9dx5lFr+nSvhj+gD+dv/guV+3V+1T+x34q/Z0039nL4pf8ACurLx34f+JF94rh/4Qj4c+Lv7VutA1HwfBpMvmeOvCHieWx+yRarfps02Szjn8/dcpM0UJj+y4VyrAZlTxssbQ9s6U6Cpv2tanyqcajl/CqU735V8V7W0tqfh/i9xhxFwviMjp5FmP1GGMo4+eJX1TA4n2kqNTCxpO+MwuIcOVVJq1NxTv7ydlb+Zv8AaQ/4KJ/tjftceB9K+G/7Qvxh/wCFg+C9E8V2PjfTNG/4V98LfCn2bxRpuka7oNlqf9o+CPBHhrVZvJ0rxLrVr9iuL6XT5Ptvny2klzbWk0H3GCybLcuqyr4PDexqypulKXtq9S9OUoTceWrVnFXlCLulfS17Np/gWe8ccU8TYSngM7zT67hKWJhi6dL6ll2G5cRTpVqMKnPhMJh6jtTxFWPJKbg+e7i5Ri18U16Z8mFABQAUAftT/wAEi/8AglxcftteMLv4q/F231TSf2avh9q9vaahHbm6069+LPieEC5m8FaJqcDw3Fhoemwm2m8aa7YypfQwXtnomiTQapfXOreHvmOIs+WV01h8O4yx1aLavZrD03oqsou6c5O/soPRtOUk4pRn+r+Gfh5Li3FSzHM41KeQYKqozUeaE8yxC954SjUTUoUaa5Xiq0GppTjSotVJyqUP2l/4LL/tjwfsI/s/fDn9lX9lpNI+FHjL4kaRe29uPA9lBoc3ww+Duk79Nu7rwzFpwtRoWv8AjHWnk0jR/EECzXtpa6T4wv7aS08QjStYtPmeGstebYytj8fzYilQkm/atzVfEy95Kd788KcfelB2Tcqad4c0X+reKnFK4PyTA8OcO+zy3FY+lOMfqcVReX5XSvTlLDqHL7GtiqrdKlWjecY08VOLjX9nVj/IR8I/jl8WvgV8RdJ+K3wo8e+JPBnjzSNRTUo9d0nVLuGbUX+0C4urLXovNMGv6Rqh8yHWdI1iO807V7We4ttQtriGeRG/RcRhcPi6MsPiKMKtKUeXklFNR0snDrCUd4yjaUWk000fzJlmb5lk+OpZlluMr4XGUqiqKtTqSTqPm5pQrK9q1KpqqtKqpQqxcozjJNo/uw8O+Dv2a/8Agsp+w98M/HPxU8Hac2p+JPD11A2uaGLW38cfB74naXONI8aWvhDXriC61DT7A+INJF3FpepJLpninw2dBvNa0u7hmszF+UzqY7hrNK9LD1JcsJp8k7uliaElzUnUgmk3yStzR96nPnUZJpn9g0MLkPinwjgMZmOFp+0xFCUfbUeVYzK8wpy9li44WtJSnCHt6fMqdROniMP7GVWnJONv4of2yv2SPiT+xV8dfE3wT+JESXT2GNY8HeK7WFodK8deB7+6uodC8V6bG0kxtvtYtJ7XVNMeaabRtas9R0qSe5+yLdT/AKfluY0MzwkMVQdr+7Vpt3lSqpJzpy2va6cZWSlFxlZXsv5P4p4Zx/CecYjKcelJw/e4XExVqeMwk5SVHE01d8vNyuNSm23SqxnTblyqUvlau8+cCgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD+i7/g20/5Oo+Ov/Zv0v/qxvBFfGca/7hhP+wxf+map+5eA/wDyUecf9iV/+p2EP7MK/NT+pz+Tr/g5o/5Dn7Gv/YJ+PP8A6WfCGv0Hgf4My/xYT8sQfzd4/fxuFv8Ar1nP/pWWH8s1feH87hQB/Xf/AMECP2j9a8cfsu/tGfs4eJdSuL8/BayuvFXgL7XP5r2fgv4haX4iOq6BZIUDR6fonizR73WF3SSET+MpIkEcMMSV+d8XYKNLH4LGwil9Zap1rLerRlDlm/OVOSj6Ur7s/prwYz2tjOHs9yLEVJT/ALJhLEYLmd3HCY6nX9pRiraQpYmlOqtXrimlZJI/kQr9EP5lCgD+hn/g26/5PE+Mv/ZtOv8A/q0fhXXx3Gv/ACLcN/2HQ/8ATGIP27wI/wCSozX/ALEFb/1Y5cf2i1+Zn9Vn8kv/AAcx/wDI8fsjf9ip8YP/AE7/AA/r9C4H/hZj/wBfMN/6TWP5q8ff974Z/wCwbNP/AE7gj+Xuvuz+ewoAKACgD2D9n/4KeMP2jvjV8NPgd4Dg83xR8S/Fem+G7GZonnt9KtZ3afWfEOoRxESnSvDOiW+o+IdXaM+ZHpemXciBmUA82MxVPBYWviqr/d0KcptbOTWkYL+9OTjCP96SPUyXKcVnubYDKMGr4jH4mnQg7Nxpxk+arXmlr7PD0Y1K9W2qp05Nan+lL8C/gr4C/Z2+EvgX4L/DLSU0fwZ4A0G10TSoOHurySPdNqGsanPgG71jXNRlu9X1e8bBudQvLiUBFZUX8TxeKrYzEVcTXlzVa03KT6LtGK6RhG0Yrokj+88nynBZHluDyrL6apYXBUY0aa+1JrWdWo/tVa1Ryq1ZP4pyk9Nj+Cn/AIK+fGyX44/8FBPj/q0N895oPgDxBB8HvDMfnLPBZaf8NLZfD2sxWUiO8ZtL7xrD4q1uMo20vq0jAAsa/WuHML9VyfBxatOtB4melm3XfPG/mqTpx/7dP428Ts2eb8a51VU+ejgq6yvDq94whgI+wqqLTa5Z4tYmqrdajPzQr2z4E/qw/wCDaz44XDD9o39m7ULwNbRDw/8AGzwlY7jvikka28DfEC52sxDRyBfhsieWieU6SmVpDPEI/gONsKv9ixqWvv4Wo/vq0V/6f9fkf0b4C5u3/buQzl7q9hm2Gh1TfLg8bL0f+wJWtZ3ve6t+of8AwWL/AGJbL9rz9lbX9c8N6P8Aa/jX8DbLVvH/AMNLi0gR9T1nT7a3iuPGvgIERPcXMXifRLD7TpVjCySTeLdH8OASLA13HP4XDeaPLsfCM5WwuKcaNdN+7Ft2pVuydOTtJv8A5dyn1tb9C8UeEocTcO1q1ClzZtlEKuNwEoxTqVYRipYvB7OUliKUOanBNN4mlQ1tzJ/wGV+uH8YBQAUAFABQAUAFABQAUAFABQAUAFABQAUAFABQB/Rd/wAG2n/J1Hx1/wCzfpf/AFY3givjONf9wwn/AGGL/wBM1T9y8B/+Sjzj/sSv/wBTsIf2YV+an9Tn8nX/AAc0f8hz9jX/ALBPx5/9LPhDX6DwP8GZf4sJ+WIP5u8fv43C3/XrOf8A0rLD+WavvD+dwoA/bj/ggz4wm0D9rP4qeGzM4tPHf7Lfxa0hrbfiKS/0a68LeKLS4KbG3y29po2pxR/NHtju5zvOfLf5fiymp5fh521pY/Dyv2UlUptejco/cj9a8G8U6PEuY0L+7jOHsypOPRzpSw+IjLbVxjSqJbaSlr0f4j19QfkoUAf0M/8ABt1/yeJ8Zf8As2nX/wD1aPwrr47jX/kW4b/sOh/6YxB+3eBH/JUZr/2IK3/qxy4/tFr8zP6rP5Jf+DmP/keP2Rv+xU+MH/p3+H9foXA/8LMf+vmG/wDSax/NXj7/AL3wz/2DZp/6dwR/L3X3Z/PYUAFABQB/Tz/wbffs4wa344+NX7U+uWPmw+CdPs/hH4AuJCjwp4i8Swwa/wCOr6JDH5kWoaT4dh8NaZBOswVrDxfqsLROWV4/heNca40sLgIPWq3iKy68kLwpL0lNzk1benFn9BeBORKri824irQusJCOWYKTs0q+ISrYyaVrqdOgsPTTv8GKqKzvdf1meIdbsvDOga54k1JtmneH9H1PW799yJsstKsp7+6bfKyRptgt5DukdEXGXZVBI/PoRc5whH4pyjFesmkvxZ/SVetDD0a1eppChSqVpvRe5Tg5y1ei0i99D/LZ8V+JNU8ZeKPEni/W5jc614r1/WPEmr3DMzNPqmuajc6pfzMzlnYy3d1K5ZmLEtliTk1+8U4RpU4U4K0acIwiu0YRUUvuR/njia9TFYiviqz5quJrVa9WXepWnKpN666yk3qYFWYn6/f8ELviK/gL/go18KdMa4NtYfE3wx8Rvh1qTb0WORLnwlf+LtKt5d/LC48R+D9EhiRCHNy8BGVDK3znFVH22S4iVruhUo1o/Koqcn8oVJfK5+neEGOeD46y2nzcsMww+PwNR3STUsNPE04v/FXwtJJb8zR/fBX5Kf2Wf51P/BUv9nCL9l79uD41fD7SbA2HgzXtai+JXw/jBU248I/ECM67HY2QH7xbPw5rkuueE4BOBMRoBctMjpcTfsuQ436/leFrSd6sI+wrd/aUfcu/OcOSo7ae/wBNl/DniJkS4e4uzbBU4OGFrVVj8EtLfVsavbKEOvJQrOthlza/uL3kmpP8969g+JCgAoAKACgAoAKACgAoAKACgAoAKACgAoAKAP6Lv+DbT/k6j46/9m/S/wDqxvBFfGca/wC4YT/sMX/pmqfuXgP/AMlHnH/Ylf8A6nYQ/swr81P6nP5Ov+Dmj/kOfsa/9gn48/8ApZ8Ia/QeB/gzL/FhPyxB/N3j9/G4W/69Zz/6Vlh/LNX3h/O4UAfbH/BP39pnwl+yV+0fpfxg8c6N4k17wzB4F+JXhK+07wlbaVd6483jPwXq2gaZPbw6zq2i2BgtdUu7K4vmfUIpVso5zBHPNshfy84wNTMcFLDUpQhN1aFRSqOShalVjOSbjGTu4ppab2vZH1nBWf4bhrPaeaYulXrYeODx+GnTw0acqzeKwlWjTcVVqUoWjUlCU7zT5FKybsn8T16h8mFAH9DP/Bt1/wAnifGX/s2nX/8A1aPwrr47jX/kW4b/ALDof+mMQft3gR/yVGa/9iCt/wCrHLj+0WvzM/qs/kl/4OY/+R4/ZG/7FT4wf+nf4f1+hcD/AMLMf+vmG/8ASax/NXj7/vfDP/YNmn/p3BH8vdfdn89hQAUAFAH+hZ/wR/8AgvH8Ev8Agnx+z/pc1p9l1v4geH7j4w+IXaMRy3V38TLp/EWiSzoFVhLbeDJvC+mESbpAunqGK4CJ+PcR4r61nGMkneNGaw0PJUFySt61VUl8z+2/DHKllPBOS03Hlq42hLNK7tZylj5OvRcl3jhXh6eutoL0Xvn7e3is+CP2Jf2svEqMEuLH9nr4tW9g7FQqapq3grWNH0p23EBwmpX9qxjBDSgeWhDuprjymn7XNMvh0eMw7f8AhjVjKX/kqfoezxlifqfCXEmITtKGSZlGDfSpVwlWlTfn+8nHTrt1P81ev20/gsKAPrX9gnxgfAf7bP7J/ilpzbW1h+0F8KLbUp1Kgx6NrHjPSNF1tvmBUj+yNRvQynbuUld8ZPmL5+bU/bZXmFO128HiHFf3o0pSj/5NFH0vBuK+p8W8N4i/LGGd5bGb7UquKpUav/lKpP12utz/AEqa/Ej+9D+WH/g5T+CsEmk/s4ftE2FlGt1aX/iP4M+KL9YiZri1vYJfG3ga1klVSBBYz2XxAkjSRx+91NjGpLSEfe8E4p82NwTejUMTTXRNNUqr9WnR/wDAT+dvHrKU6eRZ5CCUozr5ViJ296UZp4vBxb/lg4Y1pPrUdup/J/X6AfzeFABQAUAFABQAUAFABQAUAFABQAUAFABQAUAf0Xf8G2n/ACdR8df+zfpf/VjeCK+M41/3DCf9hi/9M1T9y8B/+Sjzj/sSv/1Owh/ZhX5qf1Ofydf8HNH/ACHP2Nf+wT8ef/Sz4Q1+g8D/AAZl/iwn5Yg/m7x+/jcLf9es5/8ASssP5Zq+8P53CgAoAKACgD+hn/g26/5PE+Mv/ZtOv/8Aq0fhXXx3Gv8AyLcN/wBh0P8A0xiD9u8CP+SozX/sQVv/AFY5cf2i1+Zn9Vn8kv8Awcx/8jx+yN/2Knxg/wDTv8P6/QuB/wCFmP8A18w3/pNY/mrx9/3vhn/sGzT/ANO4I/l7r7s/nsKACgDp/BPhTU/HnjPwj4H0VDJrHjPxPoHhTSY1TzGk1PxFqtppFgioXjDlrq8iUIZE3E43rnIzq1I0qVSrL4aVOdSX+GEXJ/gjowmGqYzFYbB0lerisRRw1Jb3qV6kaUFa6veUl1Xqj/UZ8LeG9K8HeGPDnhDQYPsuh+FdC0jw3o1r8n+jaVoen2+madB+7SOP9zZ2sMfyRony/KijCj8JqTlUnOpN3nUnKcn3lNuUn822f6F4ehTwuHoYajHlo4ajSoUo6e7TowjThHRJaRilokuyR+dn/BYrXW8Of8E1/wBqXUFcxm48MeDtC3KpYlfFPxR8DeGWTAVsCVdXMTNjCK5YsoBYezw3DnzvALtUqz/8F0Ks/wD20+H8UK3sOAuIp3tzYfC0e/8AvGYYTD2+ftbeV7n+elX7CfxIFAHWeAtfbwp468F+KVYo3hrxZ4c19XVzGyNo+sWeohlkGShU22Q4GVI3DpWdaHtKVWn/AD05w/8AAouP6nTgqzw2MwmITs8PiaFZO9rOlVhO9+nw7n+plX4Mf6IH5Qf8FsfhinxL/wCCc/xvkjgE+qfDqfwb8TtHJV2ED+GvFWmW2vT/ACBmBTwdq3iZVYqUDOPMKR75E+g4Yr+wzrC62jWVWhLz56cnBf8AgyMD848Wcv8Ar/A2btK9TAvC5hS30+r4mnGs9L7YWpiLdO9ldr+ACv10/i0KACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/ou/4NtP8Ak6j46/8AZv0v/qxvBFfGca/7hhP+wxf+map+5eA//JR5x/2JX/6nYQ/swr81P6nP5Ov+Dmj/AJDn7Gv/AGCfjz/6WfCGv0Hgf4My/wAWE/LEH83eP38bhb/r1nP/AKVlh/LNX3h/O4UAFABQAUAf0M/8G3X/ACeJ8Zf+zadf/wDVo/CuvjuNf+Rbhv8AsOh/6YxB+3eBH/JUZr/2IK3/AKscuP7Ra/Mz+qz+SX/g5j/5Hj9kb/sVPjB/6d/h/X6FwP8Awsx/6+Yb/wBJrH81ePv+98M/9g2af+ncEfy9192fz2FABQB93/8ABMLwYPHn/BQT9krQmj81bT4zeGPF7JhWBX4evP4/YsHdFKKvhks4ySUB2pI2I28nPavscnzCe18NOn/4OtR/9vPsfD7C/XONeGqNr8ua4fFW30wPNjXu1/0D/wDAex/o31+MH90H47f8F39U/s//AIJu/Fa03hP7b8ZfCXSwpMYMnlfEPQta2KHBZiP7I8zEOJNsbMT5IlB+k4TjfOsO/wCWniJf+UZx/wDbup+X+MVTk4DzKN7e1xWW0+mtsdRq2V/+vV9NdO1z+Cqv1k/jYKACgD/Uv+H2pnWvAXgjWTjOreEPDWpnaVK5v9Gsrr5SpKkfveCpK46HFfg1aPLWqx/lqTj90mj/AEQwVT2uDwlX/n5hqFTT+/ShL9Tzn9qHwQnxL/Zr/aB+HrwG5/4Tb4K/FDwvFCocyNc634K1rT7RovLSWQTx3M8MkDRxySJMiMiOwCnfAVfYY7B1r29liqFT5Rqxb+Vk7+RwcQ4RY/Ic6wLjzfW8pzDDpLdyrYSrCNrJu6k01ZNppaH+YtX7kf5/BQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAH9F3/AAbaf8nUfHX/ALN+l/8AVjeCK+M41/3DCf8AYYv/AEzVP3LwH/5KPOP+xK//AFOwh/ZhX5qf1Ofydf8ABzR/yHP2Nf8AsE/Hn/0s+ENfoPA/wZl/iwn5Yg/m7x+/jcLf9es5/wDSssP5Zq+8P53CgAoAKACgD+hn/g26/wCTxPjL/wBm06//AOrR+FdfHca/8i3Df9h0P/TGIP27wI/5KjNf+xBW/wDVjlx/aLX5mf1WfyS/8HMf/I8fsjf9ip8YP/Tv8P6/QuB/4WY/9fMN/wCk1j+avH3/AHvhn/sGzT/07gj+Xuvuz+ewoAKAP2E/4IS+Hk1r/gpJ8I9QdA//AAinhP4s+IV3bMI83w58Q+GlfD8sVPiL5fL+dWIfhUY185xXPlyTEL/n5Uw8P/K0J/8Ath+oeD1D2vHmWTtf6thsyr9NL4Gvh76/9f8Apr16H97Vfkp/ZJ+Hv/BwXfiz/wCCfdxblwv9qfGr4a2AUozGQxweJdT2KwBEZA04yb2KqVjaPO51U/U8Hq+cJ/y4Wu/xhH/24/I/GufLwVKN/wCJmuAhtvZV6lvL+He77W6n8Mdfqh/IQUAFAH+nt+zheHUP2ePgNfmSOU33wY+F14ZYSpikNz4H0OYyRFCVMb79yFSVKkYJFfheNVsZi1tbE1191WaP9BMinz5Jk07p8+VZdO62fNhKLuvJ30PZZI45Y3ilRJIpEaOSORQ8ckbgq6OjAqyMpKsrAhgSCCDXMeq0mmmk01Zp6pp7prqmf5ZvjrQB4U8beMfC4BA8N+KvEOgANu3AaPq13pwDb2Zs/wCjc7mZs9WJya/eaU/aUqdT+enCf/gUVL9T/O/GUfq2LxWH/wCgfE16P/gqrKHn/KctWhzBQAUAFABQAUAFABQAUAFABQAUAFABQAUAf0Xf8G2n/J1Hx1/7N+l/9WN4Ir4zjX/cMJ/2GL/0zVP3LwH/AOSjzj/sSv8A9TsIf2YV+an9Tn8nX/BzR/yHP2Nf+wT8ef8A0s+ENfoPA/wZl/iwn5Yg/m7x+/jcLf8AXrOf/SssP5Zq+8P53Pc/2X9M03Wv2l/2d9H1jT7LVtI1b45/CTTNV0rU7SC/03U9Nv8Ax94ftb7T9QsbqOW2vLK8tpZba7tLmKSC4gkkhmjeN2U8uPlKOBxkotxlHCYiUZRbUoyVGbTTWqaeqa1T1R7HD1OnVz/I6VWEKlKpnGWU6lOpFTp1Kc8bQjOE4STjOE4txlGSakm000z0v/goD4d8P+Ev23P2qfDPhXQ9H8M+G9C+OfxE0zRPD/h/TLLRtE0fTrXxDex22n6VpOmwW1hp9lbRgRwWlpbwwQoAscaqAKwyic6mV4CdScpznhaMpTnJylKTgruUpNtt9W22zv41oUcNxbxHh8NRpYehRzfG06VChThSo0oRrSUYU6dNRhCEVooxiklsj5Br0T5gKAP6Gf8Ag26/5PE+Mv8A2bTr/wD6tH4V18dxr/yLcN/2HQ/9MYg/bvAj/kqM1/7EFb/1Y5cf2i1+Zn9Vn8kv/BzH/wAjx+yN/wBip8YP/Tv8P6/QuB/4WY/9fMN/6TWP5q8ff974Z/7Bs0/9O4I/l7r7s/nsKACgD93f+Dd2wW7/AG9fEFw2zOl/s8/EK/TcCSGk8WfDnTD5ZHAfZqLgk8eWXHUivlOMnbKYL+bGUV/5TrS/Q/YvA+ClxlXl/wA+8jx016vE4Gnp8pv5H9wNflp/W5+DX/BxPctB+wd4WiChhe/tG/D+2ckkFFTwX8TrzcuOpLWipg8bXY9QK+s4NV82qeWCrP8A8q0F+p+OeOMuXg3Dq3x57go+lsLmE7/+S2+Z/ENX6ifySFABQB/pp/sf3K3v7Jf7Lt4ilFu/2dfglcqjEFkWf4aeGZQrEcEqHwSOMjivw/MVbMMeu2NxS+6vM/v3hiXNw1w9LbmyPKZW7XwGHZ9F1xHuH+ZH+1rpw0j9qr9pnSQQRpf7QXxm04FWZ1IsviN4ktgVdlRmB8rhmRWYclVJwP3HLnzZfgZfzYPDP76MGfwDxLD2XEef0/8An3neaw7/AAY6vHfTt2R8+12HiBQAUAFABQAUAFABQAUAFABQAUAFABQAUAf0Xf8ABtp/ydR8df8As36X/wBWN4Ir4zjX/cMJ/wBhi/8ATNU/cvAf/ko84/7Er/8AU7CH9mFfmp/U5/PX/wAFzv2W9L/aO1X9mifUv2mf2Y/2ev8AhEdP+LUUMP7Q/wAR7jwFP4s/ty5+HLySeE44ND1j+04tF/sqNdadzb/ZH1XS1US/aCU+w4Vx8sFHHKOBx2M9pLD3eDoqqqfKq38S848rlze7vfll2PxLxf4dp57UyB1M/wCH8k+rQzJJZ3jpYN4n20sC28Mo0avtFS9mlVb5eV1Ke/Np+Bn/AA7C8L/9JKf+Caf/AIkRqP8A8xNfXf27U/6Emd/+Ecf/AJafjP8AxD7D/wDRe8Bf+Hup/wDMh7D+zz/wTf8ADnhf4/fA3xNB/wAFDP8Agnd4nn8O/GH4Z67D4a8NfH2+v/EfiGXSPGmiahHofh+xfwdCl7rerPbiw0q0aaJbm/uIIWljDlxzYzOp1MHioPJ85pqeGrwc54RKEOalJc837R2jG95O2iTZ6mR8CUMPnWUYhcb8D4h0M0y+ssPh85nOvXdLF0pqjRg8KlOrVceSnFtc05RV1e58Pf8ABSH/AJP4/a+/7OB+Jf8A6kt7XqZL/wAijLv+wOh/6Qj5Hjz/AJLPif8A7HWP/wDT8j4or1D5MKAP6Gf+Dbr/AJPE+Mv/AGbTr/8A6tH4V18dxr/yLcN/2HQ/9MYg/bvAj/kqM1/7EFb/ANWOXH9otfmZ/VZ/JL/wcx/8jx+yN/2Knxg/9O/w/r9C4H/hZj/18w3/AKTWP5q8ff8Ae+Gf+wbNP/TuCP5e6+7P57CgAoA/oD/4NwP+T4Pip/2an44/9W78Da+Q40/5FeH/AOxhS/8AUfFH7T4E/wDJXZj/ANk5i/8A1Z5Qf2t1+Yn9YH4I/wDBxd/yYn4J/wCzlvAP/qvvizX1vBn/ACNqv/YDW/8AT2HPxrxy/wCSPwn/AGP8F/6hZkfxH1+oH8lhQAUAf6Y/7F//ACZ3+yd/2bT8Cf8A1V3havxDM/8AkZZh/wBh2L/9P1D+++Ff+SX4b/7EGT/+q7Dn0vXCe8f5pX7dUccX7bv7Y8USJHFH+1T+0LHHHGoSOONPi34vVERFAVUVQFVVACgAAACv27Kv+RXlv/YBg/8A1Hpn8E8YJLi3ilJJJcR52kloklmeKskuiR8rV3nzgUAFABQAUAFABQAUAFABQAUAFABQAUAFAH9F3/Btp/ydR8df+zfpf/VjeCK+M41/3DCf9hi/9M1T9y8B/wDko84/7Er/APU7CH9mFfmp/U5/J1/wc0f8hz9jX/sE/Hn/ANLPhDX6DwP8GZf4sJ+WIP5u8fv43C3/AF6zn/0rLD+WavvD+dz6B/ZM/wCTqP2Z/wDs4H4Nf+rG8N1x5h/uGO/7A8T/AOmZnt8Nf8lHkH/Y6yr/ANTqB6t/wUh/5P4/a+/7OB+Jf/qS3tc+S/8AIoy7/sDof+kI9Hjz/ks+J/8AsdY//wBPyPiivUPkwoA/oZ/4Nuv+TxPjL/2bTr//AKtH4V18dxr/AMi3Df8AYdD/ANMYg/bvAj/kqM1/7EFb/wBWOXH9otfmZ/VZ/JL/AMHMf/I8fsjf9ip8YP8A07/D+v0Lgf8AhZj/ANfMN/6TWP5q8ff974Z/7Bs0/wDTuCP5e6+7P57CgAoA/fj/AINyLr7P+3N8RYtm/wC3fsveO7Xdu2+Vs+J/wZvd+Nrb8/ZPL25THmb9x2bG+R40V8qo+WPpP/yhiV+p+z+BcuXi/HK1+fh7GR9LZhlU7+fw26b36WP7Zq/MD+sj8Ef+Di7/AJMT8E/9nLeAf/VffFmvreDP+RtV/wCwGt/6ew5+NeOX/JH4T/sf4L/1CzI/iPr9QP5LCgAoA/0yf2MVZP2Pf2UEdSrL+zV8ClZWBVlZfhd4WBVgcEEEYIPIPBr8PzP/AJGWYf8AYbi//T9Q/vvhXThfhv8A7EOT/wDqvw59K1xHvH+Z9+21erqX7Zv7XOoqYyt/+078e71TC4kiK3XxV8VzgxSAkPGRJ8jgkMuGB5r9vytcuWZdHtgcIvuw9NH8DcWT9pxVxNU09/iDOZ6O697McS9H1WujPmKu4+fCgAoAKACgAoAKACgAoAKACgAoAKACgAoA/ou/4NtP+TqPjr/2b9L/AOrG8EV8Zxr/ALhhP+wxf+map+5eA/8AyUecf9iV/wDqdhD+zCvzU/qc/k6/4OaP+Q5+xr/2Cfjz/wClnwhr9B4H+DMv8WE/LEH83eP38bhb/r1nP/pWWH8s1feH87nWeAvGer/Dnx14L+IXh9bN9e8B+LPDnjPRE1GF7nT31fwvrFnremrfW8U1vJPZte2MIuYY7iB5YC6JNEzB1zrUo1qVWjO/JVpzpTs7PlqRcZWdnZ2bs7PXodOCxVXA4zCY6hyutg8TQxVFTTlB1cPVhWp88U4uUeeC5kpJtXSa3N74x/FXxP8AHL4q/EH4xeNI9Li8W/EvxZrXjPxFHolpNY6Qmr69ey316um2dxdXs9tZieVhBDLd3MkceFaaQjcYw2Hp4XD0cNS5vZ0KcaUOZ3lywVlzNJJu27svQ2zTMcRm+Y43NMWqaxOPxNXFV1Ri4UlVrSc5qnCUpuMbvROUml1Z5rW5wBQB/Qz/AMG3X/J4nxl/7Np1/wD9Wj8K6+O41/5FuG/7Dof+mMQft3gR/wAlRmv/AGIK3/qxy4/tFr8zP6rP5Jf+DmP/AJHj9kb/ALFT4wf+nf4f1+hcD/wsx/6+Yb/0msfzV4+/73wz/wBg2af+ncEfy9192fz2FABQB+3n/Bvxq66b/wAFB7CzJAOv/Br4l6QmcZLQ/wBga9hffbojHjnaG7Zr5fi+PNk7f8mJoS+/nh/7cfrfgrV9nxtCP/P7KsfSXy9hW/Kkz+6Kvyo/r4/Cn/g4btDcfsDaXMIUkFh8fvh1ds7BM24fw949sfOj3ncHZrxYCYsv5c7gjyjIR9Xwc7ZvJX3wlZevv0nb8L/I/H/G6PNwZTdk+TOsDK+nu3o4yF1fr71tNbN9Ln8O9fqR/IwUAFAH+nF+ypBLa/svfs3W067J7f4CfB6CZNytsli+Hnh2ORdyFkba6kblZlOMqSMGvw3MHfH41rZ4vEtfOtM/0A4cTjw9kMWrOOTZWmuzWBoJrTTfse+VyHsn+YB+0JrK+I/j78cPEKOJF174v/EvWVkXG2RdU8aa1fB1xHCMMJwwxDEMHiNPuj90wceTCYWH8mGoR/8AAaUV59u5/n1ndX2+dZvXTuq2aZhVT7+0xdWd9l37L0R5BXSeWFABQAUAFABQAUAFABQAUAFABQAUAFABQB/Rd/wbaf8AJ1Hx1/7N+l/9WN4Ir4zjX/cMJ/2GL/0zVP3LwH/5KPOP+xK//U7CH9mFfmp/U5/J1/wc0f8AIc/Y1/7BPx5/9LPhDX6DwP8ABmX+LCfliD+bvH7+Nwt/16zn/wBKyw/lmr7w/ncKACgAoAKAP6Gf+Dbr/k8T4y/9m06//wCrR+FdfHca/wDItw3/AGHQ/wDTGIP27wI/5KjNf+xBW/8AVjlx/aLX5mf1WfyS/wDBzH/yPH7I3/YqfGD/ANO/w/r9C4H/AIWY/wDXzDf+k1j+avH3/e+Gf+wbNP8A07gj+Xuvuz+ewoAKAP1G/wCCL/imPwn/AMFKv2arq4lMdprGo/EDwtOofYJZPEvwr8b6RpkTHow/tq502TYQdzRqBhyrL4PE1P2mSY5LeMaNReXJiKUpf+SqR+h+FWIWG49yGUnaNWeNw8tbXdfLsXSpr/wbKm7dbd9T/QYr8gP7WPxU/wCC/Oni9/4J3+J7khCdJ+Kfwv1BSzSKVMmr3WlZjCfK77dTYFZcRiMu4/epGK+n4Rds5pr+ahXX/kql/wC2n5R4zw5+B8RLT91mOXT3fWrKnpbd/vNnpa73SP4TK/Vj+PQoAKAP9Q34IaedI+C3wh0ookZ0z4X+ANPMce8JGbLwppNsUTzFR9imPau9VfAG5QcgfhOKlzYnEy/mr1pffUkz/QnKIeyyrLKdkvZ5fgoWWy5MNTjZXs7aaXR2Hi3xDaeEvCvibxXfsiWPhjw/rPiG9eQssa2mi6dc6lcs7KrMEWG2csVVmABIUnis6cHUqQprepOMF6ykor8WdWJrxw2GxGJnZQw9CrXm3ty0qcqkr21taL2P8sq7u7m/u7q+vJnuLu9uJru6nkwZJ7m4kaaeZyAAXkldnbAAyx4r95SSSSVkkkl2S0SP87pSlOUpzblKcnKUnu5Sd235tu5XpkhQAUAFABQAUAFABQAUAFABQAUAFABQAUAf0Xf8G2n/ACdR8df+zfpf/VjeCK+M41/3DCf9hi/9M1T9y8B/+Sjzj/sSv/1Owh/ZhX5qf1Ofydf8HNH/ACHP2Nf+wT8ef/Sz4Q1+g8D/AAZl/iwn5Yg/m7x+/jcLf9es5/8ASssP5Zq+8P53CgAoAKACgD+hn/g26/5PE+Mv/ZtOv/8Aq0fhXXx3Gv8AyLcN/wBh0P8A0xiD9u8CP+SozX/sQVv/AFY5cf2i1+Zn9Vn8kv8Awcx/8jx+yN/2Knxg/wDTv8P6/QuB/wCFmP8A18w3/pNY/mrx9/3vhn/sGzT/ANO4I/l7r7s/nsKACgD6R/Y58fRfC39rL9mr4h3M/wBmsPCPxz+FutatNvZAuiW3jPR/7cVmV4yEl0hr2J8tsKuRIrxllbizKj9Yy/HUUrupha8Yr+86UuT/AMmse9wtjVl3EuQY6UuWGGzjLqtV3t+5jiqXttbrR0udPpZ63Wh/pm1+Hn99n5N/8Fv9IbVf+CZ37QkqKHk0e8+EmroCxQhYvjN4As7hl+dEYpaX1w+19wZVYRoZvKx9BwtLlzzB/wB5YiP/AJbVmvxS/wCGPzbxcpOpwDnbWrpSyyrvbRZrgoy6paRm3Z/JXsfwC1+un8XhQBPbW095c29nbRma5up4ra3iUgNLPPIsUUaliFBeRlUFiBk8kDmk2km3okm2/JbjjFzlGMVeUmoxXdt2S+bZ/qjaTp0WkaVpmkwHMOl6fZadCcMMxWVtHbRnDvK4ykQOGkkYfxO5yx/BJS5pSk95Nyfzdz/RWlBUqdOmtqcIQXpCKit23su79WfHP/BR/wCIP/CsP2EP2r/FyzfZrhfgp408NafcgZa31bx3pzeBNHnjGQPNh1TxJZyQ7gyCVUMkciBo29PJaPt82y+na6+tUptd40pe1kv/AAGDufLcdY3+z+DuJMSnyyWU4uhCX8tTGU3g6Ul5qpXi1fS6V01of5vFftJ/CQUAFABQAUAFABQAUAFABQAUAFABQAUAFABQB/Rd/wAG2n/J1Hx1/wCzfpf/AFY3givjONf9wwn/AGGL/wBM1T9y8B/+Sjzj/sSv/wBTsIf2YV+an9Tn8nX/AAc0f8hz9jX/ALBPx5/9LPhDX6DwP8GZf4sJ+WIP5u8fv43C3/XrOf8A0rLD+WavvD+dwoAKACgAoA/oZ/4Nuv8Ak8T4y/8AZtOv/wDq0fhXXx3Gv/Itw3/YdD/0xiD9u8CP+SozX/sQVv8A1Y5cf2i1+Zn9Vn8kv/BzH/yPH7I3/YqfGD/07/D+v0Lgf+FmP/XzDf8ApNY/mrx9/wB74Z/7Bs0/9O4I/l7r7s/nsKAO18P/AA38feK/Cvjjxz4a8H+INc8HfDO30K7+IPifTdMubrRPBtt4n1J9H8OzeItRiRrbS01vVI5NP0v7VJGb27R4LcPIpAynXo06lKlOpCFSu5qjTlJKdVwjzTUI7y5Y6ytstWddDAY3E4bGYzD4WvWwuXxoyxuIp05SpYWOIqOlQdeaXLTVWonCnzNc0k0rtHFqzIysrFWUhlZSQysDkMpGCCCMgjkHkVqcm2q0aP8ATh/ZY+LEXx1/Zs+BPxhS4S5uPiJ8KfA/ijVWR45DDr+o+H7F/EdjK0X7v7Rp2vjUtPulTAS4tpUwNuB+G4/D/VMbi8Nayo4irTj5wU3yP0lDla8mf6AcO5ks4yHJ80UlJ47LcHiKmqdq1ShB14NrTmp1vaQl/eiz5+/4Km+HW8Uf8E8/2tNMSJ5TbfCTV/ERVMEhfB95p/i15TkEbIU0RppO4jjYgg4I7Mhn7POMvl3xEYf+DE6f48x4viJQeI4I4lppX5csq19O2FlDEt/JUrvyR/nPV+zH8MhQB7H+zr4YPjb9oL4FeDAnmHxd8Y/hj4YEe1m3nX/G2iaUE2p87bvte3anzHOF5xXNjanssHi6v/PvDV6n/gFKUv0PVyPD/W87yfCWv9azTL8PbXX22Lo07aa683TU/wBPuvws/wBBD8Gf+Dhr4tp4I/Yj0T4aW9wg1L41fFjwvo1xZmUI8vhfwRFd+OtUu1j3B5ktPEek+DIHXY0aG/jd3RxEsn1nB2H9rmkq7Xu4XD1JJ/8ATyralFfOEqr+XqfjnjdmawnCVHARa9pm2ZYelKN7N4fCKWMqStu+WvTwsXpZc6badk/4h6/UT+SQoAKACgAoAKACgAoAKACgAoAKACgAoAKACgD+i7/g20/5Oo+Ov/Zv0v8A6sbwRXxnGv8AuGE/7DF/6Zqn7l4D/wDJR5x/2JX/AOp2EP7MK/NT+pz+Tr/g5o/5Dn7Gv/YJ+PP/AKWfCGv0Hgf4My/xYT8sQfzd4/fxuFv+vWc/+lZYfyzV94fzuFABQAUAFAH9DP8Awbdf8nifGX/s2nX/AP1aPwrr47jX/kW4b/sOh/6YxB+3eBH/ACVGa/8AYgrf+rHLj+0WvzM/qs/kl/4OY/8AkeP2Rv8AsVPjB/6d/h/X6FwP/CzH/r5hv/Sax/NXj7/vfDP/AGDZp/6dwR/L3X3Z/PYUAfrr+xrosyf8Ew/+CtXiKRMW9xY/se6LaSB/vTWnxj1e+1FGTGPkS+0tkfP8cgwOp+dzKS/t3h6HVPMpP0eGio/lI/TeFqTXh94lV2tJQ4YpRd+sc0qzmrek6dn6n5FV9EfmR/bZ/wAG9Hx9X4j/ALH3iL4L6jemfXv2fPHl/Y2Vs4G+LwH8R5r/AMXeHpDKTvmP/CUjx7aKrZ+y2lnZQKVhEMa/l/GOE9hmUMVFWhjKSbf/AE+o2pz/APKfsX5tt73P608Es6+v8L18qnO9bJMZOEIvdYPHOeKoO/X/AGj67H+7GEI7WR+xX7R/gwfEf9nn47/D0wm4/wCE6+DXxO8HrCoZnlfxJ4K1vR0RAkcz+YXvF8spFI4faUjdgFPzeCq+xxmErbeyxNCpf/BVjLy7dz9Qz3CfX8kzjA25vrmVZhhba3ft8JVpK1k3e8tLJu+yuf5hNfuh/n2FAH6Ef8EpfA0nxC/4KI/soaFHCJv7N+J9t45cN91I/hno2r/EV5iSCAYh4W3x5xmURqp3MtePxBV9jk2YTvbmoOl/4PlGjb5+0+4+28OMG8dxxw3RSv7PMI4x+SwFKrjr/L6vp52W5/orV+NH9xn8Uf8AwcQ/HmP4hftbeDPgppd+bnSPgF8PbdNWtg+YrTx78TGs/E+tKqgbCT4PtPh8HbczLMJ4WCNEwP6dwbhPY5dVxUlaWLrPlfejQvTj/wCVHW+Vmfyf44ZysbxLhMppz5qWS4JKpG+kcZmHJiKq/wDCWGCv1vdaWP5/a+vPxYKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA/ou/wCDbT/k6j46/wDZv0v/AKsbwRXxnGv+4YT/ALDF/wCmap+5eA//ACUecf8AYlf/AKnYQ/swr81P6nP5Ov8Ag5o/5Dn7Gv8A2Cfjz/6WfCGv0Hgf4My/xYT8sQfzd4/fxuFv+vWc/wDpWWH8s1feH87hQAUAFABQB/Qz/wAG3X/J4nxl/wCzadf/APVo/CuvjuNf+Rbhv+w6H/pjEH7d4Ef8lRmv/Ygrf+rHLj+0WvzM/qs/kl/4OY/+R4/ZG/7FT4wf+nf4f1+hcD/wsx/6+Yb/ANJrH81ePv8AvfDP/YNmn/p3BH8vdfdn89hQB/R18BfhRe+Bv+De79rzx/qdnJb3Pxl+JXh/xHpE8kIiN14T8LfFf4P+B9PZCcyTRp4k0LxgySsVjZZQsUQCtNcfF4vEKrxhl1GLusNQnCSvtUqYfE1X6e5On/Wi/dcmy2eD8E+JsbUi4yzXH0a9JtW5sNh8yyvBw82lXo4pp7a6Lq/5xa+0Pwo/Wv8A4IuftV237MX7avhCz8TaoNN+HHxwth8I/GM07RrZWGoa3eW83gTXrl5NsdtHp3i+LTtPvdQklii0/Q9b1q6mYxowr57ibL3jssqOEeathX9YpJbtRTVWC781NyaW7nGKR+l+FPEceH+K8NDEVPZ4DN4/2Zim7ckKlWUXg60m7KKp4pQhKbaUKNarJ6I/vzr8jP7OP8yL9q/4WS/BH9pr4+fCV7V7S38AfFvx54c0qJ1kUSaBZeI9Q/4Ry8iEoWQ2+oaA+m39q7gGS3uYn/izX7jl+I+tYHCYi93Ww9Kcv8bgudeqnzJ+aP4A4ky55TxBnWW8vJHBZnjaFNa60IV5+wkr68s6Ps5xvvGSPn6uw8U/f7/g3V+Fsni39srxx8S7m083TPhJ8HNbe3vCjMLXxT461jSfDmlRhgyrG914bj8a4ZhJuSB0CfMZI/keMsR7PLaVBP3sRiY3XenSjKcvun7L7z9p8DsueJ4pxmPlG9PLMrquMrfDiMZVpUKav0csOsX30TXmf2JfGn4s+E/gR8JviJ8Y/HV4ll4U+G3hHWvFusyGRY5biHSbOS4h0yz3BvN1PWLsW+k6VaojzXmpXtpawRyTTIjfm+Fw9TF4ijhqSvUr1I04+Tk7OT/uxV5SfSKbeiP6gzXMsNk+W47NMZJQw2Aw1XE1XezkqUXJU4d6lWXLTpxSblUnGKTbSP8AM3+MXxR8S/G74rfEb4v+MZUl8UfEvxn4i8a635WBbwXviHU7nUns7RVSNY7KwWdbKxiVESG0t4YkRVQKP2/DUIYXD0cNT/h0KUKUe7UIqN35u133bZ/AuaZjiM3zLHZpimniMfiq+Lq22U69SVRwjorQhdQgkklGKSWh5vW5wBQAUAFABQAUAFABQAUAFABQAUAFABQAUAFAH9F3/Btp/wAnUfHX/s36X/1Y3givjONf9wwn/YYv/TNU/cvAf/ko84/7Er/9TsIf2YV+an9Tn8nX/BzR/wAhz9jX/sE/Hn/0s+ENfoPA/wAGZf4sJ+WIP5u8fv43C3/XrOf/AErLD+WavvD+dwoAKACgAoA/oZ/4Nuv+TxPjL/2bTr//AKtH4V18dxr/AMi3Df8AYdD/ANMYg/bvAj/kqM1/7EFb/wBWOXH9otfmZ/VZ/JL/AMHMf/I8fsjf9ip8YP8A07/D+v0Lgf8AhZj/ANfMN/6TWP5q8ff974Z/7Bs0/wDTuCP5e6+7P57PsD9iv9i34vftu/GLRPhn8NtGv4dAjv7Cb4i/ESXT5pvDPw68LSXA+3axq12TBazapJax3I8O+HBdw6h4i1GNbW2MNrHfX9j52Z5nhsrw069eSc7NUaN0p1qltIxWrUb2552ahHV3dk/p+FOFMz4tzSll+ApTVFTg8djnBvD4HDt+/VqS0i6jipewocynXmuWNoqc4f2Lf8FQfhX4O+B//BH34yfCH4fad/Zfgz4c+Afg/wCE/D1mz+bP9g0j4u/DW2F1fXBAa71PUJVl1DVL6XM19qN1dXk5aad2P5vkWIqYriPDYms+arWrYmpN9Lyw9d2S6RW0VsopJbH9ReIOXYXKPDDNMswUPZ4TA4LLMNQje8uSlmeAjzTl9qpN3nUm9Z1JSk9Wz+Cmv1k/jYVWZGVlYqykMrKSGVgchlIwQQRkEcg8igNtVo0f3jf8EcP+Chul/tgfAvT/AIZ+P9fgb9ov4NaLYaN4rtr+6VdT+IHhGxSLT9C+JNis8r3Gp3MkK22l+OJYjI9p4lCandx2dp4m0iFvyfiTJpZdinXowf1LEycqbS92jUes6DsrRV7ypd4e6ruEj+xvC3jenxPk9PL8bWX9uZVShSxMZy/eY3DQShRx8LvmqSa5aeLau44j95JRjiKSPw8/4OFv2aL74b/tT+Hv2htH0ox+Dfj/AOFdPg1jUYEb7PB8T/AVlbeH9WtLhIwYbQ6n4Oh8IanZu5ik1a9i8RzrHJLZXk7/AFPB2OVfATwcpfvcHUbjF7uhWbnFrq+Wo6kX/KnBdUj8j8bcgngOIqGd0qdsLnWGgqtRJ8qzDBQjQqxkl7sPaYVYWpDVOrNV5WbhOT/n7r68/FT+43/ggP8Asy3vwV/Y9vfi14jsJbDxZ+0p4jg8ZW8NxG8FxF8NvDMF3ovw9FxDLCj/APE0lu/FXi3T7lJZbe70LxTo88QjYy7/AMs4uxyxWZLDwd6eBg6Ttqvb1GpVrO/2UqdOS3U6ckz+uvBjIJ5TwvPMq8HDE59XWKipJqSwGHUqWBuml/EcsRiYSTanRxFJq2t/y7/4L0f8FD9P+LHiiD9jb4P64l94C+HWu/2n8adf0+aT7N4m+JOkTXFrp/ge3kVI0u9E8BP517rEiz3Vlqfi+5toRBbz+CoLu/8Ae4TyZ4em8yxMLVq0OXCwa1hQkk3VfaVbaOicaabu1VaX574yccQzLELhbK6yngsDW9pmtaDfLiMfScowwkXZKVHBu86rTlCpipRVovCKU/5tq+1PwcKACgAoAKACgAoAKACgAoAKACgAoAKACgAoA+vP2aPjJ+yj8L9K8VWn7Rn7Gf8Aw1Jqerahptz4Y1f/AIaI+JHwR/4RGwtra5i1DTvsHgXS9Qt9e/tO4lt7n7ZqDRzWX2byYFZJnI87HYbMK8qbwWZ/UIxUlUj9ToYr2jbVpXqyThyq6stHe72Pp8gzThvL6eJjnvCv+sVSrOnLD1f7cx+U/VoRjJTp8mDpzjW9pJxlzTs4ctlo2fpP+zZ/wVp/ZD/ZD8Va742/Z3/4Jk/8K98T+JvD58La3qf/AA2f8TvFn23QW1Gx1Y2P2Lxx8N/Eun22dQ02yuPtVpaQXn7nyhceRJLHJ4mN4ezHMacKWMzz21OE/aRj/ZlCnafK43vSrwb0k1ZtrXa595kPiVwxwzia2LyPw/8AqOIxFD6vWqf61Zhieej7SFXk5MXgMRCPv04S5oxjPS3NZtP7M/4ibv8AqyT/AM2S/wDxB15v+o3/AFNP/LL/AO+z6r/iP/8A1SX/AJnv/wADHyd+01/wWL/Zb/bFn8G3P7R3/BNX/hYs/wAPoteg8IP/AMNj/ETwj/ZEXid9Ik1xdvgT4YeGEv8A7c+g6Sd2pretbfZMWZtxPcib0MDw3j8tVVYLO/Yqs4Op/wAJtGpzez5uT+LXqWtzy+G1763srfNcQeKPDvFDwss94C+vPBKssK/9acdhvZLEOk6y/wBjy/DqfO6NP+Jz8vL7vLeV/wA3f2jPjr+xp8SvAlloH7P37CH/AAzP43g8TWGqXnxA/wCGoPip8Zft/hy30/Vra+8Lf8Ip410iw0i1/tG/vNK1L+24pjfWn9j/AGOGNodQuWX2sFhMzoVXPGZt9epODiqP1DD4a024tVPaUpOT5UpR5bWfNd6pHwme5xwrj8HCjkvB39gYtYiFSWN/1hzHNeehGFWM8P8AVsXShSjzzlTqe2T54+y5UrTkfEdeofJBQAUAfWP7Mvxe/Zb+FsHjKP8AaO/Y/wD+Gp59bl0F/CFx/wANA/ET4H/8IRFp6auuuQ+V4E0zUE8S/wDCQveaS/mamYm0n+xttmHGo3O3z8dhsfXdL6lmX1BRU/aL6nRxXtb8vI/3slyclpfD8XNr8KPpOH8z4dy5YpZ7wx/rE6rovCy/trHZR9UUFV9srYOnNV/budN3qW9n7L3b88rfpZ+zd/wVi/Y+/ZF8Y6z4/wD2ef8AgmN/wr7xb4g8M3Hg/V9W/wCG0fih4s+1+HLrVNK1qfTvsHjj4c+JdMt9+p6Jpdz9rtbKG+X7L5KXS281xFL4mN4fzLMacaOMzz21OE1UjH+zKFO01GUVK9KtCT92UlZtrW9rpH32Q+JPC/DOKq43JPD/AOpYmvh5YWrU/wBa8wxPNQlUp1XDkxeBxFON6lKnLmjBT92ylyuSf2l/xE3f9WSf+bJf/iDrzP8AUb/qaf8All/99n1f/Ef/APqkv/M9/wDgY+SP2mf+Cwv7K37Yl94R1L9o3/gml/wsW98CWmsWPhSb/hsn4jeEf7Ktdfm0+fVovL8C/DLwxFffa5dKsH36lHeSQeRttnhWWYSehgeHMflqqRwWd+xVVxdRf2bRqczgmo/xa9S1uZ/Da99b6HzOf+KHDvFE8NUz3gH69PBxqwwz/wBacdhvZxrOEqqtg8vw6nzOnB3qKTVvdau7/POg/trf8E0PDl9HqOn/APBIPRLi4idHWPXv21PjB4qsSU3YEml+J/A2saZMh3HfHNaPHJhd6tsTb2TyzPJrlfEckn/JlmGpv/wKnVjJfJniUeLOAaE1OHhjSlJNO1bivNMRDTvTxGDq02tdU4tPrsj9DPAn/BxZ4C+F3huy8HfDX/gnh4U+H/hPTsmx8NeDPjlpXhnQrVmREeSHStG/Z5s7JJZFijEswh82XYpldyAa8erwZWrzdSvnNStUlvOrhZTm/WUsY3bsr6H2+D8csFl1CGFwHA+GwWGp/Bh8Lm9PD0Y6JNqnSySME3ZXdru2rZ4f+2f/AMF3f+GvP2Zvih+zr/wyx/wr3/hZNp4atf8AhMf+F4f8JZ/Yv/CPeNPDni/f/wAI/wD8Kg8Nf2j9s/4R/wDs/b/blj9n+1/a90/2f7NN1ZZwp/Z2OoY36/7b2Dm/Z/VfZ83PSnT+P6zPltz3+B3tbS915HFXjF/rNkGYZH/q79S+vxoR+tf2v9Z9l7DFUMTf2H9mYfn5vY8n8aHLzc2vLyv+fGvsD8TCgD0P4UfFf4hfA/4heFvip8K/FOp+DfHng3U4tV0DX9KlCT206Bo5re4hkWS21DTNQtpJrDVtJv4bnTtV065udP1C2uLO4mhfHEYejiqNTD4inGrSqx5Zwls10ae6knZxkmpRkk000md2W5ljsox2HzHLsRUwuMwtRVKNam7OLWjjJO8Z05xbhUpzUoVISlCcZRk0/wCkKD/gr7+yB+3X+z7dfs5/8FG/AHiT4faneixu1+K3wv0mXXtC0zxNo6J/Znjjw9ZRR6z4t8G+Id019DPp1rovi7SLvTbvUdKvJ5dK1W600fFPhzMcqxixuS1oVoq6+r15ck5U5fFSm3y06sNE1JypyUlGSSlFSP3ZeJ3DHGGSSyLjrBV8FUnyS/tLL6TrUaeIpJezxdCCVXE4WvrNOEaWJpSpynTm3TqSpnxB4A/Zo/4JB/D7xtD44+Kv/BRHWfjR8ONL1Ianpfwn8F/s7fFnwh4p8W2ttcLcW2ieJvEtxaajHpdtMsT2OqrbWfh241K1Zrmw13w7PPAkfq1sdxHWpOlh8mjhq0o8ssRVxmHqU6bas5QgnHma3jdzUXo4TSZ8lgsg8McFi1jMx44q5rgKc/aU8twmR5lhcTiYxfNGjiK8o1FTi7OFTlhQdSL5oVqDaS+if23f+C8niH4heCrj4HfsVeD9X+Bvw3GkReGJfiLqhsNO+Ikvhq1tI9Ni0PwRoeh3F7pPw505LGI2cOq2+rax4i+wPbnSm8I3tszScWV8Jwo1ViszqRxVfmdT2Mbujzt8zlVnNKVaV3flcYwvfm9ome3xb4x18dhJZRwphauUYD2Sw7x1Tkhjnh4xVNUcJRoynSwNPkXKqkatWvycvs3hpx1/nRZmdmd2LMxLMzEszMxyWYnJJJOSTyTya+zPw3cSgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAKACgAoAA/9k=`;
diff --git a/fyo/core/docHandler.ts b/fyo/core/docHandler.ts
index 76bba70c..f40343a2 100644
--- a/fyo/core/docHandler.ts
+++ b/fyo/core/docHandler.ts
@@ -1,7 +1,7 @@
 import { Doc } from 'fyo/model/doc';
 import { DocMap, ModelMap, SinglesMap } from 'fyo/model/types';
 import { coreModels } from 'fyo/models';
-import { NotFoundError } from 'fyo/utils/errors';
+import { NotFoundError, ValueError } from 'fyo/utils/errors';
 import Observable from 'fyo/utils/observable';
 import { Schema } from 'schemas/types';
 import { getRandomString } from 'utils';
@@ -50,9 +50,17 @@ export class DocHandler {
 
   async getDoc(
     schemaName: string,
-    name: string,
+    name?: string,
     options = { skipDocumentCache: false }
   ) {
+    if (name === undefined) {
+      name = schemaName;
+    }
+
+    if (name === schemaName && !this.fyo.schemaMap[schemaName]?.isSingle) {
+      throw new ValueError(`${schemaName} is not a Single Schema`);
+    }
+
     let doc: Doc | undefined;
     if (!options?.skipDocumentCache) {
       doc = this.#getFromCache(schemaName, name);
@@ -69,10 +77,6 @@ export class DocHandler {
     return doc;
   }
 
-  async getSingle(schemaName: string) {
-    return await this.getDoc(schemaName, schemaName);
-  }
-
   getNewDoc(
     schemaName: string,
     data: DocValueMap = {},
diff --git a/fyo/index.ts b/fyo/index.ts
index aecfdcb8..edeefd25 100644
--- a/fyo/index.ts
+++ b/fyo/index.ts
@@ -108,7 +108,7 @@ export class Fyo {
     await this.#initializeMoneyMaker();
 
     this.doc.registerModels(models, regionalModels);
-    await this.doc.getSingle('SystemSettings');
+    await this.doc.getDoc('SystemSettings');
     this._initialized = true;
   }
 
diff --git a/models/baseModels/Account/Account.ts b/models/baseModels/Account/Account.ts
index 58bff4e5..97c5238f 100644
--- a/models/baseModels/Account/Account.ts
+++ b/models/baseModels/Account/Account.ts
@@ -58,9 +58,7 @@ export class Account extends Doc {
     return {
       parentField: 'parentAccount',
       async getRootLabel(): Promise<string> {
-        const accountingSettings = await fyo.doc.getSingle(
-          'AccountingSettings'
-        );
+        const accountingSettings = await fyo.doc.getDoc('AccountingSettings');
         return accountingSettings.companyName as string;
       },
     };
diff --git a/models/types.ts b/models/types.ts
index 535f314e..6cb25110 100644
--- a/models/types.ts
+++ b/models/types.ts
@@ -20,7 +20,6 @@ export enum ModelNameEnum {
   PurchaseInvoiceItem = 'PurchaseInvoiceItem',
   SalesInvoice = 'SalesInvoice',
   SalesInvoiceItem = 'SalesInvoiceItem',
-  SalesInvoiceSettings = 'SalesInvoiceSettings',
   SetupWizard = 'SetupWizard',
   Tax = 'Tax',
   TaxDetail = 'TaxDetail',
diff --git a/schemas/app/SalesInvoiceSettings.json b/schemas/app/SalesInvoiceSettings.json
deleted file mode 100644
index 6779c82a..00000000
--- a/schemas/app/SalesInvoiceSettings.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "name": "SalesInvoiceSettings",
-  "label": "Sales Invoice Settings",
-  "isSingle": true,
-  "isChild": false,
-  "fields": [
-    {
-      "fieldname": "template",
-      "label": "Template",
-      "placeholder": "Template",
-      "fieldtype": "Select",
-      "options": [
-        {
-          "value": "Basic I",
-          "label": "Basic I"
-        },
-        {
-          "value": "Basic II",
-          "label": "Basic II"
-        },
-        {
-          "value": "Modern",
-          "label": "Modern"
-        }
-      ],
-      "required": true,
-      "default": "Basic I"
-    },
-    {
-      "fieldname": "font",
-      "label": "Font",
-      "placeholder": "Font",
-      "fieldtype": "Select",
-      "options": [
-        {
-          "value": "Montserrat",
-          "label": "Montserrat"
-        },
-        {
-          "value": "Open Sans",
-          "label": "Open Sans"
-        },
-        {
-          "value": "Oxygen",
-          "label": "Oxygen"
-        },
-        {
-          "value": "Merriweather",
-          "label": "Merriweather"
-        }
-      ],
-      "required": true,
-      "default": "Montserrat"
-    },
-    {
-      "fieldname": "themeColor",
-      "label": "Theme Color",
-      "fieldtype": "Data",
-      "required": true,
-      "default": "#000000",
-      "hidden": true
-    }
-  ]
-}
diff --git a/schemas/schemas.ts b/schemas/schemas.ts
index a6eb8b65..bf48e0d1 100644
--- a/schemas/schemas.ts
+++ b/schemas/schemas.ts
@@ -18,7 +18,6 @@ import PurchaseInvoice from './app/PurchaseInvoice.json';
 import PurchaseInvoiceItem from './app/PurchaseInvoiceItem.json';
 import SalesInvoice from './app/SalesInvoice.json';
 import SalesInvoiceItem from './app/SalesInvoiceItem.json';
-import SalesInvoiceSettings from './app/SalesInvoiceSettings.json';
 import SetupWizard from './app/SetupWizard.json';
 import Tax from './app/Tax.json';
 import TaxDetail from './app/TaxDetail.json';
@@ -75,7 +74,6 @@ export const appSchemas: Schema[] | SchemaStub[] = [
 
   SalesInvoice as Schema,
   SalesInvoiceItem as Schema,
-  SalesInvoiceSettings as Schema,
 
   Tax as Schema,
   TaxDetail as Schema,
diff --git a/src/App.vue b/src/App.vue
index 21d041b4..53cecb79 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -116,8 +116,8 @@ export default {
       await this.setDesk(filePath);
     },
     async setDeskRoute() {
-      const { onboardingComplete } = await fyo.doc.getSingle('GetStarted');
-      const { hideGetStarted } = await fyo.doc.getSingle('SystemSettings');
+      const { onboardingComplete } = await fyo.doc.getDoc('GetStarted');
+      const { hideGetStarted } = await fyo.doc.getDoc('SystemSettings');
 
       if (hideGetStarted || onboardingComplete) {
         routeTo('/');
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index e285c183..221ab6b6 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -128,7 +128,7 @@ export default {
     Icon,
   },
   async mounted() {
-    const { companyName } = await fyo.doc.getSingle('AccountingSettings');
+    const { companyName } = await fyo.doc.getDoc('AccountingSettings');
     this.companyName = companyName;
     this.groups = getSidebarConfig();
 
diff --git a/src/initFyo.ts b/src/initFyo.ts
index 5cc4ef48..6ff3a1d7 100644
--- a/src/initFyo.ts
+++ b/src/initFyo.ts
@@ -37,8 +37,8 @@ export async function initializeInstance(
 }
 
 async function setSingles(fyo: Fyo) {
-  await fyo.doc.getSingle(ModelNameEnum.AccountingSettings);
-  await fyo.doc.getSingle(ModelNameEnum.GetStarted);
+  await fyo.doc.getDoc(ModelNameEnum.AccountingSettings);
+  await fyo.doc.getDoc(ModelNameEnum.GetStarted);
 }
 
 async function setCreds(fyo: Fyo) {
@@ -58,15 +58,13 @@ async function setVersion(fyo: Fyo) {
 
   const { appVersion } = fyo.store;
   if (version !== appVersion) {
-    const systemSettings = await fyo.doc.getSingle(
-      ModelNameEnum.SystemSettings
-    );
+    const systemSettings = await fyo.doc.getDoc(ModelNameEnum.SystemSettings);
     await systemSettings?.setAndSync('version', appVersion);
   }
 }
 
 async function setInstanceId(fyo: Fyo) {
-  const systemSettings = await fyo.doc.getSingle(ModelNameEnum.SystemSettings);
+  const systemSettings = await fyo.doc.getDoc(ModelNameEnum.SystemSettings);
   if (!systemSettings.instanceId) {
     await systemSettings.setAndSync('instanceId', getRandomString());
   }
diff --git a/src/pages/ChartOfAccounts.vue b/src/pages/ChartOfAccounts.vue
index 68637a68..c28b4600 100644
--- a/src/pages/ChartOfAccounts.vue
+++ b/src/pages/ChartOfAccounts.vue
@@ -158,7 +158,7 @@ export default {
     },
     async fetchAccounts() {
       this.settings = fyo.models[ModelNameEnum.Account].getTreeSettings(fyo);
-      const { currency } = await fyo.doc.getSingle('AccountingSettings');
+      const { currency } = await fyo.doc.getDoc('AccountingSettings');
       this.root = {
         label: await this.settings.getRootLabel(),
         balance: 0,
diff --git a/src/pages/GetStarted.vue b/src/pages/GetStarted.vue
index 82eff24f..9d98bd58 100644
--- a/src/pages/GetStarted.vue
+++ b/src/pages/GetStarted.vue
@@ -101,7 +101,7 @@ export default {
     this.sections = getGetStartedConfig();
   },
   async activated() {
-    await fyo.doc.getSingle('GetStarted');
+    await fyo.doc.getDoc('GetStarted');
     this.checkForCompletedTasks();
   },
   methods: {
@@ -145,7 +145,7 @@ export default {
         return true;
       }
 
-      const doc = await fyo.doc.getSingle('GetStarted');
+      const doc = await fyo.doc.getDoc('GetStarted');
       const onboardingComplete = fyo.schemaMap.GetStarted.fields
         .filter(({ fieldname }) => fieldname !== 'onboardingComplete')
         .map(({ fieldname }) => doc.get(fieldname))
@@ -153,7 +153,7 @@ export default {
 
       if (onboardingComplete) {
         await this.updateChecks({ onboardingComplete });
-        const systemSettings = await fyo.doc.getSingle('SystemSettings');
+        const systemSettings = await fyo.doc.getDoc('SystemSettings');
         await systemSettings.set('hideGetStarted', true);
         await systemSettings.sync();
       }
@@ -205,7 +205,7 @@ export default {
     },
     async updateChecks(toUpdate) {
       await fyo.singles.GetStarted.setAndSync(toUpdate);
-      await fyo.doc.getSingle('GetStarted');
+      await fyo.doc.getDoc('GetStarted');
     },
     isCompleted(item) {
       return fyo.singles.GetStarted.get(item.fieldname) || false;
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index 5ca11563..3043f150 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -244,9 +244,9 @@ export default {
       }
       await this.handleError(error);
     }
-    this.printSettings = await fyo.doc.getSingle('PrintSettings');
+    this.printSettings = await fyo.doc.getDoc('PrintSettings');
     this.companyName = (
-      await fyo.doc.getSingle('AccountingSettings')
+      await fyo.doc.getDoc('AccountingSettings')
     ).companyName;
 
     let query = this.$route.query;
diff --git a/src/pages/PrintView/PrintView.vue b/src/pages/PrintView/PrintView.vue
index 87e9c895..269e5c40 100644
--- a/src/pages/PrintView/PrintView.vue
+++ b/src/pages/PrintView/PrintView.vue
@@ -77,7 +77,7 @@ export default {
   },
   async mounted() {
     this.doc = await fyo.doc.getDoc(this.schemaName, this.name);
-    this.printSettings = await fyo.doc.getSingle('PrintSettings');
+    this.printSettings = await fyo.doc.getDoc('PrintSettings');
 
     if (fyo.store.isDevelopment) {
       window.pv = this;
diff --git a/src/pages/Settings/TabInvoice.vue b/src/pages/Settings/TabInvoice.vue
index a6783f4d..e4d958e1 100644
--- a/src/pages/Settings/TabInvoice.vue
+++ b/src/pages/Settings/TabInvoice.vue
@@ -60,9 +60,9 @@ export default {
     };
   },
   async mounted() {
-    this.doc = await fyo.doc.getSingle('PrintSettings');
+    this.doc = await fyo.doc.getDoc('PrintSettings');
     this.companyName = (
-      await fyo.doc.getSingle('AccountingSettings')
+      await fyo.doc.getDoc('AccountingSettings')
     ).companyName;
   },
   computed: {
diff --git a/src/setup/setupInstance.ts b/src/setup/setupInstance.ts
index 9d8920c5..ec3f0d3f 100644
--- a/src/setup/setupInstance.ts
+++ b/src/setup/setupInstance.ts
@@ -55,7 +55,7 @@ async function updateAccountingSettings(
   }: SetupWizardOptions,
   fyo: Fyo
 ) {
-  const accountingSettings = (await fyo.doc.getSingle(
+  const accountingSettings = (await fyo.doc.getDoc(
     'AccountingSettings'
   )) as AccountingSettings;
   await accountingSettings.setAndSync({
@@ -74,7 +74,7 @@ async function updatePrintSettings(
   { logo, companyName, email }: SetupWizardOptions,
   fyo: Fyo
 ) {
-  const printSettings = await fyo.doc.getSingle('PrintSettings');
+  const printSettings = await fyo.doc.getDoc('PrintSettings');
   await printSettings.setAndSync({
     logo,
     companyName,
@@ -93,7 +93,7 @@ async function updateSystemSettings(
     companyCurrency ?? countryOptions.currency ?? DEFAULT_CURRENCY;
   const locale = countryOptions.locale ?? DEFAULT_LOCALE;
   const countryCode = getCountryCodeFromCountry(country);
-  const systemSettings = await fyo.doc.getSingle('SystemSettings');
+  const systemSettings = await fyo.doc.getDoc('SystemSettings');
   const instanceId = getRandomString();
 
   systemSettings.setAndSync({

From 3af46dc24a8ed059ed1402886084bace1da266b5 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Thu, 26 May 2022 15:43:12 +0530
Subject: [PATCH 162/163] fix: disgusting typo

---
 src/components/SalesInvoice/Templates/Minimal.vue | 2 +-
 translations/ar.csv                               | 2 +-
 translations/ca-ES.csv                            | 2 +-
 translations/de.csv                               | 2 +-
 translations/es.csv                               | 2 +-
 translations/fr.csv                               | 2 +-
 translations/nl.csv                               | 2 +-
 translations/pt.csv                               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/SalesInvoice/Templates/Minimal.vue b/src/components/SalesInvoice/Templates/Minimal.vue
index cc8dd323..aa335683 100644
--- a/src/components/SalesInvoice/Templates/Minimal.vue
+++ b/src/components/SalesInvoice/Templates/Minimal.vue
@@ -30,7 +30,7 @@
           class="font-semibold text-xl"
           :style="{ color: printSettings.color }"
         >
-          {{ doc.schemaName === 'SalesInvoice' ? t`Sales Invoie` : t`Purchase Invoice` }}
+          {{ doc.schemaName === 'SalesInvoice' ? t`Sales Invoice` : t`Purchase Invoice` }}
         </div>
         <div>
           {{ doc.name }}
diff --git a/translations/ar.csv b/translations/ar.csv
index d12fb7b1..6ef0f3f2 100644
--- a/translations/ar.csv
+++ b/translations/ar.csv
@@ -470,7 +470,7 @@ Sales,المبيعات,
 "Sales Invoice Item",,
 "Sales Invoice Settings",,
 "Sales Invoices",,
-"Sales Invoie",,
+"Sales Invoice",,
 "Sales Item Created",,
 "Sales Items","عناصر المبيعات",
 "Sales Payments",,
diff --git a/translations/ca-ES.csv b/translations/ca-ES.csv
index 9f0e69f2..01395822 100644
--- a/translations/ca-ES.csv
+++ b/translations/ca-ES.csv
@@ -470,7 +470,7 @@ Sales,Vendes,
 "Sales Invoice Item",,
 "Sales Invoice Settings",,
 "Sales Invoices",,
-"Sales Invoie",,
+"Sales Invoice",,
 "Sales Item Created",,
 "Sales Items","Artícles venuts",
 "Sales Payments",,
diff --git a/translations/de.csv b/translations/de.csv
index 756208bc..c3b8b240 100644
--- a/translations/de.csv
+++ b/translations/de.csv
@@ -470,7 +470,7 @@ Sales,Vertrieb,
 "Sales Invoice Item",,
 "Sales Invoice Settings",,
 "Sales Invoices",,
-"Sales Invoie",,
+"Sales Invoice",,
 "Sales Item Created",,
 "Sales Items",,
 "Sales Payments",,
diff --git a/translations/es.csv b/translations/es.csv
index b6a21b48..77f7bc52 100644
--- a/translations/es.csv
+++ b/translations/es.csv
@@ -470,7 +470,7 @@ Sales,Ventas,
 "Sales Invoice Item",,
 "Sales Invoice Settings",,
 "Sales Invoices",,
-"Sales Invoie",,
+"Sales Invoice",,
 "Sales Item Created",,
 "Sales Items","Artículos de venta",
 "Sales Payments",,
diff --git a/translations/fr.csv b/translations/fr.csv
index 4b94373b..4560b975 100644
--- a/translations/fr.csv
+++ b/translations/fr.csv
@@ -470,7 +470,7 @@ Sales,Ventes,
 "Sales Invoice Item",,
 "Sales Invoice Settings",,
 "Sales Invoices",,
-"Sales Invoie",,
+"Sales Invoice",,
 "Sales Item Created",,
 "Sales Items",,
 "Sales Payments",,
diff --git a/translations/nl.csv b/translations/nl.csv
index 31a38aca..7f958482 100644
--- a/translations/nl.csv
+++ b/translations/nl.csv
@@ -470,7 +470,7 @@ Sales,Verkopen,
 "Sales Invoice Item",,
 "Sales Invoice Settings",,
 "Sales Invoices",,
-"Sales Invoie",,
+"Sales Invoice",,
 "Sales Item Created",,
 "Sales Items",,
 "Sales Payments",,
diff --git a/translations/pt.csv b/translations/pt.csv
index 03d551af..3eade7d4 100644
--- a/translations/pt.csv
+++ b/translations/pt.csv
@@ -470,7 +470,7 @@ Sales,Vendas,
 "Sales Invoice Item",,
 "Sales Invoice Settings",,
 "Sales Invoices",,
-"Sales Invoie",,
+"Sales Invoice",,
 "Sales Item Created",,
 "Sales Items",,
 "Sales Payments",,

From f27d22504b94a2a7e4c2699d0f2c8a3dc481b193 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 27 May 2022 00:45:05 +0530
Subject: [PATCH 163/163] incr: fix build issue and minor updates to readme

---
 dummy/README.md              |   4 +
 fyo/README.md                |  16 ++--
 package.json                 |   3 +-
 reports/README.md            |   3 +-
 src/README.md                |   2 +-
 src/components/SearchBar.vue |  10 ++-
 src/utils/search.ts          |  28 +++----
 vue.config.js                |  11 +--
 yarn.lock                    | 151 ++++++++++++++++-------------------
 9 files changed, 109 insertions(+), 119 deletions(-)

diff --git a/dummy/README.md b/dummy/README.md
index 7da57f33..fca58117 100644
--- a/dummy/README.md
+++ b/dummy/README.md
@@ -5,3 +5,7 @@ a demo instance.
 
 There are a few `.json` files here (eg: `items.json`) which have been generated,
 these are not to be edited.
+
+The generated data has some randomness, there is a `baseCount` arg to the
+exported `setupDummyInstance` function, the number of transactions generated are
+always more than this.
\ No newline at end of file
diff --git a/fyo/README.md b/fyo/README.md
index ec315a15..511363ac 100644
--- a/fyo/README.md
+++ b/fyo/README.md
@@ -18,17 +18,19 @@ allows for a single source of truth and a common interface to access different
 modules such as `db`, `doc` an `auth`.
 
 **Localization**: Since Books' functionality changes depending on region,
-regional information is required in the initialization process.
+regional information (`countryCode`) is required in the initialization process.
 
-**Doc**: This is `fyo`'s abstraction for an ORM, the associated files are
-located in `model`, all classes exported from `books/models` extend this.
+**`Doc`**: This is `fyo`'s abstraction for an ORM, the associated files are
+located in `model/doc.ts`, all classes exported from `books/models` extend this.
 
 ### Terminology
 
 - **Schema**: object that defines shape of the data in the database.
-- **Model**: the controller class that extends the `Doc` class or the `Doc`
-  class itself (if a controller doesn't exist).
-- **Doc**: instance of a Model, i.e. what has the data.
+- **Model**: the controller class that extends the `Doc` class, or the `Doc`
+  class itself (if a specific controller doesn't exist).
+- **doc** (not `Doc`): instance of a Model, i.e. what has the data.
+    
+If you are confused, I understand.
 
 ## Initialization
 
@@ -94,7 +96,7 @@ This can be done using `fyo/utils/translation.ts/setLanguageMapOnTranslationStri
 
 Since translations are runtime, if the code is evaluated before the language map
 is loaded, translations won't work. To prevent this, don't maintain translation
-strings globally.
+strings globally since this will be evaluated before the map is loaded.
 
 ## Observers
 
diff --git a/package.json b/package.json
index eec613da..ae90e813 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "luxon": "^2.0.2",
     "node-fetch": "2",
     "pesa": "^1.1.12",
-    "vue": "^3.2.30",
+    "vue": "^3.2.36",
     "vue-router": "^4.0.12"
   },
   "devDependencies": {
@@ -74,7 +74,6 @@
     "tslib": "^2.3.1",
     "typescript": "^4.6.2",
     "vue-cli-plugin-electron-builder": "^2.0.0",
-    "vue-template-compiler": "^2.6.10",
     "webpack": "^5.66.0"
   },
   "prettier": {
diff --git a/reports/README.md b/reports/README.md
index 483d3009..06301e4c 100644
--- a/reports/README.md
+++ b/reports/README.md
@@ -3,4 +3,5 @@
 Reports are a view of stored data, the code here doesn't alter any data.
 
 All reports should extend the `Report` class in `reports/Report.ts`, depending
-on the report it may have custom `.vue` files.
+on the report it may have custom `.vue` files. Check the `type.ts` file for the
+shape of the report data.
diff --git a/src/README.md b/src/README.md
index c81f01dc..ba619bb4 100644
--- a/src/README.md
+++ b/src/README.md
@@ -21,4 +21,4 @@ All of them are triggered from `src/App.vue`.
 ## Global Fyo
 
 Global fyo is exported from `initFyo.ts`. Only code that isn't going to be unit
-tested should use this.
+tested using `mocha` should use this, i.e. code in `src`
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index 0e59a082..f0db9331 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -1,6 +1,3 @@
-<script setup>
-const keys = useKeys();
-</script>
 <template>
   <div>
     <!-- Search Bar Button -->
@@ -149,6 +146,10 @@ import { nextTick, watch } from 'vue';
 import Modal from './Modal.vue';
 
 export default {
+  setup() {
+    const keys = useKeys();
+    return { keys };
+  },
   data() {
     return {
       idx: 0,
@@ -332,11 +333,14 @@ export default {
         .map(({ si }) => si);
 
       let docs = [];
+      /*
       if (this.groupFilters.Docs && this.inputValue) {
         docs = this.docSearch.search(this.inputValue);
       }
+      */
 
       const all = [docs, nonDocs].flat();
+      // eslint-disable-next-line
       this.totalLength = all.length;
       return all.slice(0, 50);
     },
diff --git a/src/utils/search.ts b/src/utils/search.ts
index 3a8deb2e..1981be76 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -267,18 +267,18 @@ class Search {
     [ModelNameEnum.JournalEntry]: 50,
   };
 
-  #groupedKeywords?: Dictionary<Keyword[]>;
+  _groupedKeywords?: Dictionary<Keyword[]>;
 
   constructor() {
     this.keywords = {};
   }
 
   get groupedKeywords() {
-    if (!this.#groupedKeywords || !Object.keys(this.#groupedKeywords!).length) {
-      this.#groupedKeywords = this.getGroupedKeywords();
+    if (!this._groupedKeywords || !Object.keys(this._groupedKeywords!).length) {
+      this._groupedKeywords = this.getGroupedKeywords();
     }
 
-    return this.#groupedKeywords!;
+    return this._groupedKeywords!;
   }
 
   search(keyword: string /*, array: DocSearchItem[]*/): DocSearchItem[] {
@@ -326,7 +326,7 @@ class Search {
   }
 
   async fetchKeywords() {
-    const searchables = this.#getSearchables();
+    const searchables = this._getSearchables();
     for (const searchable of searchables) {
       const options: GetAllOptions = {
         fields: [searchable.fields, searchable.meta].flat(),
@@ -338,13 +338,13 @@ class Search {
       }
 
       const maps = await fyo.db.getAllRaw(searchable.schemaName, options);
-      this.#addToSearchable(maps, searchable);
+      this._addToSearchable(maps, searchable);
     }
 
-    this.#setPriority();
+    this._setPriority();
   }
 
-  #getSearchables(): Searchable[] {
+  _getSearchables(): Searchable[] {
     const searchable: Searchable[] = [];
     for (const schemaName of Object.keys(fyo.schemaMap)) {
       const schema = fyo.schemaMap[schemaName];
@@ -374,7 +374,7 @@ class Search {
     return searchable;
   }
 
-  #setPriority() {
+  _setPriority() {
     for (const schemaName in this.keywords) {
       const kw = this.keywords[schemaName];
       const basePriority = this.priorityMap[schemaName] ?? 0;
@@ -397,7 +397,7 @@ class Search {
     }
   }
 
-  #addToSearchable(maps: DocValueMap[], searchable: Searchable) {
+  _addToSearchable(maps: DocValueMap[], searchable: Searchable) {
     if (!maps.length) {
       return;
     }
@@ -406,13 +406,13 @@ class Search {
 
     for (const map of maps) {
       const keyword: Keyword = { values: [], meta: {}, priority: 0 };
-      this.#setKeywords(map, searchable, keyword);
-      this.#setMeta(map, searchable, keyword);
+      this._setKeywords(map, searchable, keyword);
+      this._setMeta(map, searchable, keyword);
       this.keywords[searchable.schemaName]!.keywords.push(keyword);
     }
   }
 
-  #setKeywords(map: DocValueMap, searchable: Searchable, keyword: Keyword) {
+  _setKeywords(map: DocValueMap, searchable: Searchable, keyword: Keyword) {
     // Set individual field values
     for (const fn of searchable.fields) {
       let value = map[fn] as string | undefined;
@@ -426,7 +426,7 @@ class Search {
     }
   }
 
-  #setMeta(map: DocValueMap, searchable: Searchable, keyword: Keyword) {
+  _setMeta(map: DocValueMap, searchable: Searchable, keyword: Keyword) {
     // Set the meta map
     for (const fn of searchable.meta) {
       const meta = map[fn];
diff --git a/vue.config.js b/vue.config.js
index fc014927..c2a4a73c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,7 +4,7 @@ const webpack = require('webpack');
 module.exports = {
   pluginOptions: {
     electronBuilder: {
-      externals: ['knex', 'sqlite3'],
+      externals: ['knex', 'better-sqlite3'],
       nodeIntegration: true,
       mainProcessFile: 'main.ts',
       disableMainProcessTypescript: false,
@@ -32,6 +32,7 @@ module.exports = {
       filename: 'index.html',
     },
   },
+  parallel: false,
   runtimeCompiler: true,
   lintOnSave: process.env.NODE_ENV !== 'production',
   configureWebpack(config) {
@@ -48,14 +49,6 @@ module.exports = {
       fixtures: path.resolve(__dirname, './fixtures'),
     });
 
-    config.plugins.push(
-      // https://github.com/knex/knex/issues/1446#issuecomment-537715431
-      new webpack.ContextReplacementPlugin(
-        /knex[/\\]lib[/\\]dialects/,
-        /sqlite3[/\\]index.js/
-      )
-    );
-
     config.module.rules.push({
       test: /\.txt$/i,
       use: 'raw-loader',
diff --git a/yarn.lock b/yarn.lock
index 7fa31303..d36353e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1942,47 +1942,47 @@
     semver "^7.3.4"
     strip-ansi "^6.0.0"
 
-"@vue/compiler-core@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.30.tgz#6c5b362490930e72de8d033270a145e3830ae5c4"
-  integrity sha512-64fq1KfcR+k3Vlw+IsBM2VhV5B+2IP3YxvKU8LWCDLrkmlXtbf2eMK6+0IwX5KP41D0f1gzryIiXR7P8cB9O5Q==
+"@vue/compiler-core@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.36.tgz#2fa44595308c95610602df54dcb69063ba2c8383"
+  integrity sha512-bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/shared" "3.2.30"
+    "@vue/shared" "3.2.36"
     estree-walker "^2.0.2"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.30.tgz#ed15e6243227baeaa445d04df804aee6e4926eab"
-  integrity sha512-t7arHz2SXLCXlF2fdGDFVbhENbGMez254Z5edUqb//6WXJU1lC7GvSkUE7i5x8WSjgfqt60i0V8zdmk16rvLdw==
+"@vue/compiler-dom@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz#16d911ff163ed5fc8087a01645bf14bb7f325401"
+  integrity sha512-tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA==
   dependencies:
-    "@vue/compiler-core" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-core" "3.2.36"
+    "@vue/shared" "3.2.36"
 
-"@vue/compiler-sfc@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.30.tgz#9d2e56adb859059551fc1204bc37503f168c4d0c"
-  integrity sha512-P/5YpILtcQY92z72gxhkyOUPHVskEzhSrvYi91Xcr+csOxaDaYU5OqOxCzZKcf3Og70Tat404vO1OHrwprN90A==
+"@vue/compiler-sfc@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz#e5065e7c0e5170ffa750e3c3dd93a29db109d0f2"
+  integrity sha512-AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.30"
-    "@vue/compiler-dom" "3.2.30"
-    "@vue/compiler-ssr" "3.2.30"
-    "@vue/reactivity-transform" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-core" "3.2.36"
+    "@vue/compiler-dom" "3.2.36"
+    "@vue/compiler-ssr" "3.2.36"
+    "@vue/reactivity-transform" "3.2.36"
+    "@vue/shared" "3.2.36"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
     postcss "^8.1.10"
     source-map "^0.6.1"
 
-"@vue/compiler-ssr@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.30.tgz#fc2bc13a9cdfd70fcffab3f0bc7de141cd9c3411"
-  integrity sha512-OUh3MwAu/PsD7VN3UOdBbTkltkrUCNouSht47+CMRzpUR5+ta7+xyMAVHeq8wg4YZenWaJimbR5TL35Ka4Vk6g==
+"@vue/compiler-ssr@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz#314f3a9424db58142c3608f48cbda7aa05fc66cb"
+  integrity sha512-+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw==
   dependencies:
-    "@vue/compiler-dom" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-dom" "3.2.36"
+    "@vue/shared" "3.2.36"
 
 "@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
   version "3.3.0"
@@ -2017,53 +2017,53 @@
   resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab"
   integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==
 
-"@vue/reactivity-transform@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.30.tgz#2006e9f4645777a481b78ae77fc486159afa8480"
-  integrity sha512-Le5XzCJyK3qTjoTnvQG/Ehu8fYjayauMNFyMaEnwFlm/avDofpuibpS9u+/6AgzsGnVWN+i0Jgf25bJd9DIwMw==
+"@vue/reactivity-transform@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz#8426a941b0b09d1b94fc162d4642758183b5d133"
+  integrity sha512-Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA==
   dependencies:
     "@babel/parser" "^7.16.4"
-    "@vue/compiler-core" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-core" "3.2.36"
+    "@vue/shared" "3.2.36"
     estree-walker "^2.0.2"
     magic-string "^0.25.7"
 
-"@vue/reactivity@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.30.tgz#fdae2bb66d075c34593ea7e15c6831300a1ad39e"
-  integrity sha512-qlNKbkRn2JiGxVUEdoXbLAy+vcuHUCcq+YH2uXWz0BNMvXY2plmz+oqsw+694llwmYLkke5lbdYF4DIupisIkg==
+"@vue/reactivity@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.36.tgz#026b14e716febffe80cd284fd8a2b33378968646"
+  integrity sha512-c2qvopo0crh9A4GXi2/2kfGYMxsJW4tVILrqRPydVGZHhq0fnzy6qmclWOhBFckEhmyxmpHpdJtIRYGeKcuhnA==
   dependencies:
-    "@vue/shared" "3.2.30"
+    "@vue/shared" "3.2.36"
 
-"@vue/runtime-core@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.30.tgz#1acc119ff8a49c06af6b03611bc4e03f464ca8a2"
-  integrity sha512-RTi7xH0Ht/6wfbo2WFBMJTEiyWFTqGhrksJm8lz6E+auO6lXZ6Eq3gPNfLt47GDWCm4xyrv+rs5R4UbarPEQ1Q==
+"@vue/runtime-core@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.36.tgz#be5115e665679c26bf3807d2326675dc1d847134"
+  integrity sha512-PTWBD+Lub+1U3/KhbCExrfxyS14hstLX+cBboxVHaz+kXoiDLNDEYAovPtxeTutbqtClIXtft+wcGdC+FUQ9qQ==
   dependencies:
-    "@vue/reactivity" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/reactivity" "3.2.36"
+    "@vue/shared" "3.2.36"
 
-"@vue/runtime-dom@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.30.tgz#16a85b359ea1fff9b1dd61e9d00e93f4652aba5e"
-  integrity sha512-a3+jrncDvEFQmB+v9k0VyT4/Y3XO6OAueCroXXY4yLyr6PJeyxljweV5TzvW0rvVzH9sZO0QAvG76Lo+6C92Qw==
+"@vue/runtime-dom@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.36.tgz#cd5d403ea23c18ee7c17767103a1b2f8263c54bb"
+  integrity sha512-gYPYblm7QXHVuBohqNRRT7Wez0f2Mx2D40rb4fleehrJU9CnkjG0phhcGEZFfGwCmHZRqBCRgbFWE98bPULqkg==
   dependencies:
-    "@vue/runtime-core" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/runtime-core" "3.2.36"
+    "@vue/shared" "3.2.36"
     csstype "^2.6.8"
 
-"@vue/server-renderer@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.30.tgz#4acccad3933475d07b94560c6cb205363975b969"
-  integrity sha512-pzb8J/w+JdZVOtuKFlirGqrs4GP60FXGDJySw3WV2pCetuFstaacDrnymEeSo3ohAD+Qjv7zAG+Y7OvkdxQxmQ==
+"@vue/server-renderer@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.36.tgz#1e7c1cf63bd17df7828d04e8c780ee6ca7a9ed7c"
+  integrity sha512-uZE0+jfye6yYXWvAQYeHZv+f50sRryvy16uiqzk3jn8hEY8zTjI+rzlmZSGoE915k+W/Ol9XSw6vxOUD8dGkUg==
   dependencies:
-    "@vue/compiler-ssr" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-ssr" "3.2.36"
+    "@vue/shared" "3.2.36"
 
-"@vue/shared@3.2.30":
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.30.tgz#e2ba8f6692399c27c81c668ecd3f1a4e13ee2f5e"
-  integrity sha512-B3HouBtUxcfu2w2d+VhdLcVBXKYYhXiFMAfQ+hoe8NUhKkPRkWDIqhpuehCZxVQ3S2dN1P1WfKGlxGC+pfmxGg==
+"@vue/shared@3.2.36":
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.36.tgz#35e11200542cf29068ba787dad57da9bdb82f644"
+  integrity sha512-JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ==
 
 "@vue/web-component-wrapper@^1.2.0":
   version "1.3.0"
@@ -4508,11 +4508,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-de-indent@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
-  integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
-
 debounce-fn@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7"
@@ -6665,7 +6660,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@1.2.0, he@1.2.x, he@^1.1.0:
+he@1.2.0, he@1.2.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -12471,29 +12466,21 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.6.10:
-  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
-  integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
-  dependencies:
-    de-indent "^1.0.2"
-    he "^1.1.0"
-
 vue-template-es2015-compiler@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue@^3.2.30:
-  version "3.2.30"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.30.tgz#47de3039631ac22cab2fd26b427575260199b8bb"
-  integrity sha512-ZmTFWVJUX2XADkuOB8GcLTuxnBLogjJBTNVrM7WsTnjqRQ+VR8bLNrvNsbn8vj/LaP5+0WFAPrpngOYE2x+e+Q==
+vue@^3.2.36:
+  version "3.2.36"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.36.tgz#8daa996e2ced521708de97d066c7c998e8bc3378"
+  integrity sha512-5yTXmrE6gW8IQgttzHW5bfBiFA6mx35ZXHjGLDmKYzW6MMmYvCwuKybANRepwkMYeXw2v1buGg3/lPICY5YlZw==
   dependencies:
-    "@vue/compiler-dom" "3.2.30"
-    "@vue/compiler-sfc" "3.2.30"
-    "@vue/runtime-dom" "3.2.30"
-    "@vue/server-renderer" "3.2.30"
-    "@vue/shared" "3.2.30"
+    "@vue/compiler-dom" "3.2.36"
+    "@vue/compiler-sfc" "3.2.36"
+    "@vue/runtime-dom" "3.2.36"
+    "@vue/server-renderer" "3.2.36"
+    "@vue/shared" "3.2.36"
 
 watchpack-chokidar2@^2.0.1:
   version "2.0.1"