fix: Reorder patch execution

fix(e-invoicing): validation & tax calculation fixes

.eslintrc

@@ -92,7 +92,6 @@
 		"cur_page": true,
 		"cur_list": true,
 		"cur_tree": true,
-		"cur_pos": true,
 		"msg_dialog": true,
 		"is_null": true,
 		"in_list": true,
@@ -147,15 +146,9 @@
 		"Chart": true,
 		"Cypress": true,
 		"cy": true,
-		"describe": true,
-		"expect": true,
 		"it": true,
 		"context": true,
 		"before": true,
-		"beforeEach": true,
-		"onScan": true,
-		"html2canvas": true,
-		"extend_cscript": true,
-		"localforage": true
+		"beforeEach": true
 	}
 }

.flake8

@@ -1,36 +0,0 @@
-[flake8]
-ignore =
-    E121,
-    E126,
-    E127,
-    E128,
-    E203,
-    E225,
-    E226,
-    E231,
-    E241,
-    E251,
-    E261,
-    E265,
-    E302,
-    E303,
-    E305,
-    E402,
-    E501,
-    E741,
-    W291,
-    W292,
-    W293,
-    W391,
-    W503,
-    W504,
-    F403,
-    B007,
-    B950,
-    W191,
-    E124, # closing bracket, irritating while writing QB code
-    E131, # continuation line unaligned for hanging indent
-    E123, # closing bracket does not match indentation of opening bracket's line
-
-max-line-length = 200
-exclude=.github/helper/semgrep_rules

.git-blame-ignore-revs

@@ -1,22 +0,0 @@
-# Since version 2.23 (released in August 2019), git-blame has a feature
-# to ignore or bypass certain commits.
-#
-# This file contains a list of commits that are not likely what you
-# are looking for in a blame, such as mass reformatting or renaming.
-# You can set this file as a default ignore file for blame by running
-# the following command.
-#
-# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
-
-# This commit just changes spaces to tabs for indentation in some files
-5f473611bd6ed57703716244a054d3fb5ba9cd23
-
-# Whitespace trimming throughout codebase
-9bb69e711a5da43aaf8c8ecb5601aeffd89dbe5a
-f0bcb753fb7ebbb64bb0d6906d431d002f0f7d8f
-
-# imports cleanup
-4b2be2999f2203493b49bf74c5b440d49e38b5e3
-
-# formatting with black
-c07713b860505211db2af685e2e950bf5dd7dd3a

.github/helper/.flake8_strict

@@ -1,72 +0,0 @@
-[flake8]
-ignore =
-    B007,
-    B009,
-    B010,
-    B950,
-    E101,
-    E111,
-    E114,
-    E116,
-    E117,
-    E121,
-    E122,
-    E123,
-    E124,
-    E125,
-    E126,
-    E127,
-    E128,
-    E131,
-    E201,
-    E202,
-    E203,
-    E211,
-    E221,
-    E222,
-    E223,
-    E224,
-    E225,
-    E226,
-    E228,
-    E231,
-    E241,
-    E242,
-    E251,
-    E261,
-    E262,
-    E265,
-    E266,
-    E271,
-    E272,
-    E273,
-    E274,
-    E301,
-    E302,
-    E303,
-    E305,
-    E306,
-    E402,
-    E501,
-    E502,
-    E701,
-    E702,
-    E703,
-    E741,
-    F403,
-    W191,
-    W291,
-    W292,
-    W293,
-    W391,
-    W503,
-    W504,
-    E711,
-    E129,
-    F841,
-    E713,
-    E712,
-
-
-max-line-length = 200
-exclude=.github/helper/semgrep_rules,test_*.py

.github/helper/documentation.py

@@ -1,7 +1,7 @@
 import sys
+import requests
 from urllib.parse import urlparse
 
-import requests
 
 docs_repos = [
 	"frappe_docs",
@@ -24,8 +24,6 @@ def docs_link_exists(body):
 					parts = parsed_url.path.split('/')
 					if len(parts) == 5 and parts[1] == "frappe" and parts[2] in docs_repos:
 						return True
-				elif parsed_url.netloc == "docs.erpnext.com":
-					return True
 
 
 if __name__ == "__main__":
@@ -34,15 +32,11 @@ if __name__ == "__main__":
 
 	if response.ok:
 		payload = response.json()
-		title = (payload.get("title") or "").lower().strip()
-		head_sha = (payload.get("head") or {}).get("sha")
-		body = (payload.get("body") or "").lower()
+		title = payload.get("title", "").lower()
+		head_sha = payload.get("head", {}).get("sha")
+		body = payload.get("body", "").lower()
 
-		if (title.startswith("feat")
-			and head_sha
-			and "no-docs" not in body
-			and "backport" not in body
-		):
+		if title.startswith("feat") and head_sha and "no-docs" not in body:
 			if docs_link_exists(body):
 				print("Documentation Link Found. You're Awesome! 🎉")
 

.github/helper/install.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Check for merge conflicts before proceeding
-python -m compileall -f "${GITHUB_WORKSPACE}"
-if grep -lr --exclude-dir=node_modules "^<<<<<<< " "${GITHUB_WORKSPACE}"
-    then echo "Found merge conflicts"
-    exit 1
-fi
-
-cd ~ || exit
-
-sudo apt-get install redis-server libcups2-dev
-
-pip install frappe-bench
-
-git clone https://github.com/frappe/frappe --branch "${GITHUB_BASE_REF:-${GITHUB_REF##*/}}" --depth 1
-bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench
-
-mkdir ~/frappe-bench/sites/test_site
-cp -r "${GITHUB_WORKSPACE}/.github/helper/site_config.json" ~/frappe-bench/sites/test_site/
-
-mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
-mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
-
-mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
-mysql --host 127.0.0.1 --port 3306 -u root -e "CREATE DATABASE test_frappe"
-mysql --host 127.0.0.1 --port 3306 -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
-
-mysql --host 127.0.0.1 --port 3306 -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
-mysql --host 127.0.0.1 --port 3306 -u root -e "FLUSH PRIVILEGES"
-
-wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
-tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
-sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
-sudo chmod o+x /usr/local/bin/wkhtmltopdf
-
-cd ~/frappe-bench || exit
-
-sed -i 's/watch:/# watch:/g' Procfile
-sed -i 's/schedule:/# schedule:/g' Procfile
-sed -i 's/socketio:/# socketio:/g' Procfile
-sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
-
-bench get-app erpnext "${GITHUB_WORKSPACE}"
-bench start &> bench_run_logs.txt &
-bench --site test_site reinstall --yes

.github/helper/semgrep_rules/frappe_correctness.py

@@ -1,63 +0,0 @@
-import frappe
-from frappe import _
-from frappe.model.document import Document
-
-
-# ruleid: frappe-modifying-but-not-comitting
-def on_submit(self):
-	if self.value_of_goods == 0:
-		frappe.throw(_('Value of goods cannot be 0'))
-	self.status = 'Submitted'
-
-
-# ok: frappe-modifying-but-not-comitting
-def on_submit(self):
-	if self.value_of_goods == 0:
-		frappe.throw(_('Value of goods cannot be 0'))
-	self.status = 'Submitted'
-	self.db_set('status', 'Submitted')
-
-# ok: frappe-modifying-but-not-comitting
-def on_submit(self):
-	if self.value_of_goods == 0:
-		frappe.throw(_('Value of goods cannot be 0'))
-	x = "y"
-	self.status = x
-	self.db_set('status', x)
-
-
-# ok: frappe-modifying-but-not-comitting
-def on_submit(self):
-	x = "y"
-	self.status = x
-	self.save()
-
-# ruleid: frappe-modifying-but-not-comitting-other-method
-class DoctypeClass(Document):
-	def on_submit(self):
-		self.good_method()
-		self.tainted_method()
-
-	def tainted_method(self):
-		self.status = "uptate"
-
-
-# ok: frappe-modifying-but-not-comitting-other-method
-class DoctypeClass(Document):
-	def on_submit(self):
-		self.good_method()
-		self.tainted_method()
-
-	def tainted_method(self):
-		self.status = "update"
-		self.db_set("status", "update")
-
-# ok: frappe-modifying-but-not-comitting-other-method
-class DoctypeClass(Document):
-	def on_submit(self):
-		self.good_method()
-		self.tainted_method()
-		self.save()
-
-	def tainted_method(self):
-		self.status = "uptate"

.github/helper/semgrep_rules/frappe_correctness.yml

@@ -1,151 +0,0 @@
-# This file specifies rules for correctness according to how frappe doctype data model works.
-
-rules:
-- id: frappe-modifying-but-not-comitting
-  patterns:
-    - pattern: |
-        def $METHOD(self, ...):
-          ...
-          self.$ATTR = ...
-    - pattern-not: |
-        def $METHOD(self, ...):
-          ...
-          self.$ATTR = ...
-          ...
-          self.db_set(..., self.$ATTR, ...)
-    - pattern-not: |
-        def $METHOD(self, ...):
-          ...
-          self.$ATTR = $SOME_VAR
-          ...
-          self.db_set(..., $SOME_VAR, ...)
-    - pattern-not: |
-        def $METHOD(self, ...):
-          ...
-          self.$ATTR = $SOME_VAR
-          ...
-          self.save()
-    - metavariable-regex:
-        metavariable: '$ATTR'
-        # this is negative look-ahead, add more attrs to ignore like (ignore|ignore_this_too|ignore_me)
-        regex: '^(?!ignore_linked_doctypes|status_updater)(.*)$'
-    - metavariable-regex:
-        metavariable: "$METHOD"
-        regex: "(on_submit|on_cancel)"
-  message: |
-    DocType modified in self.$METHOD. Please check if modification of self.$ATTR is commited to database.
-  languages: [python]
-  severity: ERROR
-
-- id: frappe-modifying-but-not-comitting-other-method
-  patterns:
-  - pattern: |
-      class $DOCTYPE(...):
-        def $METHOD(self, ...):
-          ...
-          self.$ANOTHER_METHOD()
-          ...
-
-        def $ANOTHER_METHOD(self, ...):
-          ...
-          self.$ATTR = ...
-  - pattern-not: |
-      class $DOCTYPE(...):
-        def $METHOD(self, ...):
-          ...
-          self.$ANOTHER_METHOD()
-          ...
-
-        def $ANOTHER_METHOD(self, ...):
-          ...
-          self.$ATTR = ...
-          ...
-          self.db_set(..., self.$ATTR, ...)
-  - pattern-not: |
-      class $DOCTYPE(...):
-        def $METHOD(self, ...):
-          ...
-          self.$ANOTHER_METHOD()
-          ...
-
-        def $ANOTHER_METHOD(self, ...):
-          ...
-          self.$ATTR = $SOME_VAR
-          ...
-          self.db_set(..., $SOME_VAR, ...)
-  - pattern-not: |
-      class $DOCTYPE(...):
-        def $METHOD(self, ...):
-          ...
-          self.$ANOTHER_METHOD()
-          ...
-          self.save()
-        def $ANOTHER_METHOD(self, ...):
-          ...
-          self.$ATTR = ...
-  - metavariable-regex:
-      metavariable: "$METHOD"
-      regex: "(on_submit|on_cancel)"
-  message: |
-    self.$ANOTHER_METHOD is called from self.$METHOD, check if changes to self.$ATTR are commited to database.
-  languages: [python]
-  severity: ERROR
-
-- id: frappe-print-function-in-doctypes
-  pattern: print(...)
-  message: |
-      Did you mean to leave this print statement in? Consider using msgprint or logger instead of print statement.
-  languages: [python]
-  severity: WARNING
-  paths:
-      include:
-        - "*/**/doctype/*"
-
-- id: frappe-modifying-child-tables-while-iterating
-  pattern-either:
-    - pattern: |
-        for $ROW in self.$TABLE:
-            ...
-            self.remove(...)
-    - pattern: |
-        for $ROW in self.$TABLE:
-            ...
-            self.append(...)
-  message: |
-      Child table being modified while iterating on it.
-  languages: [python]
-  severity: ERROR
-  paths:
-      include:
-        - "*/**/doctype/*"
-
-- id: frappe-same-key-assigned-twice
-  pattern-either:
-    - pattern: |
-        {..., $X: $A, ..., $X: $B, ...}
-    - pattern: |
-        dict(..., ($X, $A), ..., ($X, $B), ...)
-    - pattern: |
-        _dict(..., ($X, $A), ..., ($X, $B), ...)
-  message: |
-      key `$X` is uselessly assigned twice. This could be a potential bug.
-  languages: [python]
-  severity: ERROR
-
-
-- id: frappe-manual-commit
-  patterns:
-    - pattern: frappe.db.commit()
-    - pattern-not-inside: |
-        try:
-          ...
-        except ...:
-          ...
-  message: |
-    Manually commiting a transaction is highly discouraged. Read about the transaction model implemented by Frappe Framework before adding manual commits: https://frappeframework.com/docs/user/en/api/database#database-transaction-model If you think manual commit is required then add a comment explaining why and `// nosemgrep` on the same line.
-  paths:
-      exclude:
-        - "**/patches/**"
-        - "**/demo/**"
-  languages: [python]
-  severity: ERROR

.github/helper/semgrep_rules/report.py

@@ -1,14 +0,0 @@
-from frappe import _
-
-# ruleid: frappe-missing-translate-function-in-report-python
-{"label": "Field Label"}
-
-# ruleid: frappe-missing-translate-function-in-report-python
-dict(label="Field Label")
-
-
-# ok: frappe-missing-translate-function-in-report-python
-{"label": _("Field Label")}
-
-# ok: frappe-missing-translate-function-in-report-python
-dict(label=_("Field Label"))

.github/helper/semgrep_rules/ux.py

@@ -1,30 +0,0 @@
-import frappe
-from frappe import _, msgprint, throw
-
-# ruleid: frappe-missing-translate-function-python
-throw("Error Occured")
-
-# ruleid: frappe-missing-translate-function-python
-frappe.throw("Error Occured")
-
-# ruleid: frappe-missing-translate-function-python
-frappe.msgprint("Useful message")
-
-# ruleid: frappe-missing-translate-function-python
-msgprint("Useful message")
-
-
-# ok: frappe-missing-translate-function-python
-translatedmessage = _("Hello")
-
-# ok: frappe-missing-translate-function-python
-throw(translatedmessage)
-
-# ok: frappe-missing-translate-function-python
-msgprint(translatedmessage)
-
-# ok: frappe-missing-translate-function-python
-msgprint(_("Helpful message"))
-
-# ok: frappe-missing-translate-function-python
-frappe.throw(_("Error occured"))

.github/helper/translation.py

@@ -2,7 +2,7 @@ import re
 import sys
 
 errors_encounter = 0
-pattern = re.compile(r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)")
+pattern = re.compile(r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)")
 words_pattern = re.compile(r"_{1,2}\([\"'`]{1,3}.*?[a-zA-Z]")
 start_pattern = re.compile(r"_{1,2}\([f\"'`]{1,3}")
 f_string_pattern = re.compile(r"_\(f[\"']")
@@ -28,7 +28,7 @@ for _file in files_to_scan:
 					has_f_string = f_string_pattern.search(line)
 					if has_f_string:
 						errors_encounter += 1
-						print(f'\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}')
+						print(f'\nF-strings are not supported for translations at line number {line_number + 1}\n{line.strip()[:100]}')
 						continue
 					else:
 						continue
@@ -36,7 +36,7 @@ for _file in files_to_scan:
 				match = pattern.search(line)
 				error_found = False
 
-				if not match and line.endswith((',\n', '[\n')):
+				if not match and line.endswith(',\n'):
 					# concat remaining text to validate multiline pattern
 					line = "".join(file_lines[line_number - 1:])
 					line = line[start_matches.start() + 1:]
@@ -44,11 +44,11 @@ for _file in files_to_scan:
 
 				if not match:
 					error_found = True
-					print(f'\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}')
+					print(f'\nTranslation syntax error at line number {line_number + 1}\n{line.strip()[:100]}')
 
 				if not error_found and not words_pattern.search(line):
 					error_found = True
-					print(f'\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}')
+					print(f'\nTranslation is useless because it has no words at line number {line_number + 1}\n{line.strip()[:100]}')
 
 				if error_found:
 					errors_encounter += 1

.github/workflows/backport.yml

@@ -1,26 +1,16 @@
 name: Backport
 on:
-  pull_request_target:
+  pull_request:
     types:
       - closed
       - labeled
 
 jobs:
-  main:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
+  backport:
+    runs-on: ubuntu-18.04
+    name: Backport
     steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
+      - name: Backport
+        uses: tibdex/backport@v1
         with:
-          repository: "frappe/backport"
-          path: ./actions
-          ref: develop
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Run backport
-        uses: ./actions/backport
-        with:
-          token: ${{secrets.BACKPORT_BOT_TOKEN}}
-          labelsToAdd: "backport"
-          title: "{{originalTitle}}"
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker-release.yml

@@ -11,4 +11,4 @@ jobs:
     - name: curl
       run: |
         apk add curl bash
-        curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${{ secrets.CI_PAT }}" https://api.github.com/repos/frappe/frappe_docker/actions/workflows/build_stable.yml/dispatches -d '{"ref":"main"}'
+        curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token ${{ secrets.TRAVIS_CI_TOKEN }}" -d '{"request":{"branch":"master"}}' https://api.travis-ci.com/repo/frappe%2Ffrappe_docker/requests

.github/workflows/docs-checker.yml

@@ -6,7 +6,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 10
 
     steps:
       - name: 'Setup Environment'

.github/workflows/linters.yml

@@ -1,31 +0,0 @@
-name: Linters
-
-on:
-  pull_request: { }
-
-jobs:
-
-  linters:
-    name: linters
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-
-      - name: Install and Run Pre-commit
-        uses: pre-commit/action@v2.0.3
-
-      - name: Download Semgrep rules
-        run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
-
-      - uses: returntocorp/semgrep-action@v1
-        env:
-            SEMGREP_TIMEOUT: 120
-        with:
-            config: >-
-              r/python.lang.correctness
-              ./frappe-semgrep-rules/rules

.github/workflows/patch.yml

@@ -1,90 +0,0 @@
-name: Patch
-
-on:
-  pull_request:
-    paths-ignore:
-      - '**.js'
-      - '**.md'
-  workflow_dispatch:
-
-
-concurrency:
-  group: patch-mariadb-v13-${{ github.event.number }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: ubuntu-18.04
-    timeout-minutes: 60
-
-    name: Patch Test
-
-    services:
-      mysql:
-        image: mariadb:10.3
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: YES
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v2
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-          check-latest: true
-
-      - name: Add to Hosts
-        run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
-
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-
-      - name: Run Patch Tests
-        run: |
-          cd ~/frappe-bench/
-          wget https://erpnext.com/files/v10-erpnext.sql.gz
-          bench --site test_site --force restore ~/frappe-bench/v10-erpnext.sql.gz
-          bench --site test_site migrate

.github/workflows/release.yml

@@ -1,31 +0,0 @@
-name: Generate Semantic Release
-on:
-  push:
-    branches:
-      - version-13
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Entire Repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-      - name: Setup Node.js v14
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-      - name: Setup dependencies
-        run: |
-          npm install @semantic-release/git @semantic-release/exec --no-save
-      - name: Create Release
-        env:
-          GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          GIT_AUTHOR_NAME: "Frappe PR Bot"
-          GIT_AUTHOR_EMAIL: "developers@frappe.io"
-          GIT_COMMITTER_NAME: "Frappe PR Bot"
-          GIT_COMMITTER_EMAIL: "developers@frappe.io"
-        run: npx semantic-release

.github/workflows/server-tests.yml

@@ -1,100 +0,0 @@
-name: Server
-
-on:
-  pull_request:
-    paths-ignore:
-      - '**.js'
-      - '**.md'
-  workflow_dispatch:
-  push:
-    branches: [ develop ]
-    paths-ignore:
-      - '**.js'
-      - '**.md'
-
-concurrency:
-  group: server-mariadb-v13-${{ github.event.number }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: ubuntu-18.04
-    timeout-minutes: 60
-
-    strategy:
-      fail-fast: false
-
-      matrix:
-        container: [1, 2, 3]
-
-    name: Python Unit Tests
-
-    services:
-      mysql:
-        image: mariadb:10.3
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: YES
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v2
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 12
-          check-latest: true
-
-      - name: Add to Hosts
-        run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
-
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-
-      - name: Run Tests
-        run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator
-        env:
-          TYPE: server
-          CI_BUILD_ID: ${{ github.run_id }}
-          ORCHESTRATOR_URL: http://test-orchestrator.frappe.io

.github/workflows/ui-tests.yml

@@ -1,117 +0,0 @@
-name: UI
-
-on:
-  pull_request:
-    paths-ignore:
-      - '**.md'
-  workflow_dispatch:
-
-concurrency:
-  group: ui-v13-${{ github.event.number }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: ubuntu-18.04
-    timeout-minutes: 60
-
-    strategy:
-      fail-fast: false
-
-    name: UI Tests (Cypress)
-
-    services:
-      mysql:
-        image: mariadb:10.3
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: YES
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - name: Clone
-        uses: actions/checkout@v2
-
-      - name: Setup Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          check-latest: true
-
-      - name: Add to Hosts
-        run: |
-          echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
-
-      - name: Cache pip
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Cache cypress binary
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache
-          key: ${{ runner.os }}-cypress-
-          restore-keys: |
-            ${{ runner.os }}-cypress-
-            ${{ runner.os }}-
-
-      - name: Install
-        run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-        env:
-          DB: mariadb
-          TYPE: ui
-
-      - name: Site Setup
-        run: cd ~/frappe-bench/ && bench --site test_site execute erpnext.setup.utils.before_tests
-
-      - name: cypress pre-requisites
-        run: cd ~/frappe-bench/apps/frappe && yarn add cypress-file-upload@^5 @testing-library/cypress@^8 --no-lockfile
-
-
-      - name: Build Assets
-        run: cd ~/frappe-bench/ && bench build
-        env:
-          CI: Yes
-
-      - name: UI Tests
-        run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests erpnext --headless
-        env:
-          CYPRESS_RECORD_KEY: 60a8e3bf-08f5-45b1-9269-2b207d7d30cd
-
-      - name: Show bench console if tests failed
-        if: ${{ failure() }}
-        run: cat ~/frappe-bench/bench_run_logs.txt

.mergify.yml

@@ -1,58 +0,0 @@
-pull_request_rules:
-  - name: Auto-close PRs on stable branch
-    conditions:
-      - and:
-        - and:
-          - author!=surajshetty3416
-          - author!=gavindsouza
-          - author!=rohitwaghchaure
-          - author!=nabinhait
-        - or:
-          - base=version-13
-          - base=version-12
-    actions:
-      close:
-      comment:
-          message: |
-            @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on an appropriate hotfix branch. 
-            https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist#which-branch
-
-  - name: backport to version-13-hotfix
-    conditions:
-      - label="backport version-13-hotfix"
-    actions:
-      backport:
-        branches:
-          - version-13-hotfix
-        assignees:
-          - "{{ author }}"
-
-  - name: backport to version-13-pre-release
-    conditions:
-      - label="backport version-13-pre-release"
-    actions:
-      backport:
-        branches:
-          - version-13-pre-release
-        assignees:
-          - "{{ author }}"
-
-  - name: backport to version-12-hotfix
-    conditions:
-      - label="backport version-12-hotfix"
-    actions:
-      backport:
-        branches:
-          - version-12-hotfix
-        assignees:
-          - "{{ author }}"
-
-  - name: backport to version-12-pre-release
-    conditions:
-      - label="backport version-12-pre-release"
-    actions:
-      backport:
-        branches:
-          - version-12-pre-release
-        assignees:
-          - "{{ author }}"

.pre-commit-config.yaml

@@ -1,45 +0,0 @@
-exclude: 'node_modules|.git'
-default_stages: [commit]
-fail_fast: false
-
-
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
-    hooks:
-      - id: trailing-whitespace
-        files: "erpnext.*"
-        exclude: ".*json$|.*txt$|.*csv|.*md"
-      - id: check-yaml
-      - id: no-commit-to-branch
-        args: ['--branch', 'develop']
-      - id: check-merge-conflict
-      - id: check-ast
-
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
-    hooks:
-      - id: flake8
-        additional_dependencies: [
-          'flake8-bugbear',
-        ]
-        args: ['--config', '.github/helper/.flake8_strict']
-        exclude: ".*setup.py$"
-
-  - repo: https://github.com/adityahase/black
-    rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
-    hooks:
-      - id: black
-        additional_dependencies: ['click==8.0.4']
-
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.9.1
-    hooks:
-      - id: isort
-        exclude: ".*setup.py$"
-
-
-ci:
-    autoupdate_schedule: weekly
-    skip: []
-    submodules: false

.pylintrc

@@ -0,0 +1 @@
+disable=access-member-before-definition

.releaserc

@@ -1,24 +0,0 @@
-{
-	"branches": ["version-13"],
-	"plugins": [
-		"@semantic-release/commit-analyzer", {
-			"preset": "angular",
-			"releaseRules": [
-				{"breaking": true, "release": false}
-			]
-		},
-		"@semantic-release/release-notes-generator",
-		[
-			"@semantic-release/exec", {
-				"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" erpnext/__init__.py'
-			}
-		],
-		[
-			"@semantic-release/git", {
-				"assets": ["erpnext/__init__.py"],
-				"message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}"
-			}
-		],
-		"@semantic-release/github"
-	]
-}

.snyk

@@ -0,0 +1,8 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.14.0
+ignore: {}
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  SNYK-JS-LODASH-450202:
+    - cypress > getos > async > lodash:
+        patched: '2020-01-31T01:35:12.802Z'

.travis.yml

@@ -0,0 +1,69 @@
+language: python
+dist: trusty
+
+git:
+  depth: 1
+
+cache:
+  - pip
+
+addons:
+  hosts: test_site
+  mariadb: 10.3
+
+jobs:
+  include:
+  - name: "Python 3.6 Server Side Test"
+    python: 3.6
+    script: bench --site test_site run-tests --app erpnext --coverage
+
+  - name: "Python 3.6 Patch Test"
+    python: 3.6
+    before_script:
+      - wget http://build.erpnext.com/20171108_190013_955977f8_database.sql.gz
+      - bench --site test_site --force restore ~/frappe-bench/20171108_190013_955977f8_database.sql.gz
+    script: bench --site test_site migrate
+
+install:
+  - cd ~
+  - nvm install 10
+
+  - pip install frappe-bench
+
+  - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
+  - bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench
+
+  - mkdir ~/frappe-bench/sites/test_site
+  - cp -r $TRAVIS_BUILD_DIR/.travis/site_config.json ~/frappe-bench/sites/test_site/
+
+  - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"
+  - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"
+
+  - mysql -u root -e "CREATE DATABASE test_frappe"
+  - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"
+  - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"
+
+  - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"
+  - mysql -u root -e "FLUSH PRIVILEGES"
+
+  - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
+  - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
+  - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
+  - sudo chmod o+x /usr/local/bin/wkhtmltopdf
+  - sudo apt-get install libcups2-dev
+
+  - cd ~/frappe-bench
+
+  - sed -i 's/watch:/# watch:/g' Procfile
+  - sed -i 's/schedule:/# schedule:/g' Procfile
+  - sed -i 's/socketio:/# socketio:/g' Procfile
+  - sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
+
+  - bench get-app erpnext $TRAVIS_BUILD_DIR
+  - bench start &
+  - bench --site test_site reinstall --yes
+
+after_script:
+  - pip install coverage==4.5.4
+  - pip install python-coveralls
+  - coveralls -b apps/erpnext -d ../../sites/.coverage

.travis/site_config.json

@@ -1,6 +1,4 @@
 {
- "db_host": "127.0.0.1",
- "db_port": 3306,
  "db_name": "test_frappe",
  "db_password": "test_frappe",
  "auto_email_id": "test@example.com",

CODEOWNERS

@@ -3,33 +3,16 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
-erpnext/accounts/               @nextchamp-saqib @deepeshgarg007
-erpnext/assets/                 @nextchamp-saqib @deepeshgarg007
-erpnext/erpnext_integrations/   @nextchamp-saqib
-erpnext/loan_management/        @nextchamp-saqib @deepeshgarg007
-erpnext/regional                @nextchamp-saqib @deepeshgarg007
-erpnext/selling                 @nextchamp-saqib @deepeshgarg007
-erpnext/support/                @nextchamp-saqib @deepeshgarg007
-pos*                            @nextchamp-saqib
-
-erpnext/buying/                 @marination @rohitwaghchaure @ankush
-erpnext/e_commerce/             @marination
-erpnext/maintenance/            @marination @rohitwaghchaure
-erpnext/manufacturing/          @marination @rohitwaghchaure @ankush
-erpnext/portal/                 @marination
-erpnext/quality_management/     @marination @rohitwaghchaure
-erpnext/shopping_cart/          @marination
-erpnext/stock/                  @marination @rohitwaghchaure @ankush
-
-erpnext/crm/                    @ruchamahabal @pateljannat
-erpnext/education/              @ruchamahabal @pateljannat
-erpnext/healthcare/             @ruchamahabal @pateljannat @chillaranand
-erpnext/hr/                     @ruchamahabal @pateljannat
-erpnext/non_profit/             @ruchamahabal
-erpnext/payroll                 @ruchamahabal @pateljannat
-erpnext/projects/               @ruchamahabal @pateljannat
-
-erpnext/controllers             @deepeshgarg007 @nextchamp-saqib @rohitwaghchaure @marination
-
-.github/                        @surajshetty3416 @ankush
-requirements.txt                @gavindsouza
+manufacturing/          @rohitwaghchaure @marination
+accounts/               @deepeshgarg007 @nextchamp-saqib
+loan_management/        @deepeshgarg007 @rohitwaghchaure
+pos*                    @nextchamp-saqib @rohitwaghchaure
+assets/                 @nextchamp-saqib @deepeshgarg007
+stock/                  @marination @rohitwaghchaure
+buying/                 @marination @deepeshgarg007
+hr/                     @Anurag810 @rohitwaghchaure
+projects/               @hrwX @nextchamp-saqib
+support/                @hrwX @marination
+healthcare/             @ruchamahabal @marination
+erpnext_integrations/   @Mangesh-Khairnar @nextchamp-saqib
+requirements.txt        @gavindsouza

README.md

@@ -5,7 +5,7 @@
         <p>ERP made simple</p>
     </p>
 
-[![CI](https://github.com/frappe/erpnext/actions/workflows/ci-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/ci-tests.yml)
+[![Build Status](https://api.travis-ci.com/frappe/erpnext.svg?branch=develop)](https://travis-ci.com/frappe/erpnext)
 [![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
 [![Coverage Status](https://coveralls.io/repos/github/frappe/erpnext/badge.svg?branch=develop)](https://coveralls.io/github/frappe/erpnext?branch=develop)
 
@@ -39,10 +39,6 @@ ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a
 
 ---
 
-### Containerized Installation
-
-Use docker to deploy ERPNext in production or for development of [Frappe](https://github.com/frappe/frappe) apps. See https://github.com/frappe/frappe_docker for more details.
-
 ### Full Install
 
 The Easy Way: our install script for bench will install all dependencies (e.g. MariaDB). See https://github.com/frappe/bench for more details.

cypress.json

@@ -1,11 +0,0 @@
-{
-    "baseUrl": "http://test_site:8000",
-    "projectId": "da59y9",
-    "adminPassword": "admin",
-    "defaultCommandTimeout": 20000,
-    "pageLoadTimeout": 15000,
-    "retries": {
-      "runMode": 2,
-      "openMode": 2
-    }
-}

cypress/fixtures/example.json

@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}

cypress/integration/test_customer.js

@@ -1,13 +0,0 @@
-
-context('Customer', () => {
-	before(() => {
-		cy.login();
-	});
-	it('Check Customer Group', () => {
-		cy.visit(`app/customer/`);
-		cy.get('.primary-action').click();
-		cy.wait(500);
-		cy.get('.custom-actions > .btn').click();
-		cy.get_field('customer_group', 'Link').should('have.value', 'All Customer Groups');
-	});
-});

cypress/integration/test_organizational_chart_desktop.js

@@ -1,116 +0,0 @@
-context('Organizational Chart', () => {
-	before(() => {
-		cy.login();
-		cy.visit('/app/website');
-	});
-
-	it('navigates to org chart', () => {
-		cy.visit('/app');
-		cy.visit('/app/organizational-chart');
-		cy.url().should('include', '/organizational-chart');
-
-		cy.window().its('frappe.csrf_token').then(csrf_token => {
-			return cy.request({
-				url: `/api/method/erpnext.tests.ui_test_helpers.create_employee_records`,
-				method: 'POST',
-				headers: {
-					Accept: 'application/json',
-					'Content-Type': 'application/json',
-					'X-Frappe-CSRF-Token': csrf_token
-				},
-				timeout: 60000
-			}).then(res => {
-				expect(res.status).eq(200);
-				cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
-				cy.get('@input')
-					.clear({ force: true })
-					.type('Test Org Chart{downarrow}{enter}', { force: true })
-					.blur({ force: true });
-			});
-		});
-	});
-
-	it('renders root nodes and loads children for the first expandable node', () => {
-		// check rendered root nodes and the node name, title, connections
-		cy.get('.hierarchy').find('.root-level ul.node-children').children()
-			.should('have.length', 2)
-			.first()
-			.as('first-child');
-
-		cy.get('@first-child').get('.node-name').contains('Test Employee 1');
-		cy.get('@first-child').get('.node-info').find('.node-title').contains('CEO');
-		cy.get('@first-child').get('.node-info').find('.node-connections').contains('· 2 Connections');
-
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			// children of 1st root visible
-			cy.get(`div[data-parent="${employee_records.message[0]}"]`).as('child-node');
-			cy.get('@child-node')
-				.should('have.length', 1)
-				.should('be.visible');
-			cy.get('@child-node').get('.node-name').contains('Test Employee 3');
-
-			// connectors between first root node and immediate child
-			cy.get(`path[data-parent="${employee_records.message[0]}"]`)
-				.should('be.visible')
-				.invoke('attr', 'data-child')
-				.should('equal', employee_records.message[2]);
-		});
-	});
-
-	it('hides active nodes children and connectors on expanding sibling node', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			// click sibling
-			cy.get(`#${employee_records.message[1]}`)
-				.click()
-				.should('have.class', 'active');
-
-			// child nodes and connectors hidden
-			cy.get(`[data-parent="${employee_records.message[0]}"]`).should('not.be.visible');
-			cy.get(`path[data-parent="${employee_records.message[0]}"]`).should('not.be.visible');
-		});
-	});
-
-	it('collapses previous level nodes and refreshes connectors on expanding child node', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			// click child node
-			cy.get(`#${employee_records.message[3]}`)
-				.click()
-				.should('have.class', 'active');
-
-			// previous level nodes: parent should be on active-path; other nodes should be collapsed
-			cy.get(`#${employee_records.message[0]}`).should('have.class', 'collapsed');
-			cy.get(`#${employee_records.message[1]}`).should('have.class', 'active-path');
-
-			// previous level connectors refreshed
-			cy.get(`path[data-parent="${employee_records.message[1]}"]`)
-				.should('have.class', 'collapsed-connector');
-
-			// child node's children and connectors rendered
-			cy.get(`[data-parent="${employee_records.message[3]}"]`).should('be.visible');
-			cy.get(`path[data-parent="${employee_records.message[3]}"]`).should('be.visible');
-		});
-	});
-
-	it('expands previous level nodes', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			cy.get(`#${employee_records.message[0]}`)
-				.click()
-				.should('have.class', 'active');
-
-			cy.get(`[data-parent="${employee_records.message[0]}"]`)
-				.should('be.visible');
-
-			cy.get('ul.hierarchy').children().should('have.length', 2);
-			cy.get(`#connectors`).children().should('have.length', 1);
-		});
-	});
-
-	it('edit node navigates to employee master', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			cy.get(`#${employee_records.message[0]}`).find('.btn-edit-node')
-				.click();
-
-			cy.url().should('include', `/employee/${employee_records.message[0]}`);
-		});
-	});
-});

cypress/integration/test_organizational_chart_mobile.js

@@ -1,195 +0,0 @@
-context('Organizational Chart Mobile', () => {
-	before(() => {
-		cy.login();
-		cy.visit('/app/website');
-	});
-
-	it('navigates to org chart', () => {
-		cy.viewport(375, 667);
-		cy.visit('/app');
-		cy.visit('/app/organizational-chart');
-		cy.url().should('include', '/organizational-chart');
-
-		cy.window().its('frappe.csrf_token').then(csrf_token => {
-			return cy.request({
-				url: `/api/method/erpnext.tests.ui_test_helpers.create_employee_records`,
-				method: 'POST',
-				headers: {
-					Accept: 'application/json',
-					'Content-Type': 'application/json',
-					'X-Frappe-CSRF-Token': csrf_token
-				},
-				timeout: 60000
-			}).then(res => {
-				expect(res.status).eq(200);
-				cy.get('.frappe-control[data-fieldname=company] input').focus().as('input');
-				cy.get('@input')
-					.clear({ force: true })
-					.type('Test Org Chart{downarrow}{enter}', { force: true })
-					.blur({ force: true });
-			});
-		});
-	});
-
-	it('renders root nodes', () => {
-		// check rendered root nodes and the node name, title, connections
-		cy.get('.hierarchy-mobile').find('.root-level').children()
-			.should('have.length', 2)
-			.first()
-			.as('first-child');
-
-		cy.get('@first-child').get('.node-name').contains('Test Employee 1');
-		cy.get('@first-child').get('.node-info').find('.node-title').contains('CEO');
-		cy.get('@first-child').get('.node-info').find('.node-connections').contains('· 2');
-	});
-
-	it('expands root node', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			cy.get(`#${employee_records.message[1]}`)
-				.click()
-				.should('have.class', 'active');
-
-			// other root node removed
-			cy.get(`#${employee_records.message[0]}`).should('not.exist');
-
-			// children of active root node
-			cy.get('.hierarchy-mobile').find('.level').first().find('ul.node-children').children()
-				.should('have.length', 2);
-
-			cy.get(`div[data-parent="${employee_records.message[1]}"]`).first().as('child-node');
-			cy.get('@child-node').should('be.visible');
-
-			cy.get('@child-node')
-				.get('.node-name')
-				.contains('Test Employee 4');
-
-			// connectors between root node and immediate children
-			cy.get(`path[data-parent="${employee_records.message[1]}"]`).as('connectors');
-			cy.get('@connectors')
-				.should('have.length', 2)
-				.should('be.visible');
-
-			cy.get('@connectors')
-				.first()
-				.invoke('attr', 'data-child')
-				.should('eq', employee_records.message[3]);
-		});
-	});
-
-	it('expands child node', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			cy.get(`#${employee_records.message[3]}`)
-				.click()
-				.should('have.class', 'active')
-				.as('expanded_node');
-
-			// 2 levels on screen; 1 on active path; 1 collapsed
-			cy.get('.hierarchy-mobile').children().should('have.length', 2);
-			cy.get(`#${employee_records.message[1]}`).should('have.class', 'active-path');
-
-			// children of expanded node visible
-			cy.get('@expanded_node')
-				.next()
-				.should('have.class', 'node-children')
-				.as('node-children');
-
-			cy.get('@node-children').children().should('have.length', 1);
-			cy.get('@node-children')
-				.first()
-				.get('.node-card')
-				.should('have.class', 'active-child')
-				.contains('Test Employee 7');
-
-			// orphan connectors removed
-			cy.get(`#connectors`).children().should('have.length', 2);
-		});
-	});
-
-	it('renders sibling group', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			// sibling group visible for parent
-			cy.get(`#${employee_records.message[1]}`)
-				.next()
-				.as('sibling_group');
-
-			cy.get('@sibling_group')
-				.should('have.attr', 'data-parent', 'undefined')
-				.should('have.class', 'node-group')
-				.and('have.class', 'collapsed');
-
-			cy.get('@sibling_group').get('.avatar-group').children().as('siblings');
-			cy.get('@siblings').should('have.length', 1);
-			cy.get('@siblings')
-				.first()
-				.should('have.attr', 'title', 'Test Employee 1');
-
-		});
-	});
-
-	it('expands previous level nodes', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			cy.get(`#${employee_records.message[6]}`)
-				.click()
-				.should('have.class', 'active');
-
-			// clicking on previous level node should remove all the nodes ahead
-			// and expand that node
-			cy.get(`#${employee_records.message[3]}`).click();
-			cy.get(`#${employee_records.message[3]}`)
-				.should('have.class', 'active')
-				.should('not.have.class', 'active-path');
-
-			cy.get(`#${employee_records.message[6]}`).should('have.class', 'active-child');
-			cy.get('.hierarchy-mobile').children().should('have.length', 2);
-			cy.get(`#connectors`).children().should('have.length', 2);
-		});
-	});
-
-	it('expands sibling group', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			// sibling group visible for parent
-			cy.get(`#${employee_records.message[6]}`).click();
-
-			cy.get(`#${employee_records.message[3]}`)
-				.next()
-				.click();
-
-			// siblings of parent should be visible
-			cy.get('.hierarchy-mobile').prev().as('sibling_group');
-			cy.get('@sibling_group')
-				.should('exist')
-				.should('have.class', 'sibling-group')
-				.should('not.have.class', 'collapsed');
-
-			cy.get(`#${employee_records.message[1]}`)
-				.should('be.visible')
-				.should('have.class', 'active');
-
-			cy.get(`[data-parent="${employee_records.message[1]}"]`)
-				.should('be.visible')
-				.should('have.length', 2)
-				.should('have.class', 'active-child');
-		});
-	});
-
-	it('goes to the respective level after clicking on non-collapsed sibling group', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(() => {
-			// click on non-collapsed sibling group
-			cy.get('.hierarchy-mobile')
-				.prev()
-				.click();
-
-			// should take you to that level
-			cy.get('.hierarchy-mobile').find('li.level .node-card').should('have.length', 2);
-		});
-	});
-
-	it('edit node navigates to employee master', () => {
-		cy.call('erpnext.tests.ui_test_helpers.get_employee_records').then(employee_records => {
-			cy.get(`#${employee_records.message[0]}`).find('.btn-edit-node')
-				.click();
-
-			cy.url().should('include', `/employee/${employee_records.message[0]}`);
-		});
-	});
-});

cypress/plugins/index.js

@@ -1,17 +0,0 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-module.exports = () => {
-	// `on` is used to hook into various events Cypress emits
-	// `config` is the resolved Cypress config
-};

cypress/support/commands.js

@@ -1,31 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... });
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... });
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... });
-//
-//
-// -- This is will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... });
-
-const slug = (name) => name.toLowerCase().replace(" ", "-");
-
-Cypress.Commands.add("go_to_doc", (doctype, name) => {
-	cy.visit(`/app/${slug(doctype)}/${encodeURIComponent(name)}`);
-});

cypress/support/index.js

@@ -1,26 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands';
-import '../../../frappe/cypress/support/commands' // eslint-disable-line
-
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
-
-Cypress.Cookies.defaults({
-	preserve: 'sid'
-});

cypress/tsconfig.json

@@ -1,12 +0,0 @@
-{
-    "compilerOptions": {
-        "allowJs": true,
-        "baseUrl": "../node_modules",
-        "types": [
-            "cypress"
-        ]
-    },
-    "include": [
-        "**/*.*"
-    ]
-}

erpnext/.stylelintrc

@@ -1,9 +0,0 @@
-{
-	"extends": ["stylelint-config-recommended"],
-	"plugins": ["stylelint-scss"],
-	"rules": {
-		"at-rule-no-unknown": null,
-		"scss/at-rule-no-unknown": true,
-		"no-descending-specificity": null
-	}
-}

erpnext/__init__.py

@@ -1,60 +1,53 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
 import inspect
-
 import frappe
-
 from erpnext.hooks import regional_overrides
+from frappe.utils import getdate
 
-__version__ = "13.29.0"
-
+__version__ = '13.0.0-beta.14'
 
 def get_default_company(user=None):
-	"""Get default company for user"""
+	'''Get default company for user'''
 	from frappe.defaults import get_user_default_as_list
 
 	if not user:
 		user = frappe.session.user
 
-	companies = get_user_default_as_list(user, "company")
+	companies = get_user_default_as_list(user, 'company')
 	if companies:
 		default_company = companies[0]
 	else:
-		default_company = frappe.db.get_single_value("Global Defaults", "default_company")
+		default_company = frappe.db.get_single_value('Global Defaults', 'default_company')
 
 	return default_company
 
 
 def get_default_currency():
-	"""Returns the currency of the default company"""
+	'''Returns the currency of the default company'''
 	company = get_default_company()
 	if company:
-		return frappe.get_cached_value("Company", company, "default_currency")
-
+		return frappe.get_cached_value('Company',  company,  'default_currency')
 
 def get_default_cost_center(company):
-	"""Returns the default cost center of the company"""
+	'''Returns the default cost center of the company'''
 	if not company:
 		return None
 
 	if not frappe.flags.company_cost_center:
 		frappe.flags.company_cost_center = {}
 	if not company in frappe.flags.company_cost_center:
-		frappe.flags.company_cost_center[company] = frappe.get_cached_value(
-			"Company", company, "cost_center"
-		)
+		frappe.flags.company_cost_center[company] = frappe.get_cached_value('Company',  company,  'cost_center')
 	return frappe.flags.company_cost_center[company]
 
-
 def get_company_currency(company):
-	"""Returns the default company currency"""
+	'''Returns the default company currency'''
 	if not frappe.flags.company_currency:
 		frappe.flags.company_currency = {}
 	if not company in frappe.flags.company_currency:
-		frappe.flags.company_currency[company] = frappe.db.get_value(
-			"Company", company, "default_currency", cache=True
-		)
+		frappe.flags.company_currency[company] = frappe.db.get_value('Company',  company,  'default_currency', cache=True)
 	return frappe.flags.company_currency[company]
 
-
 def set_perpetual_inventory(enable=1, company=None):
 	if not company:
 		company = "_Test Company" if frappe.flags.in_test else get_default_company()
@@ -63,10 +56,9 @@ def set_perpetual_inventory(enable=1, company=None):
 	company.enable_perpetual_inventory = enable
 	company.save()
 
-
-def encode_company_abbr(name, company=None, abbr=None):
-	"""Returns name encoded with company abbreviation"""
-	company_abbr = abbr or frappe.get_cached_value("Company", company, "abbr")
+def encode_company_abbr(name, company):
+	'''Returns name encoded with company abbreviation'''
+	company_abbr = frappe.get_cached_value('Company',  company,  "abbr")
 	parts = name.rsplit(" - ", 1)
 
 	if parts[-1].lower() != company_abbr.lower():
@@ -74,73 +66,65 @@ def encode_company_abbr(name, company=None, abbr=None):
 
 	return " - ".join(parts)
 
-
 def is_perpetual_inventory_enabled(company):
 	if not company:
 		company = "_Test Company" if frappe.flags.in_test else get_default_company()
 
-	if not hasattr(frappe.local, "enable_perpetual_inventory"):
+	if not hasattr(frappe.local, 'enable_perpetual_inventory'):
 		frappe.local.enable_perpetual_inventory = {}
 
 	if not company in frappe.local.enable_perpetual_inventory:
-		frappe.local.enable_perpetual_inventory[company] = (
-			frappe.get_cached_value("Company", company, "enable_perpetual_inventory") or 0
-		)
+		frappe.local.enable_perpetual_inventory[company] = frappe.get_cached_value('Company',
+			company,  "enable_perpetual_inventory") or 0
 
 	return frappe.local.enable_perpetual_inventory[company]
 
-
 def get_default_finance_book(company=None):
 	if not company:
 		company = get_default_company()
 
-	if not hasattr(frappe.local, "default_finance_book"):
+	if not hasattr(frappe.local, 'default_finance_book'):
 		frappe.local.default_finance_book = {}
 
 	if not company in frappe.local.default_finance_book:
-		frappe.local.default_finance_book[company] = frappe.get_cached_value(
-			"Company", company, "default_finance_book"
-		)
+		frappe.local.default_finance_book[company] = frappe.get_cached_value('Company',
+			company,  "default_finance_book")
 
 	return frappe.local.default_finance_book[company]
 
-
 def get_party_account_type(party_type):
-	if not hasattr(frappe.local, "party_account_types"):
+	if not hasattr(frappe.local, 'party_account_types'):
 		frappe.local.party_account_types = {}
 
 	if not party_type in frappe.local.party_account_types:
-		frappe.local.party_account_types[party_type] = (
-			frappe.db.get_value("Party Type", party_type, "account_type") or ""
-		)
+		frappe.local.party_account_types[party_type] = frappe.db.get_value("Party Type",
+			party_type, "account_type") or ''
 
 	return frappe.local.party_account_types[party_type]
 
-
 def get_region(company=None):
-	"""Return the default country based on flag, company or global settings
+	'''Return the default country based on flag, company or global settings
 
 	You can also set global company flag in `frappe.flags.company`
-	"""
+	'''
 	if company or frappe.flags.company:
-		return frappe.get_cached_value("Company", company or frappe.flags.company, "country")
+		return frappe.get_cached_value('Company',
+			company or frappe.flags.company, 'country')
 	elif frappe.flags.country:
 		return frappe.flags.country
 	else:
-		return frappe.get_system_settings("country")
-
+		return frappe.get_system_settings('country')
 
 def allow_regional(fn):
-	"""Decorator to make a function regionally overridable
+	'''Decorator to make a function regionally overridable
 
 	Example:
 	@erpnext.allow_regional
 	def myfunction():
-	  pass"""
-
+	  pass'''
 	def caller(*args, **kwargs):
 		region = get_region()
-		fn_name = inspect.getmodule(fn).__name__ + "." + fn.__name__
+		fn_name = inspect.getmodule(fn).__name__ + '.' + fn.__name__
 		if region in regional_overrides and fn_name in regional_overrides[region]:
 			return frappe.get_attr(regional_overrides[region][fn_name])(*args, **kwargs)
 		else:
@@ -148,16 +132,10 @@ def allow_regional(fn):
 
 	return caller
 
-
 def get_last_membership(member):
-	"""Returns last membership if exists"""
-	last_membership = frappe.get_all(
-		"Membership",
-		"name,to_date,membership_type",
-		dict(member=member, paid=1),
-		order_by="to_date desc",
-		limit=1,
-	)
+	'''Returns last membership if exists'''
+	last_membership = frappe.get_all('Membership', 'name,to_date,membership_type',
+		dict(member=member, paid=1), order_by='to_date desc', limit=1)
 
 	if last_membership:
 		return last_membership[0]

erpnext/accounts/custom/address.py

@@ -1,11 +1,7 @@
 import frappe
 from frappe import _
-from frappe.contacts.doctype.address.address import (
-	Address,
-	get_address_display,
-	get_address_templates,
-)
-
+from frappe.contacts.doctype.address.address import Address
+from frappe.contacts.doctype.address.address import get_address_templates
 
 class ERPNextAddress(Address):
 	def validate(self):
@@ -23,34 +19,20 @@ class ERPNextAddress(Address):
 		if self.is_your_company_address and not [
 			row for row in self.links if row.link_doctype == "Company"
 		]:
-			frappe.throw(
-				_("Address needs to be linked to a Company. Please add a row for Company in the Links table."),
-				title=_("Company Not Linked"),
-			)
-
-	def on_update(self):
-		"""
-		After Address is updated, update the related 'Primary Address' on Customer.
-		"""
-		address_display = get_address_display(self.as_dict())
-		filters = {"customer_primary_address": self.name}
-		customers = frappe.db.get_all("Customer", filters=filters, as_list=True)
-		for customer_name in customers:
-			frappe.db.set_value("Customer", customer_name[0], "primary_address", address_display)
-
+			frappe.throw(_("Address needs to be linked to a Company. Please add a row for Company in the Links table."),
+				title=_("Company Not Linked"))
 
 @frappe.whitelist()
-def get_shipping_address(company, address=None):
+def get_shipping_address(company, address = None):
 	filters = [
 		["Dynamic Link", "link_doctype", "=", "Company"],
 		["Dynamic Link", "link_name", "=", company],
-		["Address", "is_your_company_address", "=", 1],
+		["Address", "is_your_company_address", "=", 1]
 	]
 	fields = ["*"]
-	if address and frappe.db.get_value("Dynamic Link", {"parent": address, "link_name": company}):
+	if address and frappe.db.get_value('Dynamic Link',
+		{'parent': address, 'link_name': company}):
 		filters.append(["Address", "name", "=", address])
-	if not address:
-		filters.append(["Address", "is_shipping_address", "=", 1])
 
 	address = frappe.get_all("Address", filters=filters, fields=fields) or {}
 

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js

@@ -19,4 +19,4 @@ frappe.dashboards.chart_sources["Account Balance Timeline"] = {
 			reqd: 1
 		},
 	]
-};
+};

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

@@ -1,35 +1,26 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-
-import frappe
+from __future__ import unicode_literals
+import frappe, json
 from frappe import _
-from frappe.utils import add_to_date, formatdate, get_link_to_form, getdate, nowdate
+from frappe.utils import add_to_date, date_diff, getdate, nowdate, get_last_day, formatdate, get_link_to_form
+from erpnext.accounts.report.general_ledger.general_ledger import execute
 from frappe.utils.dashboard import cache_source
 from frappe.utils.dateutils import get_from_date_from_timespan, get_period_ending
 from frappe.utils.nestedset import get_descendants_of
 
-
 @frappe.whitelist()
 @cache_source
-def get(
-	chart_name=None,
-	chart=None,
-	no_cache=None,
-	filters=None,
-	from_date=None,
-	to_date=None,
-	timespan=None,
-	time_interval=None,
-	heatmap_year=None,
-):
+def get(chart_name = None, chart = None, no_cache = None, filters = None, from_date = None,
+	to_date = None, timespan = None, time_interval = None, heatmap_year = None):
 	if chart_name:
-		chart = frappe.get_doc("Dashboard Chart", chart_name)
+		chart = frappe.get_doc('Dashboard Chart', chart_name)
 	else:
 		chart = frappe._dict(frappe.parse_json(chart))
 	timespan = chart.timespan
 
-	if chart.timespan == "Select Date Range":
+	if chart.timespan == 'Select Date Range':
 		from_date = chart.from_date
 		to_date = chart.to_date
 
@@ -40,23 +31,17 @@ def get(
 	company = filters.get("company")
 
 	if not account and chart_name:
-		frappe.throw(
-			_("Account is not set for the dashboard chart {0}").format(
-				get_link_to_form("Dashboard Chart", chart_name)
-			)
-		)
+		frappe.throw(_("Account is not set for the dashboard chart {0}")
+			.format(get_link_to_form("Dashboard Chart", chart_name)))
 
 	if not frappe.db.exists("Account", account) and chart_name:
-		frappe.throw(
-			_("Account {0} does not exists in the dashboard chart {1}").format(
-				account, get_link_to_form("Dashboard Chart", chart_name)
-			)
-		)
+		frappe.throw(_("Account {0} does not exists in the dashboard chart {1}")
+			.format(account, get_link_to_form("Dashboard Chart", chart_name)))
 
 	if not to_date:
 		to_date = nowdate()
 	if not from_date:
-		if timegrain in ("Monthly", "Quarterly"):
+		if timegrain in ('Monthly', 'Quarterly'):
 			from_date = get_from_date_from_timespan(to_date, timespan)
 
 	# fetch dates to plot
@@ -69,14 +54,16 @@ def get(
 	result = build_result(account, dates, gl_entries)
 
 	return {
-		"labels": [formatdate(r[0].strftime("%Y-%m-%d")) for r in result],
-		"datasets": [{"name": account, "values": [r[1] for r in result]}],
+		"labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result],
+		"datasets": [{
+			"name": account,
+			"values": [r[1] for r in result]
+		}]
 	}
 
-
 def build_result(account, dates, gl_entries):
 	result = [[getdate(date), 0.0] for date in dates]
-	root_type = frappe.db.get_value("Account", account, "root_type")
+	root_type = frappe.db.get_value('Account', account, 'root_type')
 
 	# start with the first date
 	date_index = 0
@@ -91,34 +78,30 @@ def build_result(account, dates, gl_entries):
 		result[date_index][1] += entry.debit - entry.credit
 
 	# if account type is credit, switch balances
-	if root_type not in ("Asset", "Expense"):
+	if root_type not in ('Asset', 'Expense'):
 		for r in result:
 			r[1] = -1 * r[1]
 
 	# for balance sheet accounts, the totals are cumulative
-	if root_type in ("Asset", "Liability", "Equity"):
+	if root_type in ('Asset', 'Liability', 'Equity'):
 		for i, r in enumerate(result):
 			if i > 0:
-				r[1] = r[1] + result[i - 1][1]
+				r[1] = r[1] + result[i-1][1]
 
 	return result
 
-
 def get_gl_entries(account, to_date):
-	child_accounts = get_descendants_of("Account", account, ignore_permissions=True)
+	child_accounts = get_descendants_of('Account', account, ignore_permissions=True)
 	child_accounts.append(account)
 
-	return frappe.db.get_all(
-		"GL Entry",
-		fields=["posting_date", "debit", "credit"],
-		filters=[
-			dict(posting_date=("<", to_date)),
-			dict(account=("in", child_accounts)),
-			dict(voucher_type=("!=", "Period Closing Voucher")),
+	return frappe.db.get_all('GL Entry',
+		fields = ['posting_date', 'debit', 'credit'],
+		filters = [
+			dict(posting_date = ('<', to_date)),
+			dict(account = ('in', child_accounts)),
+			dict(voucher_type = ('!=', 'Period Closing Voucher'))
 		],
-		order_by="posting_date asc",
-	)
-
+		order_by = 'posting_date asc')
 
 def get_dates_from_timegrain(from_date, to_date, timegrain):
 	days = months = years = 0
@@ -133,8 +116,6 @@ def get_dates_from_timegrain(from_date, to_date, timegrain):
 
 	dates = [get_period_ending(from_date, timegrain)]
 	while getdate(dates[-1]) < getdate(to_date):
-		date = get_period_ending(
-			add_to_date(dates[-1], years=years, months=months, days=days), timegrain
-		)
+		date = get_period_ending(add_to_date(dates[-1], years=years, months=months, days=days), timegrain)
 		dates.append(date)
 	return dates

erpnext/accounts/deferred_revenue.py

@@ -1,44 +1,28 @@
+from __future__ import unicode_literals
+
 import frappe
 from frappe import _
-from frappe.email import sendmail_to_system_managers
-from frappe.utils import (
-	add_days,
-	add_months,
-	cint,
-	date_diff,
-	flt,
-	get_first_day,
-	get_last_day,
-	get_link_to_form,
-	getdate,
-	rounded,
-	today,
-)
-
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import (
-	get_accounting_dimensions,
-)
+from frappe.utils import date_diff, add_months, today, getdate, add_days, flt, get_last_day, get_first_day, cint, get_link_to_form, rounded
 from erpnext.accounts.utils import get_account_currency
-
+from frappe.email import sendmail_to_system_managers
+from frappe.utils.background_jobs import enqueue
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
 
 def validate_service_stop_date(doc):
-	"""Validates service_stop_date for Purchase Invoice and Sales Invoice"""
+	''' Validates service_stop_date for Purchase Invoice and Sales Invoice '''
 
-	enable_check = (
-		"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
-	)
+	enable_check = "enable_deferred_revenue" \
+		if doc.doctype=="Sales Invoice" else "enable_deferred_expense"
 
 	old_stop_dates = {}
-	old_doc = frappe.db.get_all(
-		"{0} Item".format(doc.doctype), {"parent": doc.name}, ["name", "service_stop_date"]
-	)
+	old_doc = frappe.db.get_all("{0} Item".format(doc.doctype),
+		{"parent": doc.name}, ["name", "service_stop_date"])
 
 	for d in old_doc:
 		old_stop_dates[d.name] = d.service_stop_date or ""
 
 	for item in doc.items:
-		if not item.get(enable_check):
-			continue
+		if not item.get(enable_check): continue
 
 		if item.service_stop_date:
 			if date_diff(item.service_stop_date, item.service_start_date) < 0:
@@ -47,31 +31,21 @@ def validate_service_stop_date(doc):
 			if date_diff(item.service_stop_date, item.service_end_date) > 0:
 				frappe.throw(_("Service Stop Date cannot be after Service End Date"))
 
-		if (
-			old_stop_dates
-			and old_stop_dates.get(item.name)
-			and item.service_stop_date != old_stop_dates.get(item.name)
-		):
+		if old_stop_dates and old_stop_dates.get(item.name) and item.service_stop_date!=old_stop_dates.get(item.name):
 			frappe.throw(_("Cannot change Service Stop Date for item in row {0}").format(item.idx))
 
-
 def build_conditions(process_type, account, company):
-	conditions = ""
-	deferred_account = (
-		"item.deferred_revenue_account" if process_type == "Income" else "item.deferred_expense_account"
-	)
+	conditions=''
+	deferred_account = "item.deferred_revenue_account" if process_type=="Income" else "item.deferred_expense_account"
 
 	if account:
-		conditions += "AND %s='%s'" % (deferred_account, account)
+		conditions += "AND %s='%s'"%(deferred_account, account)
 	elif company:
-		conditions += f"AND p.company = {frappe.db.escape(company)}"
+		conditions += "AND p.company='%s'"%(company)
 
 	return conditions
 
-
-def convert_deferred_expense_to_expense(
-	deferred_process, start_date=None, end_date=None, conditions=""
-):
+def convert_deferred_expense_to_expense(deferred_process, start_date=None, end_date=None, conditions=''):
 	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
 
 	if not start_date:
@@ -80,19 +54,14 @@ def convert_deferred_expense_to_expense(
 		end_date = add_days(today(), -1)
 
 	# check for the purchase invoice for which GL entries has to be done
-	invoices = frappe.db.sql_list(
-		"""
+	invoices = frappe.db.sql_list('''
 		select distinct item.parent
 		from `tabPurchase Invoice Item` item, `tabPurchase Invoice` p
 		where item.service_start_date<=%s and item.service_end_date>=%s
 		and item.enable_deferred_expense = 1 and item.parent=p.name
 		and item.docstatus = 1 and ifnull(item.amount, 0) > 0
 		{0}
-	""".format(
-			conditions
-		),
-		(end_date, start_date),
-	)  # nosec
+	'''.format(conditions), (end_date, start_date)) #nosec
 
 	# For each invoice, book deferred expense
 	for invoice in invoices:
@@ -102,10 +71,7 @@ def convert_deferred_expense_to_expense(
 	if frappe.flags.deferred_accounting_error:
 		send_mail(deferred_process)
 
-
-def convert_deferred_revenue_to_income(
-	deferred_process, start_date=None, end_date=None, conditions=""
-):
+def convert_deferred_revenue_to_income(deferred_process, start_date=None, end_date=None, conditions=''):
 	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
 
 	if not start_date:
@@ -114,19 +80,14 @@ def convert_deferred_revenue_to_income(
 		end_date = add_days(today(), -1)
 
 	# check for the sales invoice for which GL entries has to be done
-	invoices = frappe.db.sql_list(
-		"""
+	invoices = frappe.db.sql_list('''
 		select distinct item.parent
 		from `tabSales Invoice Item` item, `tabSales Invoice` p
 		where item.service_start_date<=%s and item.service_end_date>=%s
 		and item.enable_deferred_revenue = 1 and item.parent=p.name
 		and item.docstatus = 1 and ifnull(item.amount, 0) > 0
 		{0}
-	""".format(
-			conditions
-		),
-		(end_date, start_date),
-	)  # nosec
+	'''.format(conditions), (end_date, start_date)) #nosec
 
 	for invoice in invoices:
 		doc = frappe.get_doc("Sales Invoice", invoice)
@@ -135,43 +96,30 @@ def convert_deferred_revenue_to_income(
 	if frappe.flags.deferred_accounting_error:
 		send_mail(deferred_process)
 
-
 def get_booking_dates(doc, item, posting_date=None):
 	if not posting_date:
 		posting_date = add_days(today(), -1)
 
 	last_gl_entry = False
 
-	deferred_account = (
-		"deferred_revenue_account" if doc.doctype == "Sales Invoice" else "deferred_expense_account"
-	)
+	deferred_account = "deferred_revenue_account" if doc.doctype=="Sales Invoice" else "deferred_expense_account"
 
-	prev_gl_entry = frappe.db.sql(
-		"""
+	prev_gl_entry = frappe.db.sql('''
 		select name, posting_date from `tabGL Entry` where company=%s and account=%s and
 		voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
-		and is_cancelled = 0
 		order by posting_date desc limit 1
-	""",
-		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
-		as_dict=True,
-	)
+	''', (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
 
-	prev_gl_via_je = frappe.db.sql(
-		"""
+	prev_gl_via_je = frappe.db.sql('''
 		SELECT p.name, p.posting_date FROM `tabJournal Entry` p, `tabJournal Entry Account` c
 		WHERE p.name = c.parent and p.company=%s and c.account=%s
 		and c.reference_type=%s and c.reference_name=%s
 		and c.reference_detail_no=%s and c.docstatus < 2 order by posting_date desc limit 1
-	""",
-		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
-		as_dict=True,
-	)
+	''', (doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
 
 	if prev_gl_via_je:
-		if (not prev_gl_entry) or (
-			prev_gl_entry and prev_gl_entry[0].posting_date < prev_gl_via_je[0].posting_date
-		):
+		if (not prev_gl_entry) or (prev_gl_entry and
+			prev_gl_entry[0].posting_date < prev_gl_via_je[0].posting_date):
 			prev_gl_entry = prev_gl_via_je
 
 	if prev_gl_entry:
@@ -195,94 +143,66 @@ def get_booking_dates(doc, item, posting_date=None):
 	else:
 		return None, None, None
 
-
-def calculate_monthly_amount(
-	doc, item, last_gl_entry, start_date, end_date, total_days, total_booking_days, account_currency
-):
+def calculate_monthly_amount(doc, item, last_gl_entry, start_date, end_date, total_days, total_booking_days, account_currency):
 	amount, base_amount = 0, 0
 
 	if not last_gl_entry:
-		total_months = (
-			(item.service_end_date.year - item.service_start_date.year) * 12
-			+ (item.service_end_date.month - item.service_start_date.month)
-			+ 1
-		)
+		total_months = (item.service_end_date.year - item.service_start_date.year) * 12 + \
+			(item.service_end_date.month - item.service_start_date.month) + 1
 
-		prorate_factor = flt(date_diff(item.service_end_date, item.service_start_date)) / flt(
-			date_diff(get_last_day(item.service_end_date), get_first_day(item.service_start_date))
-		)
+		prorate_factor = flt(date_diff(item.service_end_date, item.service_start_date)) \
+			/ flt(date_diff(get_last_day(item.service_end_date), get_first_day(item.service_start_date)))
 
 		actual_months = rounded(total_months * prorate_factor, 1)
 
-		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
-			doc, item
-		)
+		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(doc, item)
 		base_amount = flt(item.base_net_amount / actual_months, item.precision("base_net_amount"))
 
 		if base_amount + already_booked_amount > item.base_net_amount:
 			base_amount = item.base_net_amount - already_booked_amount
 
-		if account_currency == doc.company_currency:
+		if account_currency==doc.company_currency:
 			amount = base_amount
 		else:
-			amount = flt(item.net_amount / actual_months, item.precision("net_amount"))
+			amount = flt(item.net_amount/actual_months, item.precision("net_amount"))
 			if amount + already_booked_amount_in_account_currency > item.net_amount:
 				amount = item.net_amount - already_booked_amount_in_account_currency
 
 		if not (get_first_day(start_date) == start_date and get_last_day(end_date) == end_date):
-			partial_month = flt(date_diff(end_date, start_date)) / flt(
-				date_diff(get_last_day(end_date), get_first_day(start_date))
-			)
+			partial_month = flt(date_diff(end_date, start_date)) \
+				/ flt(date_diff(get_last_day(end_date), get_first_day(start_date)))
 
 			base_amount = rounded(partial_month, 1) * base_amount
 			amount = rounded(partial_month, 1) * amount
 	else:
-		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
-			doc, item
-		)
-		base_amount = flt(
-			item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
-		)
-		if account_currency == doc.company_currency:
+		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(doc, item)
+		base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
+		if account_currency==doc.company_currency:
 			amount = base_amount
 		else:
-			amount = flt(
-				item.net_amount - already_booked_amount_in_account_currency, item.precision("net_amount")
-			)
+			amount = flt(item.net_amount - already_booked_amount_in_account_currency, item.precision("net_amount"))
 
 	return amount, base_amount
 
-
 def calculate_amount(doc, item, last_gl_entry, total_days, total_booking_days, account_currency):
 	amount, base_amount = 0, 0
 	if not last_gl_entry:
-		base_amount = flt(
-			item.base_net_amount * total_booking_days / flt(total_days), item.precision("base_net_amount")
-		)
-		if account_currency == doc.company_currency:
+		base_amount = flt(item.base_net_amount*total_booking_days/flt(total_days), item.precision("base_net_amount"))
+		if account_currency==doc.company_currency:
 			amount = base_amount
 		else:
-			amount = flt(
-				item.net_amount * total_booking_days / flt(total_days), item.precision("net_amount")
-			)
+			amount = flt(item.net_amount*total_booking_days/flt(total_days), item.precision("net_amount"))
 	else:
-		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
-			doc, item
-		)
+		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(doc, item)
 
-		base_amount = flt(
-			item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
-		)
-		if account_currency == doc.company_currency:
+		base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
+		if account_currency==doc.company_currency:
 			amount = base_amount
 		else:
-			amount = flt(
-				item.net_amount - already_booked_amount_in_account_currency, item.precision("net_amount")
-			)
+			amount = flt(item.net_amount - already_booked_amount_in_account_currency, item.precision("net_amount"))
 
 	return amount, base_amount
 
-
 def get_already_booked_amount(doc, item):
 	if doc.doctype == "Sales Invoice":
 		total_credit_debit, total_credit_debit_currency = "debit", "debit_in_account_currency"
@@ -291,31 +211,20 @@ def get_already_booked_amount(doc, item):
 		total_credit_debit, total_credit_debit_currency = "credit", "credit_in_account_currency"
 		deferred_account = "deferred_expense_account"
 
-	gl_entries_details = frappe.db.sql(
-		"""
+	gl_entries_details = frappe.db.sql('''
 		select sum({0}) as total_credit, sum({1}) as total_credit_in_account_currency, voucher_detail_no
 		from `tabGL Entry` where company=%s and account=%s and voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
-		and is_cancelled = 0
 		group by voucher_detail_no
-	""".format(
-			total_credit_debit, total_credit_debit_currency
-		),
-		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
-		as_dict=True,
-	)
+	'''.format(total_credit_debit, total_credit_debit_currency),
+		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
 
-	journal_entry_details = frappe.db.sql(
-		"""
+	journal_entry_details = frappe.db.sql('''
 		SELECT sum(c.{0}) as total_credit, sum(c.{1}) as total_credit_in_account_currency, reference_detail_no
 		FROM `tabJournal Entry` p , `tabJournal Entry Account` c WHERE p.name = c.parent and
 		p.company = %s and c.account=%s and c.reference_type=%s and c.reference_name=%s and c.reference_detail_no=%s
 		and p.docstatus < 2 group by reference_detail_no
-	""".format(
-			total_credit_debit, total_credit_debit_currency
-		),
-		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
-		as_dict=True,
-	)
+	'''.format(total_credit_debit, total_credit_debit_currency),
+		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name), as_dict=True)
 
 	already_booked_amount = gl_entries_details[0].total_credit if gl_entries_details else 0
 	already_booked_amount += journal_entry_details[0].total_credit if journal_entry_details else 0
@@ -323,31 +232,20 @@ def get_already_booked_amount(doc, item):
 	if doc.currency == doc.company_currency:
 		already_booked_amount_in_account_currency = already_booked_amount
 	else:
-		already_booked_amount_in_account_currency = (
-			gl_entries_details[0].total_credit_in_account_currency if gl_entries_details else 0
-		)
-		already_booked_amount_in_account_currency += (
-			journal_entry_details[0].total_credit_in_account_currency if journal_entry_details else 0
-		)
+		already_booked_amount_in_account_currency = gl_entries_details[0].total_credit_in_account_currency if gl_entries_details else 0
+		already_booked_amount_in_account_currency += journal_entry_details[0].total_credit_in_account_currency if journal_entry_details else 0
 
 	return already_booked_amount, already_booked_amount_in_account_currency
 
-
 def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
-	enable_check = (
-		"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
-	)
+	enable_check = "enable_deferred_revenue" \
+		if doc.doctype=="Sales Invoice" else "enable_deferred_expense"
 
-	accounts_frozen_upto = frappe.get_cached_value("Accounts Settings", "None", "acc_frozen_upto")
-
-	def _book_deferred_revenue_or_expense(
-		item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on
-	):
+	def _book_deferred_revenue_or_expense(item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on):
 		start_date, end_date, last_gl_entry = get_booking_dates(doc, item, posting_date=posting_date)
-		if not (start_date and end_date):
-			return
+		if not (start_date and end_date): return
 
-		account_currency = get_account_currency(item.expense_account or item.income_account)
+		account_currency = get_account_currency(item.expense_account)
 		if doc.doctype == "Sales Invoice":
 			against, project = doc.customer, doc.project
 			credit_account, debit_account = item.income_account, item.deferred_revenue_account
@@ -358,305 +256,194 @@ def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
 		total_days = date_diff(item.service_end_date, item.service_start_date) + 1
 		total_booking_days = date_diff(end_date, start_date) + 1
 
-		if book_deferred_entries_based_on == "Months":
-			amount, base_amount = calculate_monthly_amount(
-				doc,
-				item,
-				last_gl_entry,
-				start_date,
-				end_date,
-				total_days,
-				total_booking_days,
-				account_currency,
-			)
+		if book_deferred_entries_based_on == 'Months':
+			amount, base_amount = calculate_monthly_amount(doc, item, last_gl_entry,
+				start_date, end_date, total_days, total_booking_days, account_currency)
 		else:
-			amount, base_amount = calculate_amount(
-				doc, item, last_gl_entry, total_days, total_booking_days, account_currency
-			)
-
-		if not amount:
-			return
-
-		# check if books nor frozen till endate:
-		if accounts_frozen_upto and (end_date) <= getdate(accounts_frozen_upto):
-			end_date = get_last_day(add_days(accounts_frozen_upto, 1))
+			amount, base_amount = calculate_amount(doc, item, last_gl_entry,
+				total_days, total_booking_days, account_currency)
 
 		if via_journal_entry:
-			book_revenue_via_journal_entry(
-				doc,
-				credit_account,
-				debit_account,
-				amount,
-				base_amount,
-				end_date,
-				project,
-				account_currency,
-				item.cost_center,
-				item,
-				deferred_process,
-				submit_journal_entry,
-			)
+			book_revenue_via_journal_entry(doc, credit_account, debit_account, against, amount,
+				base_amount, end_date, project, account_currency, item.cost_center, item, deferred_process, submit_journal_entry)
 		else:
-			make_gl_entries(
-				doc,
-				credit_account,
-				debit_account,
-				against,
-				amount,
-				base_amount,
-				end_date,
-				project,
-				account_currency,
-				item.cost_center,
-				item,
-				deferred_process,
-			)
+			make_gl_entries(doc, credit_account, debit_account, against,
+				amount, base_amount, end_date, project, account_currency, item.cost_center, item, deferred_process)
 
 		# Returned in case of any errors because it tries to submit the same record again and again in case of errors
 		if frappe.flags.deferred_accounting_error:
 			return
 
 		if getdate(end_date) < getdate(posting_date) and not last_gl_entry:
-			_book_deferred_revenue_or_expense(
-				item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on
-			)
+			_book_deferred_revenue_or_expense(item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on)
 
-	via_journal_entry = cint(
-		frappe.db.get_singles_value("Accounts Settings", "book_deferred_entries_via_journal_entry")
-	)
-	submit_journal_entry = cint(
-		frappe.db.get_singles_value("Accounts Settings", "submit_journal_entries")
-	)
-	book_deferred_entries_based_on = frappe.db.get_singles_value(
-		"Accounts Settings", "book_deferred_entries_based_on"
-	)
+	via_journal_entry = cint(frappe.db.get_singles_value('Accounts Settings', 'book_deferred_entries_via_journal_entry'))
+	submit_journal_entry = cint(frappe.db.get_singles_value('Accounts Settings', 'submit_journal_entries'))
+	book_deferred_entries_based_on = frappe.db.get_singles_value('Accounts Settings', 'book_deferred_entries_based_on')
 
-	for item in doc.get("items"):
+	for item in doc.get('items'):
 		if item.get(enable_check):
-			_book_deferred_revenue_or_expense(
-				item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on
-			)
-
+			_book_deferred_revenue_or_expense(item, via_journal_entry, submit_journal_entry, book_deferred_entries_based_on)
 
 def process_deferred_accounting(posting_date=None):
-	"""Converts deferred income/expense into income/expense
-	Executed via background jobs on every month end"""
+	''' Converts deferred income/expense into income/expense
+		Executed via background jobs on every month end '''
 
 	if not posting_date:
 		posting_date = today()
 
-	if not cint(
-		frappe.db.get_singles_value(
-			"Accounts Settings", "automatically_process_deferred_accounting_entry"
-		)
-	):
+	if not cint(frappe.db.get_singles_value('Accounts Settings', 'automatically_process_deferred_accounting_entry')):
 		return
 
 	start_date = add_months(today(), -1)
 	end_date = add_days(today(), -1)
 
-	companies = frappe.get_all("Company")
+	for record_type in ('Income', 'Expense'):
+		doc = frappe.get_doc(dict(
+			doctype='Process Deferred Accounting',
+			posting_date=posting_date,
+			start_date=start_date,
+			end_date=end_date,
+			type=record_type
+		))
 
-	for company in companies:
-		for record_type in ("Income", "Expense"):
-			doc = frappe.get_doc(
-				dict(
-					doctype="Process Deferred Accounting",
-					company=company.name,
-					posting_date=posting_date,
-					start_date=start_date,
-					end_date=end_date,
-					type=record_type,
-				)
-			)
+		doc.insert()
+		doc.submit()
 
-			doc.insert()
-			doc.submit()
-
-
-def make_gl_entries(
-	doc,
-	credit_account,
-	debit_account,
-	against,
-	amount,
-	base_amount,
-	posting_date,
-	project,
-	account_currency,
-	cost_center,
-	item,
-	deferred_process=None,
-):
+def make_gl_entries(doc, credit_account, debit_account, against,
+	amount, base_amount, posting_date, project, account_currency, cost_center, item, deferred_process=None):
 	# GL Entry for crediting the amount in the deferred expense
 	from erpnext.accounts.general_ledger import make_gl_entries
 
-	if amount == 0:
-		return
+	if amount == 0: return
 
 	gl_entries = []
 	gl_entries.append(
-		doc.get_gl_dict(
-			{
-				"account": credit_account,
-				"against": against,
-				"credit": base_amount,
-				"credit_in_account_currency": amount,
-				"cost_center": cost_center,
-				"voucher_detail_no": item.name,
-				"posting_date": posting_date,
-				"project": project,
-				"against_voucher_type": "Process Deferred Accounting",
-				"against_voucher": deferred_process,
-			},
-			account_currency,
-			item=item,
-		)
+		doc.get_gl_dict({
+			"account": credit_account,
+			"against": against,
+			"credit": base_amount,
+			"credit_in_account_currency": amount,
+			"cost_center": cost_center,
+			"voucher_detail_no": item.name,
+			'posting_date': posting_date,
+			'project': project,
+			'against_voucher_type': 'Process Deferred Accounting',
+			'against_voucher': deferred_process
+		}, account_currency, item=item)
 	)
 	# GL Entry to debit the amount from the expense
 	gl_entries.append(
-		doc.get_gl_dict(
-			{
-				"account": debit_account,
-				"against": against,
-				"debit": base_amount,
-				"debit_in_account_currency": amount,
-				"cost_center": cost_center,
-				"voucher_detail_no": item.name,
-				"posting_date": posting_date,
-				"project": project,
-				"against_voucher_type": "Process Deferred Accounting",
-				"against_voucher": deferred_process,
-			},
-			account_currency,
-			item=item,
-		)
+		doc.get_gl_dict({
+			"account": debit_account,
+			"against": against,
+			"debit": base_amount,
+			"debit_in_account_currency": amount,
+			"cost_center": cost_center,
+			"voucher_detail_no": item.name,
+			'posting_date': posting_date,
+			'project': project,
+			'against_voucher_type': 'Process Deferred Accounting',
+			'against_voucher': deferred_process
+		}, account_currency, item=item)
 	)
 
 	if gl_entries:
 		try:
 			make_gl_entries(gl_entries, cancel=(doc.docstatus == 2), merge_entries=True)
 			frappe.db.commit()
-		except Exception as e:
-			if frappe.flags.in_test:
-				traceback = frappe.get_traceback()
-				frappe.log_error(
-					title=_("Error while processing deferred accounting for Invoice {0}").format(doc.name),
-					message=traceback,
-				)
-				raise e
-			else:
-				frappe.db.rollback()
-				traceback = frappe.get_traceback()
-				frappe.log_error(
-					title=_("Error while processing deferred accounting for Invoice {0}").format(doc.name),
-					message=traceback,
-				)
-				frappe.flags.deferred_accounting_error = True
+		except:
+			frappe.db.rollback()
+			traceback = frappe.get_traceback()
+			frappe.log_error(message=traceback)
 
+			frappe.flags.deferred_accounting_error = True
 
 def send_mail(deferred_process):
-	title = _("Error while processing deferred accounting for {0}").format(deferred_process)
-	link = get_link_to_form("Process Deferred Accounting", deferred_process)
-	content = _("Deferred accounting failed for some invoices:") + "\n"
-	content += _(
-		"Please check Process Deferred Accounting {0} and submit manually after resolving errors."
-	).format(link)
+	title = _("Error while processing deferred accounting for {0}".format(deferred_process))
+	content = _("""
+		Deferred accounting failed for some invoices:
+		Please check Process Deferred Accounting {0}
+		and submit manually after resolving errors
+	""").format(get_link_to_form('Process Deferred Accounting', deferred_process))
 	sendmail_to_system_managers(title, content)
 
+def book_revenue_via_journal_entry(doc, credit_account, debit_account, against,
+	amount, base_amount, posting_date, project, account_currency, cost_center, item,
+	deferred_process=None, submit='No'):
 
-def book_revenue_via_journal_entry(
-	doc,
-	credit_account,
-	debit_account,
-	amount,
-	base_amount,
-	posting_date,
-	project,
-	account_currency,
-	cost_center,
-	item,
-	deferred_process=None,
-	submit="No",
-):
+	if amount == 0: return
 
-	if amount == 0:
-		return
-
-	journal_entry = frappe.new_doc("Journal Entry")
+	journal_entry = frappe.new_doc('Journal Entry')
 	journal_entry.posting_date = posting_date
 	journal_entry.company = doc.company
-	journal_entry.voucher_type = (
-		"Deferred Revenue" if doc.doctype == "Sales Invoice" else "Deferred Expense"
-	)
-	journal_entry.process_deferred_accounting = deferred_process
+	journal_entry.voucher_type = 'Deferred Revenue' if doc.doctype == 'Sales Invoice' \
+		else 'Deferred Expense'
 
 	debit_entry = {
-		"account": credit_account,
-		"credit": base_amount,
-		"credit_in_account_currency": amount,
-		"account_currency": account_currency,
-		"reference_name": doc.name,
-		"reference_type": doc.doctype,
-		"reference_detail_no": item.name,
-		"cost_center": cost_center,
-		"project": project,
+		'account': credit_account,
+		'credit': base_amount,
+		'credit_in_account_currency': amount,
+		'party_type': 'Customer' if doc.doctype == 'Sales Invoice' else 'Supplier',
+		'party': against,
+		'account_currency': account_currency,
+		'reference_name': doc.name,
+		'reference_type': doc.doctype,
+		'reference_detail_no': item.name,
+		'cost_center': cost_center,
+		'project': project,
 	}
 
 	credit_entry = {
-		"account": debit_account,
-		"debit": base_amount,
-		"debit_in_account_currency": amount,
-		"account_currency": account_currency,
-		"reference_name": doc.name,
-		"reference_type": doc.doctype,
-		"reference_detail_no": item.name,
-		"cost_center": cost_center,
-		"project": project,
+		'account': debit_account,
+		'debit': base_amount,
+		'debit_in_account_currency': amount,
+		'party_type': 'Customer' if doc.doctype == 'Sales Invoice' else 'Supplier',
+		'party': against,
+		'account_currency': account_currency,
+		'reference_name': doc.name,
+		'reference_type': doc.doctype,
+		'reference_detail_no': item.name,
+		'cost_center': cost_center,
+		'project': project,
 	}
 
 	for dimension in get_accounting_dimensions():
-		debit_entry.update({dimension: item.get(dimension)})
+		debit_entry.update({
+			dimension: item.get(dimension)
+		})
 
-		credit_entry.update({dimension: item.get(dimension)})
+		credit_entry.update({
+			dimension: item.get(dimension)
+		})
 
-	journal_entry.append("accounts", debit_entry)
-	journal_entry.append("accounts", credit_entry)
+	journal_entry.append('accounts', debit_entry)
+	journal_entry.append('accounts', credit_entry)
 
 	try:
 		journal_entry.save()
 
 		if submit:
 			journal_entry.submit()
-
-		frappe.db.commit()
-	except Exception:
+	except:
 		frappe.db.rollback()
 		traceback = frappe.get_traceback()
-		frappe.log_error(
-			title=_("Error while processing deferred accounting for Invoice {0}").format(doc.name),
-			message=traceback,
-		)
+		frappe.log_error(message=traceback)
 
 		frappe.flags.deferred_accounting_error = True
 
-
 def get_deferred_booking_accounts(doctype, voucher_detail_no, dr_or_cr):
 
-	if doctype == "Sales Invoice":
-		credit_account, debit_account = frappe.db.get_value(
-			"Sales Invoice Item",
-			{"name": voucher_detail_no},
-			["income_account", "deferred_revenue_account"],
-		)
+	if doctype == 'Sales Invoice':
+		credit_account, debit_account = frappe.db.get_value('Sales Invoice Item', {'name': voucher_detail_no},
+			['income_account', 'deferred_revenue_account'])
 	else:
-		credit_account, debit_account = frappe.db.get_value(
-			"Purchase Invoice Item",
-			{"name": voucher_detail_no},
-			["deferred_expense_account", "expense_account"],
-		)
+		credit_account, debit_account = frappe.db.get_value('Purchase Invoice Item', {'name': voucher_detail_no},
+			['deferred_expense_account', 'expense_account'])
 
-	if dr_or_cr == "Debit":
+	if dr_or_cr == 'Debit':
 		return debit_account
 	else:
 		return credit_account
+
+

erpnext/accounts/desk_page/accounting/accounting.json

@@ -0,0 +1,161 @@
+{
+ "cards": [
+  {
+   "hidden": 0,
+   "label": "Accounting Masters",
+   "links": "[\n    {\n        \"description\": \"Company (not Customer or Supplier) master.\",\n        \"label\": \"Company\",\n        \"name\": \"Company\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Tree of financial accounts.\",\n        \"icon\": \"fa fa-sitemap\",\n        \"label\": \"Chart of Accounts\",\n        \"name\": \"Account\",\n        \"onboard\": 1,\n        \"route\": \"#Tree/Account\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Accounts Settings\",\n        \"name\": \"Accounts Settings\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Financial / accounting year.\",\n        \"label\": \"Fiscal Year\",\n        \"name\": \"Fiscal Year\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Accounting Dimension\",\n        \"name\": \"Accounting Dimension\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Finance Book\",\n        \"name\": \"Finance Book\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Accounting Period\",\n        \"name\": \"Accounting Period\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Payment Terms based on conditions\",\n        \"label\": \"Payment Term\",\n        \"name\": \"Payment Term\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "General Ledger",
+   "links": "[\n    {\n        \"description\": \"Accounting journal entries.\",\n        \"label\": \"Journal Entry\",\n        \"name\": \"Journal Entry\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Make journal entries from a template.\",\n        \"label\": \"Journal Entry Template\",\n        \"name\": \"Journal Entry Template\",\n        \"type\": \"doctype\"\n    },\n    \n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"General Ledger\",\n        \"name\": \"General Ledger\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Customer Ledger Summary\",\n        \"name\": \"Customer Ledger Summary\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Supplier Ledger Summary\",\n        \"name\": \"Supplier Ledger Summary\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Accounts Receivable",
+   "links": "[\n    {\n        \"description\": \"Bills raised to Customers.\",\n        \"label\": \"Sales Invoice\",\n        \"name\": \"Sales Invoice\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Customer database.\",\n        \"label\": \"Customer\",\n        \"name\": \"Customer\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Bank/Cash transactions against party or for internal transfer\",\n        \"label\": \"Payment Entry\",\n        \"name\": \"Payment Entry\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Payment Request\",\n        \"label\": \"Payment Request\",\n        \"name\": \"Payment Request\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Accounts Receivable\",\n        \"name\": \"Accounts Receivable\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Accounts Receivable Summary\",\n        \"name\": \"Accounts Receivable Summary\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Sales Register\",\n        \"name\": \"Sales Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Item-wise Sales Register\",\n        \"name\": \"Item-wise Sales Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Order\",\n        \"is_query_report\": true,\n        \"label\": \"Sales Order Analysis\",\n        \"name\": \"Sales Order Analysis\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Delivered Items To Be Billed\",\n        \"name\": \"Delivered Items To Be Billed\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Accounts Payable",
+   "links": "[\n    {\n        \"description\": \"Bills raised by Suppliers.\",\n        \"label\": \"Purchase Invoice\",\n        \"name\": \"Purchase Invoice\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Supplier database.\",\n        \"label\": \"Supplier\",\n        \"name\": \"Supplier\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Bank/Cash transactions against party or for internal transfer\",\n        \"label\": \"Payment Entry\",\n        \"name\": \"Payment Entry\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Purchase Invoice\"\n        ],\n        \"doctype\": \"Purchase Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Accounts Payable\",\n        \"name\": \"Accounts Payable\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Purchase Invoice\"\n        ],\n        \"doctype\": \"Purchase Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Accounts Payable Summary\",\n        \"name\": \"Accounts Payable Summary\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Purchase Invoice\"\n        ],\n        \"doctype\": \"Purchase Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Purchase Register\",\n        \"name\": \"Purchase Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Purchase Invoice\"\n        ],\n        \"doctype\": \"Purchase Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Item-wise Purchase Register\",\n        \"name\": \"Item-wise Purchase Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Purchase Order\"\n        ],\n        \"doctype\": \"Purchase Order\",\n        \"is_query_report\": true,\n        \"label\": \"Purchase Order Analysis\",\n        \"name\": \"Purchase Order Analysis\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Purchase Invoice\"\n        ],\n        \"doctype\": \"Purchase Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Received Items To Be Billed\",\n        \"name\": \"Received Items To Be Billed\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Reports",
+   "links": "[\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Trial Balance for Party\",\n        \"name\": \"Trial Balance for Party\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Journal Entry\"\n        ],\n        \"doctype\": \"Journal Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Payment Period Based On Invoice Date\",\n        \"name\": \"Payment Period Based On Invoice Date\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Sales Partners Commission\",\n        \"name\": \"Sales Partners Commission\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Customer\"\n        ],\n        \"doctype\": \"Customer\",\n        \"is_query_report\": true,\n        \"label\": \"Customer Credit Balance\",\n        \"name\": \"Customer Credit Balance\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Sales Payment Summary\",\n        \"name\": \"Sales Payment Summary\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Address\"\n        ],\n        \"doctype\": \"Address\",\n        \"is_query_report\": true,\n        \"label\": \"Address And Contacts\",\n        \"name\": \"Address And Contacts\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"DATEV Export\",\n        \"name\": \"DATEV\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Financial Statements",
+   "links": "[\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Trial Balance\",\n        \"name\": \"Trial Balance\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Profit and Loss Statement\",\n        \"name\": \"Profit and Loss Statement\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Balance Sheet\",\n        \"name\": \"Balance Sheet\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Cash Flow\",\n        \"name\": \"Cash Flow\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Consolidated Financial Statement\",\n        \"name\": \"Consolidated Financial Statement\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Multi Currency",
+   "links": "[\n    {\n        \"description\": \"Enable / disable currencies.\",\n        \"label\": \"Currency\",\n        \"name\": \"Currency\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Currency exchange rate master.\",\n        \"label\": \"Currency Exchange\",\n        \"name\": \"Currency Exchange\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Exchange Rate Revaluation master.\",\n        \"label\": \"Exchange Rate Revaluation\",\n        \"name\": \"Exchange Rate Revaluation\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Settings",
+   "links": "[\n    {\n        \"description\": \"Setup Gateway accounts.\",\n        \"label\": \"Payment Gateway Account\",\n        \"name\": \"Payment Gateway Account\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Template of terms or contract.\",\n        \"label\": \"Terms and Conditions Template\",\n        \"name\": \"Terms and Conditions\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"e.g. Bank, Cash, Credit Card\",\n        \"label\": \"Mode of Payment\",\n        \"name\": \"Mode of Payment\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Bank Statement",
+   "links": "[\n    {\n        \"label\": \"Bank\",\n        \"name\": \"Bank\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Bank Account\",\n        \"name\": \"Bank Account\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Bank Clearance\",\n        \"name\": \"Bank Clearance\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Bank Reconciliation\",\n        \"name\": \"bank-reconciliation\",\n        \"type\": \"page\"\n    },\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Bank Reconciliation Statement\",\n        \"name\": \"Bank Reconciliation Statement\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Subscription Management",
+   "links": "[\n    {\n        \"label\": \"Subscription Plan\",\n        \"name\": \"Subscription Plan\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Subscription\",\n        \"name\": \"Subscription\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Subscription Settings\",\n        \"name\": \"Subscription Settings\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Goods and Services Tax (GST India)",
+   "links": "[\n    {\n        \"label\": \"GST Settings\",\n        \"name\": \"GST Settings\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"GST HSN Code\",\n        \"name\": \"GST HSN Code\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"is_query_report\": true,\n        \"label\": \"GSTR-1\",\n        \"name\": \"GSTR-1\",\n        \"type\": \"report\"\n    },\n    {\n        \"is_query_report\": true,\n        \"label\": \"GSTR-2\",\n        \"name\": \"GSTR-2\",\n        \"type\": \"report\"\n    },\n    {\n        \"label\": \"GSTR 3B Report\",\n        \"name\": \"GSTR 3B Report\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"is_query_report\": true,\n        \"label\": \"GST Sales Register\",\n        \"name\": \"GST Sales Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"is_query_report\": true,\n        \"label\": \"GST Purchase Register\",\n        \"name\": \"GST Purchase Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"is_query_report\": true,\n        \"label\": \"GST Itemised Sales Register\",\n        \"name\": \"GST Itemised Sales Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"is_query_report\": true,\n        \"label\": \"GST Itemised Purchase Register\",\n        \"name\": \"GST Itemised Purchase Register\",\n        \"type\": \"report\"\n    },\n    {\n        \"country\": \"India\",\n        \"description\": \"C-Form records\",\n        \"label\": \"C-Form\",\n        \"name\": \"C-Form\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"country\": \"India\",\n        \"label\": \"Lower Deduction Certificate\",\n        \"name\": \"Lower Deduction Certificate\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Share Management",
+   "links": "[\n    {\n        \"description\": \"List of available Shareholders with folio numbers\",\n        \"label\": \"Shareholder\",\n        \"name\": \"Shareholder\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"List of all share transactions\",\n        \"label\": \"Share Transfer\",\n        \"name\": \"Share Transfer\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Share Transfer\"\n        ],\n        \"doctype\": \"Share Transfer\",\n        \"is_query_report\": true,\n        \"label\": \"Share Ledger\",\n        \"name\": \"Share Ledger\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Share Transfer\"\n        ],\n        \"doctype\": \"Share Transfer\",\n        \"is_query_report\": true,\n        \"label\": \"Share Balance\",\n        \"name\": \"Share Balance\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Cost Center and Budgeting",
+   "links": "[\n    {\n        \"description\": \"Tree of financial Cost Centers.\",\n        \"icon\": \"fa fa-sitemap\",\n        \"label\": \"Chart of Cost Centers\",\n        \"name\": \"Cost Center\",\n        \"route\": \"#Tree/Cost Center\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Define budget for a financial year.\",\n        \"label\": \"Budget\",\n        \"name\": \"Budget\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Accounting Dimension\",\n        \"name\": \"Accounting Dimension\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"dependencies\": [\n            \"Cost Center\"\n        ],\n        \"doctype\": \"Cost Center\",\n        \"is_query_report\": true,\n        \"label\": \"Budget Variance Report\",\n        \"name\": \"Budget Variance Report\",\n        \"type\": \"report\"\n    },\n    {\n        \"description\": \"Seasonality for setting budgets, targets etc.\",\n        \"label\": \"Monthly Distribution\",\n        \"name\": \"Monthly Distribution\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Opening and Closing",
+   "links": "[\n    {\n        \"label\": \"Opening Invoice Creation Tool\",\n        \"name\": \"Opening Invoice Creation Tool\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Chart of Accounts Importer\",\n        \"name\": \"Chart of Accounts Importer\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Close Balance Sheet and book Profit or Loss.\",\n        \"label\": \"Period Closing Voucher\",\n        \"name\": \"Period Closing Voucher\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Taxes",
+   "links": "[\n    {\n        \"description\": \"Tax template for selling transactions.\",\n        \"label\": \"Sales Taxes and Charges Template\",\n        \"name\": \"Sales Taxes and Charges Template\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Tax template for buying transactions.\",\n        \"label\": \"Purchase Taxes and Charges Template\",\n        \"name\": \"Purchase Taxes and Charges Template\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Tax template for item tax rates.\",\n        \"label\": \"Item Tax Template\",\n        \"name\": \"Item Tax Template\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Tax Category for overriding tax rates.\",\n        \"label\": \"Tax Category\",\n        \"name\": \"Tax Category\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Tax Rule for transactions.\",\n        \"label\": \"Tax Rule\",\n        \"name\": \"Tax Rule\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Tax Withholding rates to be applied on transactions.\",\n        \"label\": \"Tax Withholding Category\",\n        \"name\": \"Tax Withholding Category\",\n        \"type\": \"doctype\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Profitability",
+   "links": "[\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Gross Profit\",\n        \"name\": \"Gross Profit\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"GL Entry\"\n        ],\n        \"doctype\": \"GL Entry\",\n        \"is_query_report\": true,\n        \"label\": \"Profitability Analysis\",\n        \"name\": \"Profitability Analysis\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Sales Invoice\"\n        ],\n        \"doctype\": \"Sales Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Sales Invoice Trends\",\n        \"name\": \"Sales Invoice Trends\",\n        \"type\": \"report\"\n    },\n    {\n        \"dependencies\": [\n            \"Purchase Invoice\"\n        ],\n        \"doctype\": \"Purchase Invoice\",\n        \"is_query_report\": true,\n        \"label\": \"Purchase Invoice Trends\",\n        \"name\": \"Purchase Invoice Trends\",\n        \"type\": \"report\"\n    }\n]"
+  },
+  {
+   "hidden": 0,
+   "label": "Value-Added Tax (VAT UAE)",
+   "links": "[\n    {\n        \"country\": \"United Arab Emirates\",\n        \"label\": \"UAE VAT Settings\",\n        \"name\": \"UAE VAT Settings\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"country\": \"United Arab Emirates\",\n        \"is_query_report\": true,\n        \"label\": \"UAE VAT 201\",\n        \"name\": \"UAE VAT 201\",\n        \"type\": \"report\"\n    }\n\n]"
+  }
+ ],
+ "category": "Modules",
+ "charts": [
+  {
+   "chart_name": "Profit and Loss",
+   "label": "Profit and Loss"
+  }
+ ],
+ "creation": "2020-03-02 15:41:59.515192",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Desk Page",
+ "extends_another_page": 0,
+ "hide_custom": 0,
+ "idx": 0,
+ "is_standard": 1,
+ "label": "Accounting",
+ "modified": "2020-11-11 18:35:11.542909",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Accounting",
+ "onboarding": "Accounts",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
+ "shortcuts": [
+  {
+   "label": "Chart Of Accounts",
+   "link_to": "Account",
+   "type": "DocType"
+  },
+  {
+   "label": "Sales Invoice",
+   "link_to": "Sales Invoice",
+   "type": "DocType"
+  },
+  {
+   "label": "Purchase Invoice",
+   "link_to": "Purchase Invoice",
+   "type": "DocType"
+  },
+  {
+   "label": "Journal Entry",
+   "link_to": "Journal Entry",
+   "type": "DocType"
+  },
+  {
+   "label": "Payment Entry",
+   "link_to": "Payment Entry",
+   "type": "DocType"
+  },
+  {
+   "label": "Accounts Receivable",
+   "link_to": "Accounts Receivable",
+   "type": "Report"
+  },
+  {
+   "label": "General Ledger",
+   "link_to": "General Ledger",
+   "type": "Report"
+  },
+  {
+   "label": "Trial Balance",
+   "link_to": "Trial Balance",
+   "type": "Report"
+  },
+  {
+   "label": "Dashboard",
+   "link_to": "Accounts",
+   "type": "Dashboard"
+  }
+ ]
+}

erpnext/accounts/doctype/__init__.py

@@ -0,0 +1 @@
+from __future__ import unicode_literals

erpnext/accounts/doctype/account/__init__.py

@@ -0,0 +1 @@
+from __future__ import unicode_literals

erpnext/accounts/doctype/account/account.js

@@ -43,12 +43,12 @@ frappe.ui.form.on('Account', {
 				frm.trigger('add_toolbar_buttons');
 			}
 			if (frm.has_perm('write')) {
-				frm.add_custom_button(__('Merge Account'), function () {
-					frm.trigger("merge_account");
-				}, __('Actions'));
 				frm.add_custom_button(__('Update Account Name / Number'), function () {
 					frm.trigger("update_account_number");
-				}, __('Actions'));
+				});
+				frm.add_custom_button(__('Merge Account'), function () {
+					frm.trigger("merge_account");
+				});
 			}
 		}
 	},
@@ -59,12 +59,11 @@ frappe.ui.form.on('Account', {
 		}
 	},
 	add_toolbar_buttons: function(frm) {
-		frm.add_custom_button(__('Chart of Accounts'), () => {
-			frappe.set_route("Tree", "Account");
-		}, __('View'));
+		frm.add_custom_button(__('Chart of Accounts'),
+			function () { frappe.set_route("Tree", "Account"); });
 
 		if (frm.doc.is_group == 1) {
-			frm.add_custom_button(__('Convert to Non-Group'), function () {
+			frm.add_custom_button(__('Group to Non-Group'), function () {
 				return frappe.call({
 					doc: frm.doc,
 					method: 'convert_group_to_ledger',
@@ -72,11 +71,10 @@ frappe.ui.form.on('Account', {
 						frm.refresh();
 					}
 				});
-			}, __('Actions'));
-
+			});
 		} else if (cint(frm.doc.is_group) == 0
 			&& frappe.boot.user.can_read.indexOf("GL Entry") !== -1) {
-			frm.add_custom_button(__('General Ledger'), function () {
+			cur_frm.add_custom_button(__('Ledger'), function () {
 				frappe.route_options = {
 					"account": frm.doc.name,
 					"from_date": frappe.sys_defaults.year_start_date,
@@ -84,9 +82,9 @@ frappe.ui.form.on('Account', {
 					"company": frm.doc.company
 				};
 				frappe.set_route("query-report", "General Ledger");
-			}, __('View'));
+			});
 
-			frm.add_custom_button(__('Convert to Group'), function () {
+			frm.add_custom_button(__('Non-Group to Group'), function () {
 				return frappe.call({
 					doc: frm.doc,
 					method: 'convert_ledger_to_group',
@@ -94,7 +92,7 @@ frappe.ui.form.on('Account', {
 						frm.refresh();
 					}
 				});
-			}, __('Actions'));
+			});
 		}
 	},
 

erpnext/accounts/doctype/account/account.py

@@ -1,47 +1,35 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-
+from __future__ import unicode_literals
 import frappe
-from frappe import _, throw
 from frappe.utils import cint, cstr
+from frappe import throw, _
 from frappe.utils.nestedset import NestedSet, get_ancestors_of, get_descendants_of
 
-import erpnext
-
-
-class RootNotEditable(frappe.ValidationError):
-	pass
-
-
-class BalanceMismatchError(frappe.ValidationError):
-	pass
-
+class RootNotEditable(frappe.ValidationError): pass
+class BalanceMismatchError(frappe.ValidationError): pass
 
 class Account(NestedSet):
-	nsm_parent_field = "parent_account"
-
+	nsm_parent_field = 'parent_account'
 	def on_update(self):
-		if frappe.local.flags.ignore_update_nsm:
+		if frappe.local.flags.ignore_on_update:
 			return
 		else:
 			super(Account, self).on_update()
 
 	def onload(self):
-		frozen_accounts_modifier = frappe.db.get_value(
-			"Accounts Settings", "Accounts Settings", "frozen_accounts_modifier"
-		)
+		frozen_accounts_modifier = frappe.db.get_value("Accounts Settings", "Accounts Settings",
+			"frozen_accounts_modifier")
 		if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles():
 			self.set_onload("can_freeze_account", True)
 
 	def autoname(self):
 		from erpnext.accounts.utils import get_autoname_with_number
-
 		self.name = get_autoname_with_number(self.account_number, self.account_name, None, self.company)
 
 	def validate(self):
 		from erpnext.accounts.utils import validate_field_number
-
 		if frappe.local.flags.allow_unverified_charts:
 			return
 		self.validate_parent()
@@ -58,33 +46,22 @@ class Account(NestedSet):
 	def validate_parent(self):
 		"""Fetch Parent Details and validate parent account"""
 		if self.parent_account:
-			par = frappe.db.get_value(
-				"Account", self.parent_account, ["name", "is_group", "company"], as_dict=1
-			)
+			par = frappe.db.get_value("Account", self.parent_account,
+				["name", "is_group", "company"], as_dict=1)
 			if not par:
-				throw(
-					_("Account {0}: Parent account {1} does not exist").format(self.name, self.parent_account)
-				)
+				throw(_("Account {0}: Parent account {1} does not exist").format(self.name, self.parent_account))
 			elif par.name == self.name:
 				throw(_("Account {0}: You can not assign itself as parent account").format(self.name))
 			elif not par.is_group:
-				throw(
-					_("Account {0}: Parent account {1} can not be a ledger").format(
-						self.name, self.parent_account
-					)
-				)
+				throw(_("Account {0}: Parent account {1} can not be a ledger").format(self.name, self.parent_account))
 			elif par.company != self.company:
-				throw(
-					_("Account {0}: Parent account {1} does not belong to company: {2}").format(
-						self.name, self.parent_account, self.company
-					)
-				)
+				throw(_("Account {0}: Parent account {1} does not belong to company: {2}")
+					.format(self.name, self.parent_account, self.company))
 
 	def set_root_and_report_type(self):
 		if self.parent_account:
-			par = frappe.db.get_value(
-				"Account", self.parent_account, ["report_type", "root_type"], as_dict=1
-			)
+			par = frappe.db.get_value("Account", self.parent_account,
+				["report_type", "root_type"], as_dict=1)
 
 			if par.report_type:
 				self.report_type = par.report_type
@@ -95,20 +72,15 @@ class Account(NestedSet):
 			db_value = frappe.db.get_value("Account", self.name, ["report_type", "root_type"], as_dict=1)
 			if db_value:
 				if self.report_type != db_value.report_type:
-					frappe.db.sql(
-						"update `tabAccount` set report_type=%s where lft > %s and rgt < %s",
-						(self.report_type, self.lft, self.rgt),
-					)
+					frappe.db.sql("update `tabAccount` set report_type=%s where lft > %s and rgt < %s",
+						(self.report_type, self.lft, self.rgt))
 				if self.root_type != db_value.root_type:
-					frappe.db.sql(
-						"update `tabAccount` set root_type=%s where lft > %s and rgt < %s",
-						(self.root_type, self.lft, self.rgt),
-					)
+					frappe.db.sql("update `tabAccount` set root_type=%s where lft > %s and rgt < %s",
+						(self.root_type, self.lft, self.rgt))
 
 		if self.root_type and not self.report_type:
-			self.report_type = (
-				"Balance Sheet" if self.root_type in ("Asset", "Liability", "Equity") else "Profit and Loss"
-			)
+			self.report_type = "Balance Sheet" \
+				if self.root_type in ("Asset", "Liability", "Equity") else "Profit and Loss"
 
 	def validate_root_details(self):
 		# does not exists parent
@@ -121,26 +93,21 @@ class Account(NestedSet):
 
 	def validate_root_company_and_sync_account_to_children(self):
 		# ignore validation while creating new compnay or while syncing to child companies
-		if (
-			frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation
-		):
+		if frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation:
 			return
 		ancestors = get_root_company(self.company)
 		if ancestors:
 			if frappe.get_value("Company", self.company, "allow_account_creation_against_child_company"):
 				return
-			if not frappe.db.get_value(
-				"Account", {"account_name": self.account_name, "company": ancestors[0]}, "name"
-			):
+			if not frappe.db.get_value("Account",
+				{'account_name': self.account_name, 'company': ancestors[0]}, 'name'):
 				frappe.throw(_("Please add the account to root level Company - {}").format(ancestors[0]))
 		elif self.parent_account:
-			descendants = get_descendants_of("Company", self.company)
-			if not descendants:
-				return
+			descendants = get_descendants_of('Company', self.company)
+			if not descendants: return
 			parent_acc_name_map = {}
-			parent_acc_name, parent_acc_number = frappe.db.get_value(
-				"Account", self.parent_account, ["account_name", "account_number"]
-			)
+			parent_acc_name, parent_acc_number = frappe.db.get_value('Account', self.parent_account, \
+				["account_name", "account_number"])
 			filters = {
 				"company": ["in", descendants],
 				"account_name": parent_acc_name,
@@ -148,13 +115,10 @@ class Account(NestedSet):
 			if parent_acc_number:
 				filters["account_number"] = parent_acc_number
 
-			for d in frappe.db.get_values(
-				"Account", filters=filters, fieldname=["company", "name"], as_dict=True
-			):
+			for d in frappe.db.get_values('Account', filters=filters, fieldname=["company", "name"], as_dict=True):
 				parent_acc_name_map[d["company"]] = d["name"]
 
-			if not parent_acc_name_map:
-				return
+			if not parent_acc_name_map: return
 
 			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
@@ -175,38 +139,26 @@ class Account(NestedSet):
 	def validate_frozen_accounts_modifier(self):
 		old_value = frappe.db.get_value("Account", self.name, "freeze_account")
 		if old_value and old_value != self.freeze_account:
-			frozen_accounts_modifier = frappe.db.get_value(
-				"Accounts Settings", None, "frozen_accounts_modifier"
-			)
-			if not frozen_accounts_modifier or frozen_accounts_modifier not in frappe.get_roles():
-				throw(_("You are not authorized to set Frozen value"))
+			frozen_accounts_modifier = frappe.db.get_value('Accounts Settings', None, 'frozen_accounts_modifier')
+			if not frozen_accounts_modifier or \
+				frozen_accounts_modifier not in frappe.get_roles():
+					throw(_("You are not authorized to set Frozen value"))
 
 	def validate_balance_must_be_debit_or_credit(self):
 		from erpnext.accounts.utils import get_balance_on
-
 		if not self.get("__islocal") and self.balance_must_be:
 			account_balance = get_balance_on(self.name)
 
 			if account_balance > 0 and self.balance_must_be == "Credit":
-				frappe.throw(
-					_(
-						"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
-					)
-				)
+				frappe.throw(_("Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"))
 			elif account_balance < 0 and self.balance_must_be == "Debit":
-				frappe.throw(
-					_(
-						"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
-					)
-				)
+				frappe.throw(_("Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"))
 
 	def validate_account_currency(self):
 		if not self.account_currency:
-			self.account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
+			self.account_currency = frappe.get_cached_value('Company',  self.company,  "default_currency")
 
-		gl_currency = frappe.db.get_value("GL Entry", {"account": self.name}, "account_currency")
-
-		if gl_currency and self.account_currency != gl_currency:
+		elif self.account_currency != frappe.db.get_value("Account", self.name, "account_currency"):
 			if frappe.db.get_value("GL Entry", {"account": self.name}):
 				frappe.throw(_("Currency can not be changed after making entries using some other currency"))
 
@@ -215,52 +167,46 @@ class Account(NestedSet):
 			company_bold = frappe.bold(company)
 			parent_acc_name_bold = frappe.bold(parent_acc_name)
 			if not parent_acc_name_map.get(company):
-				frappe.throw(
-					_(
-						"While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
-					).format(company_bold, parent_acc_name_bold),
-					title=_("Account Not Found"),
-				)
+				frappe.throw(_("While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA")
+					.format(company_bold, parent_acc_name_bold), title=_("Account Not Found"))
 
 			# validate if parent of child company account to be added is a group
-			if frappe.db.get_value("Account", self.parent_account, "is_group") and not frappe.db.get_value(
-				"Account", parent_acc_name_map[company], "is_group"
-			):
-				msg = _(
-					"While creating account for Child Company {0}, parent account {1} found as a ledger account."
-				).format(company_bold, parent_acc_name_bold)
+			if (frappe.db.get_value("Account", self.parent_account, "is_group")
+				and not frappe.db.get_value("Account", parent_acc_name_map[company], "is_group")):
+				msg = _("While creating account for Child Company {0}, parent account {1} found as a ledger account.").format(company_bold, parent_acc_name_bold)
 				msg += "<br><br>"
-				msg += _(
-					"Please convert the parent account in corresponding child company to a group account."
-				)
+				msg += _("Please convert the parent account in corresponding child company to a group account.")
 				frappe.throw(msg, title=_("Invalid Parent Account"))
 
-			filters = {"account_name": self.account_name, "company": company}
+			filters = {
+				"account_name": self.account_name,
+				"company": company
+			}
 
 			if self.account_number:
 				filters["account_number"] = self.account_number
 
-			child_account = frappe.db.get_value("Account", filters, "name")
+			child_account = frappe.db.get_value("Account", filters, 'name')
 			if not child_account:
 				doc = frappe.copy_doc(self)
 				doc.flags.ignore_root_company_validation = True
-				doc.update(
-					{
-						"company": company,
-						# parent account's currency should be passed down to child account's curreny
-						# if it is None, it picks it up from default company currency, which might be unintended
-						"account_currency": erpnext.get_company_currency(company),
-						"parent_account": parent_acc_name_map[company],
-					}
-				)
+				doc.update({
+					"company": company,
+					# parent account's currency should be passed down to child account's curreny
+					# if it is None, it picks it up from default company currency, which might be unintended
+					"account_currency": self.account_currency,
+					"parent_account": parent_acc_name_map[company]
+				})
 
 				doc.save()
-				frappe.msgprint(_("Account {0} is added in the child company {1}").format(doc.name, company))
+				frappe.msgprint(_("Account {0} is added in the child company {1}")
+					.format(doc.name, company))
 			elif child_account:
 				# update the parent company's value in child companies
 				doc = frappe.get_doc("Account", child_account)
 				parent_value_changed = False
-				for field in ["account_type", "freeze_account", "balance_must_be"]:
+				for field in ['account_type', 'account_currency',
+					'freeze_account', 'balance_must_be']:
 					if doc.get(field) != self.get(field):
 						parent_value_changed = True
 						doc.set(field, self.get(field))
@@ -268,7 +214,6 @@ class Account(NestedSet):
 				if parent_value_changed:
 					doc.save()
 
-	@frappe.whitelist()
 	def convert_group_to_ledger(self):
 		if self.check_if_child_exists():
 			throw(_("Account with child nodes cannot be converted to ledger"))
@@ -279,12 +224,11 @@ class Account(NestedSet):
 			self.save()
 			return 1
 
-	@frappe.whitelist()
 	def convert_ledger_to_group(self):
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction can not be converted to group."))
 		elif self.account_type and not self.flags.exclude_account_type_check:
-			throw(_("Cannot convert to Group because Account Type is selected."))
+			throw(_("Cannot covert to Group because Account Type is selected."))
 		else:
 			self.is_group = 1
 			self.save()
@@ -295,11 +239,8 @@ class Account(NestedSet):
 		return frappe.db.get_value("GL Entry", {"account": self.name})
 
 	def check_if_child_exists(self):
-		return frappe.db.sql(
-			"""select name from `tabAccount` where parent_account = %s
-			and docstatus != 2""",
-			self.name,
-		)
+		return frappe.db.sql("""select name from `tabAccount` where parent_account = %s
+			and docstatus != 2""", self.name)
 
 	def validate_mandatory(self):
 		if not self.root_type:
@@ -315,99 +256,73 @@ class Account(NestedSet):
 
 		super(Account, self).on_trash(True)
 
-
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
-	return frappe.db.sql(
-		"""select name from tabAccount
+	return frappe.db.sql("""select name from tabAccount
 		where is_group = 1 and docstatus != 2 and company = %s
-		and %s like %s order by name limit %s, %s"""
-		% ("%s", searchfield, "%s", "%s", "%s"),
-		(filters["company"], "%%%s%%" % txt, start, page_len),
-		as_list=1,
-	)
-
+		and %s like %s order by name limit %s, %s""" %
+		("%s", searchfield, "%s", "%s", "%s"),
+		(filters["company"], "%%%s%%" % txt, start, page_len), as_list=1)
 
 def get_account_currency(account):
 	"""Helper function to get account currency"""
 	if not account:
 		return
-
 	def generator():
-		account_currency, company = frappe.get_cached_value(
-			"Account", account, ["account_currency", "company"]
-		)
+		account_currency, company = frappe.get_cached_value("Account", account, ["account_currency", "company"])
 		if not account_currency:
-			account_currency = frappe.get_cached_value("Company", company, "default_currency")
+			account_currency = frappe.get_cached_value('Company',  company,  "default_currency")
 
 		return account_currency
 
 	return frappe.local_cache("account_currency", account, generator)
 
-
 def on_doctype_update():
 	frappe.db.add_index("Account", ["lft", "rgt"])
 
-
 def get_account_autoname(account_number, account_name, company):
 	# first validate if company exists
-	company = frappe.get_cached_value("Company", company, ["abbr", "name"], as_dict=True)
+	company = frappe.get_cached_value('Company',  company,  ["abbr", "name"], as_dict=True)
 	if not company:
-		frappe.throw(_("Company {0} does not exist").format(company))
+		frappe.throw(_('Company {0} does not exist').format(company))
 
 	parts = [account_name.strip(), company.abbr]
 	if cstr(account_number).strip():
 		parts.insert(0, cstr(account_number).strip())
-	return " - ".join(parts)
-
+	return ' - '.join(parts)
 
 def validate_account_number(name, account_number, company):
 	if account_number:
-		account_with_same_number = frappe.db.get_value(
-			"Account", {"account_number": account_number, "company": company, "name": ["!=", name]}
-		)
+		account_with_same_number = frappe.db.get_value("Account",
+			{"account_number": account_number, "company": company, "name": ["!=", name]})
 		if account_with_same_number:
-			frappe.throw(
-				_("Account Number {0} already used in account {1}").format(
-					account_number, account_with_same_number
-				)
-			)
-
+			frappe.throw(_("Account Number {0} already used in account {1}")
+				.format(account_number, account_with_same_number))
 
 @frappe.whitelist()
 def update_account_number(name, account_name, account_number=None, from_descendant=False):
 	account = frappe.db.get_value("Account", name, "company", as_dict=True)
-	if not account:
-		return
+	if not account: return
 
-	old_acc_name, old_acc_number = frappe.db.get_value(
-		"Account", name, ["account_name", "account_number"]
-	)
+	old_acc_name, old_acc_number = frappe.db.get_value('Account', name, \
+				["account_name", "account_number"])
 
 	# check if account exists in parent company
 	ancestors = get_ancestors_of("Company", account.company)
-	allow_independent_account_creation = frappe.get_value(
-		"Company", account.company, "allow_account_creation_against_child_company"
-	)
+	allow_independent_account_creation = frappe.get_value("Company", account.company, "allow_account_creation_against_child_company")
 
 	if ancestors and not allow_independent_account_creation:
 		for ancestor in ancestors:
-			if frappe.db.get_value("Account", {"account_name": old_acc_name, "company": ancestor}, "name"):
+			if frappe.db.get_value("Account", {'account_name': old_acc_name, 'company': ancestor}, 'name'):
 				# same account in parent company exists
 				allow_child_account_creation = _("Allow Account Creation Against Child Company")
 
-				message = _("Account {0} exists in parent company {1}.").format(
-					frappe.bold(old_acc_name), frappe.bold(ancestor)
-				)
+				message = _("Account {0} exists in parent company {1}.").format(frappe.bold(old_acc_name), frappe.bold(ancestor))
 				message += "<br>"
-				message += _("Renaming it is only allowed via parent company {0}, to avoid mismatch.").format(
-					frappe.bold(ancestor)
-				)
+				message += _("Renaming it is only allowed via parent company {0}, to avoid mismatch.").format(frappe.bold(ancestor))
 				message += "<br><br>"
-				message += _("To overrule this, enable '{0}' in company {1}").format(
-					allow_child_account_creation, frappe.bold(account.company)
-				)
+				message += _("To overrule this, enable '{0}' in company {1}").format(allow_child_account_creation, frappe.bold(account.company))
 
 				frappe.throw(message, title=_("Rename Not Allowed"))
 
@@ -420,53 +335,42 @@ def update_account_number(name, account_name, account_number=None, from_descenda
 
 	if not from_descendant:
 		# Update and rename in child company accounts as well
-		descendants = get_descendants_of("Company", account.company)
+		descendants = get_descendants_of('Company', account.company)
 		if descendants:
-			sync_update_account_number_in_child(
-				descendants, old_acc_name, account_name, account_number, old_acc_number
-			)
+			sync_update_account_number_in_child(descendants, old_acc_name, account_name, account_number, old_acc_number)
 
 	new_name = get_account_autoname(account_number, account_name, account.company)
 	if name != new_name:
 		frappe.rename_doc("Account", name, new_name, force=1)
 		return new_name
 
-
 @frappe.whitelist()
 def merge_account(old, new, is_group, root_type, company):
 	# Validate properties before merging
 	if not frappe.db.exists("Account", new):
 		throw(_("Account {0} does not exist").format(new))
 
-	val = list(frappe.db.get_value("Account", new, ["is_group", "root_type", "company"]))
+	val = list(frappe.db.get_value("Account", new,
+		["is_group", "root_type", "company"]))
 
 	if val != [cint(is_group), root_type, company]:
-		throw(
-			_(
-				"""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""
-			)
-		)
+		throw(_("""Merging is only possible if following properties are same in both records. Is Group, Root Type, Company"""))
 
 	if is_group and frappe.db.get_value("Account", new, "parent_account") == old:
-		frappe.db.set_value(
-			"Account", new, "parent_account", frappe.db.get_value("Account", old, "parent_account")
-		)
+		frappe.db.set_value("Account", new, "parent_account",
+			frappe.db.get_value("Account", old, "parent_account"))
 
 	frappe.rename_doc("Account", old, new, merge=1, force=1)
 
 	return new
 
-
 @frappe.whitelist()
 def get_root_company(company):
 	# return the topmost company in the hierarchy
-	ancestors = get_ancestors_of("Company", company, "lft asc")
+	ancestors = get_ancestors_of('Company', company, "lft asc")
 	return [ancestors[0]] if ancestors else []
 
-
-def sync_update_account_number_in_child(
-	descendants, old_acc_name, account_name, account_number=None, old_acc_number=None
-):
+def sync_update_account_number_in_child(descendants, old_acc_name, account_name, account_number=None, old_acc_number=None):
 	filters = {
 		"company": ["in", descendants],
 		"account_name": old_acc_name,
@@ -474,7 +378,5 @@ def sync_update_account_number_in_child(
 	if old_acc_number:
 		filters["account_number"] = old_acc_number
 
-	for d in frappe.db.get_values(
-		"Account", filters=filters, fieldname=["company", "name"], as_dict=True
-	):
-		update_account_number(d["name"], account_name, account_number, from_descendant=True)
+	for d in frappe.db.get_values('Account', filters=filters, fieldname=["company", "name"], as_dict=True):
+			update_account_number(d["name"], account_name, account_number, from_descendant=True)

erpnext/accounts/doctype/account/account_tree.js

@@ -45,50 +45,6 @@ frappe.treeview_settings["Account"] = {
 	],
 	root_label: "Accounts",
 	get_tree_nodes: 'erpnext.accounts.utils.get_children',
-	on_get_node: function(nodes, deep=false) {
-		if (frappe.boot.user.can_read.indexOf("GL Entry") == -1) return;
-
-		let accounts = [];
-		if (deep) {
-			// in case of `get_all_nodes`
-			accounts = nodes.reduce((acc, node) => [...acc, ...node.data], []);
-		} else {
-			accounts = nodes;
-		}
-
-		const get_balances = frappe.call({
-			method: 'erpnext.accounts.utils.get_account_balances',
-			args: {
-				accounts: accounts,
-				company: cur_tree.args.company
-			},
-		});
-
-		get_balances.then(r => {
-			if (!r.message || r.message.length == 0) return;
-
-			for (let account of r.message) {
-
-				const node = cur_tree.nodes && cur_tree.nodes[account.value];
-				if (!node || node.is_root) continue;
-
-				// show Dr if positive since balance is calculated as debit - credit else show Cr
-				const balance = account.balance_in_account_currency || account.balance;
-				const dr_or_cr = balance > 0 ? "Dr": "Cr";
-				const format = (value, currency) => format_currency(Math.abs(value), currency);
-
-				if (account.balance!==undefined) {
-					node.parent && node.parent.find('.balance-area').remove();
-					$('<span class="balance-area pull-right">'
-						+ (account.balance_in_account_currency ?
-							(format(account.balance_in_account_currency, account.account_currency) + " / ") : "")
-						+ format(account.balance, account.company_currency)
-						+ " " + dr_or_cr
-						+ '</span>').insertBefore(node.$ul);
-				}
-			}
-		});
-	},
 	add_tree_node: 'erpnext.accounts.utils.add_ac',
 	menu_items:[
 		{
@@ -164,7 +120,25 @@ frappe.treeview_settings["Account"] = {
 			} else {
 				treeview.new_node();
 			}
-		}, "add");
+		}, "octicon octicon-plus");
+	},
+	onrender: function(node) {
+		if(frappe.boot.user.can_read.indexOf("GL Entry") !== -1){
+
+			// show Dr if positive since balance is calculated as debit - credit else show Cr
+			let balance = node.data.balance_in_account_currency || node.data.balance;
+			let dr_or_cr = balance > 0 ? "Dr": "Cr";
+
+			if (node.data && node.data.balance!==undefined) {
+				$('<span class="balance-area pull-right text-muted small">'
+					+ (node.data.balance_in_account_currency ?
+						(format_currency(Math.abs(node.data.balance_in_account_currency),
+							node.data.account_currency) + " / ") : "")
+					+ format_currency(Math.abs(node.data.balance), node.data.company_currency)
+					+ " " + dr_or_cr
+					+ '</span>').insertBefore(node.$ul);
+			}
+		}
 	},
 	toolbar: [
 		{
@@ -176,7 +150,7 @@ frappe.treeview_settings["Account"] = {
 					&& node.expandable && !node.hide_add;
 			},
 			click: function() {
-				var me = frappe.views.trees['Account'];
+				var me = frappe.treeview_settings['Account'].treeview;
 				me.new_node();
 			},
 			btnClass: "hidden-xs"

erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py

@@ -1,19 +1,15 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
 
-import json
-import os
 
-import frappe
+import frappe, os, json
 from frappe.utils import cstr
-from frappe.utils.nestedset import rebuild_tree
-from six import iteritems
 from unidecode import unidecode
+from six import iteritems
+from frappe.utils.nestedset import rebuild_tree
 
-
-def create_charts(
-	company, chart_template=None, existing_company=None, custom_chart=None, from_coa_importer=None
-):
+def create_charts(company, chart_template=None, existing_company=None, custom_chart=None):
 	chart = custom_chart or get_chart(chart_template, existing_company)
 	if chart:
 		accounts = []
@@ -23,41 +19,30 @@ def create_charts(
 				if root_account:
 					root_type = child.get("root_type")
 
-				if account_name not in [
-					"account_name",
-					"account_number",
-					"account_type",
-					"root_type",
-					"is_group",
-					"tax_rate",
-				]:
+				if account_name not in ["account_number", "account_type",
+					"root_type", "is_group", "tax_rate"]:
 
 					account_number = cstr(child.get("account_number")).strip()
-					account_name, account_name_in_db = add_suffix_if_duplicate(
-						account_name, account_number, accounts
-					)
+					account_name, account_name_in_db = add_suffix_if_duplicate(account_name,
+						account_number, accounts)
 
 					is_group = identify_is_group(child)
-					report_type = (
-						"Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] else "Profit and Loss"
-					)
+					report_type = "Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] \
+						else "Profit and Loss"
 
-					account = frappe.get_doc(
-						{
-							"doctype": "Account",
-							"account_name": child.get("account_name") if from_coa_importer else account_name,
-							"company": company,
-							"parent_account": parent,
-							"is_group": is_group,
-							"root_type": root_type,
-							"report_type": report_type,
-							"account_number": account_number,
-							"account_type": child.get("account_type"),
-							"account_currency": child.get("account_currency")
-							or frappe.db.get_value("Company", company, "default_currency"),
-							"tax_rate": child.get("tax_rate"),
-						}
-					)
+					account = frappe.get_doc({
+						"doctype": "Account",
+						"account_name": account_name,
+						"company": company,
+						"parent_account": parent,
+						"is_group": is_group,
+						"root_type": root_type,
+						"report_type": report_type,
+						"account_number": account_number,
+						"account_type": child.get("account_type"),
+						"account_currency": child.get('account_currency') or frappe.db.get_value('Company',  company,  "default_currency"),
+						"tax_rate": child.get("tax_rate")
+					})
 
 					if root_account or frappe.local.flags.allow_unverified_charts:
 						account.flags.ignore_mandatory = True
@@ -72,15 +57,15 @@ def create_charts(
 
 		# Rebuild NestedSet HSM tree for Account Doctype
 		# after all accounts are already inserted.
-		frappe.local.flags.ignore_update_nsm = True
+		frappe.local.flags.ignore_on_update = True
 		_import_accounts(chart, None, None, root_account=True)
 		rebuild_tree("Account", "parent_account")
-		frappe.local.flags.ignore_update_nsm = False
-
+		frappe.local.flags.ignore_on_update = False
 
 def add_suffix_if_duplicate(account_name, account_number, accounts):
 	if account_number:
-		account_name_in_db = unidecode(" - ".join([account_number, account_name.strip().lower()]))
+		account_name_in_db = unidecode(" - ".join([account_number,
+			account_name.strip().lower()]))
 	else:
 		account_name_in_db = unidecode(account_name.strip().lower())
 
@@ -90,37 +75,27 @@ def add_suffix_if_duplicate(account_name, account_number, accounts):
 
 	return account_name, account_name_in_db
 
-
 def identify_is_group(child):
 	if child.get("is_group"):
 		is_group = child.get("is_group")
-	elif len(
-		set(child.keys())
-		- set(["account_name", "account_type", "root_type", "is_group", "tax_rate", "account_number"])
-	):
+	elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate", "account_number"])):
 		is_group = 1
 	else:
 		is_group = 0
 
 	return is_group
 
-
 def get_chart(chart_template, existing_company=None):
 	chart = {}
 	if existing_company:
 		return get_account_tree_from_existing_company(existing_company)
 
 	elif chart_template == "Standard":
-		from erpnext.accounts.doctype.account.chart_of_accounts.verified import (
-			standard_chart_of_accounts,
-		)
-
+		from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
 		return standard_chart_of_accounts.get()
 	elif chart_template == "Standard with Numbers":
-		from erpnext.accounts.doctype.account.chart_of_accounts.verified import (
-			standard_chart_of_accounts_with_account_number,
-		)
-
+		from erpnext.accounts.doctype.account.chart_of_accounts.verified \
+			import standard_chart_of_accounts_with_account_number
 		return standard_chart_of_accounts_with_account_number.get()
 	else:
 		folders = ("verified",)
@@ -136,7 +111,6 @@ def get_chart(chart_template, existing_company=None):
 						if chart and json.loads(chart).get("name") == chart_template:
 							return json.loads(chart).get("tree")
 
-
 @frappe.whitelist()
 def get_charts_for_country(country, with_standard=False):
 	charts = []
@@ -144,10 +118,9 @@ def get_charts_for_country(country, with_standard=False):
 	def _get_chart_name(content):
 		if content:
 			content = json.loads(content)
-			if (
-				content and content.get("disabled", "No") == "No"
-			) or frappe.local.flags.allow_unverified_charts:
-				charts.append(content["name"])
+			if (content and content.get("disabled", "No") == "No") \
+				or frappe.local.flags.allow_unverified_charts:
+					charts.append(content["name"])
 
 	country_code = frappe.db.get_value("Country", country, "code")
 	if country_code:
@@ -174,21 +147,11 @@ def get_charts_for_country(country, with_standard=False):
 
 
 def get_account_tree_from_existing_company(existing_company):
-	all_accounts = frappe.get_all(
-		"Account",
-		filters={"company": existing_company},
-		fields=[
-			"name",
-			"account_name",
-			"parent_account",
-			"account_type",
-			"is_group",
-			"root_type",
-			"tax_rate",
-			"account_number",
-		],
-		order_by="lft, rgt",
-	)
+	all_accounts = frappe.get_all('Account',
+		filters={'company': existing_company},
+		fields = ["name", "account_name", "parent_account", "account_type",
+			"is_group", "root_type", "tax_rate", "account_number"],
+		order_by="lft, rgt")
 
 	account_tree = {}
 
@@ -197,7 +160,6 @@ def get_account_tree_from_existing_company(existing_company):
 		build_account_tree(account_tree, None, all_accounts)
 	return account_tree
 
-
 def build_account_tree(tree, parent, all_accounts):
 	# find children
 	parent_account = parent.name if parent else ""
@@ -226,29 +188,27 @@ def build_account_tree(tree, parent, all_accounts):
 		# call recursively to build a subtree for current account
 		build_account_tree(tree[child.account_name], child, all_accounts)
 
-
 @frappe.whitelist()
 def validate_bank_account(coa, bank_account):
 	accounts = []
 	chart = get_chart(coa)
 
 	if chart:
-
 		def _get_account_names(account_master):
 			for account_name, child in iteritems(account_master):
-				if account_name not in ["account_number", "account_type", "root_type", "is_group", "tax_rate"]:
+				if account_name not in ["account_number", "account_type",
+					"root_type", "is_group", "tax_rate"]:
 					accounts.append(account_name)
 
 					_get_account_names(child)
 
 		_get_account_names(chart)
 
-	return bank_account in accounts
-
+	return (bank_account in accounts)
 
 @frappe.whitelist()
-def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=False):
-	"""get chart template from its folder and parse the json to be rendered as tree"""
+def build_tree_from_json(chart_template, chart_data=None):
+	''' get chart template from its folder and parse the json to be rendered as tree '''
 	chart = chart_data or get_chart(chart_template)
 
 	# if no template selected, return as it is
@@ -256,33 +216,19 @@ def build_tree_from_json(chart_template, chart_data=None, from_coa_importer=Fals
 		return
 
 	accounts = []
-
 	def _import_accounts(children, parent):
-		"""recursively called to form a parent-child based list of dict from chart template"""
+		''' recursively called to form a parent-child based list of dict from chart template '''
 		for account_name, child in iteritems(children):
 			account = {}
-			if account_name in [
-				"account_name",
-				"account_number",
-				"account_type",
-				"root_type",
-				"is_group",
-				"tax_rate",
-			]:
-				continue
+			if account_name in ["account_number", "account_type",\
+				"root_type", "is_group", "tax_rate"]: continue
 
-			if from_coa_importer:
-				account_name = child["account_name"]
-
-			account["parent_account"] = parent
-			account["expandable"] = True if identify_is_group(child) else False
-			account["value"] = (
-				(cstr(child.get("account_number")).strip() + " - " + account_name)
-				if child.get("account_number")
-				else account_name
-			)
+			account['parent_account'] = parent
+			account['expandable'] = True if identify_is_group(child) else False
+			account['value'] = (cstr(child.get('account_number')).strip() + ' - ' + account_name) \
+				if child.get('account_number') else account_name
 			accounts.append(account)
-			_import_accounts(child, account["value"])
+			_import_accounts(child, account['value'])
 
 	_import_accounts(chart, None)
 	return accounts

erpnext/accounts/doctype/account/chart_of_accounts/import_from_openerp.py

@@ -4,14 +4,14 @@
 """
 Import chart of accounts from OpenERP sources
 """
+from __future__ import print_function, unicode_literals
 
+import os, json
 import ast
-import json
-import os
 from xml.etree import ElementTree as ET
-
-import frappe
 from frappe.utils.csvutils import read_csv_content
+import frappe
+
 from six import iteritems
 
 path = "/Users/nabinhait/projects/odoo/addons"
@@ -21,7 +21,6 @@ charts = {}
 all_account_types = []
 all_roots = {}
 
-
 def go():
 	global accounts, charts
 	default_account_types = get_default_account_types()
@@ -36,16 +35,14 @@ def go():
 		accounts, charts = {}, {}
 		country_path = os.path.join(path, country_dir)
 		manifest = ast.literal_eval(open(os.path.join(country_path, "__openerp__.py")).read())
-		data_files = (
-			manifest.get("data", []) + manifest.get("init_xml", []) + manifest.get("update_xml", [])
-		)
+		data_files = manifest.get("data", []) + manifest.get("init_xml", []) + \
+			manifest.get("update_xml", [])
 		files_path = [os.path.join(country_path, d) for d in data_files]
 		xml_roots = get_xml_roots(files_path)
 		csv_content = get_csv_contents(files_path)
 		prefix = country_dir if csv_content else None
-		account_types = get_account_types(
-			xml_roots.get("account.account.type", []), csv_content.get("account.account.type", []), prefix
-		)
+		account_types = get_account_types(xml_roots.get("account.account.type", []),
+			csv_content.get("account.account.type", []), prefix)
 		account_types.update(default_account_types)
 
 		if xml_roots:
@@ -58,15 +55,12 @@ def go():
 
 	create_all_roots_file()
 
-
 def get_default_account_types():
 	default_types_root = []
-	default_types_root.append(
-		ET.parse(os.path.join(path, "account", "data", "data_account_type.xml")).getroot()
-	)
+	default_types_root.append(ET.parse(os.path.join(path, "account", "data",
+			"data_account_type.xml")).getroot())
 	return get_account_types(default_types_root, None, prefix="account")
 
-
 def get_xml_roots(files_path):
 	xml_roots = frappe._dict()
 	for filepath in files_path:
@@ -75,69 +69,64 @@ def get_xml_roots(files_path):
 			tree = ET.parse(filepath)
 			root = tree.getroot()
 			for node in root[0].findall("record"):
-				if node.get("model") in [
-					"account.account.template",
-					"account.chart.template",
-					"account.account.type",
-				]:
+				if node.get("model") in ["account.account.template",
+					"account.chart.template", "account.account.type"]:
 					xml_roots.setdefault(node.get("model"), []).append(root)
 					break
 	return xml_roots
 
-
 def get_csv_contents(files_path):
 	csv_content = {}
 	for filepath in files_path:
 		fname = os.path.basename(filepath)
-		for file_type in ["account.account.template", "account.account.type", "account.chart.template"]:
+		for file_type in ["account.account.template", "account.account.type",
+				"account.chart.template"]:
 			if fname.startswith(file_type) and fname.endswith(".csv"):
 				with open(filepath, "r") as csvfile:
 					try:
-						csv_content.setdefault(file_type, []).append(read_csv_content(csvfile.read()))
+						csv_content.setdefault(file_type, [])\
+							.append(read_csv_content(csvfile.read()))
 					except Exception as e:
 						continue
 	return csv_content
 
-
 def get_account_types(root_list, csv_content, prefix=None):
 	types = {}
 	account_type_map = {
-		"cash": "Cash",
-		"bank": "Bank",
-		"tr_cash": "Cash",
-		"tr_bank": "Bank",
-		"receivable": "Receivable",
-		"tr_receivable": "Receivable",
-		"account rec": "Receivable",
-		"payable": "Payable",
-		"tr_payable": "Payable",
-		"equity": "Equity",
-		"stocks": "Stock",
-		"stock": "Stock",
-		"tax": "Tax",
-		"tr_tax": "Tax",
-		"tax-out": "Tax",
-		"tax-in": "Tax",
-		"charges_personnel": "Chargeable",
-		"fixed asset": "Fixed Asset",
-		"cogs": "Cost of Goods Sold",
+		'cash': 'Cash',
+		'bank': 'Bank',
+		'tr_cash': 'Cash',
+		'tr_bank': 'Bank',
+		'receivable': 'Receivable',
+		'tr_receivable': 'Receivable',
+		'account rec': 'Receivable',
+		'payable': 'Payable',
+		'tr_payable': 'Payable',
+		'equity': 'Equity',
+		'stocks': 'Stock',
+		'stock': 'Stock',
+		'tax': 'Tax',
+		'tr_tax': 'Tax',
+		'tax-out': 'Tax',
+		'tax-in': 'Tax',
+		'charges_personnel': 'Chargeable',
+		'fixed asset': 'Fixed Asset',
+		'cogs': 'Cost of Goods Sold',
+
 	}
 	for root in root_list:
 		for node in root[0].findall("record"):
-			if node.get("model") == "account.account.type":
+			if node.get("model")=="account.account.type":
 				data = {}
 				for field in node.findall("field"):
-					if (
-						field.get("name") == "code"
-						and field.text.lower() != "none"
-						and account_type_map.get(field.text)
-					):
-						data["account_type"] = account_type_map[field.text]
+					if field.get("name")=="code" and field.text.lower() != "none" \
+						and account_type_map.get(field.text):
+							data["account_type"] = account_type_map[field.text]
 
 				node_id = prefix + "." + node.get("id") if prefix else node.get("id")
 				types[node_id] = data
 
-	if csv_content and csv_content[0][0] == "id":
+	if csv_content and csv_content[0][0]=="id":
 		for row in csv_content[1:]:
 			row_dict = dict(zip(csv_content[0], row))
 			data = {}
@@ -148,22 +137,21 @@ def get_account_types(root_list, csv_content, prefix=None):
 				types[node_id] = data
 	return types
 
-
 def make_maps_for_xml(xml_roots, account_types, country_dir):
 	"""make maps for `charts` and `accounts`"""
 	for model, root_list in iteritems(xml_roots):
 		for root in root_list:
 			for node in root[0].findall("record"):
-				if node.get("model") == "account.account.template":
+				if node.get("model")=="account.account.template":
 					data = {}
 					for field in node.findall("field"):
-						if field.get("name") == "name":
+						if field.get("name")=="name":
 							data["name"] = field.text
-						if field.get("name") == "parent_id":
+						if field.get("name")=="parent_id":
 							parent_id = field.get("ref") or field.get("eval")
 							data["parent_id"] = parent_id
 
-						if field.get("name") == "user_type":
+						if field.get("name")=="user_type":
 							value = field.get("ref")
 							if account_types.get(value, {}).get("account_type"):
 								data["account_type"] = account_types[value]["account_type"]
@@ -173,17 +161,16 @@ def make_maps_for_xml(xml_roots, account_types, country_dir):
 					data["children"] = []
 					accounts[node.get("id")] = data
 
-				if node.get("model") == "account.chart.template":
+				if node.get("model")=="account.chart.template":
 					data = {}
 					for field in node.findall("field"):
-						if field.get("name") == "name":
+						if field.get("name")=="name":
 							data["name"] = field.text
-						if field.get("name") == "account_root_id":
+						if field.get("name")=="account_root_id":
 							data["account_root_id"] = field.get("ref")
 						data["id"] = country_dir
 					charts.setdefault(node.get("id"), {}).update(data)
 
-
 def make_maps_for_csv(csv_content, account_types, country_dir):
 	for content in csv_content.get("account.account.template", []):
 		for row in content[1:]:
@@ -191,7 +178,7 @@ def make_maps_for_csv(csv_content, account_types, country_dir):
 			account = {
 				"name": data.get("name"),
 				"parent_id": data.get("parent_id:id") or data.get("parent_id/id"),
-				"children": [],
+				"children": []
 			}
 			user_type = data.get("user_type/id") or data.get("user_type:id")
 			if account_types.get(user_type, {}).get("account_type"):
@@ -208,14 +195,12 @@ def make_maps_for_csv(csv_content, account_types, country_dir):
 		for row in content[1:]:
 			if row:
 				data = dict(zip(content[0], row))
-				charts.setdefault(data.get("id"), {}).update(
-					{
-						"account_root_id": data.get("account_root_id:id") or data.get("account_root_id/id"),
-						"name": data.get("name"),
-						"id": country_dir,
-					}
-				)
-
+				charts.setdefault(data.get("id"), {}).update({
+					"account_root_id": data.get("account_root_id:id") or \
+						data.get("account_root_id/id"),
+					"name": data.get("name"),
+					"id": country_dir
+				})
 
 def make_account_trees():
 	"""build tree hierarchy"""
@@ -234,7 +219,6 @@ def make_account_trees():
 		if "children" in accounts[id] and not accounts[id].get("children"):
 			del accounts[id]["children"]
 
-
 def make_charts():
 	"""write chart files in app/setup/doctype/company/charts"""
 	for chart_id in charts:
@@ -253,38 +237,34 @@ def make_charts():
 		chart["country_code"] = src["id"][5:]
 		chart["tree"] = accounts[src["account_root_id"]]
 
+
 		for key, val in chart["tree"].items():
 			if key in ["name", "parent_id"]:
 				chart["tree"].pop(key)
 			if type(val) == dict:
 				val["root_type"] = ""
 		if chart:
-			fpath = os.path.join(
-				"erpnext", "erpnext", "accounts", "doctype", "account", "chart_of_accounts", filename + ".json"
-			)
+			fpath = os.path.join("erpnext", "erpnext", "accounts", "doctype", "account",
+				"chart_of_accounts", filename + ".json")
 
 			with open(fpath, "r") as chartfile:
 				old_content = chartfile.read()
-				if not old_content or (
-					json.loads(old_content).get("is_active", "No") == "No"
-					and json.loads(old_content).get("disabled", "No") == "No"
-				):
+				if not old_content or (json.loads(old_content).get("is_active", "No") == "No" \
+						and json.loads(old_content).get("disabled", "No") == "No"):
 					with open(fpath, "w") as chartfile:
 						chartfile.write(json.dumps(chart, indent=4, sort_keys=True))
 
 					all_roots.setdefault(filename, chart["tree"].keys())
 
-
 def create_all_roots_file():
-	with open("all_roots.txt", "w") as f:
+	with open('all_roots.txt', 'w') as f:
 		for filename, roots in sorted(all_roots.items()):
 			f.write(filename)
-			f.write("\n----------------------\n")
+			f.write('\n----------------------\n')
 			for r in sorted(roots):
-				f.write(r.encode("utf-8"))
-				f.write("\n")
-			f.write("\n\n\n")
+				f.write(r.encode('utf-8'))
+				f.write('\n')
+			f.write('\n\n\n')
 
-
-if __name__ == "__main__":
+if __name__=="__main__":
 	go()

erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR03_gnucash.json

@@ -63,21 +63,17 @@
 					"Gewinnermittlung \u00a74/3 nicht Ergebniswirksam": {
 						"account_number": "1371"
 					},
-					"Abziehbare Vorsteuer": {
-						"account_type": "Tax",
-						"is_group": 1,
-						"Abziehbare Vorsteuer 7%": {
-							"account_number": "1571"
-						},
-						"Abziehbare Vorsteuer 19%": {
-							"account_number": "1576"
-						},
-						"Abziehbare Vorsteuer nach \u00a713b UStG 19%": {
-							"account_number": "1577"
-						},
-						"Leistungen \u00a713b UStG 19% Vorsteuer, 19% Umsatzsteuer": {
-							"account_number": "3120"
-						}
+					"Abziehbare VSt. 7%": {
+						"account_number": "1571"
+					},
+					"Abziehbare VSt. 19%": {
+						"account_number": "1576"
+					},
+					"Abziehbare VStr. nach \u00a713b UStG 19%": {
+						"account_number": "1577"
+					},
+					"Leistungen \u00a713b UStG 19% Vorsteuer, 19% Umsatzsteuer": {
+						"account_number": "3120"
 					}
 				},
 				"III. Wertpapiere": {
@@ -200,7 +196,6 @@
 					},
 					"Umsatzsteuer": {
 						"is_group": 1,
-						"account_type": "Tax",
 						"Umsatzsteuer 7%": {
 							"account_number": "1771"
 						},

erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json

@@ -292,21 +292,18 @@
                         "Umsatzsteuerforderungen fr\u00fchere Jahre": {}
                     }, 
                     "Sonstige Verm\u00f6gensgegenst\u00e4nde oder sonstige Verbindlichkeiten": {
-                        "Abziehbare Vorsteuer": {
-                            "account_type": "Tax",
-                            "is_group": 1,
-                            "Abziehbare Vorsteuer 16%": {},
-                            "Abziehbare Vorsteuer 19%": {},
-                            "Abziehbare Vorsteuer 7%": {},
-                            "Abziehbare Vorsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Unsatzsteuerlager": {},
-                            "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb": {},
-                            "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 16%": {},
-                            "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 19%": {},
-                            "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Ust-Identifikationsnummer": {},
-                            "Abziehbare Vorsteuer nach \u00a7 13b UStG ": {},
-                            "Abziehbare Vorsteuer nach \u00a7 13b UStG 16%": {},
-                            "Abziehbare Vorsteuer nach \u00a7 13b UStG 19%": {}
-                        },
+                        "Abziehbare Vorsteuer": {}, 
+                        "Abziehbare Vorsteuer 16%": {}, 
+                        "Abziehbare Vorsteuer 19%": {}, 
+                        "Abziehbare Vorsteuer 7%": {}, 
+                        "Abziehbare Vorsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Unsatzsteuerlager": {}, 
+                        "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb": {}, 
+                        "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 16%": {}, 
+                        "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 19%": {}, 
+                        "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Ust-Identifikationsnummer": {}, 
+                        "Abziehbare Vorsteuer nach \u00a7 13b UStG ": {}, 
+                        "Abziehbare Vorsteuer nach \u00a7 13b UStG 16%": {}, 
+                        "Abziehbare Vorsteuer nach \u00a7 13b UStG 19%": {}, 
                         "Aufl\u00f6sung Vorsteuer aus Vorjahr \u00a7 4/3 EStG": {}, 
                         "Aufzuteilende Vorsteuer": {}, 
                         "Aufzuteilende Vorsteuer 16%": {}, 
@@ -676,26 +673,23 @@
                         "Sonstige Verrechnungskonten (Interimskonto)": {
                             "account_type": "Stock Received But Not Billed"
                         }, 
-                        "Umsatzsteuer": {
-                            "account_type": "Tax",
-                            "is_group": 1,
-                            "Umsatzsteuer 16%": {},
-                            "Umsatzsteuer 19%": {},
-                            "Umsatzsteuer 7%": {},
-                            "Umsatzsteuer Vorjahr": {},
-                            "Umsatzsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Umsatzsteuerlager": {},
-                            "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen": {},
-                            "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen 19%": {},
-                            "Umsatzsteuer aus innergemeinschaftlichem Erwerb ": {},
-                            "Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%": {},
-                            "Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%": {},
-                            "Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug": {},
-                            "Umsatzsteuer fr\u00fchere Jahre": {},
-                            "Umsatzsteuer laufendes Jahr": {},
-                            "Umsatzsteuer nach \u00a713b UStG": {},
-                            "Umsatzsteuer nach \u00a713b UStG 16%": {},
-                            "Umsatzsteuer nach \u00a713b UStG 19%": {}
-                        },
+                        "Umsatzsteuer": {}, 
+                        "Umsatzsteuer 16%": {}, 
+                        "Umsatzsteuer 19%": {}, 
+                        "Umsatzsteuer 7%": {}, 
+                        "Umsatzsteuer Vorjahr": {}, 
+                        "Umsatzsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Umsatzsteuerlager": {}, 
+                        "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen": {}, 
+                        "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen 19%": {}, 
+                        "Umsatzsteuer aus innergemeinschaftlichem Erwerb ": {}, 
+                        "Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%": {}, 
+                        "Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%": {}, 
+                        "Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug": {}, 
+                        "Umsatzsteuer fr\u00fchere Jahre": {}, 
+                        "Umsatzsteuer laufendes Jahr": {}, 
+                        "Umsatzsteuer nach \u00a713b UStG": {}, 
+                        "Umsatzsteuer nach \u00a713b UStG 16%": {}, 
+                        "Umsatzsteuer nach \u00a713b UStG 19%": {}, 
                         "Umsatzsteuer- Vorauszahlungen": {}, 
                         "Umsatzsteuer- Vorauszahlungen 1/11": {}, 
                         "Verbindlichkeiten aus Lohn- und Kirchensteuer": {}

erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04_with_account_number.json

@@ -659,7 +659,6 @@
                         },
                         "Abziehbare Vorsteuer (Gruppe)": {
                             "is_group": 1,
-                            "account_type": "Tax",
                             "Abziehbare Vorsteuer": {
                                 "account_number": "1400"
                             },

erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py

@@ -1,109 +1,187 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-
+from __future__ import unicode_literals
 from frappe import _
 
-
 def get():
 	return {
-		_("Application of Funds (Assets)"): {
-			_("Current Assets"): {
-				_("Accounts Receivable"): {_("Debtors"): {"account_type": "Receivable"}},
-				_("Bank Accounts"): {"account_type": "Bank", "is_group": 1},
-				_("Cash In Hand"): {_("Cash"): {"account_type": "Cash"}, "account_type": "Cash"},
-				_("Loans and Advances (Assets)"): {
-					_("Employee Advances"): {},
+	    _("Application of Funds (Assets)"): {
+	        _("Current Assets"): {
+	            _("Accounts Receivable"): {
+	                _("Debtors"): {
+	                    "account_type": "Receivable"
+	                }
+	            },
+	            _("Bank Accounts"): {
+	                "account_type": "Bank",
+					"is_group": 1
+	            },
+	            _("Cash In Hand"): {
+	                _("Cash"): {
+	                    "account_type": "Cash"
+	                },
+	                "account_type": "Cash"
+	            },
+	            _("Loans and Advances (Assets)"): {
+                    	_("Employee Advances"): {
+                    	},
+	            },
+	            _("Securities and Deposits"): {
+	                _("Earnest Money"): {}
+	            },
+	            _("Stock Assets"): {
+	                _("Stock In Hand"): {
+	                    "account_type": "Stock"
+	                },
+	                "account_type": "Stock",
+	            },
+	            _("Tax Assets"): {
+					"is_group": 1
+				}
+	        },
+	        _("Fixed Assets"): {
+	            _("Capital Equipments"): {
+	                "account_type": "Fixed Asset"
+	            },
+	            _("Electronic Equipments"): {
+	                "account_type": "Fixed Asset"
+	            },
+	            _("Furnitures and Fixtures"): {
+	                "account_type": "Fixed Asset"
+	            },
+	            _("Office Equipments"): {
+	                "account_type": "Fixed Asset"
+	            },
+	            _("Plants and Machineries"): {
+	                "account_type": "Fixed Asset"
+	            },
+				_("Buildings"): {
+					"account_type": "Fixed Asset"
 				},
-				_("Securities and Deposits"): {_("Earnest Money"): {}},
-				_("Stock Assets"): {
-					_("Stock In Hand"): {"account_type": "Stock"},
-					"account_type": "Stock",
+				_("Softwares"): {
+					"account_type": "Fixed Asset"
 				},
-				_("Tax Assets"): {"is_group": 1},
-			},
-			_("Fixed Assets"): {
-				_("Capital Equipments"): {"account_type": "Fixed Asset"},
-				_("Electronic Equipments"): {"account_type": "Fixed Asset"},
-				_("Furnitures and Fixtures"): {"account_type": "Fixed Asset"},
-				_("Office Equipments"): {"account_type": "Fixed Asset"},
-				_("Plants and Machineries"): {"account_type": "Fixed Asset"},
-				_("Buildings"): {"account_type": "Fixed Asset"},
-				_("Softwares"): {"account_type": "Fixed Asset"},
-				_("Accumulated Depreciation"): {"account_type": "Accumulated Depreciation"},
-				_("CWIP Account"): {
-					"account_type": "Capital Work in Progress",
-				},
-			},
-			_("Investments"): {"is_group": 1},
-			_("Temporary Accounts"): {_("Temporary Opening"): {"account_type": "Temporary"}},
-			"root_type": "Asset",
-		},
-		_("Expenses"): {
-			_("Direct Expenses"): {
-				_("Stock Expenses"): {
-					_("Cost of Goods Sold"): {"account_type": "Cost of Goods Sold"},
-					_("Expenses Included In Asset Valuation"): {
-						"account_type": "Expenses Included In Asset Valuation"
-					},
-					_("Expenses Included In Valuation"): {"account_type": "Expenses Included In Valuation"},
-					_("Stock Adjustment"): {"account_type": "Stock Adjustment"},
-				},
-			},
-			_("Indirect Expenses"): {
-				_("Administrative Expenses"): {},
-				_("Commission on Sales"): {},
-				_("Depreciation"): {"account_type": "Depreciation"},
-				_("Entertainment Expenses"): {},
-				_("Freight and Forwarding Charges"): {"account_type": "Chargeable"},
-				_("Legal Expenses"): {},
-				_("Marketing Expenses"): {"account_type": "Chargeable"},
-				_("Miscellaneous Expenses"): {"account_type": "Chargeable"},
-				_("Office Maintenance Expenses"): {},
-				_("Office Rent"): {},
-				_("Postal Expenses"): {},
-				_("Print and Stationery"): {},
-				_("Round Off"): {"account_type": "Round Off"},
-				_("Salary"): {},
-				_("Sales Expenses"): {},
-				_("Telephone Expenses"): {},
-				_("Travel Expenses"): {},
-				_("Utility Expenses"): {},
+	            _("Accumulated Depreciation"): {
+	            	"account_type": "Accumulated Depreciation"
+	            },
+                _("CWIP Account"): {
+                    "account_type": "Capital Work in Progress",
+                }
+	        },
+	        _("Investments"): {
+	        	"is_group": 1
+	        },
+	        _("Temporary Accounts"): {
+	            _("Temporary Opening"): {
+	            	"account_type": "Temporary"
+	            }
+	        },
+			"root_type": "Asset"
+	    },
+	    _("Expenses"): {
+	        _("Direct Expenses"): {
+	            _("Stock Expenses"): {
+	                _("Cost of Goods Sold"): {
+	                    "account_type": "Cost of Goods Sold"
+	                },
+                    _("Expenses Included In Asset Valuation"): {
+                        "account_type": "Expenses Included In Asset Valuation"
+                    },
+	                _("Expenses Included In Valuation"): {
+	                    "account_type": "Expenses Included In Valuation"
+	                },
+	                _("Stock Adjustment"): {
+	                    "account_type": "Stock Adjustment"
+	                }
+	            },
+	        },
+	        _("Indirect Expenses"): {
+	            _("Administrative Expenses"): {},
+	            _("Commission on Sales"): {},
+	            _("Depreciation"): {
+	                "account_type": "Depreciation"
+	            },
+	            _("Entertainment Expenses"): {},
+	            _("Freight and Forwarding Charges"): {
+	                "account_type": "Chargeable"
+	            },
+	            _("Legal Expenses"): {},
+	            _("Marketing Expenses"): {
+	                "account_type": "Chargeable"
+	            },
+	            _("Miscellaneous Expenses"): {
+	                "account_type": "Chargeable"
+	            },
+	            _("Office Maintenance Expenses"): {},
+	            _("Office Rent"): {},
+	            _("Postal Expenses"): {},
+	            _("Print and Stationery"): {},
+	            _("Round Off"): {
+	                "account_type": "Round Off"
+	            },
+	            _("Salary"): {},
+	            _("Sales Expenses"): {},
+	            _("Telephone Expenses"): {},
+	            _("Travel Expenses"): {},
+	            _("Utility Expenses"): {},
 				_("Write Off"): {},
 				_("Exchange Gain/Loss"): {},
-				_("Gain/Loss on Asset Disposal"): {},
-			},
-			"root_type": "Expense",
-		},
-		_("Income"): {
-			_("Direct Income"): {_("Sales"): {}, _("Service"): {}},
-			_("Indirect Income"): {"is_group": 1},
-			"root_type": "Income",
-		},
-		_("Source of Funds (Liabilities)"): {
-			_("Current Liabilities"): {
-				_("Accounts Payable"): {
-					_("Creditors"): {"account_type": "Payable"},
-					_("Payroll Payable"): {},
+				_("Gain/Loss on Asset Disposal"): {}
+	        },
+			"root_type": "Expense"
+	    },
+	    _("Income"): {
+	        _("Direct Income"): {
+	            _("Sales"): {},
+	            _("Service"): {}
+	        },
+	        _("Indirect Income"): {
+				"is_group": 1
+	        },
+	        "root_type": "Income"
+	    },
+	    _("Source of Funds (Liabilities)"): {
+	        _("Current Liabilities"): {
+			    _("Accounts Payable"): {
+			        _("Creditors"): {
+			            "account_type": "Payable"
+			        },
+			        _("Payroll Payable"): {},
+			    },
+			    _("Stock Liabilities"): {
+				    _("Stock Received But Not Billed"): {
+				        "account_type": "Stock Received But Not Billed"
+				    },
+                    _("Asset Received But Not Billed"): {
+                        "account_type": "Asset Received But Not Billed"
+                    }
+			    },
+				_("Duties and Taxes"): {
+					"account_type": "Tax",
+					"is_group": 1
 				},
-				_("Stock Liabilities"): {
-					_("Stock Received But Not Billed"): {"account_type": "Stock Received But Not Billed"},
-					_("Asset Received But Not Billed"): {"account_type": "Asset Received But Not Billed"},
-				},
-				_("Duties and Taxes"): {"account_type": "Tax", "is_group": 1},
 				_("Loans (Liabilities)"): {
 					_("Secured Loans"): {},
 					_("Unsecured Loans"): {},
 					_("Bank Overdraft Account"): {},
 				},
-			},
-			"root_type": "Liability",
-		},
+	        },
+			"root_type": "Liability"
+	    },
 		_("Equity"): {
-			_("Capital Stock"): {"account_type": "Equity"},
-			_("Dividends Paid"): {"account_type": "Equity"},
-			_("Opening Balance Equity"): {"account_type": "Equity"},
-			_("Retained Earnings"): {"account_type": "Equity"},
-			"root_type": "Equity",
-		},
+	        _("Capital Stock"): {
+	            "account_type": "Equity"
+	        },
+	        _("Dividends Paid"): {
+	            "account_type": "Equity"
+	        },
+	        _("Opening Balance Equity"): {
+	            "account_type": "Equity"
+	        },
+	        _("Retained Earnings"): {
+	            "account_type": "Equity"
+	        },
+			"root_type": "Equity"
+		}
 	}

erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py

@@ -1,158 +1,292 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-
+from __future__ import unicode_literals
 from frappe import _
 
-
 def get():
-	return {
-		_("Application of Funds (Assets)"): {
-			_("Current Assets"): {
-				_("Accounts Receivable"): {
-					_("Debtors"): {"account_type": "Receivable", "account_number": "1310"},
-					"account_number": "1300",
-				},
-				_("Bank Accounts"): {"account_type": "Bank", "is_group": 1, "account_number": "1200"},
-				_("Cash In Hand"): {
-					_("Cash"): {"account_type": "Cash", "account_number": "1110"},
-					"account_type": "Cash",
-					"account_number": "1100",
-				},
-				_("Loans and Advances (Assets)"): {
-					_("Employee Advances"): {"account_number": "1610"},
-					"account_number": "1600",
-				},
-				_("Securities and Deposits"): {
-					_("Earnest Money"): {"account_number": "1651"},
-					"account_number": "1650",
-				},
-				_("Stock Assets"): {
-					_("Stock In Hand"): {"account_type": "Stock", "account_number": "1410"},
-					"account_type": "Stock",
-					"account_number": "1400",
-				},
-				_("Tax Assets"): {"is_group": 1, "account_number": "1500"},
-				"account_number": "1100-1600",
-			},
-			_("Fixed Assets"): {
-				_("Capital Equipments"): {"account_type": "Fixed Asset", "account_number": "1710"},
-				_("Electronic Equipments"): {"account_type": "Fixed Asset", "account_number": "1720"},
-				_("Furnitures and Fixtures"): {"account_type": "Fixed Asset", "account_number": "1730"},
-				_("Office Equipments"): {"account_type": "Fixed Asset", "account_number": "1740"},
-				_("Plants and Machineries"): {"account_type": "Fixed Asset", "account_number": "1750"},
-				_("Buildings"): {"account_type": "Fixed Asset", "account_number": "1760"},
-				_("Softwares"): {"account_type": "Fixed Asset", "account_number": "1770"},
-				_("Accumulated Depreciation"): {
-					"account_type": "Accumulated Depreciation",
-					"account_number": "1780",
-				},
-				_("CWIP Account"): {"account_type": "Capital Work in Progress", "account_number": "1790"},
-				"account_number": "1700",
-			},
-			_("Investments"): {"is_group": 1, "account_number": "1800"},
-			_("Temporary Accounts"): {
-				_("Temporary Opening"): {"account_type": "Temporary", "account_number": "1910"},
-				"account_number": "1900",
-			},
-			"root_type": "Asset",
-			"account_number": "1000",
-		},
-		_("Expenses"): {
-			_("Direct Expenses"): {
-				_("Stock Expenses"): {
-					_("Cost of Goods Sold"): {"account_type": "Cost of Goods Sold", "account_number": "5111"},
-					_("Expenses Included In Asset Valuation"): {
-						"account_type": "Expenses Included In Asset Valuation",
-						"account_number": "5112",
-					},
-					_("Expenses Included In Valuation"): {
-						"account_type": "Expenses Included In Valuation",
-						"account_number": "5118",
-					},
-					_("Stock Adjustment"): {"account_type": "Stock Adjustment", "account_number": "5119"},
-					"account_number": "5110",
-				},
-				"account_number": "5100",
-			},
-			_("Indirect Expenses"): {
-				_("Administrative Expenses"): {"account_number": "5201"},
-				_("Commission on Sales"): {"account_number": "5202"},
-				_("Depreciation"): {"account_type": "Depreciation", "account_number": "5203"},
-				_("Entertainment Expenses"): {"account_number": "5204"},
-				_("Freight and Forwarding Charges"): {"account_type": "Chargeable", "account_number": "5205"},
-				_("Legal Expenses"): {"account_number": "5206"},
-				_("Marketing Expenses"): {"account_type": "Chargeable", "account_number": "5207"},
-				_("Office Maintenance Expenses"): {"account_number": "5208"},
-				_("Office Rent"): {"account_number": "5209"},
-				_("Postal Expenses"): {"account_number": "5210"},
-				_("Print and Stationery"): {"account_number": "5211"},
-				_("Round Off"): {"account_type": "Round Off", "account_number": "5212"},
-				_("Salary"): {"account_number": "5213"},
-				_("Sales Expenses"): {"account_number": "5214"},
-				_("Telephone Expenses"): {"account_number": "5215"},
-				_("Travel Expenses"): {"account_number": "5216"},
-				_("Utility Expenses"): {"account_number": "5217"},
-				_("Write Off"): {"account_number": "5218"},
-				_("Exchange Gain/Loss"): {"account_number": "5219"},
-				_("Gain/Loss on Asset Disposal"): {"account_number": "5220"},
-				_("Miscellaneous Expenses"): {"account_type": "Chargeable", "account_number": "5221"},
-				"account_number": "5200",
-			},
-			"root_type": "Expense",
-			"account_number": "5000",
-		},
-		_("Income"): {
-			_("Direct Income"): {
-				_("Sales"): {"account_number": "4110"},
-				_("Service"): {"account_number": "4120"},
-				"account_number": "4100",
-			},
-			_("Indirect Income"): {"is_group": 1, "account_number": "4200"},
-			"root_type": "Income",
-			"account_number": "4000",
-		},
-		_("Source of Funds (Liabilities)"): {
-			_("Current Liabilities"): {
-				_("Accounts Payable"): {
-					_("Creditors"): {"account_type": "Payable", "account_number": "2110"},
-					_("Payroll Payable"): {"account_number": "2120"},
-					"account_number": "2100",
-				},
-				_("Stock Liabilities"): {
-					_("Stock Received But Not Billed"): {
-						"account_type": "Stock Received But Not Billed",
-						"account_number": "2210",
-					},
-					_("Asset Received But Not Billed"): {
-						"account_type": "Asset Received But Not Billed",
-						"account_number": "2211",
-					},
-					"account_number": "2200",
-				},
-				_("Duties and Taxes"): {
-					_("TDS Payable"): {"account_number": "2310"},
-					"account_type": "Tax",
-					"is_group": 1,
-					"account_number": "2300",
-				},
-				_("Loans (Liabilities)"): {
-					_("Secured Loans"): {"account_number": "2410"},
-					_("Unsecured Loans"): {"account_number": "2420"},
-					_("Bank Overdraft Account"): {"account_number": "2430"},
-					"account_number": "2400",
-				},
-				"account_number": "2100-2400",
-			},
-			"root_type": "Liability",
-			"account_number": "2000",
-		},
-		_("Equity"): {
-			_("Capital Stock"): {"account_type": "Equity", "account_number": "3100"},
-			_("Dividends Paid"): {"account_type": "Equity", "account_number": "3200"},
-			_("Opening Balance Equity"): {"account_type": "Equity", "account_number": "3300"},
-			_("Retained Earnings"): {"account_type": "Equity", "account_number": "3400"},
-			"root_type": "Equity",
-			"account_number": "3000",
-		},
-	}
+    return {
+        _("Application of Funds (Assets)"): {
+            _("Current Assets"): {
+                _("Accounts Receivable"): {
+                    _("Debtors"): {
+                        "account_type": "Receivable",
+                        "account_number": "1310"
+                    },
+                    "account_number": "1300"
+                },
+                _("Bank Accounts"): {
+                    "account_type": "Bank",
+                    "is_group": 1,
+                    "account_number": "1200"
+                },
+                _("Cash In Hand"): {
+                    _("Cash"): {
+                        "account_type": "Cash",
+                        "account_number": "1110"
+                    },
+                    "account_type": "Cash",
+                    "account_number": "1100"
+                },
+                _("Loans and Advances (Assets)"): {
+                    _("Employee Advances"): {
+                        "account_number": "1610"
+                    },
+                    "account_number": "1600"
+                },
+                _("Securities and Deposits"): {
+                    _("Earnest Money"): {
+                        "account_number": "1651"
+                    },
+                    "account_number": "1650"
+                },
+                _("Stock Assets"): {
+                    _("Stock In Hand"): {
+                        "account_type": "Stock",
+                        "account_number": "1410"
+                    },
+                    "account_type": "Stock",
+                    "account_number": "1400"
+                },
+                _("Tax Assets"): {
+                    "is_group": 1,
+                    "account_number": "1500"
+                },
+                "account_number": "1100-1600"
+            },
+            _("Fixed Assets"): {
+                _("Capital Equipments"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1710"
+                },
+                _("Electronic Equipments"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1720"
+                },
+                _("Furnitures and Fixtures"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1730"
+                },
+                _("Office Equipments"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1740"
+                },
+                _("Plants and Machineries"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1750"
+                },
+                _("Buildings"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1760"
+                },
+                _("Softwares"): {
+                    "account_type": "Fixed Asset",
+                    "account_number": "1770"
+                },
+                _("Accumulated Depreciation"): {
+                    "account_type": "Accumulated Depreciation",
+                    "account_number": "1780"
+                },
+                _("CWIP Account"): {
+                    "account_type": "Capital Work in Progress",
+                    "account_number": "1790"
+                },
+                "account_number": "1700"
+            },
+            _("Investments"): {
+                "is_group": 1,
+                "account_number": "1800"
+            },
+            _("Temporary Accounts"): {
+                _("Temporary Opening"): {
+                    "account_type": "Temporary",
+                    "account_number": "1910"
+                },
+                "account_number": "1900"
+            },
+            "root_type": "Asset",
+            "account_number": "1000"
+        },
+        _("Expenses"): {
+            _("Direct Expenses"): {
+                _("Stock Expenses"): {
+                    _("Cost of Goods Sold"): {
+                        "account_type": "Cost of Goods Sold",
+                        "account_number": "5111"
+                    },
+                    _("Expenses Included In Asset Valuation"): {
+                        "account_type": "Expenses Included In Asset Valuation",
+                        "account_number": "5112"
+                    },
+                    _("Expenses Included In Valuation"): {
+                        "account_type": "Expenses Included In Valuation",
+                        "account_number": "5118"
+                    },
+                    _("Stock Adjustment"): {
+                        "account_type": "Stock Adjustment",
+                        "account_number": "5119"
+                    },
+                    "account_number": "5110"
+                },
+                "account_number": "5100"
+            },
+            _("Indirect Expenses"): {
+                _("Administrative Expenses"): {
+                    "account_number": "5201"
+                },
+                _("Commission on Sales"): {
+                    "account_number": "5202"
+                },
+                _("Depreciation"): {
+                    "account_type": "Depreciation",
+                    "account_number": "5203"
+                },
+                _("Entertainment Expenses"): {
+                    "account_number": "5204"
+                },
+                _("Freight and Forwarding Charges"): {
+                    "account_type": "Chargeable",
+                    "account_number": "5205"
+                },
+                _("Legal Expenses"): {
+                    "account_number": "5206"
+                },
+                _("Marketing Expenses"): {
+                    "account_type": "Chargeable",
+                    "account_number": "5207"
+                },
+                _("Office Maintenance Expenses"): {
+                    "account_number": "5208"
+                },
+                _("Office Rent"): {
+                    "account_number": "5209"
+                },
+                _("Postal Expenses"): {
+                    "account_number": "5210"
+                },
+                _("Print and Stationery"): {
+                    "account_number": "5211"
+                },
+                _("Round Off"): {
+                    "account_type": "Round Off",
+                    "account_number": "5212"
+                },
+                _("Salary"): {
+                    "account_number": "5213"
+                },
+                _("Sales Expenses"): {
+                    "account_number": "5214"
+                },
+                _("Telephone Expenses"): {
+                    "account_number": "5215"
+                },
+                _("Travel Expenses"): {
+                    "account_number": "5216"
+                },
+                _("Utility Expenses"): {
+                    "account_number": "5217"
+                },
+                _("Write Off"): {
+                    "account_number": "5218"
+                },
+                _("Exchange Gain/Loss"): {
+                    "account_number": "5219"
+                },
+                _("Gain/Loss on Asset Disposal"): {
+                    "account_number": "5220"
+                },
+                _("Miscellaneous Expenses"): {
+                    "account_type": "Chargeable",
+                    "account_number": "5221"
+                },
+                "account_number": "5200"
+            },
+            "root_type": "Expense",
+            "account_number": "5000"
+        },
+        _("Income"): {
+            _("Direct Income"): {
+                _("Sales"): {
+                    "account_number": "4110"
+                },
+                _("Service"): {
+                    "account_number": "4120"
+                },
+                "account_number": "4100"
+            },
+            _("Indirect Income"): {
+                "is_group": 1,
+                "account_number": "4200"
+            },
+            "root_type": "Income",
+            "account_number": "4000"
+        },
+        _("Source of Funds (Liabilities)"): {
+            _("Current Liabilities"): {
+                _("Accounts Payable"): {
+                    _("Creditors"): {
+                        "account_type": "Payable",
+                        "account_number": "2110"
+                    },
+                    _("Payroll Payable"): {
+                        "account_number": "2120"
+                    },
+                    "account_number": "2100"
+                },
+                _("Stock Liabilities"): {
+                    _("Stock Received But Not Billed"): {
+                        "account_type": "Stock Received But Not Billed",
+                        "account_number": "2210"
+                    },
+                    _("Asset Received But Not Billed"): {
+                        "account_type": "Asset Received But Not Billed",
+                        "account_number": "2211"
+                    },
+                    "account_number": "2200"
+                },
+                _("Duties and Taxes"): {
+                    _("TDS Payable"): {
+                        "account_number": "2310"
+                    },
+                    "account_type": "Tax",
+                    "is_group": 1,
+                    "account_number": "2300"
+                },
+                _("Loans (Liabilities)"): {
+                    _("Secured Loans"): {
+                        "account_number": "2410"
+                    },
+                    _("Unsecured Loans"): {
+                        "account_number": "2420"
+                    },
+                    _("Bank Overdraft Account"): {
+                        "account_number": "2430"
+                    },
+                    "account_number": "2400"
+                },
+                "account_number": "2100-2400"
+            },
+            "root_type": "Liability",
+            "account_number": "2000"
+        },
+        _("Equity"): {
+            _("Capital Stock"): {
+                "account_type": "Equity",
+                "account_number": "3100"
+            },
+            _("Dividends Paid"): {
+                "account_type": "Equity",
+                "account_number": "3200"
+            },
+            _("Opening Balance Equity"): {
+                "account_type": "Equity",
+                "account_number": "3300"
+            },
+            _("Retained Earnings"): {
+                "account_type": "Equity",
+                "account_number": "3400"
+            },
+            "root_type": "Equity",
+            "account_number": "3000"
+        }
+    }

erpnext/accounts/doctype/account/test_account.py

@@ -1,14 +1,11 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-
+from __future__ import unicode_literals
 import unittest
-
 import frappe
-
-from erpnext.accounts.doctype.account.account import merge_account, update_account_number
-from erpnext.stock import get_company_default_inventory_account, get_warehouse_account
-
+from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
+from erpnext.accounts.doctype.account.account import update_account_number, merge_account
 
 class TestAccount(unittest.TestCase):
 	def test_rename_account(self):
@@ -20,9 +17,8 @@ class TestAccount(unittest.TestCase):
 			acc.company = "_Test Company"
 			acc.insert()
 
-		account_number, account_name = frappe.db.get_value(
-			"Account", "1210 - Debtors - _TC", ["account_number", "account_name"]
-		)
+		account_number, account_name = frappe.db.get_value("Account", "1210 - Debtors - _TC",
+			["account_number", "account_name"])
 		self.assertEqual(account_number, "1210")
 		self.assertEqual(account_name, "Debtors")
 
@@ -31,12 +27,8 @@ class TestAccount(unittest.TestCase):
 
 		update_account_number("1210 - Debtors - _TC", new_account_name, new_account_number)
 
-		new_acc = frappe.db.get_value(
-			"Account",
-			"1211-11-4 - 6 - - Debtors 1 - Test - - _TC",
-			["account_name", "account_number"],
-			as_dict=1,
-		)
+		new_acc = frappe.db.get_value("Account", "1211-11-4 - 6 - - Debtors 1 - Test - - _TC",
+			["account_name", "account_number"], as_dict=1)
 
 		self.assertEqual(new_acc.account_name, "Debtors 1 - Test -")
 		self.assertEqual(new_acc.account_number, "1211-11-4 - 6 -")
@@ -84,9 +76,7 @@ class TestAccount(unittest.TestCase):
 
 		self.assertEqual(parent, "Securities and Deposits - _TC")
 
-		merge_account(
-			"Securities and Deposits - _TC", "Cash In Hand - _TC", doc.is_group, doc.root_type, doc.company
-		)
+		merge_account("Securities and Deposits - _TC", "Cash In Hand - _TC", doc.is_group, doc.root_type, doc.company)
 		parent = frappe.db.get_value("Account", "Earnest Money - _TC", "parent_account")
 
 		# Parent account of the child account changes after merging
@@ -98,28 +88,14 @@ class TestAccount(unittest.TestCase):
 		doc = frappe.get_doc("Account", "Current Assets - _TC")
 
 		# Raise error as is_group property doesn't match
-		self.assertRaises(
-			frappe.ValidationError,
-			merge_account,
-			"Current Assets - _TC",
-			"Accumulated Depreciation - _TC",
-			doc.is_group,
-			doc.root_type,
-			doc.company,
-		)
+		self.assertRaises(frappe.ValidationError, merge_account, "Current Assets - _TC",\
+			"Accumulated Depreciation - _TC", doc.is_group, doc.root_type, doc.company)
 
 		doc = frappe.get_doc("Account", "Capital Stock - _TC")
 
 		# Raise error as root_type property doesn't match
-		self.assertRaises(
-			frappe.ValidationError,
-			merge_account,
-			"Capital Stock - _TC",
-			"Softwares - _TC",
-			doc.is_group,
-			doc.root_type,
-			doc.company,
-		)
+		self.assertRaises(frappe.ValidationError, merge_account, "Capital Stock - _TC",\
+			"Softwares - _TC", doc.is_group, doc.root_type, doc.company)
 
 	def test_account_sync(self):
 		frappe.local.flags.pop("ignore_root_company_validation", None)
@@ -130,12 +106,8 @@ class TestAccount(unittest.TestCase):
 		acc.company = "_Test Company 3"
 		acc.insert()
 
-		acc_tc_4 = frappe.db.get_value(
-			"Account", {"account_name": "Test Sync Account", "company": "_Test Company 4"}
-		)
-		acc_tc_5 = frappe.db.get_value(
-			"Account", {"account_name": "Test Sync Account", "company": "_Test Company 5"}
-		)
+		acc_tc_4 = frappe.db.get_value('Account', {'account_name': "Test Sync Account", "company": "_Test Company 4"})
+		acc_tc_5 = frappe.db.get_value('Account', {'account_name': "Test Sync Account", "company": "_Test Company 5"})
 		self.assertEqual(acc_tc_4, "Test Sync Account - _TC4")
 		self.assertEqual(acc_tc_5, "Test Sync Account - _TC5")
 
@@ -163,26 +135,8 @@ class TestAccount(unittest.TestCase):
 		update_account_number(acc.name, "Test Rename Sync Account", "1234")
 
 		# Check if renamed in children
-		self.assertTrue(
-			frappe.db.exists(
-				"Account",
-				{
-					"account_name": "Test Rename Sync Account",
-					"company": "_Test Company 4",
-					"account_number": "1234",
-				},
-			)
-		)
-		self.assertTrue(
-			frappe.db.exists(
-				"Account",
-				{
-					"account_name": "Test Rename Sync Account",
-					"company": "_Test Company 5",
-					"account_number": "1234",
-				},
-			)
-		)
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Rename Sync Account", "company": "_Test Company 4", "account_number": "1234"}))
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Rename Sync Account", "company": "_Test Company 5", "account_number": "1234"}))
 
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC3")
 		frappe.delete_doc("Account", "1234 - Test Rename Sync Account - _TC4")
@@ -198,71 +152,25 @@ class TestAccount(unittest.TestCase):
 		acc.company = "_Test Company 3"
 		acc.insert()
 
-		self.assertTrue(
-			frappe.db.exists(
-				"Account", {"account_name": "Test Group Account", "company": "_Test Company 4"}
-			)
-		)
-		self.assertTrue(
-			frappe.db.exists(
-				"Account", {"account_name": "Test Group Account", "company": "_Test Company 5"}
-			)
-		)
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Group Account", "company": "_Test Company 4"}))
+		self.assertTrue(frappe.db.exists("Account", {'account_name': "Test Group Account", "company": "_Test Company 5"}))
 
 		# Try renaming child company account
-		acc_tc_5 = frappe.db.get_value(
-			"Account", {"account_name": "Test Group Account", "company": "_Test Company 5"}
-		)
-		self.assertRaises(
-			frappe.ValidationError, update_account_number, acc_tc_5, "Test Modified Account"
-		)
+		acc_tc_5 = frappe.db.get_value('Account', {'account_name': "Test Group Account", "company": "_Test Company 5"})
+		self.assertRaises(frappe.ValidationError, update_account_number, acc_tc_5, "Test Modified Account")
 
 		# Rename child company account with allow_account_creation_against_child_company enabled
-		frappe.db.set_value(
-			"Company", "_Test Company 5", "allow_account_creation_against_child_company", 1
-		)
+		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 1)
 
 		update_account_number(acc_tc_5, "Test Modified Account")
-		self.assertTrue(
-			frappe.db.exists(
-				"Account", {"name": "Test Modified Account - _TC5", "company": "_Test Company 5"}
-			)
-		)
+		self.assertTrue(frappe.db.exists("Account", {'name': "Test Modified Account - _TC5", "company": "_Test Company 5"}))
 
-		frappe.db.set_value(
-			"Company", "_Test Company 5", "allow_account_creation_against_child_company", 0
-		)
+		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 0)
 
-		to_delete = [
-			"Test Group Account - _TC3",
-			"Test Group Account - _TC4",
-			"Test Modified Account - _TC5",
-		]
+		to_delete = ["Test Group Account - _TC3", "Test Group Account - _TC4", "Test Modified Account - _TC5"]
 		for doc in to_delete:
 			frappe.delete_doc("Account", doc)
 
-	def test_validate_account_currency(self):
-		from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
-
-		if not frappe.db.get_value("Account", "Test Currency Account - _TC"):
-			acc = frappe.new_doc("Account")
-			acc.account_name = "Test Currency Account"
-			acc.parent_account = "Tax Assets - _TC"
-			acc.company = "_Test Company"
-			acc.insert()
-		else:
-			acc = frappe.get_doc("Account", "Test Currency Account - _TC")
-
-		self.assertEqual(acc.account_currency, "INR")
-
-		# Make a JV against this account
-		make_journal_entry(
-			"Test Currency Account - _TC", "Miscellaneous Expenses - _TC", 100, submit=True
-		)
-
-		acc.account_currency = "USD"
-		self.assertRaises(frappe.ValidationError, acc.save)
-
 
 def _make_test_records(verbose=None):
 	from frappe.test_runner import make_test_objects
@@ -273,16 +181,20 @@ def _make_test_records(verbose=None):
 		["_Test Bank USD", "Bank Accounts", 0, "Bank", "USD"],
 		["_Test Bank EUR", "Bank Accounts", 0, "Bank", "EUR"],
 		["_Test Cash", "Cash In Hand", 0, "Cash", None],
+
 		["_Test Account Stock Expenses", "Direct Expenses", 1, None, None],
 		["_Test Account Shipping Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
 		["_Test Account Customs Duty", "_Test Account Stock Expenses", 0, "Tax", None],
 		["_Test Account Insurance Charges", "_Test Account Stock Expenses", 0, "Chargeable", None],
 		["_Test Account Stock Adjustment", "_Test Account Stock Expenses", 0, "Stock Adjustment", None],
 		["_Test Employee Advance", "Current Liabilities", 0, None, None],
+
 		["_Test Account Tax Assets", "Current Assets", 1, None, None],
 		["_Test Account VAT", "_Test Account Tax Assets", 0, "Tax", None],
 		["_Test Account Service Tax", "_Test Account Tax Assets", 0, "Tax", None],
+
 		["_Test Account Reserves and Surplus", "Current Liabilities", 0, None, None],
+
 		["_Test Account Cost for Goods Sold", "Expenses", 0, None, None],
 		["_Test Account Excise Duty", "_Test Account Tax Assets", 0, "Tax", None],
 		["_Test Account Education Cess", "_Test Account Tax Assets", 0, "Tax", None],
@@ -291,45 +203,38 @@ def _make_test_records(verbose=None):
 		["_Test Account Discount", "Direct Expenses", 0, None, None],
 		["_Test Write Off", "Indirect Expenses", 0, None, None],
 		["_Test Exchange Gain/Loss", "Indirect Expenses", 0, None, None],
+
 		["_Test Account Sales", "Direct Income", 0, None, None],
+
 		# related to Account Inventory Integration
 		["_Test Account Stock In Hand", "Current Assets", 0, None, None],
+
 		# fixed asset depreciation
 		["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
 		["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
 		["_Test Depreciations", "Expenses", 0, None, None],
 		["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
+
 		# Receivable / Payable Account
 		["_Test Receivable", "Current Assets", 0, "Receivable", None],
 		["_Test Payable", "Current Liabilities", 0, "Payable", None],
 		["_Test Receivable USD", "Current Assets", 0, "Receivable", "USD"],
-		["_Test Payable USD", "Current Liabilities", 0, "Payable", "USD"],
+		["_Test Payable USD", "Current Liabilities", 0, "Payable", "USD"]
 	]
 
-	for company, abbr in [
-		["_Test Company", "_TC"],
-		["_Test Company 1", "_TC1"],
-		["_Test Company with perpetual inventory", "TCP1"],
-	]:
-		test_objects = make_test_objects(
-			"Account",
-			[
-				{
-					"doctype": "Account",
-					"account_name": account_name,
-					"parent_account": parent_account + " - " + abbr,
-					"company": company,
-					"is_group": is_group,
-					"account_type": account_type,
-					"account_currency": currency,
-				}
-				for account_name, parent_account, is_group, account_type, currency in accounts
-			],
-		)
+	for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"], ["_Test Company with perpetual inventory", "TCP1"]]:
+		test_objects = make_test_objects("Account", [{
+				"doctype": "Account",
+				"account_name": account_name,
+				"parent_account": parent_account + " - " + abbr,
+				"company": company,
+				"is_group": is_group,
+				"account_type": account_type,
+				"account_currency": currency
+			} for account_name, parent_account, is_group, account_type, currency in accounts])
 
 	return test_objects
 
-
 def get_inventory_account(company, warehouse=None):
 	account = None
 	if warehouse:
@@ -339,24 +244,19 @@ def get_inventory_account(company, warehouse=None):
 
 	return account
 
-
 def create_account(**kwargs):
-	account = frappe.db.get_value(
-		"Account", filters={"account_name": kwargs.get("account_name"), "company": kwargs.get("company")}
-	)
+	account = frappe.db.get_value("Account", filters={"account_name": kwargs.get("account_name"), "company": kwargs.get("company")})
 	if account:
 		return account
 	else:
-		account = frappe.get_doc(
-			dict(
-				doctype="Account",
-				account_name=kwargs.get("account_name"),
-				account_type=kwargs.get("account_type"),
-				parent_account=kwargs.get("parent_account"),
-				company=kwargs.get("company"),
-				account_currency=kwargs.get("account_currency"),
-			)
-		)
+		account = frappe.get_doc(dict(
+			doctype = "Account",
+			account_name = kwargs.get('account_name'),
+			account_type = kwargs.get('account_type'),
+			parent_account = kwargs.get('parent_account'),
+			company = kwargs.get('company'),
+			account_currency = kwargs.get('account_currency')
+		))
 
 		account.save()
 		return account.name

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js

@@ -60,4 +60,4 @@ frappe.ui.form.on('Accounting Dimension Detail', {
 		let row = locals[cdt][cdn];
 		row.reference_document = frm.doc.document_type;
 	}
-});
+});

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json

@@ -30,7 +30,6 @@
    "fieldtype": "Link",
    "label": "Reference Document Type",
    "options": "DocType",
-   "read_only_depends_on": "eval:!doc.__islocal",
    "reqd": 1
   },
   {
@@ -49,7 +48,7 @@
   }
  ],
  "links": [],
- "modified": "2021-02-08 16:37:53.936656",
+ "modified": "2020-03-22 20:34:39.805728",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension",

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

@@ -1,62 +1,45 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
-import json
-
+from __future__ import unicode_literals
 import frappe
-from frappe import _, scrub
-from frappe.custom.doctype.custom_field.custom_field import create_custom_field
-from frappe.model import core_doctypes_list
+from frappe import _
+import json
 from frappe.model.document import Document
+from frappe.custom.doctype.custom_field.custom_field import create_custom_field
+from frappe import scrub
 from frappe.utils import cstr
-
+from frappe.utils.background_jobs import enqueue
+from frappe.model import core_doctypes_list
 
 class AccountingDimension(Document):
 	def before_insert(self):
 		self.set_fieldname_and_label()
 
 	def validate(self):
-		if self.document_type in core_doctypes_list + (
-			"Accounting Dimension",
-			"Project",
-			"Cost Center",
-			"Accounting Dimension Detail",
-			"Company",
-			"Account",
-		):
+		if self.document_type in core_doctypes_list + ('Accounting Dimension', 'Project',
+				'Cost Center', 'Accounting Dimension Detail', 'Company') :
 
 			msg = _("Not allowed to create accounting dimension for {0}").format(self.document_type)
 			frappe.throw(msg)
 
-		exists = frappe.db.get_value(
-			"Accounting Dimension", {"document_type": self.document_type}, ["name"]
-		)
+		exists = frappe.db.get_value("Accounting Dimension", {'document_type': self.document_type}, ['name'])
 
 		if exists and self.is_new():
-			frappe.throw(_("Document Type already used as a dimension"))
-
-		if not self.is_new():
-			self.validate_document_type_change()
-
-	def validate_document_type_change(self):
-		doctype_before_save = frappe.db.get_value("Accounting Dimension", self.name, "document_type")
-		if doctype_before_save != self.document_type:
-			message = _("Cannot change Reference Document Type.")
-			message += _("Please create a new Accounting Dimension if required.")
-			frappe.throw(message)
+			frappe.throw("Document Type already used as a dimension")
 
 	def after_insert(self):
 		if frappe.flags.in_test:
 			make_dimension_in_accounting_doctypes(doc=self)
 		else:
-			frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self, queue="long")
+			frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self, queue='long')
 
 	def on_trash(self):
 		if frappe.flags.in_test:
-			delete_accounting_dimension(doc=self)
+			delete_accounting_dimension(doc=self, queue='long')
 		else:
-			frappe.enqueue(delete_accounting_dimension, doc=self, queue="long")
+			frappe.enqueue(delete_accounting_dimension, doc=self)
 
 	def set_fieldname_and_label(self):
 		if not self.label:
@@ -68,20 +51,17 @@ class AccountingDimension(Document):
 	def on_update(self):
 		frappe.flags.accounting_dimensions = None
 
-
-def make_dimension_in_accounting_doctypes(doc, doclist=None):
-	if not doclist:
-		doclist = get_doctypes_with_dimensions()
-
+def make_dimension_in_accounting_doctypes(doc):
+	doclist = get_doctypes_with_dimensions()
 	doc_count = len(get_accounting_dimensions())
 	count = 0
 
 	for doctype in doclist:
 
 		if (doc_count + 1) % 2 == 0:
-			insert_after_field = "dimension_col_break"
+			insert_after_field = 'dimension_col_break'
 		else:
-			insert_after_field = "accounting_dimensions_section"
+			insert_after_field = 'accounting_dimensions_section'
 
 		df = {
 			"fieldname": doc.fieldname,
@@ -89,33 +69,30 @@ def make_dimension_in_accounting_doctypes(doc, doclist=None):
 			"fieldtype": "Link",
 			"options": doc.document_type,
 			"insert_after": insert_after_field,
-			"owner": "Administrator",
+			"owner": "Administrator"
 		}
 
-		meta = frappe.get_meta(doctype, cached=False)
-		fieldnames = [d.fieldname for d in meta.get("fields")]
+		if doctype == "Budget":
+			add_dimension_to_budget_doctype(df, doc)
+		else:
+			meta = frappe.get_meta(doctype, cached=False)
+			fieldnames = [d.fieldname for d in meta.get("fields")]
 
-		if df["fieldname"] not in fieldnames:
-			if doctype == "Budget":
-				add_dimension_to_budget_doctype(df.copy(), doc)
-			else:
-				create_custom_field(doctype, df, ignore_validate=True)
+			if df['fieldname'] not in fieldnames:
+				create_custom_field(doctype, df)
 
 		count += 1
 
-		frappe.publish_progress(count * 100 / len(doclist), title=_("Creating Dimensions..."))
+		frappe.publish_progress(count*100/len(doclist), title = _("Creating Dimensions..."))
 		frappe.clear_cache(doctype=doctype)
 
-
 def add_dimension_to_budget_doctype(df, doc):
-	df.update(
-		{
-			"insert_after": "cost_center",
-			"depends_on": "eval:doc.budget_against == '{0}'".format(doc.document_type),
-		}
-	)
+	df.update({
+		"insert_after": "cost_center",
+		"depends_on": "eval:doc.budget_against == '{0}'".format(doc.document_type)
+	})
 
-	create_custom_field("Budget", df, ignore_validate=True)
+	create_custom_field("Budget", df)
 
 	property_setter = frappe.db.exists("Property Setter", "Budget-budget_against-options")
 
@@ -124,44 +101,36 @@ def add_dimension_to_budget_doctype(df, doc):
 		property_setter_doc.value = property_setter_doc.value + "\n" + doc.document_type
 		property_setter_doc.save()
 
-		frappe.clear_cache(doctype="Budget")
+		frappe.clear_cache(doctype='Budget')
 	else:
-		frappe.get_doc(
-			{
-				"doctype": "Property Setter",
-				"doctype_or_field": "DocField",
-				"doc_type": "Budget",
-				"field_name": "budget_against",
-				"property": "options",
-				"property_type": "Text",
-				"value": "\nCost Center\nProject\n" + doc.document_type,
-			}
-		).insert(ignore_permissions=True)
+		frappe.get_doc({
+			"doctype": "Property Setter",
+			"doctype_or_field": "DocField",
+			"doc_type": "Budget",
+			"field_name": "budget_against",
+			"property": "options",
+			"property_type": "Text",
+			"value": "\nCost Center\nProject\n" + doc.document_type
+		}).insert(ignore_permissions=True)
 
 
 def delete_accounting_dimension(doc):
 	doclist = get_doctypes_with_dimensions()
 
-	frappe.db.sql(
-		"""
+	frappe.db.sql("""
 		DELETE FROM `tabCustom Field`
 		WHERE fieldname = %s
-		AND dt IN (%s)"""
-		% ("%s", ", ".join(["%s"] * len(doclist))),  # nosec
-		tuple([doc.fieldname] + doclist),
-	)
+		AND dt IN (%s)""" %			#nosec
+		('%s', ', '.join(['%s']* len(doclist))), tuple([doc.fieldname] + doclist))
 
-	frappe.db.sql(
-		"""
+	frappe.db.sql("""
 		DELETE FROM `tabProperty Setter`
 		WHERE field_name = %s
-		AND doc_type IN (%s)"""
-		% ("%s", ", ".join(["%s"] * len(doclist))),  # nosec
-		tuple([doc.fieldname] + doclist),
-	)
+		AND doc_type IN (%s)""" %		#nosec
+		('%s', ', '.join(['%s']* len(doclist))), tuple([doc.fieldname] + doclist))
 
 	budget_against_property = frappe.get_doc("Property Setter", "Budget-budget_against-options")
-	value_list = budget_against_property.value.split("\n")[3:]
+	value_list = budget_against_property.value.split('\n')[3:]
 
 	if doc.document_type in value_list:
 		value_list.remove(doc.document_type)
@@ -172,7 +141,6 @@ def delete_accounting_dimension(doc):
 	for doctype in doclist:
 		frappe.clear_cache(doctype=doctype)
 
-
 @frappe.whitelist()
 def disable_dimension(doc):
 	if frappe.flags.in_test:
@@ -180,11 +148,10 @@ def disable_dimension(doc):
 	else:
 		frappe.enqueue(toggle_disabling, doc=doc)
 
-
 def toggle_disabling(doc):
 	doc = json.loads(doc)
 
-	if doc.get("disabled"):
+	if doc.get('disabled'):
 		df = {"read_only": 1}
 	else:
 		df = {"read_only": 0}
@@ -192,7 +159,7 @@ def toggle_disabling(doc):
 	doclist = get_doctypes_with_dimensions()
 
 	for doctype in doclist:
-		field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": doc.get("fieldname")})
+		field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": doc.get('fieldname')})
 		if field:
 			custom_field = frappe.get_doc("Custom Field", field)
 			custom_field.update(df)
@@ -200,40 +167,34 @@ def toggle_disabling(doc):
 
 		frappe.clear_cache(doctype=doctype)
 
-
 def get_doctypes_with_dimensions():
-	return frappe.get_hooks("accounting_dimension_doctypes")
+	doclist = ["GL Entry", "Sales Invoice", "POS Invoice", "Purchase Invoice", "Payment Entry", "Asset",
+		"Expense Claim", "Expense Claim Detail", "Expense Taxes and Charges", "Stock Entry", "Budget", "Payroll Entry", "Delivery Note",
+		"Sales Invoice Item", "POS Invoice Item", "Purchase Invoice Item", "Purchase Order Item", "Journal Entry Account", "Material Request Item", "Delivery Note Item",
+		"Purchase Receipt Item", "Stock Entry Detail", "Payment Entry Deduction", "Sales Taxes and Charges", "Purchase Taxes and Charges", "Shipping Rule",
+		"Landed Cost Item", "Asset Value Adjustment", "Loyalty Program", "Fee Schedule", "Fee Structure", "Stock Reconciliation",
+		"Travel Request", "Fees", "POS Profile", "Opening Invoice Creation Tool", "Opening Invoice Creation Tool Item", "Subscription",
+		"Subscription Plan"]
 
+	return doclist
 
-def get_accounting_dimensions(as_list=True, filters=None):
-
-	if not filters:
-		filters = {"disabled": 0}
-
+def get_accounting_dimensions(as_list=True):
 	if frappe.flags.accounting_dimensions is None:
-		frappe.flags.accounting_dimensions = frappe.get_all(
-			"Accounting Dimension",
-			fields=["label", "fieldname", "disabled", "document_type"],
-			filters=filters,
-		)
+		frappe.flags.accounting_dimensions = frappe.get_all("Accounting Dimension",
+			fields=["label", "fieldname", "disabled", "document_type"])
 
 	if as_list:
 		return [d.fieldname for d in frappe.flags.accounting_dimensions]
 	else:
 		return frappe.flags.accounting_dimensions
 
-
 def get_checks_for_pl_and_bs_accounts():
-	dimensions = frappe.db.sql(
-		"""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
+	dimensions = frappe.db.sql("""SELECT p.label, p.disabled, p.fieldname, c.default_dimension, c.company, c.mandatory_for_pl, c.mandatory_for_bs
 		FROM `tabAccounting Dimension`p ,`tabAccounting Dimension Detail` c
-		WHERE p.name = c.parent""",
-		as_dict=1,
-	)
+		WHERE p.name = c.parent""", as_dict=1)
 
 	return dimensions
 
-
 def get_dimension_with_children(doctype, dimension):
 
 	if isinstance(dimension, list):
@@ -241,39 +202,34 @@ def get_dimension_with_children(doctype, dimension):
 
 	all_dimensions = []
 	lft, rgt = frappe.db.get_value(doctype, dimension, ["lft", "rgt"])
-	children = frappe.get_all(
-		doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft"
-	)
+	children = frappe.get_all(doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft")
 	all_dimensions += [c.name for c in children]
 
 	return all_dimensions
 
-
 @frappe.whitelist()
 def get_dimensions(with_cost_center_and_project=False):
-	dimension_filters = frappe.db.sql(
-		"""
+	dimension_filters = frappe.db.sql("""
 		SELECT label, fieldname, document_type
 		FROM `tabAccounting Dimension`
 		WHERE disabled = 0
-	""",
-		as_dict=1,
-	)
+	""", as_dict=1)
 
-	default_dimensions = frappe.db.sql(
-		"""SELECT p.fieldname, c.company, c.default_dimension
+	default_dimensions = frappe.db.sql("""SELECT p.fieldname, c.company, c.default_dimension
 		FROM `tabAccounting Dimension Detail` c, `tabAccounting Dimension` p
-		WHERE c.parent = p.name""",
-		as_dict=1,
-	)
+		WHERE c.parent = p.name""", as_dict=1)
 
 	if with_cost_center_and_project:
-		dimension_filters.extend(
-			[
-				{"fieldname": "cost_center", "document_type": "Cost Center"},
-				{"fieldname": "project", "document_type": "Project"},
-			]
-		)
+		dimension_filters.extend([
+			{
+				'fieldname': 'cost_center',
+				'document_type': 'Cost Center'
+			},
+			{
+				'fieldname': 'project',
+				'document_type': 'Project'
+			}
+		])
 
 	default_dimensions_map = {}
 	for dimension in default_dimensions:

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

@@ -1,15 +1,13 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-
-import unittest
+from __future__ import unicode_literals
 
 import frappe
-
-from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+import unittest
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-
-test_dependencies = ["Cost Center", "Location", "Warehouse", "Department"]
-
+from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import delete_accounting_dimension
 
 class TestAccountingDimension(unittest.TestCase):
 	def setUp(self):
@@ -19,27 +17,24 @@ class TestAccountingDimension(unittest.TestCase):
 		si = create_sales_invoice(do_not_save=1)
 
 		si.location = "Block 1"
-		si.append(
-			"items",
-			{
-				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC",
-				"qty": 1,
-				"rate": 100,
-				"income_account": "Sales - _TC",
-				"expense_account": "Cost of Goods Sold - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"department": "_Test Department - _TC",
-				"location": "Block 1",
-			},
-		)
+		si.append("items", {
+			"item_code": "_Test Item",
+			"warehouse": "_Test Warehouse - _TC",
+			"qty": 1,
+			"rate": 100,
+			"income_account": "Sales - _TC",
+			"expense_account": "Cost of Goods Sold - _TC",
+			"cost_center": "_Test Cost Center - _TC",
+			"department": "_Test Department - _TC",
+			"location": "Block 1"
+		})
 
 		si.save()
 		si.submit()
 
 		gle = frappe.get_doc("GL Entry", {"voucher_no": si.name, "account": "Sales - _TC"})
 
-		self.assertEqual(gle.get("department"), "_Test Department - _TC")
+		self.assertEqual(gle.get('department'), "_Test Department - _TC")
 
 	def test_dimension_against_journal_entry(self):
 		je = make_journal_entry("Sales - _TC", "Sales Expenses - _TC", 500, save=False)
@@ -54,24 +49,21 @@ class TestAccountingDimension(unittest.TestCase):
 
 		gle = frappe.get_doc("GL Entry", {"voucher_no": je.name, "account": "Sales - _TC"})
 		gle1 = frappe.get_doc("GL Entry", {"voucher_no": je.name, "account": "Sales Expenses - _TC"})
-		self.assertEqual(gle.get("department"), "_Test Department - _TC")
-		self.assertEqual(gle1.get("department"), "_Test Department - _TC")
+		self.assertEqual(gle.get('department'), "_Test Department - _TC")
+		self.assertEqual(gle1.get('department'), "_Test Department - _TC")
 
 	def test_mandatory(self):
 		si = create_sales_invoice(do_not_save=1)
-		si.append(
-			"items",
-			{
-				"item_code": "_Test Item",
-				"warehouse": "_Test Warehouse - _TC",
-				"qty": 1,
-				"rate": 100,
-				"income_account": "Sales - _TC",
-				"expense_account": "Cost of Goods Sold - _TC",
-				"cost_center": "_Test Cost Center - _TC",
-				"location": "",
-			},
-		)
+		si.append("items", {
+			"item_code": "_Test Item",
+			"warehouse": "_Test Warehouse - _TC",
+			"qty": 1,
+			"rate": 100,
+			"income_account": "Sales - _TC",
+			"expense_account": "Cost of Goods Sold - _TC",
+			"cost_center": "_Test Cost Center - _TC",
+			"location": ""
+		})
 
 		si.save()
 		self.assertRaises(frappe.ValidationError, si.submit)
@@ -79,39 +71,31 @@ class TestAccountingDimension(unittest.TestCase):
 	def tearDown(self):
 		disable_dimension()
 
-
 def create_dimension():
 	frappe.set_user("Administrator")
 
 	if not frappe.db.exists("Accounting Dimension", {"document_type": "Department"}):
-		frappe.get_doc(
-			{
-				"doctype": "Accounting Dimension",
-				"document_type": "Department",
-			}
-		).insert()
+		frappe.get_doc({
+			"doctype": "Accounting Dimension",
+			"document_type": "Department",
+		}).insert()
 	else:
 		dimension = frappe.get_doc("Accounting Dimension", "Department")
 		dimension.disabled = 0
 		dimension.save()
 
 	if not frappe.db.exists("Accounting Dimension", {"document_type": "Location"}):
-		dimension1 = frappe.get_doc(
-			{
-				"doctype": "Accounting Dimension",
-				"document_type": "Location",
-			}
-		)
+		dimension1 = frappe.get_doc({
+			"doctype": "Accounting Dimension",
+			"document_type": "Location",
+		})
 
-		dimension1.append(
-			"dimension_defaults",
-			{
-				"company": "_Test Company",
-				"reference_document": "Location",
-				"default_dimension": "Block 1",
-				"mandatory_for_bs": 1,
-			},
-		)
+		dimension1.append("dimension_defaults", {
+			"company": "_Test Company",
+			"reference_document": "Location",
+			"default_dimension": "Block 1",
+			"mandatory_for_bs": 1
+		})
 
 		dimension1.insert()
 		dimension1.save()
@@ -120,7 +104,6 @@ def create_dimension():
 		dimension1.disabled = 0
 		dimension1.save()
 
-
 def disable_dimension():
 	dimension1 = frappe.get_doc("Accounting Dimension", "Department")
 	dimension1.disabled = 1
@@ -129,3 +112,5 @@ def disable_dimension():
 	dimension2 = frappe.get_doc("Accounting Dimension", "Location")
 	dimension2.disabled = 1
 	dimension2.save()
+
+

erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-
 class AccountingDimensionDetail(Document):
 	pass

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.js

@@ -8,7 +8,7 @@ frappe.ui.form.on('Accounting Dimension Filter', {
 		}
 
 		let help_content =
-			`<table class="table table-bordered" style="background-color: var(--scrollbar-track-color);">
+			`<table class="table table-bordered" style="background-color: #f9f9f9;">
 				<tr><td>
 					<p>
 						<i class="fa fa-hand-right"></i>
@@ -79,4 +79,4 @@ frappe.ui.form.on('Allowed Dimension', {
 		row.accounting_dimension = frm.doc.accounting_dimension;
 		frm.refresh_field("dimensions");
 	}
-});
+});

erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.py

@@ -1,12 +1,12 @@
+# -*- coding: utf-8 -*-
 # Copyright, (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 import frappe
 from frappe import _, scrub
 from frappe.model.document import Document
 
-
 class AccountingDimensionFilter(Document):
 	def validate(self):
 		self.validate_applicable_accounts()
@@ -19,27 +19,17 @@ class AccountingDimensionFilter(Document):
 				WHERE d.name = a.parent
 				and d.name != %s
 				and d.accounting_dimension = %s
-			""",
-			(self.name, self.accounting_dimension),
-			as_dict=1,
-		)
+			""", (self.name, self.accounting_dimension), as_dict=1)
 
 		account_list = [d.account for d in accounts]
 
-		for account in self.get("accounts"):
+		for account in self.get('accounts'):
 			if account.applicable_on_account in account_list:
-				frappe.throw(
-					_("Row {0}: {1} account already applied for Accounting Dimension {2}").format(
-						account.idx,
-						frappe.bold(account.applicable_on_account),
-						frappe.bold(self.accounting_dimension),
-					)
-				)
-
+				frappe.throw(_("Row {0}: {1} account already applied for Accounting Dimension {2}").format(
+					account.idx, frappe.bold(account.applicable_on_account), frappe.bold(self.accounting_dimension)))
 
 def get_dimension_filter_map():
-	filters = frappe.db.sql(
-		"""
+	filters = frappe.db.sql("""
 		SELECT
 			a.applicable_on_account, d.dimension_value, p.accounting_dimension,
 			p.allow_or_restrict, a.is_mandatory
@@ -50,30 +40,22 @@ def get_dimension_filter_map():
 			p.name = a.parent
 			AND p.disabled = 0
 			AND p.name = d.parent
-	""",
-		as_dict=1,
-	)
+	""", as_dict=1)
 
 	dimension_filter_map = {}
 
 	for f in filters:
 		f.fieldname = scrub(f.accounting_dimension)
 
-		build_map(
-			dimension_filter_map,
-			f.fieldname,
-			f.applicable_on_account,
-			f.dimension_value,
-			f.allow_or_restrict,
-			f.is_mandatory,
-		)
+		build_map(dimension_filter_map, f.fieldname, f.applicable_on_account, f.dimension_value,
+			f.allow_or_restrict, f.is_mandatory)
 
 	return dimension_filter_map
 
-
 def build_map(map_object, dimension, account, filter_value, allow_or_restrict, is_mandatory):
-	map_object.setdefault(
-		(dimension, account),
-		{"allowed_dimensions": [], "is_mandatory": is_mandatory, "allow_or_restrict": allow_or_restrict},
-	)
-	map_object[(dimension, account)]["allowed_dimensions"].append(filter_value)
+	map_object.setdefault((dimension, account), {
+		'allowed_dimensions': [],
+		'is_mandatory': is_mandatory,
+		'allow_or_restrict': allow_or_restrict
+	})
+	map_object[(dimension, account)]['allowed_dimensions'].append(filter_value)

erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py

@@ -1,20 +1,14 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-
-import unittest
+from __future__ import unicode_literals
 
 import frappe
-
-from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import (
-	create_dimension,
-	disable_dimension,
-)
+import unittest
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.accounts.doctype.accounting_dimension.test_accounting_dimension import create_dimension, disable_dimension
 from erpnext.exceptions import InvalidAccountDimensionError, MandatoryAccountDimensionError
 
-test_dependencies = ["Location", "Cost Center", "Department"]
-
-
 class TestAccountingDimensionFilter(unittest.TestCase):
 	def setUp(self):
 		create_dimension()
@@ -23,9 +17,9 @@ class TestAccountingDimensionFilter(unittest.TestCase):
 
 	def test_allowed_dimension_validation(self):
 		si = create_sales_invoice(do_not_save=1)
-		si.items[0].cost_center = "Main - _TC"
-		si.department = "Accounts - _TC"
-		si.location = "Block 1"
+		si.items[0].cost_center = 'Main - _TC'
+		si.department = 'Accounts - _TC'
+		si.location = 'Block 1'
 		si.save()
 
 		self.assertRaises(InvalidAccountDimensionError, si.submit)
@@ -33,12 +27,12 @@ class TestAccountingDimensionFilter(unittest.TestCase):
 
 	def test_mandatory_dimension_validation(self):
 		si = create_sales_invoice(do_not_save=1)
-		si.department = ""
-		si.location = "Block 1"
+		si.department = ''
+		si.location = 'Block 1'
 
 		# Test with no department for Sales Account
-		si.items[0].department = ""
-		si.items[0].cost_center = "_Test Cost Center 2 - _TC"
+		si.items[0].department = ''
+		si.items[0].cost_center = '_Test Cost Center 2 - _TC'
 		si.save()
 
 		self.assertRaises(MandatoryAccountDimensionError, si.submit)
@@ -53,54 +47,53 @@ class TestAccountingDimensionFilter(unittest.TestCase):
 			if si.docstatus == 1:
 				si.cancel()
 
-
 def create_accounting_dimension_filter():
-	if not frappe.db.get_value(
-		"Accounting Dimension Filter", {"accounting_dimension": "Cost Center"}
-	):
-		frappe.get_doc(
-			{
-				"doctype": "Accounting Dimension Filter",
-				"accounting_dimension": "Cost Center",
-				"allow_or_restrict": "Allow",
-				"company": "_Test Company",
-				"accounts": [
-					{
-						"applicable_on_account": "Sales - _TC",
-					}
-				],
-				"dimensions": [
-					{"accounting_dimension": "Cost Center", "dimension_value": "_Test Cost Center 2 - _TC"}
-				],
-			}
-		).insert()
+	if not frappe.db.get_value('Accounting Dimension Filter',
+		{'accounting_dimension': 'Cost Center'}):
+		frappe.get_doc({
+			'doctype': 'Accounting Dimension Filter',
+			'accounting_dimension': 'Cost Center',
+			'allow_or_restrict': 'Allow',
+			'company': '_Test Company',
+			'accounts': [{
+				'applicable_on_account': 'Sales - _TC',
+			}],
+			'dimensions': [{
+				'accounting_dimension': 'Cost Center',
+				'dimension_value': '_Test Cost Center 2 - _TC'
+			}]
+		}).insert()
 	else:
-		doc = frappe.get_doc("Accounting Dimension Filter", {"accounting_dimension": "Cost Center"})
+		doc = frappe.get_doc('Accounting Dimension Filter', {'accounting_dimension': 'Cost Center'})
 		doc.disabled = 0
 		doc.save()
 
-	if not frappe.db.get_value("Accounting Dimension Filter", {"accounting_dimension": "Department"}):
-		frappe.get_doc(
-			{
-				"doctype": "Accounting Dimension Filter",
-				"accounting_dimension": "Department",
-				"allow_or_restrict": "Allow",
-				"company": "_Test Company",
-				"accounts": [{"applicable_on_account": "Sales - _TC", "is_mandatory": 1}],
-				"dimensions": [{"accounting_dimension": "Department", "dimension_value": "Accounts - _TC"}],
-			}
-		).insert()
+	if not frappe.db.get_value('Accounting Dimension Filter',
+		{'accounting_dimension': 'Department'}):
+		frappe.get_doc({
+			'doctype': 'Accounting Dimension Filter',
+			'accounting_dimension': 'Department',
+			'allow_or_restrict': 'Allow',
+			'company': '_Test Company',
+			'accounts': [{
+				'applicable_on_account': 'Sales - _TC',
+				'is_mandatory': 1
+			}],
+			'dimensions': [{
+				'accounting_dimension': 'Department',
+				'dimension_value': 'Accounts - _TC'
+			}]
+		}).insert()
 	else:
-		doc = frappe.get_doc("Accounting Dimension Filter", {"accounting_dimension": "Department"})
+		doc = frappe.get_doc('Accounting Dimension Filter', {'accounting_dimension': 'Department'})
 		doc.disabled = 0
 		doc.save()
 
-
 def disable_dimension_filter():
-	doc = frappe.get_doc("Accounting Dimension Filter", {"accounting_dimension": "Cost Center"})
+	doc = frappe.get_doc('Accounting Dimension Filter', {'accounting_dimension': 'Cost Center'})
 	doc.disabled = 1
 	doc.save()
 
-	doc = frappe.get_doc("Accounting Dimension Filter", {"accounting_dimension": "Department"})
+	doc = frappe.get_doc('Accounting Dimension Filter', {'accounting_dimension': 'Department'})
 	doc.disabled = 1
 	doc.save()

erpnext/accounts/doctype/accounting_period/accounting_period.py

@@ -1,15 +1,13 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 import frappe
-from frappe import _
 from frappe.model.document import Document
+from frappe import _
 
-
-class OverlapError(frappe.ValidationError):
-	pass
-
+class OverlapError(frappe.ValidationError): pass
 
 class AccountingPeriod(Document):
 	def validate(self):
@@ -19,12 +17,11 @@ class AccountingPeriod(Document):
 		self.bootstrap_doctypes_for_closing()
 
 	def autoname(self):
-		company_abbr = frappe.get_cached_value("Company", self.company, "abbr")
+		company_abbr = frappe.get_cached_value('Company',  self.company,  "abbr")
 		self.name = " - ".join([self.period_name, company_abbr])
 
 	def validate_overlap(self):
-		existing_accounting_period = frappe.db.sql(
-			"""select name from `tabAccounting Period`
+		existing_accounting_period = frappe.db.sql("""select name from `tabAccounting Period`
 			where (
 				(%(start_date)s between start_date and end_date)
 				or (%(end_date)s between start_date and end_date)
@@ -35,29 +32,17 @@ class AccountingPeriod(Document):
 				"start_date": self.start_date,
 				"end_date": self.end_date,
 				"name": self.name,
-				"company": self.company,
-			},
-			as_dict=True,
-		)
+				"company": self.company
+			}, as_dict=True)
 
 		if len(existing_accounting_period) > 0:
-			frappe.throw(
-				_("Accounting Period overlaps with {0}").format(existing_accounting_period[0].get("name")),
-				OverlapError,
-			)
+			frappe.throw(_("Accounting Period overlaps with {0}")
+				.format(existing_accounting_period[0].get("name")), OverlapError)
 
-	@frappe.whitelist()
 	def get_doctypes_for_closing(self):
 		docs_for_closing = []
-		doctypes = [
-			"Sales Invoice",
-			"Purchase Invoice",
-			"Journal Entry",
-			"Payroll Entry",
-			"Bank Clearance",
-			"Asset",
-			"Stock Entry",
-		]
+		doctypes = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Payroll Entry", \
+			"Bank Clearance", "Asset", "Stock Entry"]
 		closed_doctypes = [{"document_type": doctype, "closed": 1} for doctype in doctypes]
 		for closed_doctype in closed_doctypes:
 			docs_for_closing.append(closed_doctype)
@@ -67,7 +52,7 @@ class AccountingPeriod(Document):
 	def bootstrap_doctypes_for_closing(self):
 		if len(self.closed_documents) == 0:
 			for doctype_for_closing in self.get_doctypes_for_closing():
-				self.append(
-					"closed_documents",
-					{"document_type": doctype_for_closing.document_type, "closed": doctype_for_closing.closed},
-				)
+				self.append('closed_documents', {
+					"document_type": doctype_for_closing.document_type,
+					"closed": doctype_for_closing.closed
+				})

erpnext/accounts/doctype/accounting_period/test_accounting_period.js

@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Accounting Period", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Accounting Period
+		() => frappe.tests.make('Accounting Period', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

erpnext/accounts/doctype/accounting_period/test_accounting_period.py

@@ -1,55 +1,46 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-
-import unittest
+from __future__ import unicode_literals
 
 import frappe
-from frappe.utils import add_months, nowdate
-
+import unittest
+from frappe.utils import nowdate, add_months
+from erpnext.accounts.general_ledger import ClosedAccountingPeriod
 from erpnext.accounts.doctype.accounting_period.accounting_period import OverlapError
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.accounts.general_ledger import ClosedAccountingPeriod
-
-test_dependencies = ["Item"]
-
 
 class TestAccountingPeriod(unittest.TestCase):
-	def test_overlap(self):
-		ap1 = create_accounting_period(
-			start_date="2018-04-01", end_date="2018-06-30", company="Wind Power LLC"
-		)
-		ap1.save()
+    def test_overlap(self):
+        ap1 = create_accounting_period(start_date = "2018-04-01",
+            end_date = "2018-06-30", company = "Wind Power LLC")
+        ap1.save()
 
-		ap2 = create_accounting_period(
-			start_date="2018-06-30",
-			end_date="2018-07-10",
-			company="Wind Power LLC",
-			period_name="Test Accounting Period 1",
-		)
-		self.assertRaises(OverlapError, ap2.save)
+        ap2 = create_accounting_period(start_date = "2018-06-30",
+            end_date = "2018-07-10", company = "Wind Power LLC", period_name = "Test Accounting Period 1")
+        self.assertRaises(OverlapError, ap2.save)
 
-	def test_accounting_period(self):
-		ap1 = create_accounting_period(period_name="Test Accounting Period 2")
-		ap1.save()
+    def test_accounting_period(self):
+        ap1 = create_accounting_period(period_name = "Test Accounting Period 2")
+        ap1.save()
 
-		doc = create_sales_invoice(
-			do_not_submit=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC"
-		)
-		self.assertRaises(ClosedAccountingPeriod, doc.submit)
-
-	def tearDown(self):
-		for d in frappe.get_all("Accounting Period"):
-			frappe.delete_doc("Accounting Period", d.name)
+        doc = create_sales_invoice(do_not_submit=1, cost_center = "_Test Company - _TC", warehouse = "Stores - _TC")
+        self.assertRaises(ClosedAccountingPeriod, doc.submit)
 
+    def tearDown(self):
+        for d in frappe.get_all("Accounting Period"):
+            frappe.delete_doc("Accounting Period", d.name)
 
 def create_accounting_period(**args):
-	args = frappe._dict(args)
+    args = frappe._dict(args)
 
-	accounting_period = frappe.new_doc("Accounting Period")
-	accounting_period.start_date = args.start_date or nowdate()
-	accounting_period.end_date = args.end_date or add_months(nowdate(), 1)
-	accounting_period.company = args.company or "_Test Company"
-	accounting_period.period_name = args.period_name or "_Test_Period_Name_1"
-	accounting_period.append("closed_documents", {"document_type": "Sales Invoice", "closed": 1})
+    accounting_period = frappe.new_doc("Accounting Period")
+    accounting_period.start_date = args.start_date or nowdate()
+    accounting_period.end_date = args.end_date or add_months(nowdate(), 1)
+    accounting_period.company = args.company or "_Test Company"
+    accounting_period.period_name =args.period_name or  "_Test_Period_Name_1"
+    accounting_period.append("closed_documents", {
+        "document_type": 'Sales Invoice', "closed": 1
+    })
 
-	return accounting_period
+    return accounting_period

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -6,46 +6,3 @@ frappe.ui.form.on('Accounts Settings', {
 
 	}
 });
-
-frappe.tour['Accounts Settings'] = [
-	{
-		fieldname: "acc_frozen_upto",
-		title: "Accounts Frozen Upto",
-		description: __("Freeze accounting transactions up to specified date, nobody can make/modify entry except the specified Role."),
-	},
-	{
-		fieldname: "frozen_accounts_modifier",
-		title: "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
-		description: __("Users with this Role are allowed to set frozen accounts and create/modify accounting entries against frozen accounts.")
-	},
-	{
-		fieldname: "determine_address_tax_category_from",
-		title: "Determine Address Tax Category From",
-		description: __("Tax category can be set on Addresses. An address can be Shipping or Billing address. Set which addres to select when applying Tax Category.")
-	},
-	{
-		fieldname: "over_billing_allowance",
-		title: "Over Billing Allowance Percentage",
-		description: __("The percentage by which you can overbill transactions. For example, if the order value is $100 for an Item and percentage here is set as 10% then you are allowed to bill for $110.")
-	},
-	{
-		fieldname: "credit_controller",
-		title: "Credit Controller",
-		description: __("Select the role that is allowed to submit transactions that exceed credit limits set. The credit limit can be set in the Customer form.")
-	},
-	{
-		fieldname: "make_payment_via_journal_entry",
-		title: "Make Payment via Journal Entry",
-		description: __("When checked, if user proceeds to make payment from an invoice, the system will open a Journal Entry instead of a Payment Entry.")
-	},
-	{
-		fieldname: "unlink_payment_on_cancellation_of_invoice",
-		title: "Unlink Payment on Cancellation of Invoice",
-		description: __("If checked, system will unlink the payment against the respective invoice.")
-	},
-	{
-		fieldname: "unlink_advance_payment_on_cancelation_of_order",
-		title: "Unlink Advance Payment on Cancellation of Order",
-		description: __("Similar to the previous option, this unlinks any advance payments made against Purchase/Sales Orders.")
-	}
-];

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -7,33 +7,26 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
-  "accounts_transactions_settings_section",
-  "over_billing_allowance",
-  "role_allowed_to_over_bill",
-  "make_payment_via_journal_entry",
-  "column_break_11",
-  "check_supplier_invoice_uniqueness",
-  "unlink_payment_on_cancellation_of_invoice",
-  "automatically_fetch_payment_terms",
-  "delete_linked_ledger_entries",
-  "book_asset_depreciation_entry_automatically",
-  "unlink_advance_payment_on_cancelation_of_order",
-  "enable_common_party_accounting",
-  "post_change_gl_entries",
-  "enable_discount_accounting",
-  "tax_settings_section",
-  "determine_address_tax_category_from",
-  "column_break_19",
-  "add_taxes_from_item_tax_template",
-  "period_closing_settings_section",
+  "auto_accounting_for_stock",
   "acc_frozen_upto",
   "frozen_accounts_modifier",
+  "determine_address_tax_category_from",
+  "over_billing_allowance",
+  "role_allowed_to_over_bill",
   "column_break_4",
   "credit_controller",
+  "check_supplier_invoice_uniqueness",
+  "make_payment_via_journal_entry",
+  "unlink_payment_on_cancellation_of_invoice",
+  "unlink_advance_payment_on_cancelation_of_order",
+  "book_asset_depreciation_entry_automatically",
+  "add_taxes_from_item_tax_template",
+  "automatically_fetch_payment_terms",
+  "delete_linked_ledger_entries",
   "deferred_accounting_settings_section",
+  "automatically_process_deferred_accounting_entry",
   "book_deferred_entries_based_on",
   "column_break_18",
-  "automatically_process_deferred_accounting_entry",
   "book_deferred_entries_via_journal_entry",
   "submit_journal_entries",
   "print_settings",
@@ -47,6 +40,15 @@
   "use_custom_cash_flow"
  ],
  "fields": [
+  {
+   "default": "1",
+   "description": "If enabled, the system will post accounting entries for inventory automatically",
+   "fieldname": "auto_accounting_for_stock",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "in_list_view": 1,
+   "label": "Make Accounting Entry For Every Stock Movement"
+  },
   {
    "description": "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below",
    "fieldname": "acc_frozen_upto",
@@ -92,7 +94,6 @@
    "default": "0",
    "fieldname": "make_payment_via_journal_entry",
    "fieldtype": "Check",
-   "hidden": 1,
    "label": "Make Payment via Journal Entry"
   },
   {
@@ -175,7 +176,7 @@
    "default": "0",
    "fieldname": "automatically_fetch_payment_terms",
    "fieldtype": "Check",
-   "label": "Automatically Fetch Payment Terms from Order"
+   "label": "Automatically Fetch Payment Terms"
   },
   {
    "description": "The percentage you are allowed to bill more against the amount ordered. For example, if the order value is $100 for an item and tolerance is set as 10%, then you are allowed to bill up to $110 ",
@@ -228,54 +229,11 @@
    "label": "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
   },
   {
-   "description": "Users with this role are allowed to over bill above the allowance percentage",
+   "description": "Users with this role are allowed to over bill above the allowance perecentage",
    "fieldname": "role_allowed_to_over_bill",
    "fieldtype": "Link",
    "label": "Role Allowed to Over Bill ",
    "options": "Role"
-  },
-  {
-   "fieldname": "period_closing_settings_section",
-   "fieldtype": "Section Break",
-   "label": "Period Closing Settings"
-  },
-  {
-   "fieldname": "accounts_transactions_settings_section",
-   "fieldtype": "Section Break",
-   "label": "Transactions Settings"
-  },
-  {
-   "fieldname": "column_break_11",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "tax_settings_section",
-   "fieldtype": "Section Break",
-   "label": "Tax Settings"
-  },
-  {
-   "fieldname": "column_break_19",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "1",
-   "description": "If enabled, ledger entries will be posted for change amount in POS transactions",
-   "fieldname": "post_change_gl_entries",
-   "fieldtype": "Check",
-   "label": "Create Ledger Entries for Change Amount"
-  },
-  {
-   "default": "0",
-   "description": "If enabled, additional ledger entries will be made for discounts in a separate Discount Account",
-   "fieldname": "enable_discount_accounting",
-   "fieldtype": "Check",
-   "label": "Enable Discount Accounting"
-  },
-  {
-   "default": "0",
-   "fieldname": "enable_common_party_accounting",
-   "fieldtype": "Check",
-   "label": "Enable Common Party Accounting"
   }
  ],
  "icon": "icon-cog",
@@ -283,7 +241,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-10-11 17:42:36.427699",
+ "modified": "2021-03-11 18:52:05.601996",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -3,14 +3,11 @@
 
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 import frappe
-from frappe import _
-from frappe.custom.doctype.property_setter.property_setter import make_property_setter
-from frappe.model.document import Document
 from frappe.utils import cint
-
-from erpnext.stock.utils import check_pending_reposting
+from frappe.model.document import Document
+from frappe.custom.doctype.property_setter.property_setter import make_property_setter
 
 
 class AccountsSettings(Document):
@@ -18,108 +15,20 @@ class AccountsSettings(Document):
 		frappe.clear_cache()
 
 	def validate(self):
-		frappe.db.set_default(
-			"add_taxes_from_item_tax_template", self.get("add_taxes_from_item_tax_template", 0)
-		)
-
-		frappe.db.set_default(
-			"enable_common_party_accounting", self.get("enable_common_party_accounting", 0)
-		)
+		frappe.db.set_default("add_taxes_from_item_tax_template",
+			self.get("add_taxes_from_item_tax_template", 0))
 
 		self.validate_stale_days()
 		self.enable_payment_schedule_in_print()
-		self.toggle_discount_accounting_fields()
-		self.validate_pending_reposts()
 
 	def validate_stale_days(self):
 		if not self.allow_stale and cint(self.stale_days) <= 0:
 			frappe.msgprint(
-				_("Stale Days should start from 1."), title="Error", indicator="red", raise_exception=1
-			)
+				"Stale Days should start from 1.", title='Error', indicator='red',
+				raise_exception=1)
 
 	def enable_payment_schedule_in_print(self):
 		show_in_print = cint(self.show_payment_schedule_in_print)
 		for doctype in ("Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"):
-			make_property_setter(
-				doctype, "due_date", "print_hide", show_in_print, "Check", validate_fields_for_doctype=False
-			)
-			make_property_setter(
-				doctype,
-				"payment_schedule",
-				"print_hide",
-				0 if show_in_print else 1,
-				"Check",
-				validate_fields_for_doctype=False,
-			)
-
-	def toggle_discount_accounting_fields(self):
-		enable_discount_accounting = cint(self.enable_discount_accounting)
-
-		for doctype in ["Sales Invoice Item", "Purchase Invoice Item"]:
-			make_property_setter(
-				doctype,
-				"discount_account",
-				"hidden",
-				not (enable_discount_accounting),
-				"Check",
-				validate_fields_for_doctype=False,
-			)
-			if enable_discount_accounting:
-				make_property_setter(
-					doctype,
-					"discount_account",
-					"mandatory_depends_on",
-					"eval: doc.discount_amount",
-					"Code",
-					validate_fields_for_doctype=False,
-				)
-			else:
-				make_property_setter(
-					doctype,
-					"discount_account",
-					"mandatory_depends_on",
-					"",
-					"Code",
-					validate_fields_for_doctype=False,
-				)
-
-		for doctype in ["Sales Invoice", "Purchase Invoice"]:
-			make_property_setter(
-				doctype,
-				"additional_discount_account",
-				"hidden",
-				not (enable_discount_accounting),
-				"Check",
-				validate_fields_for_doctype=False,
-			)
-			if enable_discount_accounting:
-				make_property_setter(
-					doctype,
-					"additional_discount_account",
-					"mandatory_depends_on",
-					"eval: doc.discount_amount",
-					"Code",
-					validate_fields_for_doctype=False,
-				)
-			else:
-				make_property_setter(
-					doctype,
-					"additional_discount_account",
-					"mandatory_depends_on",
-					"",
-					"Code",
-					validate_fields_for_doctype=False,
-				)
-
-		make_property_setter(
-			"Item",
-			"default_discount_account",
-			"hidden",
-			not (enable_discount_accounting),
-			"Check",
-			validate_fields_for_doctype=False,
-		)
-
-	def validate_pending_reposts(self):
-		if self.acc_frozen_upto:
-			check_pending_reposting(self.acc_frozen_upto)
+			make_property_setter(doctype, "due_date", "print_hide", show_in_print, "Check")
+			make_property_setter(doctype, "payment_schedule", "print_hide",  0 if show_in_print else 1, "Check")

erpnext/accounts/doctype/accounts_settings/regional/united_states.js

@@ -5,4 +5,4 @@ frappe.ui.form.on('Accounts Settings', {
 		frm.set_df_property("frozen_accounts_modifier", "label", "Role Allowed to Close Books & Make Changes to Closed Periods");
 		frm.set_df_property("credit_controller", "label", "Credit Manager");
 	}
-});
+});

erpnext/accounts/doctype/accounts_settings/test_accounts_settings.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import unittest
 
 import frappe
@@ -7,12 +8,12 @@ class TestAccountsSettings(unittest.TestCase):
 	def tearDown(self):
 		# Just in case `save` method succeeds, we need to take things back to default so that other tests
 		# don't break
-		cur_settings = frappe.get_doc("Accounts Settings", "Accounts Settings")
+		cur_settings = frappe.get_doc('Accounts Settings', 'Accounts Settings')
 		cur_settings.allow_stale = 1
 		cur_settings.save()
 
 	def test_stale_days(self):
-		cur_settings = frappe.get_doc("Accounts Settings", "Accounts Settings")
+		cur_settings = frappe.get_doc('Accounts Settings', 'Accounts Settings')
 		cur_settings.allow_stale = 0
 		cur_settings.stale_days = 0
 

erpnext/accounts/doctype/advance_tax/advance_tax.json

@@ -1,56 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "creation": "2021-11-25 10:24:39.836195",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "reference_type",
-  "reference_name",
-  "reference_detail",
-  "account_head",
-  "allocated_amount"
- ],
- "fields": [
-  {
-   "fieldname": "reference_type",
-   "fieldtype": "Link",
-   "label": "Reference Type",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "reference_name",
-   "fieldtype": "Dynamic Link",
-   "label": "Reference Name",
-   "options": "reference_type"
-  },
-  {
-   "fieldname": "reference_detail",
-   "fieldtype": "Data",
-   "label": "Reference Detail"
-  },
-  {
-   "fieldname": "account_head",
-   "fieldtype": "Link",
-   "label": "Account Head",
-   "options": "Account"
-  },
-  {
-   "fieldname": "allocated_amount",
-   "fieldtype": "Currency",
-   "label": "Allocated Amount",
-   "options": "party_account_currency"
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2021-11-25 10:27:51.712286",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Advance Tax",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
-}

erpnext/accounts/doctype/advance_tax/advance_tax.py

@@ -1,9 +0,0 @@
-# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-# import frappe
-from frappe.model.document import Document
-
-
-class AdvanceTax(Document):
-	pass

erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json

@@ -1,190 +0,0 @@
-{
- "actions": [],
- "creation": "2020-09-12 22:26:19.594367",
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "add_deduct_tax",
-  "charge_type",
-  "row_id",
-  "account_head",
-  "col_break_1",
-  "description",
-  "included_in_paid_amount",
-  "accounting_dimensions_section",
-  "cost_center",
-  "dimension_col_break",
-  "section_break_8",
-  "rate",
-  "section_break_9",
-  "currency",
-  "tax_amount",
-  "total",
-  "allocated_amount",
-  "column_break_13",
-  "base_tax_amount",
-  "base_total"
- ],
- "fields": [
-  {
-   "columns": 2,
-   "fieldname": "charge_type",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Type",
-   "oldfieldname": "charge_type",
-   "oldfieldtype": "Select",
-   "options": "\nActual\nOn Paid Amount\nOn Previous Row Amount\nOn Previous Row Total",
-   "reqd": 1
-  },
-  {
-   "depends_on": "eval:[\"On Previous Row Amount\", \"On Previous Row Total\"].indexOf(doc.charge_type)!==-1",
-   "fieldname": "row_id",
-   "fieldtype": "Data",
-   "label": "Reference Row #",
-   "oldfieldname": "row_id",
-   "oldfieldtype": "Data"
-  },
-  {
-   "columns": 2,
-   "fieldname": "account_head",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Account Head",
-   "oldfieldname": "account_head",
-   "oldfieldtype": "Link",
-   "options": "Account",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fieldname": "col_break_1",
-   "fieldtype": "Column Break",
-   "width": "50%"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Small Text",
-   "label": "Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Small Text",
-   "print_width": "300px",
-   "reqd": 1,
-   "width": "300px"
-  },
-  {
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-  },
-  {
-   "default": ":Company",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "oldfieldname": "cost_center_other_charges",
-   "oldfieldtype": "Link",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_8",
-   "fieldtype": "Section Break"
-  },
-  {
-   "columns": 2,
-   "fieldname": "rate",
-   "fieldtype": "Float",
-   "in_list_view": 1,
-   "label": "Rate",
-   "oldfieldname": "rate",
-   "oldfieldtype": "Currency"
-  },
-  {
-   "fieldname": "section_break_9",
-   "fieldtype": "Section Break"
-  },
-  {
-   "columns": 2,
-   "fieldname": "tax_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Amount",
-   "options": "currency"
-  },
-  {
-   "columns": 2,
-   "fieldname": "total",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Total",
-   "options": "currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_13",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "base_tax_amount",
-   "fieldtype": "Currency",
-   "label": "Amount (Company Currency)",
-   "oldfieldname": "tax_amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "base_total",
-   "fieldtype": "Currency",
-   "label": "Total (Company Currency)",
-   "oldfieldname": "total",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "add_deduct_tax",
-   "fieldtype": "Select",
-   "label": "Add Or Deduct",
-   "options": "Add\nDeduct",
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "included_in_paid_amount",
-   "fieldtype": "Check",
-   "label": "Considered In Paid Amount"
-  },
-  {
-   "fieldname": "allocated_amount",
-   "fieldtype": "Currency",
-   "label": "Allocated Amount",
-   "options": "currency"
-  },
-  {
-   "fetch_from": "account_head.account_currency",
-   "fieldname": "currency",
-   "fieldtype": "Link",
-   "label": "Account Currency",
-   "options": "Currency",
-   "read_only": 1
-  }
- ],
- "index_web_pages_for_search": 1,
- "istable": 1,
- "links": [],
- "modified": "2021-11-25 11:10:10.945027",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Advance Taxes and Charges",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "ASC"
-}

erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.py

@@ -1,10 +0,0 @@
-# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-
-# import frappe
-from frappe.model.document import Document
-
-
-class AdvanceTaxesandCharges(Document):
-	pass

erpnext/accounts/doctype/allowed_dimension/allowed_dimension.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-
 class AllowedDimension(Document):
 	pass

erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.py

@@ -1,9 +1,9 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 from frappe.model.document import Document
 
-
 class AllowedToTransactWith(Document):
 	pass

erpnext/accounts/doctype/applicable_on_account/applicable_on_account.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-
 class ApplicableOnAccount(Document):
 	pass

erpnext/accounts/doctype/bank/bank.js

@@ -42,9 +42,10 @@ let add_fields_to_mapping_table = function (frm) {
 		});
 	});
 
-	frm.fields_dict.bank_transaction_mapping.grid.update_docfield_property(
-		'bank_transaction_field', 'options', options
-	);
+	frappe.meta.get_docfield("Bank Transaction Mapping", "bank_transaction_field",
+		frm.doc.name).options = options;
+
+	frm.fields_dict.bank_transaction_mapping.grid.refresh();
 };
 
 erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {

erpnext/accounts/doctype/bank/bank.py

@@ -1,13 +1,11 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
-from frappe.contacts.address_and_contact import (
-	delete_contact_and_address,
-	load_address_and_contact,
-)
+from __future__ import unicode_literals
+import frappe
 from frappe.model.document import Document
-
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 
 class Bank(Document):
 	def onload(self):
@@ -15,4 +13,4 @@ class Bank(Document):
 		load_address_and_contact(self)
 
 	def on_trash(self):
-		delete_contact_and_address("Bank", self.name)
+		delete_contact_and_address('Bank', self.name)

erpnext/accounts/doctype/bank/bank_dashboard.py

@@ -1,8 +1,15 @@
+from __future__ import unicode_literals
+
 from frappe import _
 
 
 def get_data():
 	return {
-		"fieldname": "bank",
-		"transactions": [{"label": _("Bank Details"), "items": ["Bank Account", "Bank Guarantee"]}],
+		'fieldname': 'bank',
+		'transactions': [
+			{
+				'label': _('Bank Details'),
+				'items': ['Bank Account', 'Bank Guarantee']
+			}
+		]
 	}

erpnext/accounts/doctype/bank/test_bank.js

@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank
+		() => frappe.tests.make('Bank', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

erpnext/accounts/doctype/bank/test_bank.py

@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
+import frappe
 import unittest
 
-
 class TestBank(unittest.TestCase):
 	pass

erpnext/accounts/doctype/bank_account/bank_account.json

@@ -86,7 +86,6 @@
   },
   {
    "default": "0",
-   "description": "Setting the account as a Company Account is necessary for Bank Reconciliation",
    "fieldname": "is_company_account",
    "fieldtype": "Check",
    "label": "Is Company Account"
@@ -208,7 +207,7 @@
   }
  ],
  "links": [],
- "modified": "2020-10-23 16:48:06.303658",
+ "modified": "2020-07-17 13:59:50.795412",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",

erpnext/accounts/doctype/bank_account/bank_account.py

@@ -1,15 +1,12 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.contacts.address_and_contact import (
-	delete_contact_and_address,
-	load_address_and_contact,
-)
 from frappe.model.document import Document
-
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 
 class BankAccount(Document):
 	def onload(self):
@@ -20,7 +17,7 @@ class BankAccount(Document):
 		self.name = self.account_name + " - " + self.bank
 
 	def on_trash(self):
-		delete_contact_and_address("BankAccount", self.name)
+		delete_contact_and_address('BankAccount', self.name)
 
 	def validate(self):
 		self.validate_company()
@@ -31,9 +28,9 @@ class BankAccount(Document):
 			frappe.throw(_("Company is manadatory for company account"))
 
 	def validate_iban(self):
-		"""
+		'''
 		Algorithm: https://en.wikipedia.org/wiki/International_Bank_Account_Number#Validating_the_IBAN
-		"""
+		'''
 		# IBAN field is optional
 		if not self.iban:
 			return
@@ -43,7 +40,7 @@ class BankAccount(Document):
 			return str(9 + ord(c) - 64)
 
 		# remove whitespaces, upper case to get the right number from ord()
-		iban = "".join(self.iban.split(" ")).upper()
+		iban = ''.join(self.iban.split(' ')).upper()
 
 		# Move country code and checksum from the start to the end
 		flipped = iban[4:] + iban[:4]
@@ -52,12 +49,12 @@ class BankAccount(Document):
 		encoded = [encode_char(c) if ord(c) >= 65 and ord(c) <= 90 else c for c in flipped]
 
 		try:
-			to_check = int("".join(encoded))
+			to_check = int(''.join(encoded))
 		except ValueError:
-			frappe.throw(_("IBAN is not valid"))
+			frappe.throw(_('IBAN is not valid'))
 
 		if to_check % 97 != 1:
-			frappe.throw(_("IBAN is not valid"))
+			frappe.throw(_('IBAN is not valid'))
 
 
 @frappe.whitelist()
@@ -69,14 +66,12 @@ def make_bank_account(doctype, docname):
 
 	return doc
 
-
 @frappe.whitelist()
 def get_party_bank_account(party_type, party):
-	return frappe.db.get_value(party_type, party, "default_bank_account")
-
+	return frappe.db.get_value(party_type,
+		party, 'default_bank_account')
 
 @frappe.whitelist()
 def get_bank_account_details(bank_account):
-	return frappe.db.get_value(
-		"Bank Account", bank_account, ["account", "bank", "bank_account_no"], as_dict=1
-	)
+	return frappe.db.get_value("Bank Account",
+		bank_account, ['account', 'bank', 'bank_account_no'], as_dict=1)

erpnext/accounts/doctype/bank_account/bank_account_dashboard.py

@@ -1,20 +1,29 @@
+from __future__ import unicode_literals
+
 from frappe import _
 
 
 def get_data():
 	return {
-		"fieldname": "bank_account",
-		"non_standard_fieldnames": {
-			"Customer": "default_bank_account",
-			"Supplier": "default_bank_account",
+		'fieldname': 'bank_account',
+		'non_standard_fieldnames': {
+			'Customer': 'default_bank_account',
+			'Supplier': 'default_bank_account',
 		},
-		"transactions": [
+		'transactions': [
 			{
-				"label": _("Payments"),
-				"items": ["Payment Entry", "Payment Request", "Payment Order", "Payroll Entry"],
+				'label': _('Payments'),
+				'items': ['Payment Entry', 'Payment Request', 'Payment Order', 'Payroll Entry']
 			},
-			{"label": _("Party"), "items": ["Customer", "Supplier"]},
-			{"items": ["Bank Guarantee"]},
-			{"items": ["Journal Entry"]},
-		],
-	}
+			{
+				'label': _('Party'),
+				'items': ['Customer', 'Supplier']
+			},
+			{
+				'items': ['Bank Guarantee']
+			},
+			{
+				'items': ['Journal Entry']
+			}
+		]
+	}

erpnext/accounts/doctype/bank_account/test_bank_account.js

@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Account", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Account
+		() => frappe.tests.make('Bank Account', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

erpnext/accounts/doctype/bank_account/test_bank_account.py

@@ -1,35 +1,37 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
-
-import unittest
+from __future__ import unicode_literals
 
 import frappe
-from frappe import ValidationError
+from  frappe import _
+from  frappe import ValidationError
+import unittest
 
 # test_records = frappe.get_test_records('Bank Account')
 
-
 class TestBankAccount(unittest.TestCase):
+
 	def test_validate_iban(self):
 		valid_ibans = [
-			"GB82 WEST 1234 5698 7654 32",
-			"DE91 1000 0000 0123 4567 89",
-			"FR76 3000 6000 0112 3456 7890 189",
+			'GB82 WEST 1234 5698 7654 32',
+			'DE91 1000 0000 0123 4567 89',
+			'FR76 3000 6000 0112 3456 7890 189'
 		]
 
 		invalid_ibans = [
 			# wrong checksum (3rd place)
-			"GB72 WEST 1234 5698 7654 32",
-			"DE81 1000 0000 0123 4567 89",
-			"FR66 3000 6000 0112 3456 7890 189",
+			'GB72 WEST 1234 5698 7654 32',
+			'DE81 1000 0000 0123 4567 89',
+			'FR66 3000 6000 0112 3456 7890 189'
 		]
 
-		bank_account = frappe.get_doc({"doctype": "Bank Account"})
+		bank_account = frappe.get_doc({'doctype':'Bank Account'})
 
 		try:
 			bank_account.validate_iban()
 		except AttributeError:
-			msg = "BankAccount.validate_iban() failed for empty IBAN"
+			msg = 'BankAccount.validate_iban() failed for empty IBAN'
 			self.fail(msg=msg)
 
 		for iban in valid_ibans:
@@ -37,11 +39,11 @@ class TestBankAccount(unittest.TestCase):
 			try:
 				bank_account.validate_iban()
 			except ValidationError:
-				msg = "BankAccount.validate_iban() failed for valid IBAN {}".format(iban)
+				msg = 'BankAccount.validate_iban() failed for valid IBAN {}'.format(iban)
 				self.fail(msg=msg)
 
 		for not_iban in invalid_ibans:
 			bank_account.iban = not_iban
-			msg = "BankAccount.validate_iban() accepted invalid IBAN {}".format(not_iban)
+			msg = 'BankAccount.validate_iban() accepted invalid IBAN {}'.format(not_iban)
 			with self.assertRaises(ValidationError, msg=msg):
 				bank_account.validate_iban()

erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.py

@@ -1,9 +1,9 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 from frappe.model.document import Document
 
-
 class BankAccountSubtype(Document):
 	pass

erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.js

@@ -0,0 +1,23 @@
+/* eslint-disable */
+// rename this file from _test_[name] to test_[name] to activate
+// and remove above this line
+
+QUnit.test("test: Bank Account Subtype", function (assert) {
+	let done = assert.async();
+
+	// number of asserts
+	assert.expect(1);
+
+	frappe.run_serially([
+		// insert a new Bank Account Subtype
+		() => frappe.tests.make('Bank Account Subtype', [
+			// values to be set
+			{key: 'value'}
+		]),
+		() => {
+			assert.equal(cur_frm.doc.key, 'value');
+		},
+		() => done()
+	]);
+
+});

erpnext/accounts/doctype/bank_account_subtype/test_bank_account_subtype.py

@@ -1,8 +1,9 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 import unittest
 
-
 class TestBankAccountSubtype(unittest.TestCase):
 	pass

erpnext/accounts/doctype/bank_account_type/bank_account_type.py

@@ -1,10 +1,10 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-
+from __future__ import unicode_literals
 # import frappe
 from frappe.model.document import Document
 
-
 class BankAccountType(Document):
 	pass

erpnext/accounts/doctype/bank_account_type/test_bank_account_type.py

@@ -1,9 +1,10 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
 # import frappe
 import unittest
 
-
 class TestBankAccountType(unittest.TestCase):
 	pass

erpnext/accounts/doctype/bank_clearance/bank_clearance.js

@@ -8,7 +8,7 @@ frappe.ui.form.on("Bank Clearance", {
 
 	onload: function(frm) {
 
-		let default_bank_account =  frappe.defaults.get_user_default("Company")?
+		let default_bank_account =  frappe.defaults.get_user_default("Company")? 
 			locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
 		frm.set_value("account", default_bank_account);
 

erpnext/accounts/doctype/bank_clearance/bank_clearance.py

@@ -1,20 +1,17 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-
+from __future__ import unicode_literals
 import frappe
-from frappe import _, msgprint
+from frappe.utils import flt, getdate, nowdate, fmt_money
+from frappe import msgprint, _
 from frappe.model.document import Document
-from frappe.query_builder.custom import ConstantColumn
-from frappe.utils import flt, fmt_money, getdate
-
-import erpnext
-
-form_grid_templates = {"journal_entries": "templates/form_grid/bank_reconciliation_grid.html"}
 
+form_grid_templates = {
+	"journal_entries": "templates/form_grid/bank_reconciliation_grid.html"
+}
 
 class BankClearance(Document):
-	@frappe.whitelist()
 	def get_payment_entries(self):
 		if not (self.from_date and self.to_date):
 			frappe.throw(_("From Date and To Date are Mandatory"))
@@ -26,8 +23,7 @@ class BankClearance(Document):
 		if not self.include_reconciled_entries:
 			condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
 
-		journal_entries = frappe.db.sql(
-			"""
+		journal_entries = frappe.db.sql("""
 			select
 				"Journal Entry" as payment_document, t1.name as payment_entry,
 				t1.cheque_no as cheque_number, t1.cheque_date,
@@ -41,18 +37,12 @@ class BankClearance(Document):
 				and ifnull(t1.is_opening, 'No') = 'No' {condition}
 			group by t2.account, t1.name
 			order by t1.posting_date ASC, t1.name DESC
-		""".format(
-				condition=condition
-			),
-			{"account": self.account, "from": self.from_date, "to": self.to_date},
-			as_dict=1,
-		)
+		""".format(condition=condition), {"account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1)
 
 		if self.bank_account:
-			condition += "and bank_account = %(bank_account)s"
+			condition += 'and bank_account = %(bank_account)s'
 
-		payment_entries = frappe.db.sql(
-			"""
+		payment_entries = frappe.db.sql("""
 			select
 				"Payment Entry" as payment_document, name as payment_entry,
 				reference_no as cheque_number, reference_date as cheque_date,
@@ -67,69 +57,12 @@ class BankClearance(Document):
 				{condition}
 			order by
 				posting_date ASC, name DESC
-		""".format(
-				condition=condition
-			),
-			{
-				"account": self.account,
-				"from": self.from_date,
-				"to": self.to_date,
-				"bank_account": self.bank_account,
-			},
-			as_dict=1,
-		)
-
-		loan_disbursement = frappe.qb.DocType("Loan Disbursement")
-
-		loan_disbursements = (
-			frappe.qb.from_(loan_disbursement)
-			.select(
-				ConstantColumn("Loan Disbursement").as_("payment_document"),
-				loan_disbursement.name.as_("payment_entry"),
-				loan_disbursement.disbursed_amount.as_("credit"),
-				ConstantColumn(0).as_("debit"),
-				loan_disbursement.reference_number.as_("cheque_number"),
-				loan_disbursement.reference_date.as_("cheque_date"),
-				loan_disbursement.disbursement_date.as_("posting_date"),
-				loan_disbursement.applicant.as_("against_account"),
-			)
-			.where(loan_disbursement.docstatus == 1)
-			.where(loan_disbursement.disbursement_date >= self.from_date)
-			.where(loan_disbursement.disbursement_date <= self.to_date)
-			.where(loan_disbursement.clearance_date.isnull())
-			.where(loan_disbursement.disbursement_account.isin([self.bank_account, self.account]))
-			.orderby(loan_disbursement.disbursement_date)
-			.orderby(loan_disbursement.name, frappe.qb.desc)
-		).run(as_dict=1)
-
-		loan_repayment = frappe.qb.DocType("Loan Repayment")
-
-		loan_repayments = (
-			frappe.qb.from_(loan_repayment)
-			.select(
-				ConstantColumn("Loan Repayment").as_("payment_document"),
-				loan_repayment.name.as_("payment_entry"),
-				loan_repayment.amount_paid.as_("debit"),
-				ConstantColumn(0).as_("credit"),
-				loan_repayment.reference_number.as_("cheque_number"),
-				loan_repayment.reference_date.as_("cheque_date"),
-				loan_repayment.applicant.as_("against_account"),
-				loan_repayment.posting_date,
-			)
-			.where(loan_repayment.docstatus == 1)
-			.where(loan_repayment.clearance_date.isnull())
-			.where(loan_repayment.repay_from_salary == 0)
-			.where(loan_repayment.posting_date >= self.from_date)
-			.where(loan_repayment.posting_date <= self.to_date)
-			.where(loan_repayment.payment_account.isin([self.bank_account, self.account]))
-			.orderby(loan_repayment.posting_date)
-			.orderby(loan_repayment.name, frappe.qb.desc)
-		).run(as_dict=1)
+		""".format(condition=condition), {"account": self.account, "from":self.from_date,
+				"to": self.to_date, "bank_account": self.bank_account}, as_dict=1)
 
 		pos_sales_invoices, pos_purchase_invoices = [], []
 		if self.include_pos_transactions:
-			pos_sales_invoices = frappe.db.sql(
-				"""
+			pos_sales_invoices = frappe.db.sql("""
 				select
 					"Sales Invoice Payment" as payment_document, sip.name as payment_entry, sip.amount as debit,
 					si.posting_date, si.customer as against_account, sip.clearance_date,
@@ -140,13 +73,9 @@ class BankClearance(Document):
 					and account.name = sip.account and si.posting_date >= %(from)s and si.posting_date <= %(to)s
 				order by
 					si.posting_date ASC, si.name DESC
-			""",
-				{"account": self.account, "from": self.from_date, "to": self.to_date},
-				as_dict=1,
-			)
+			""", {"account":self.account, "from":self.from_date, "to":self.to_date}, as_dict=1)
 
-			pos_purchase_invoices = frappe.db.sql(
-				"""
+			pos_purchase_invoices = frappe.db.sql("""
 				select
 					"Purchase Invoice" as payment_document, pi.name as payment_entry, pi.paid_amount as credit,
 					pi.posting_date, pi.supplier as against_account, pi.clearance_date,
@@ -157,36 +86,21 @@ class BankClearance(Document):
 					and pi.posting_date >= %(from)s and pi.posting_date <= %(to)s
 				order by
 					pi.posting_date ASC, pi.name DESC
-			""",
-				{"account": self.account, "from": self.from_date, "to": self.to_date},
-				as_dict=1,
-			)
+			""", {"account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1)
 
-		entries = sorted(
-			list(payment_entries)
-			+ list(journal_entries)
-			+ list(pos_sales_invoices)
-			+ list(pos_purchase_invoices)
-			+ list(loan_disbursements)
-			+ list(loan_repayments),
-			key=lambda k: getdate(k["posting_date"]),
-		)
+		entries = sorted(list(payment_entries) + list(journal_entries + list(pos_sales_invoices) + list(pos_purchase_invoices)),
+			key=lambda k: k['posting_date'] or getdate(nowdate()))
 
-		self.set("payment_entries", [])
+		self.set('payment_entries', [])
 		self.total_amount = 0.0
-		default_currency = erpnext.get_default_currency()
 
 		for d in entries:
-			row = self.append("payment_entries", {})
+			row = self.append('payment_entries', {})
 
-			amount = flt(d.get("debit", 0)) - flt(d.get("credit", 0))
-
-			if not d.get("account_currency"):
-				d.account_currency = default_currency
+			amount = flt(d.get('debit', 0)) - flt(d.get('credit', 0))
 
 			formatted_amount = fmt_money(abs(amount), 2, d.account_currency)
 			d.amount = formatted_amount + " " + (_("Dr") if amount > 0 else _("Cr"))
-			d.posting_date = getdate(d.posting_date)
 
 			d.pop("credit")
 			d.pop("debit")
@@ -194,27 +108,23 @@ class BankClearance(Document):
 			row.update(d)
 			self.total_amount += flt(amount)
 
-	@frappe.whitelist()
 	def update_clearance_date(self):
 		clearance_date_updated = False
-		for d in self.get("payment_entries"):
+		for d in self.get('payment_entries'):
 			if d.clearance_date:
 				if not d.payment_document:
 					frappe.throw(_("Row #{0}: Payment document is required to complete the transaction"))
 
 				if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
-					frappe.throw(
-						_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}").format(
-							d.idx, d.clearance_date, d.cheque_date
-						)
-					)
+					frappe.throw(_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}")
+						.format(d.idx, d.clearance_date, d.cheque_date))
 
 			if d.clearance_date or self.include_reconciled_entries:
 				if not d.clearance_date:
 					d.clearance_date = None
 
 				payment_entry = frappe.get_doc(d.payment_document, d.payment_entry)
-				payment_entry.db_set("clearance_date", d.clearance_date)
+				payment_entry.db_set('clearance_date', d.clearance_date)
 
 				clearance_date_updated = True
 

erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py

@@ -1,96 +1,10 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
+from __future__ import unicode_literals
 
+# import frappe
 import unittest
 
-import frappe
-from frappe.utils import add_months, getdate
-
-from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
-from erpnext.loan_management.doctype.loan.test_loan import (
-	create_loan,
-	create_loan_accounts,
-	create_loan_type,
-	create_repayment_entry,
-	make_loan_disbursement_entry,
-)
-
-
 class TestBankClearance(unittest.TestCase):
-	@classmethod
-	def setUpClass(cls):
-		make_bank_account()
-		create_loan_accounts()
-		create_loan_masters()
-		add_transactions()
-
-	# Basic test case to test if bank clearance tool doesn't break
-	# Detailed test can be added later
-	def test_bank_clearance(self):
-		bank_clearance = frappe.get_doc("Bank Clearance")
-		bank_clearance.account = "_Test Bank Clearance - _TC"
-		bank_clearance.from_date = add_months(getdate(), -1)
-		bank_clearance.to_date = getdate()
-		bank_clearance.get_payment_entries()
-		self.assertEqual(len(bank_clearance.payment_entries), 3)
-
-
-def make_bank_account():
-	if not frappe.db.get_value("Account", "_Test Bank Clearance - _TC"):
-		frappe.get_doc(
-			{
-				"doctype": "Account",
-				"account_type": "Bank",
-				"account_name": "_Test Bank Clearance",
-				"company": "_Test Company",
-				"parent_account": "Bank Accounts - _TC",
-			}
-		).insert()
-
-
-def create_loan_masters():
-	create_loan_type(
-		"Clearance Loan",
-		2000000,
-		13.5,
-		25,
-		0,
-		5,
-		"Cash",
-		"_Test Bank Clearance - _TC",
-		"_Test Bank Clearance - _TC",
-		"Loan Account - _TC",
-		"Interest Income Account - _TC",
-		"Penalty Income Account - _TC",
-	)
-
-
-def add_transactions():
-	make_payment_entry()
-	make_loan()
-
-
-def make_loan():
-	loan = create_loan(
-		"_Test Customer",
-		"Clearance Loan",
-		280000,
-		"Repay Over Number of Periods",
-		20,
-		applicant_type="Customer",
-	)
-	loan.submit()
-	make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=getdate())
-	repayment_entry = create_repayment_entry(loan.name, "_Test Customer", getdate(), loan.loan_amount)
-	repayment_entry.save()
-	repayment_entry.submit()
-
-
-def make_payment_entry():
-	pi = make_purchase_invoice(supplier="_Test Supplier", qty=1, rate=690)
-	pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank Clearance - _TC")
-	pe.reference_no = "Conrad Oct 18"
-	pe.reference_date = "2018-10-24"
-	pe.insert()
-	pe.submit()
+	pass

erpnext/accounts/doctype/bank_clearance_detail/__init__.py

@@ -0,0 +1 @@
+from __future__ import unicode_literals