fix: link to error log list

chore: change log for v13.13.0

.git-blame-ignore-revs

@@ -8,15 +8,12 @@
 #
 # $ git config blame.ignoreRevsFile .git-blame-ignore-revs
 
-# Replace use of Class.extend with native JS class
-1fe891b287a1b3f225d29ee3d07e7b1824aba9e7
-
 # This commit just changes spaces to tabs for indentation in some files
 5f473611bd6ed57703716244a054d3fb5ba9cd23
 
-# Whitespace fix throughout codebase
-4551d7d6029b6f587f6c99d4f8df5519241c6a86
-b147b85e6ac19a9220cd1e2958a6ebd99373283a
+# Whitespace trimming throughout codebase
+9bb69e711a5da43aaf8c8ecb5601aeffd89dbe5a
+f0bcb753fb7ebbb64bb0d6906d431d002f0f7d8f
 
-# sort and cleanup imports
-915b34391c2066dfc83e60a5813c5a877cebe7ac
+# imports cleanup
+4b2be2999f2203493b49bf74c5b440d49e38b5e3

.github/helper/documentation.py

@@ -1,7 +1,7 @@
 import sys
-import requests
 from urllib.parse import urlparse
 
+import requests
 
 docs_repos = [
 	"frappe_docs",

.github/helper/install.sh

@@ -37,9 +37,5 @@ sed -i 's/socketio:/# socketio:/g' Procfile
 sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile
 
 bench get-app erpnext "${GITHUB_WORKSPACE}"
-
-if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi
-
 bench start &> bench_run_logs.txt &
 bench --site test_site reinstall --yes
-bench build --app frappe

.github/helper/semgrep_rules/frappe_correctness.py

@@ -1,6 +1,5 @@
 import frappe
 from frappe import _
-
 from frappe.model.document import Document
 
 

.github/helper/semgrep_rules/frappe_correctness.yml

@@ -132,6 +132,7 @@ rules:
   languages: [python]
   severity: ERROR
 
+
 - id: frappe-manual-commit
   patterns:
     - pattern: frappe.db.commit()
@@ -148,16 +149,3 @@ rules:
         - "**/demo/**"
   languages: [python]
   severity: ERROR
-
-- id: frappe-using-db-sql
-  pattern-either:
-    - pattern: frappe.db.sql(...)
-    - pattern: frappe.db.sql_ddl(...)
-    - pattern: frappe.db.sql_list(...)
-  paths:
-    exclude:
-      - "test_*.py"
-  message: |
-    The PR contains a SQL query that may be re-written with frappe.qb (https://frappeframework.com/docs/user/en/api/query-builder) or the Database API (https://frappeframework.com/docs/user/en/api/database)
-  languages: [python]
-  severity: ERROR

.github/helper/semgrep_rules/report.py

@@ -1,6 +1,5 @@
 from frappe import _
 
-
 # ruleid: frappe-missing-translate-function-in-report-python
 {"label": "Field Label"}
 

.github/helper/semgrep_rules/ux.py

@@ -1,6 +1,5 @@
 import frappe
-from frappe import msgprint, throw, _
-
+from frappe import _, msgprint, throw
 
 # ruleid: frappe-missing-translate-function-python
 throw("Error Occured")

.github/stale.yml

@@ -1,11 +1,11 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 15
+daysUntilStale: 30
 
 # Number of days of inactivity before a stale Issue or Pull Request is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 3
+daysUntilClose: 7
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:

.github/try-on-f-cloud-button.svg

@@ -1,32 +0,0 @@
-<svg width="201" height="60" viewBox="0 0 201 60" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_dd)">
-<rect x="4" y="2" width="193" height="52" rx="6" fill="#2490EF"/>
-<path d="M28 22.2891H32.8786V35.5H36.2088V22.2891H41.0874V19.5H28V22.2891Z" fill="white"/>
-<path d="M41.6982 35.5H45.0129V28.7109C45.0129 27.2344 46.0866 26.2188 47.5494 26.2188C48.0085 26.2188 48.6388 26.2969 48.95 26.3984V23.4453C48.6543 23.375 48.2419 23.3281 47.9074 23.3281C46.5691 23.3281 45.472 24.1094 45.0362 25.5938H44.9117V23.5H41.6982V35.5Z" fill="white"/>
-<path d="M52.8331 40C55.2996 40 56.6068 38.7344 57.2837 36.7969L61.9289 23.5156L58.4197 23.5L55.9221 32.3125H55.7976L53.3233 23.5H49.8374L54.1247 35.8437L53.9302 36.3516C53.4944 37.4766 52.6619 37.5312 51.4947 37.1719L50.7478 39.6562C51.2224 39.8594 51.9927 40 52.8331 40Z" fill="white"/>
-<path d="M73.6142 35.7344C77.2401 35.7344 79.4966 33.2422 79.4966 29.5469C79.4966 25.8281 77.2401 23.3438 73.6142 23.3438C69.9883 23.3438 67.7319 25.8281 67.7319 29.5469C67.7319 33.2422 69.9883 35.7344 73.6142 35.7344ZM73.6298 33.1562C71.9569 33.1562 71.101 31.6171 71.101 29.5233C71.101 27.4296 71.9569 25.8827 73.6298 25.8827C75.2715 25.8827 76.1274 27.4296 76.1274 29.5233C76.1274 31.6171 75.2715 33.1562 73.6298 33.1562Z" fill="white"/>
-<path d="M84.7253 28.5625C84.7331 27.0156 85.6512 26.1094 86.9895 26.1094C88.3201 26.1094 89.1215 26.9844 89.1137 28.4531V35.5H92.4284V27.8594C92.4284 25.0625 90.7945 23.3438 88.3046 23.3438C86.5306 23.3438 85.2466 24.2187 84.7097 25.6172H84.5697V23.5H81.4106V35.5H84.7253V28.5625Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M102.429 19.5H113.429V22.3141H102.429V19.5ZM102.429 35.5V26.6794H112.699V29.4982H105.94V35.5H102.429Z" fill="white"/>
-<path d="M131.584 24.9625C131.09 21.5057 128.345 19.5 124.785 19.5C120.589 19.5 117.429 22.463 117.429 27.4924C117.429 32.5142 120.55 35.4848 124.785 35.4848C128.604 35.4848 131.137 33.0916 131.584 30.1211L128.651 30.1059C128.282 31.9293 126.745 32.9549 124.824 32.9549C122.22 32.9549 120.354 31.0632 120.354 27.4924C120.354 23.9824 122.204 22.0299 124.832 22.0299C126.784 22.0299 128.314 23.1011 128.651 24.9625H131.584Z" fill="white"/>
-<path d="M136.409 19.7124H133.571V35.2718H136.409V19.7124Z" fill="white"/>
-<path d="M144.031 35.5001C147.56 35.5001 149.803 33.0917 149.803 29.483C149.803 25.8667 147.56 23.4507 144.031 23.4507C140.502 23.4507 138.259 25.8667 138.259 29.483C138.259 33.0917 140.502 35.5001 144.031 35.5001ZM144.047 33.2969C142.094 33.2969 141.137 31.6103 141.137 29.4754C141.137 27.3406 142.094 25.6312 144.047 25.6312C145.968 25.6312 146.925 27.3406 146.925 29.4754C146.925 31.6103 145.968 33.2969 144.047 33.2969Z" fill="white"/>
-<path d="M159.338 30.3641C159.338 32.1419 158.028 33.0232 156.773 33.0232C155.409 33.0232 154.499 32.0887 154.499 30.6072V23.6025H151.66V31.0327C151.66 33.8361 153.307 35.4239 155.675 35.4239C157.479 35.4239 158.749 34.5046 159.298 33.1979H159.424V35.272H162.176V23.6025H159.338V30.3641Z" fill="white"/>
-<path d="M169.014 35.4769C171.084 35.4769 172.017 34.2841 172.464 33.4332H172.637V35.2718H175.429V19.7124H172.582V25.532H172.464C172.033 24.6887 171.147 23.4503 169.022 23.4503C166.238 23.4503 164.05 25.5624 164.05 29.4522C164.05 33.2965 166.175 35.4769 169.014 35.4769ZM169.806 33.2205C167.931 33.2205 166.943 31.6251 166.943 29.437C166.943 27.2642 167.916 25.7067 169.806 25.7067C171.633 25.7067 172.637 27.173 172.637 29.437C172.637 31.701 171.617 33.2205 169.806 33.2205Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_dd" x="0" y="0" width="201" height="60" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="0.25"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="2"/>
-<feGaussianBlur stdDeviation="2"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.13 0"/>
-<feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/>
-</filter>
-</defs>
-</svg>

.github/workflows/backport.yml

@@ -8,7 +8,6 @@ on:
 jobs:
   main:
     runs-on: ubuntu-latest
-    timeout-minutes: 60
     steps:
       - name: Checkout Actions
         uses: actions/checkout@v2

.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

@@ -10,15 +10,6 @@ jobs:
     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
-
       - uses: returntocorp/semgrep-action@v1
         env:
             SEMGREP_TIMEOUT: 120
@@ -26,3 +17,11 @@ jobs:
             config: >-
               r/python.lang.correctness
               .github/helper/semgrep_rules
+
+      - 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.0

.github/workflows/patch.yml

@@ -7,14 +7,10 @@ on:
       - '**.md'
   workflow_dispatch:
 
-concurrency:
-  group: patch-develop-${{ github.event.number }}
-  cancel-in-progress: true
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
+    runs-on: ubuntu-18.04
 
     name: Patch Test
 
@@ -34,12 +30,12 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.7
+          python-version: 3.6
 
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 12
           check-latest: true
 
       - name: Add to Hosts

.github/workflows/server-tests.yml

@@ -12,14 +12,9 @@ on:
       - '**.js'
       - '**.md'
 
-concurrency:
-  group: server-develop-${{ github.event.number }}
-  cancel-in-progress: true
-
 jobs:
   test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
+    runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false
@@ -50,7 +45,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 12
           check-latest: true
 
       - name: Add to Hosts
@@ -91,8 +86,6 @@ jobs:
 
       - name: Install
         run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh
-        env:
-          TYPE: server
 
       - name: Run Tests
         run: cd ~/frappe-bench/ && bench --site test_site run-parallel-tests --app erpnext --use-orchestrator --with-coverage
@@ -101,10 +94,33 @@ jobs:
           CI_BUILD_ID: ${{ github.run_id }}
           ORCHESTRATOR_URL: http://test-orchestrator.frappe.io
 
-      - name: Upload coverage data
-        uses: codecov/codecov-action@v2
-        with:
-          name: MariaDB
-          fail_ci_if_error: true
-          files: /home/runner/frappe-bench/sites/coverage.xml
-          verbose: true
+      - name: Upload Coverage Data
+        run: |
+          cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
+          cd ${GITHUB_WORKSPACE}
+          pip3 install coverage==5.5
+          pip3 install coveralls==3.0.1
+          coveralls
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_FLAG_NAME: run-${{ matrix.container }}
+          COVERALLS_SERVICE_NAME: ${{ github.event_name == 'pull_request' && 'github' || 'github-actions' }}
+          COVERALLS_PARALLEL: true
+
+  coveralls:
+    name: Coverage Wrap Up
+    needs: test
+    container: python:3-slim
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Clone
+        uses: actions/checkout@v2
+
+      - name: Coveralls Finished
+        run: |
+          cd ${GITHUB_WORKSPACE}
+          pip3 install coverage==5.5
+          pip3 install coveralls==3.0.1
+          coveralls --finish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/translation_linter.yml

@@ -0,0 +1,22 @@
+name: Frappe Linter
+on:
+  pull_request:
+    branches:
+      - develop
+      - version-12-hotfix
+      - version-11-hotfix
+jobs:
+  check_translation:
+    name: Translation Syntax Check
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup python3
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.6
+    - name: Validating Translation Syntax
+      run: |
+        git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q
+        files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
+        python $GITHUB_WORKSPACE/.github/helper/translation.py $files

.github/workflows/ui-tests.yml

@@ -6,14 +6,9 @@ on:
       - '**.md'
   workflow_dispatch:
 
-concurrency:
-  group: ui-develop-${{ github.event.number }}
-  cancel-in-progress: true
-
 jobs:
   test:
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
+    runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false

.gitignore

@@ -7,7 +7,6 @@ latest_updates.json
 .wnf-lang-status
 *.egg-info
 dist/
-erpnext/public/dist
 erpnext/docs/current
 *.swp
 *.swo
@@ -16,4 +15,3 @@ __pycache__
 .idea/
 .vscode/
 node_modules/
-.backportrc.json

README.md

@@ -5,9 +5,9 @@
         <p>ERP made simple</p>
     </p>
 
-[![CI](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml/badge.svg?branch=develop)](https://github.com/frappe/erpnext/actions/workflows/server-tests.yml)
+[![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)
 [![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
-[![codecov](https://codecov.io/gh/frappe/erpnext/branch/develop/graph/badge.svg?token=0TwvyUg3I5)](https://codecov.io/gh/frappe/erpnext)
+[![Coverage Status](https://coveralls.io/repos/github/frappe/erpnext/badge.svg?branch=develop)](https://coveralls.io/github/frappe/erpnext?branch=develop)
 
 [https://erpnext.com](https://erpnext.com)
 
@@ -39,12 +39,6 @@ ERPNext is built on the [Frappe Framework](https://github.com/frappe/frappe), a
 
 ---
 
-<div align="center">
-    <a href="https://frappecloud.com/deploy?apps=frappe,erpnext&source=erpnext_readme">
-        <img src=".github/try-on-f-cloud-button.svg" height="40">
-    </a>
-</div>
-
 ### 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.
@@ -83,12 +77,6 @@ The ERPNext code is licensed as GNU General Public License (v3) and the Document
 
 ---
 
-## Learning
-
-1. [Frappe School](https://frappe.school) - Learn Frappe Framework and ERPNext from the various courses by the maintainers or from the community.
-
----
-
 ## Logo and Trademark
 
 The brand name ERPNext and the logo are trademarks of Frappe Technologies Pvt. Ltd.

codecov.yml

@@ -1,17 +0,0 @@
-codecov:
-  require_ci_to_pass: yes
-
-coverage:
-  status:
-    project:
-      default:
-        target: auto
-        threshold: 0.5%
-
-comment:
-  layout: "diff, files"
-  require_changes: true
-  after_n_builds: 3
-
-ignore:
-  - "erpnext/demo"

cypress.json

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

cypress/integration/test_item.js

@@ -1,44 +0,0 @@
-describe("Test Item Dashboard", () => {
-	before(() => {
-		cy.login();
-		cy.visit("/app/item");
-		cy.insert_doc(
-			"Item",
-			{
-				item_code: "e2e_test_item",
-				item_group: "All Item Groups",
-				opening_stock: 42,
-				valuation_rate: 100,
-			},
-			true
-		);
-		cy.go_to_doc("item", "e2e_test_item");
-	});
-
-	it("should show dashboard with correct data on first load", () => {
-		cy.get(".stock-levels").contains("Stock Levels").should("be.visible");
-		cy.get(".stock-levels").contains("e2e_test_item").should("exist");
-
-		// reserved and available qty
-		cy.get(".stock-levels .inline-graph-count")
-			.eq(0)
-			.contains("0")
-			.should("exist");
-		cy.get(".stock-levels .inline-graph-count")
-			.eq(1)
-			.contains("42")
-			.should("exist");
-	});
-
-	it("should persist on field change", () => {
-		cy.get('input[data-fieldname="disabled"]').check();
-		cy.wait(500);
-		cy.get(".stock-levels").contains("Stock Levels").should("be.visible");
-		cy.get(".stock-levels").should("have.length", 1);
-	});
-
-	it("should persist on reload", () => {
-		cy.reload();
-		cy.get(".stock-levels").contains("Stock Levels").should("be.visible");
-	});
-});

erpnext/__init__.py

@@ -7,7 +7,7 @@ import frappe
 
 from erpnext.hooks import regional_overrides
 
-__version__ = '13.9.0'
+__version__ = '13.13.0'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/custom/address.py

@@ -31,7 +31,10 @@ class ERPNextAddress(Address):
 		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 }
+		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)

erpnext/accounts/doctype/accounts_settings/accounts_settings.js

@@ -6,3 +6,46 @@ 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

@@ -10,7 +10,6 @@
   "accounts_transactions_settings_section",
   "over_billing_allowance",
   "role_allowed_to_over_bill",
-  "credit_controller",
   "make_payment_via_journal_entry",
   "column_break_11",
   "check_supplier_invoice_uniqueness",
@@ -30,6 +29,7 @@
   "acc_frozen_upto",
   "frozen_accounts_modifier",
   "column_break_4",
+  "credit_controller",
   "deferred_accounting_settings_section",
   "book_deferred_entries_based_on",
   "column_break_18",
@@ -75,10 +75,11 @@
    "fieldtype": "Column Break"
   },
   {
+   "description": "This role is allowed to submit transactions that exceed credit limits",
    "fieldname": "credit_controller",
    "fieldtype": "Link",
    "in_list_view": 1,
-   "label": "Role allowed to bypass Credit Limit",
+   "label": "Credit Controller",
    "options": "Role"
   },
   {

erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js

@@ -15,7 +15,7 @@ frappe.ui.form.on("Bank Reconciliation Tool", {
 	},
 
 	refresh: function (frm) {
-		frappe.require("bank-reconciliation-tool.bundle.js", () =>
+		frappe.require("assets/js/bank-reconciliation-tool.min.js", () =>
 			frm.trigger("make_reconciliation_tool")
 		);
 		frm.upload_statement_button = frm.page.set_secondary_action(

erpnext/accounts/doctype/bank_statement_import/bank_statement_import.js

@@ -320,7 +320,7 @@ frappe.ui.form.on("Bank Statement Import", {
 			return;
 		}
 
-		frappe.require("data_import_tools.bundle.js", () => {
+		frappe.require("/assets/js/data_import_tools.min.js", () => {
 			frm.import_preview = new frappe.data_import.ImportPreview({
 				wrapper: frm.get_field("import_preview").$wrapper,
 				doctype: frm.doc.reference_doctype,

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -41,9 +41,6 @@ def test_create_test_data():
 		"selling_cost_center": "Main - _TC",
 		"income_account": "Sales - _TC"
 		}],
-		"show_in_website": 1,
-		"route":"-test-tesla-car",
-		"website_warehouse": "Stores - _TC"
 		})
 		item.insert()
 	# create test item price

erpnext/accounts/doctype/dunning/test_dunning.py

@@ -45,6 +45,7 @@ class TestDunning(unittest.TestCase):
 		self.assertEqual(round(amounts.get('dunning_amount'), 2), 20)
 		self.assertEqual(round(amounts.get('grand_total'), 2), 120)
 
+
 	def test_gl_entries(self):
 		dunning = create_dunning()
 		dunning.submit()

erpnext/accounts/doctype/finance_book/test_finance_book.py

@@ -42,4 +42,4 @@ def create_finance_book():
 	else:
 		finance_book = frappe.get_doc("Finance Book", "_Test Finance Book")
 
-	return finance_book
+	return finance_book

erpnext/accounts/doctype/journal_entry/journal_entry.js

@@ -194,19 +194,19 @@ var update_jv_details = function(doc, r) {
 	refresh_field("accounts");
 }
 
-erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Controller {
-	onload() {
+erpnext.accounts.JournalEntry = frappe.ui.form.Controller.extend({
+	onload: function() {
 		this.load_defaults();
 		this.setup_queries();
 		this.setup_balance_formatter();
 		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
-	}
+	},
 
-	onload_post_render() {
+	onload_post_render: function() {
 		cur_frm.get_field("accounts").grid.set_multiple_add("account");
-	}
+	},
 
-	load_defaults() {
+	load_defaults: function() {
 		//this.frm.show_print_first = true;
 		if(this.frm.doc.__islocal && this.frm.doc.company) {
 			frappe.model.set_default_values(this.frm.doc);
@@ -216,9 +216,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 			var posting_date = this.frm.doc.posting_date;
 			if(!this.frm.doc.amended_from) this.frm.set_value('posting_date', posting_date || frappe.datetime.get_today());
 		}
-	}
+	},
 
-	setup_queries() {
+	setup_queries: function() {
 		var me = this;
 
 		me.frm.set_query("account", "accounts", function(doc, cdt, cdn) {
@@ -324,9 +324,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 		});
 
 
-	}
+	},
 
-	setup_balance_formatter() {
+	setup_balance_formatter: function() {
 		const formatter = function(value, df, options, doc) {
 			var currency = frappe.meta.get_field_currency(df, doc);
 			var dr_or_cr = value ? ('<label>' + (value > 0.0 ? __("Dr") : __("Cr")) + '</label>') : "";
@@ -337,9 +337,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 		};
 		this.frm.fields_dict.accounts.grid.update_docfield_property('balance', 'formatter', formatter);
 		this.frm.fields_dict.accounts.grid.update_docfield_property('party_balance', 'formatter', formatter);
-	}
+	},
 
-	reference_name(doc, cdt, cdn) {
+	reference_name: function(doc, cdt, cdn) {
 		var d = frappe.get_doc(cdt, cdn);
 
 		if(d.reference_name) {
@@ -351,9 +351,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				this.get_outstanding('Journal Entry', d.reference_name, doc.company, d);
 			}
 		}
-	}
+	},
 
-	get_outstanding(doctype, docname, company, child, due_date) {
+	get_outstanding: function(doctype, docname, company, child, due_date) {
 		var me = this;
 		var args = {
 			"doctype": doctype,
@@ -375,9 +375,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 				}
 			}
 		});
-	}
+	},
 
-	accounts_add(doc, cdt, cdn) {
+	accounts_add: function(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
 		$.each(doc.accounts, function(i, d) {
 			if(d.account && d.party && d.party_type) {
@@ -400,9 +400,9 @@ erpnext.accounts.JournalEntry = class JournalEntry extends frappe.ui.form.Contro
 		cur_frm.cscript.update_totals(doc);
 
 		erpnext.accounts.dimensions.copy_dimension_from_first_row(this.frm, cdt, cdn, 'accounts');
-	}
+	},
 
-};
+});
 
 cur_frm.script_manager.make(erpnext.accounts.JournalEntry);
 

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -85,7 +85,6 @@ class JournalEntry(AccountsController):
 		self.update_expense_claim()
 		self.update_inter_company_jv()
 		self.update_invoice_discounting()
-		self.update_status_for_full_and_final_statement()
 		check_if_stock_and_account_balance_synced(self.posting_date,
 			self.company, self.doctype, self.name)
 
@@ -103,7 +102,6 @@ class JournalEntry(AccountsController):
 		self.unlink_inter_company_jv()
 		self.unlink_asset_adjustment_entry()
 		self.update_invoice_discounting()
-		self.update_status_for_full_and_final_statement()
 
 	def get_title(self):
 		return self.pay_to_recd_from or self.accounts[0].account
@@ -119,15 +117,6 @@ class JournalEntry(AccountsController):
 			for voucher_no in list(set(order_list)):
 				frappe.get_doc(voucher_type, voucher_no).set_total_advance_paid()
 
-	def update_status_for_full_and_final_statement(self):
-		for entry in self.accounts:
-			if entry.reference_type == "Full and Final Statement":
-				if self.docstatus == 1:
-					frappe.db.set_value("Full and Final Statement", entry.reference_name, "status", "Paid")
-				elif self.docstatus == 2:
-					frappe.db.set_value("Full and Final Statement", entry.reference_name, "status", "Unpaid")
-
-
 	def validate_inter_company_accounts(self):
 		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
 			doc = frappe.get_doc("Journal Entry", self.inter_company_journal_entry_reference)

erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json

@@ -202,7 +202,7 @@
    "fieldname": "reference_type",
    "fieldtype": "Select",
    "label": "Reference Type",
-   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees\nFull and Final Statement"
+   "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim\nAsset\nLoan\nPayroll Entry\nEmployee Advance\nExchange Rate Revaluation\nInvoice Discounting\nFees"
   },
   {
    "fieldname": "reference_name",
@@ -280,7 +280,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-08-30 21:27:32.200299",
+ "modified": "2020-06-26 14:06:54.833738",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js

@@ -49,15 +49,7 @@ frappe.ui.form.on('Opening Invoice Creation Tool', {
 				doc: frm.doc,
 				btn: $(btn_primary),
 				method: "make_invoices",
-				freeze: 1,
-				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type]),
-				callback: function(r) {
-					if (r.message.length == 1) {
-						frappe.msgprint(__("{0} Invoice created successfully.", [frm.doc.invoice_type]));
-					} else if (r.message.length < 50) {
-						frappe.msgprint(__("{0} Invoices created successfully.", [frm.doc.invoice_type]));
-					}
-				}
+				freeze_message: __("Creating {0} Invoice", [frm.doc.invoice_type])
 			});
 		});
 

erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py

@@ -221,8 +221,7 @@ def start_import(invoices):
 	return names
 
 def publish(index, total, doctype):
-	if total < 50:
-		return
+	if total < 5: return
 	frappe.publish_realtime(
 		"opening_invoice_creation_progress",
 		dict(

erpnext/accounts/doctype/party_link/party_link.py

@@ -11,14 +11,12 @@ class PartyLink(Document):
 		if self.primary_role not in ['Customer', 'Supplier']:
 			frappe.throw(_("Allowed primary roles are 'Customer' and 'Supplier'. Please select one of these roles only."),
 				title=_("Invalid Primary Role"))
-
 		existing_party_link = frappe.get_all('Party Link', {
 			'primary_party': self.secondary_party
 		}, pluck="primary_role")
 		if existing_party_link:
 			frappe.throw(_('{} {} is already linked with another {}')
 				.format(self.secondary_role, self.secondary_party, existing_party_link[0]))
-
 		existing_party_link = frappe.get_all('Party Link', {
 			'secondary_party': self.primary_party
 		}, pluck="primary_role")

erpnext/accounts/doctype/payment_entry/payment_entry.js

@@ -533,7 +533,7 @@ frappe.ui.form.on('Payment Entry', {
 	source_exchange_rate: function(frm) {
 		if (frm.doc.paid_amount) {
 			frm.set_value("base_paid_amount", flt(frm.doc.paid_amount) * flt(frm.doc.source_exchange_rate));
-			// target exchange rate should always be same as source if both account currencies is same
+			// target exchange rate should always be same as source if both account currencies are same
 			if(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
 				frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
 				frm.set_value("base_received_amount", frm.doc.base_paid_amount);

erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js

@@ -2,8 +2,8 @@
 // For license information, please see license.txt
 
 frappe.provide("erpnext.accounts");
-erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationController extends frappe.ui.form.Controller {
-	onload() {
+erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.extend({
+	onload: function() {
 		var me = this;
 
 		this.frm.set_query("party_type", function() {
@@ -48,9 +48,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 				frappe.throw({message: __("Please Select Both Company and Party Type First"), title: title});
 			}
 		};
-	}
+	},
 
-	refresh() {
+	refresh: function() {
 		this.frm.disable_save();
 		this.frm.set_df_property('invoices', 'cannot_delete_rows', true);
 		this.frm.set_df_property('payments', 'cannot_delete_rows', true);
@@ -82,9 +82,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
 			this.frm.change_custom_button_type('Allocate', null, 'default');
 		}
-	}
+	},
 
-	company() {
+	company: function() {
 		var me = this;
 		this.frm.set_value('receivable_payable_account', '');
 		me.frm.clear_table("allocation");
@@ -92,9 +92,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 		me.frm.clear_table("payments");
 		me.frm.refresh_fields();
 		me.frm.trigger('party');
-	}
+	},
 
-	party() {
+	party: function() {
 		var me = this;
 		if (!me.frm.doc.receivable_payable_account && me.frm.doc.party_type && me.frm.doc.party) {
 			return frappe.call({
@@ -112,9 +112,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 				}
 			});
 		}
-	}
+	},
 
-	get_unreconciled_entries() {
+	get_unreconciled_entries: function() {
 		var me = this;
 		return this.frm.call({
 			doc: me.frm.doc,
@@ -127,9 +127,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			}
 		});
 
-	}
+	},
 
-	allocate() {
+	allocate: function() {
 		var me = this;
 		let payments = me.frm.fields_dict.payments.grid.get_selected_children();
 		if (!(payments.length)) {
@@ -150,9 +150,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 				me.frm.refresh();
 			}
 		});
-	}
+	},
 
-	reconcile() {
+	reconcile: function() {
 		var me = this;
 		var show_dialog = me.frm.doc.allocation.filter(d => d.difference_amount && !d.difference_account);
 
@@ -234,9 +234,9 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 		} else {
 			this.reconcile_payment_entries();
 		}
-	}
+	},
 
-	reconcile_payment_entries() {
+	reconcile_payment_entries: function() {
 		var me = this;
 
 		return this.frm.call({
@@ -249,6 +249,6 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
 			}
 		});
 	}
-};
+});
 
-extend_cscript(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm}));
+$.extend(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm}));

erpnext/accounts/doctype/payment_request/payment_request.py

@@ -293,7 +293,7 @@ class PaymentRequest(Document):
 		if not status:
 			return
 
-		shopping_cart_settings = frappe.get_doc("Shopping Cart Settings")
+		shopping_cart_settings = frappe.get_doc("E Commerce Settings")
 
 		if status in ["Authorized", "Completed"]:
 			redirect_to = None
@@ -443,7 +443,7 @@ def get_gateway_details(args):
 		return get_payment_gateway_account(args.get("payment_gateway_account"))
 
 	if args.order_type == "Shopping Cart":
-		payment_gateway_account = frappe.get_doc("Shopping Cart Settings").payment_gateway_account
+		payment_gateway_account = frappe.get_doc("E Commerce Settings").payment_gateway_account
 		return get_payment_gateway_account(payment_gateway_account)
 
 	gateway_account = get_payment_gateway_account({"is_default": 1})

erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py

@@ -131,7 +131,7 @@ class PeriodClosingVoucher(AccountsController):
 				sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as bal_in_account_currency,
 				sum(t1.debit) - sum(t1.credit) as bal_in_company_currency
 			from `tabGL Entry` t1, `tabAccount` t2
-			where t1.is_cancelled = 0 and t1.account = t2.name and t2.report_type = 'Profit and Loss'
+			where t1.account = t2.name and t2.report_type = 'Profit and Loss'
 			and t2.docstatus < 2 and t2.company = %s
 			and t1.posting_date between %s and %s
 			group by t1.account, {dimension_fields}

erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py

@@ -90,15 +90,9 @@ class TestPOSClosingEntry(unittest.TestCase):
 
 		pcv_doc.load_from_db()
 		pcv_doc.cancel()
-
-		cancelled_invoice = frappe.db.get_value(
-			'POS Invoice Merge Log', {'pos_closing_entry': pcv_doc.name},
-			'consolidated_invoice'
-		)
-		docstatus = frappe.db.get_value("Sales Invoice", cancelled_invoice, 'docstatus')
-		self.assertEqual(docstatus, 2)
-
+		si_doc.load_from_db()
 		pos_inv1.load_from_db()
+		self.assertEqual(si_doc.docstatus, 2)
 		self.assertEqual(pos_inv1.status, 'Paid')
 
 

erpnext/accounts/doctype/pos_invoice/pos_invoice.js

@@ -4,29 +4,29 @@
 {% include 'erpnext/selling/sales_common.js' %};
 frappe.provide("erpnext.accounts");
 
-erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnext.selling.SellingController {
+erpnext.selling.POSInvoiceController = erpnext.selling.SellingController.extend({
 	setup(doc) {
 		this.setup_posting_date_time_check();
-		super.setup(doc);
-	}
+		this._super(doc);
+	},
 
-	company() {
+	company: function() {
 		erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype);
-	}
+	},
 
 	onload(doc) {
-		super.onload();
-		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log', 'POS Closing Entry'];
+		this._super();
+		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice Merge Log'];
 		if(doc.__islocal && doc.is_pos && frappe.get_route_str() !== 'point-of-sale') {
 			this.frm.script_manager.trigger("is_pos");
 			this.frm.refresh_fields();
 		}
 
 		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
-	}
+	},
 
 	refresh(doc) {
-		super.refresh();
+		this._super();
 		if (doc.docstatus == 1 && !doc.is_return) {
 			this.frm.add_custom_button(__('Return'), this.make_sales_return, __('Create'));
 			this.frm.page.set_inner_btn_group_as_primary(__('Create'));
@@ -36,13 +36,13 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 			this.frm.return_print_format = "Sales Invoice Return";
 			this.frm.set_value('consolidated_invoice', '');
 		}
-	}
+	},
 
-	is_pos() {
+	is_pos: function() {
 		this.set_pos_data();
-	}
+	},
 
-	async set_pos_data() {
+	set_pos_data: async function() {
 		if(this.frm.doc.is_pos) {
 			this.frm.set_value("allocate_advances_automatically", 0);
 			if(!this.frm.doc.company) {
@@ -69,7 +69,7 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 				}
 			}
 		}
-	}
+	},
 
 	customer() {
 		if (!this.frm.doc.customer) return
@@ -86,13 +86,13 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 			}, () => {
 				this.apply_pricing_rule();
 			});
-	}
+	},
 
-	amount(){
+	amount: function(){
 		this.write_off_outstanding_amount_automatically()
-	}
+	},
 
-	change_amount(){
+	change_amount: function(){
 		if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
 			this.calculate_write_off_amount();
 		}else {
@@ -101,14 +101,14 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 		}
 
 		this.frm.refresh_fields();
-	}
+	},
 
-	loyalty_amount(){
+	loyalty_amount: function(){
 		this.calculate_outstanding_amount();
 		this.frm.refresh_field("outstanding_amount");
 		this.frm.refresh_field("paid_amount");
 		this.frm.refresh_field("base_paid_amount");
-	}
+	},
 
 	write_off_outstanding_amount_automatically() {
 		if (cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
@@ -121,17 +121,17 @@ erpnext.selling.POSInvoiceController = class POSInvoiceController extends erpnex
 
 		this.calculate_outstanding_amount(false);
 		this.frm.refresh_fields();
-	}
+	},
 
-	make_sales_return() {
+	make_sales_return: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.pos_invoice.pos_invoice.make_sales_return",
 			frm: cur_frm
 		})
-	}
-}
+	},
+})
 
-extend_cscript(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }))
+$.extend(cur_frm.cscript, new erpnext.selling.POSInvoiceController({ frm: cur_frm }))
 
 frappe.ui.form.on('POS Invoice', {
 	redeem_loyalty_points: function(frm) {

erpnext/accounts/doctype/pos_profile/pos_profile.json

@@ -120,7 +120,6 @@
   {
    "fieldname": "payments",
    "fieldtype": "Table",
-   "label": "Payment Methods",
    "options": "POS Payment Method",
    "reqd": 1
   },
@@ -378,7 +377,7 @@
    "link_fieldname": "pos_profile"
   }
  ],
- "modified": "2021-10-14 14:17:00.469298",
+ "modified": "2021-02-01 13:52:51.081311",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Profile",

erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py

@@ -7,8 +7,10 @@ from __future__ import unicode_literals
 import unittest
 
 import frappe
+from frappe import MandatoryError
 
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
+from erpnext.healthcare.doctype.lab_test_template.lab_test_template import make_item_price
 from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.stock.get_item_details import get_item_details
@@ -17,7 +19,6 @@ from erpnext.stock.get_item_details import get_item_details
 class TestPricingRule(unittest.TestCase):
 	def setUp(self):
 		delete_existing_pricing_rules()
-		setup_pricing_rule_data()
 
 	def tearDown(self):
 		delete_existing_pricing_rules()
@@ -560,8 +561,6 @@ class TestPricingRule(unittest.TestCase):
 		for doc in [si, si1]:
 			doc.delete()
 
-test_dependencies = ["Campaign"]
-
 def make_pricing_rule(**args):
 	args = frappe._dict(args)
 
@@ -608,25 +607,9 @@ def make_pricing_rule(**args):
 	if args.get(applicable_for):
 		doc.db_set(applicable_for, args.get(applicable_for))
 
-def setup_pricing_rule_data():
-	if not frappe.db.exists('Campaign', '_Test Campaign'):
-		frappe.get_doc({
-			'doctype': 'Campaign',
-			'campaign_name': '_Test Campaign',
-			'name': '_Test Campaign'
-		}).insert()
 
 def delete_existing_pricing_rules():
 	for doctype in ["Pricing Rule", "Pricing Rule Item Code",
 		"Pricing Rule Item Group", "Pricing Rule Brand"]:
 
 		frappe.db.sql("delete from `tab{0}`".format(doctype))
-
-
-def make_item_price(item, price_list_name, item_price):
-	frappe.get_doc({
-		'doctype': 'Item Price',
-		'price_list': price_list_name,
-		'item_code': item,
-		'price_list_rate': item_price
-	}).insert(ignore_permissions=True, ignore_mandatory=True)

erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json

@@ -291,7 +291,6 @@
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",
- "naming_rule": "Set by user",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js

@@ -4,10 +4,10 @@
 frappe.provide("erpnext.accounts");
 {% include 'erpnext/public/js/controllers/buying.js' %};
 
-erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.BuyingController {
-	setup(doc) {
+erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
+	setup: function(doc) {
 		this.setup_posting_date_time_check();
-		super.setup(doc);
+		this._super(doc);
 
 		// formatter for purchase invoice item
 		if(this.frm.doc.update_stock) {
@@ -25,10 +25,10 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				}
 			};
 		});
-	}
+	},
 
-	onload() {
-		super.onload();
+	onload: function() {
+		this._super();
 
 		if(!this.frm.doc.__islocal) {
 			// show credit_to in print format
@@ -44,11 +44,11 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		}
 
 		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
-	}
+	},
 
-	refresh(doc) {
+	refresh: function(doc) {
 		const me = this;
-		super.refresh();
+		this._super();
 
 		hide_fields(this.frm.doc);
 		// Show / Hide button
@@ -157,26 +157,26 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		}
 
 		this.frm.set_df_property("tax_withholding_category", "hidden", doc.apply_tds ? 0 : 1);
-	}
+	},
 
-	unblock_invoice() {
+	unblock_invoice: function() {
 		const me = this;
 		frappe.call({
 			'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.unblock_invoice',
 			'args': {'name': me.frm.doc.name},
 			'callback': (r) => me.frm.reload_doc()
 		});
-	}
+	},
 
-	block_invoice() {
+	block_invoice: function() {
 		this.make_comment_dialog_and_block_invoice();
-	}
+	},
 
-	change_release_date() {
+	change_release_date: function() {
 		this.make_dialog_and_set_release_date();
-	}
+	},
 
-	can_change_release_date(date) {
+	can_change_release_date: function(date) {
 		const diff = frappe.datetime.get_diff(date, frappe.datetime.nowdate());
 		if (diff < 0) {
 			frappe.throw(__('New release date should be in the future'));
@@ -184,9 +184,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		} else {
 			return true;
 		}
-	}
+	},
 
-	make_comment_dialog_and_block_invoice(){
+	make_comment_dialog_and_block_invoice: function(){
 		const me = this;
 
 		const title = __('Block Invoice');
@@ -228,9 +228,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		});
 
 		this.dialog.show();
-	}
+	},
 
-	make_dialog_and_set_release_date() {
+	make_dialog_and_set_release_date: function() {
 		const me = this;
 
 		const title = __('Set New Release Date');
@@ -259,17 +259,17 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		});
 
 		this.dialog.show();
-	}
+	},
 
-	set_release_date(data) {
+	set_release_date: function(data) {
 		return frappe.call({
 			'method': 'erpnext.accounts.doctype.purchase_invoice.purchase_invoice.change_release_date',
 			'args': data,
 			'callback': (r) => this.frm.reload_doc()
 		});
-	}
+	},
 
-	supplier() {
+	supplier: function() {
 		var me = this;
 
 		// Do not update if inter company reference is there as the details will already be updated
@@ -292,9 +292,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				me.frm.set_df_property("apply_tds", "read_only", me.frm.supplier_tds ? 0 : 1);
 				me.frm.set_df_property("tax_withholding_category", "hidden", me.frm.supplier_tds ? 0 : 1);
 			})
-	}
+	},
 
-	apply_tds(frm) {
+	apply_tds: function(frm) {
 		var me = this;
 
 		if (!me.frm.doc.apply_tds) {
@@ -304,9 +304,9 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 			me.frm.set_value("tax_withholding_category", me.frm.supplier_tds);
 			me.frm.set_df_property("tax_withholding_category", "hidden", 0);
 		}
-	}
+	},
 
-	credit_to() {
+	credit_to: function() {
 		var me = this;
 		if(this.frm.doc.credit_to) {
 			me.frm.call({
@@ -324,16 +324,16 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 				}
 			});
 		}
-	}
+	},
 
-	make_inter_company_invoice(frm) {
+	make_inter_company_invoice: function(frm) {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_inter_company_sales_invoice",
 			frm: frm
 		});
-	}
+	},
 
-	is_paid() {
+	is_paid: function() {
 		hide_fields(this.frm.doc);
 		if(cint(this.frm.doc.is_paid)) {
 			this.frm.set_value("allocate_advances_automatically", 0);
@@ -344,44 +344,44 @@ erpnext.accounts.PurchaseInvoice = class PurchaseInvoice extends erpnext.buying.
 		}
 		this.calculate_outstanding_amount();
 		this.frm.refresh_fields();
-	}
+	},
 
-	write_off_amount() {
+	write_off_amount: function() {
 		this.set_in_company_currency(this.frm.doc, ["write_off_amount"]);
 		this.calculate_outstanding_amount();
 		this.frm.refresh_fields();
-	}
+	},
 
-	paid_amount() {
+	paid_amount: function() {
 		this.set_in_company_currency(this.frm.doc, ["paid_amount"]);
 		this.write_off_amount();
 		this.frm.refresh_fields();
-	}
+	},
 
-	allocated_amount() {
+	allocated_amount: function() {
 		this.calculate_total_advance();
 		this.frm.refresh_fields();
-	}
+	},
 
-	items_add(doc, cdt, cdn) {
+	items_add: function(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
 		this.frm.script_manager.copy_from_first_row("items", row,
 			["expense_account", "discount_account", "cost_center", "project"]);
-	}
+	},
 
-	on_submit() {
+	on_submit: function() {
 		$.each(this.frm.doc["items"] || [], function(i, row) {
 			if(row.purchase_receipt) frappe.model.clear_doc("Purchase Receipt", row.purchase_receipt)
 		})
-	}
+	},
 
-	make_debit_note() {
+	make_debit_note: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_debit_note",
 			frm: cur_frm
 		})
-	}
-};
+	},
+});
 
 cur_frm.script_manager.make(erpnext.accounts.PurchaseInvoice);
 

erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py

@@ -42,9 +42,6 @@ from erpnext.stock.doctype.purchase_receipt.purchase_receipt import (
 	update_billed_amount_based_on_po,
 )
 
-
-class WarehouseMissingError(frappe.ValidationError): pass
-
 form_grid_templates = {
 	"items": "templates/form_grid/item_grid.html"
 }
@@ -225,8 +222,8 @@ class PurchaseInvoice(BuyingController):
 		if self.update_stock and for_validate:
 			for d in self.get('items'):
 				if not d.warehouse:
-					frappe.throw(_("Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}").
-						format(d.idx, d.item_code, self.company), exc=WarehouseMissingError)
+					frappe.throw(_("Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}").
+						format(d.idx, d.item_code, self.company))
 
 		super(PurchaseInvoice, self).validate_warehouse()
 
@@ -264,7 +261,7 @@ class PurchaseInvoice(BuyingController):
 				and (not item.po_detail or
 					not frappe.db.get_value("Purchase Order Item", item.po_detail, "delivered_by_supplier")):
 
-				if self.update_stock and item.warehouse and (not item.from_warehouse):
+				if self.update_stock and (not item.from_warehouse):
 					if for_validate and item.expense_account and item.expense_account != warehouse_account[item.warehouse]["account"]:
 						msg = _("Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account").format(
 							item.idx, frappe.bold(warehouse_account[item.warehouse]["account"]), frappe.bold(item.expense_account), frappe.bold(item.warehouse))
@@ -539,10 +536,6 @@ class PurchaseInvoice(BuyingController):
 			if d.category in ('Valuation', 'Total and Valuation')
 			and flt(d.base_tax_amount_after_discount_amount)]
 
-		exchange_rate_map, net_rate_map = get_purchase_document_details(self)
-
-		enable_discount_accounting = cint(frappe.db.get_single_value('Accounts Settings', 'enable_discount_accounting'))
-
 		for item in self.get("items"):
 			if flt(item.base_net_amount):
 				account_currency = get_account_currency(item.expense_account)
@@ -633,7 +626,7 @@ class PurchaseInvoice(BuyingController):
 						if (not item.enable_deferred_expense or self.is_return) else item.deferred_expense_account)
 
 					if not item.is_fixed_asset:
-						dummy, amount = self.get_amount_and_base_amount(item, enable_discount_accounting)
+						dummy, amount = self.get_amount_and_base_amount(item, self.enable_discount_accounting)
 					else:
 						amount = flt(item.base_net_amount + item.item_tax_amount, item.precision("base_net_amount"))
 
@@ -660,34 +653,6 @@ class PurchaseInvoice(BuyingController):
 								"project": item.project or self.project
 							}, account_currency, item=item))
 
-						# check if the exchange rate has changed
-						if item.get('purchase_receipt'):
-							if exchange_rate_map[item.purchase_receipt] and \
-								self.conversion_rate != exchange_rate_map[item.purchase_receipt] and \
-								item.net_rate == net_rate_map[item.pr_detail]:
-
-								discrepancy_caused_by_exchange_rate_difference = (item.qty * item.net_rate) * \
-									(exchange_rate_map[item.purchase_receipt] - self.conversion_rate)
-
-								gl_entries.append(
-									self.get_gl_dict({
-										"account": expense_account,
-										"against": self.supplier,
-										"debit": discrepancy_caused_by_exchange_rate_difference,
-										"cost_center": item.cost_center,
-										"project": item.project or self.project
-									}, account_currency, item=item)
-								)
-								gl_entries.append(
-									self.get_gl_dict({
-										"account": self.get_company_default("exchange_gain_loss_account"),
-										"against": self.supplier,
-										"credit": discrepancy_caused_by_exchange_rate_difference,
-										"cost_center": item.cost_center,
-										"project": item.project or self.project
-									}, account_currency, item=item)
-								)
-
 					# If asset is bought through this document and not linked to PR
 					if self.update_stock and item.landed_cost_voucher_amount:
 						expenses_included_in_asset_valuation = self.get_company_default("expenses_included_in_asset_valuation")
@@ -875,10 +840,9 @@ class PurchaseInvoice(BuyingController):
 	def make_tax_gl_entries(self, gl_entries):
 		# tax table gl entries
 		valuation_tax = {}
-		enable_discount_accounting = cint(frappe.db.get_single_value('Accounts Settings', 'enable_discount_accounting'))
 
 		for tax in self.get("taxes"):
-			amount, base_amount = self.get_tax_amounts(tax, enable_discount_accounting)
+			amount, base_amount = self.get_tax_amounts(tax, self.enable_discount_accounting)
 			if tax.category in ("Total", "Valuation and Total") and flt(base_amount):
 				account_currency = get_account_currency(tax.account_head)
 
@@ -1213,36 +1177,6 @@ class PurchaseInvoice(BuyingController):
 		if update:
 			self.db_set('status', self.status, update_modified = update_modified)
 
-# to get details of purchase invoice/receipt from which this doc was created for exchange rate difference handling
-def get_purchase_document_details(doc):
-	if doc.doctype == 'Purchase Invoice':
-		doc_reference = 'purchase_receipt'
-		items_reference = 'pr_detail'
-		parent_doctype = 'Purchase Receipt'
-		child_doctype = 'Purchase Receipt Item'
-	else:
-		doc_reference = 'purchase_invoice'
-		items_reference = 'purchase_invoice_item'
-		parent_doctype = 'Purchase Invoice'
-		child_doctype = 'Purchase Invoice Item'
-
-	purchase_receipts_or_invoices = []
-	items = []
-
-	for item in doc.get('items'):
-		if item.get(doc_reference):
-			purchase_receipts_or_invoices.append(item.get(doc_reference))
-		if item.get(items_reference):
-			items.append(item.get(items_reference))
-
-	exchange_rate_map = frappe._dict(frappe.get_all(parent_doctype, filters={'name': ('in',
-		purchase_receipts_or_invoices)}, fields=['name', 'conversion_rate'], as_list=1))
-
-	net_rate_map = frappe._dict(frappe.get_all(child_doctype, filters={'name': ('in',
-		items)}, fields=['name', 'net_rate'], as_list=1))
-
-	return exchange_rate_map, net_rate_map
-
 def get_list_context(context=None):
 	from erpnext.controllers.website_list_for_contact import get_list_context
 	list_context = get_list_context(context)

erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py

@@ -235,29 +235,6 @@ class TestPurchaseInvoice(unittest.TestCase):
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
 
-	def test_purchase_invoice_with_exchange_rate_difference(self):
-		from erpnext.stock.doctype.purchase_receipt.purchase_receipt import (
-			make_purchase_invoice as create_purchase_invoice,
-		)
-
-		pr = make_purchase_receipt(company="_Test Company with perpetual inventory", warehouse='Stores - TCP1',
-			currency = "USD", conversion_rate = 70)
-
-		pi = create_purchase_invoice(pr.name)
-		pi.conversion_rate = 80
-
-		pi.insert()
-		pi.submit()
-
-		# Get exchnage gain and loss account
-		exchange_gain_loss_account = frappe.db.get_value('Company', pi.company, 'exchange_gain_loss_account')
-
-		# fetching the latest GL Entry with exchange gain and loss account account
-		amount = frappe.db.get_value('GL Entry', {'account': exchange_gain_loss_account, 'voucher_no': pi.name}, 'debit')
-		discrepancy_caused_by_exchange_rate_diff = abs(pi.items[0].base_net_amount - pr.items[0].base_net_amount)
-
-		self.assertEqual(discrepancy_caused_by_exchange_rate_diff, amount)
-
 	def test_purchase_invoice_with_discount_accounting_enabled(self):
 		enable_discount_accounting()
 
@@ -1230,7 +1207,7 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
 def update_tax_witholding_category(company, account):
 	from erpnext.accounts.utils import get_fiscal_year
 
-	fiscal_year = get_fiscal_year(fiscal_year='2021')
+	fiscal_year = get_fiscal_year(fiscal_year='_Test Fiscal Year 2021')
 
 	if not frappe.db.get_value('Tax Withholding Rate',
 		{'parent': 'TDS - 194 - Dividends - Individual', 'from_date': ('>=', fiscal_year[1]),

erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json

@@ -878,4 +878,4 @@
  "permissions": [],
  "sort_field": "modified",
  "sort_order": "DESC"
-}
+}

erpnext/accounts/doctype/sales_invoice/regional/india.js

@@ -1,6 +1,8 @@
 {% include "erpnext/regional/india/taxes.js" %}
+{% include "erpnext/regional/india/e_invoice/einvoice.js" %}
 
 erpnext.setup_auto_gst_taxation('Sales Invoice');
+erpnext.setup_einvoice_actions('Sales Invoice')
 
 frappe.ui.form.on("Sales Invoice", {
 	setup: function(frm) {

erpnext/accounts/doctype/sales_invoice/regional/india_list.js

@@ -36,4 +36,139 @@ frappe.listview_settings['Sales Invoice'].onload = function (list_view) {
 	};
 
 	list_view.page.add_actions_menu_item(__('Generate E-Way Bill JSON'), action, false);
+
+	const generate_irns = () => {
+		const docnames = list_view.get_checked_items(true);
+		if (docnames && docnames.length) {
+			frappe.call({
+				method: 'erpnext.regional.india.e_invoice.utils.generate_einvoices',
+				args: { docnames },
+				freeze: true,
+				freeze_message: __('Generating E-Invoices...')
+			});
+		} else {
+			frappe.msgprint({
+				message: __('Please select at least one sales invoice to generate IRN'),
+				title: __('No Invoice Selected'),
+				indicator: 'red'
+			});
+		}
+	};
+
+	const cancel_irns = () => {
+		const docnames = list_view.get_checked_items(true);
+
+		const fields = [
+			{
+				"label": "Reason",
+				"fieldname": "reason",
+				"fieldtype": "Select",
+				"reqd": 1,
+				"default": "1-Duplicate",
+				"options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"]
+			},
+			{
+				"label": "Remark",
+				"fieldname": "remark",
+				"fieldtype": "Data",
+				"reqd": 1
+			}
+		];
+
+		const d = new frappe.ui.Dialog({
+			title: __("Cancel IRN"),
+			fields: fields,
+			primary_action: function() {
+				const data = d.get_values();
+				frappe.call({
+					method: 'erpnext.regional.india.e_invoice.utils.cancel_irns',
+					args: {
+						doctype: list_view.doctype,
+						docnames,
+						reason: data.reason.split('-')[0],
+						remark: data.remark
+					},
+					freeze: true,
+					freeze_message: __('Cancelling E-Invoices...'),
+				});
+				d.hide();
+			},
+			primary_action_label: __('Submit')
+		});
+		d.show();
+	};
+
+	let einvoicing_enabled = false;
+	frappe.db.get_single_value("E Invoice Settings", "enable").then(enabled => {
+		einvoicing_enabled = enabled;
+	});
+
+	list_view.$result.on("change", "input[type=checkbox]", () => {
+		if (einvoicing_enabled) {
+			const docnames = list_view.get_checked_items(true);
+			// show/hide e-invoicing actions when no sales invoices are checked
+			if (docnames && docnames.length) {
+				// prevent adding actions twice if e-invoicing action group already exists
+				if (list_view.page.get_inner_group_button(__('E-Invoicing')).length == 0) {
+					list_view.page.add_inner_button(__('Generate IRNs'), generate_irns, __('E-Invoicing'));
+					list_view.page.add_inner_button(__('Cancel IRNs'), cancel_irns, __('E-Invoicing'));
+				}
+			} else {
+				list_view.page.remove_inner_button(__('Generate IRNs'), __('E-Invoicing'));
+				list_view.page.remove_inner_button(__('Cancel IRNs'), __('E-Invoicing'));
+			}
+		}
+	});
+
+	frappe.realtime.on("bulk_einvoice_generation_complete", (data) => {
+		const { failures, user, invoices } = data;
+
+		if (invoices.length != failures.length) {
+			frappe.msgprint({
+				message: __('{0} e-invoices generated successfully', [invoices.length]),
+				title: __('Bulk E-Invoice Generation Complete'),
+				indicator: 'orange'
+			});
+		}
+
+		if (failures && failures.length && user == frappe.session.user) {
+			let message = `
+				Failed to generate IRNs for following ${failures.length} sales invoices:
+				<ul style="padding-left: 20px; padding-top: 5px;">
+					${failures.map(d => `<li>${d.docname}</li>`).join('')}
+				</ul>
+			`;
+			frappe.msgprint({
+				message: message,
+				title: __('Bulk E-Invoice Generation Complete'),
+				indicator: 'orange'
+			});
+		}
+	});
+
+	frappe.realtime.on("bulk_einvoice_cancellation_complete", (data) => {
+		const { failures, user, invoices } = data;
+
+		if (invoices.length != failures.length) {
+			frappe.msgprint({
+				message: __('{0} e-invoices cancelled successfully', [invoices.length]),
+				title: __('Bulk E-Invoice Cancellation Complete'),
+				indicator: 'orange'
+			});
+		}
+
+		if (failures && failures.length && user == frappe.session.user) {
+			let message = `
+				Failed to cancel IRNs for following ${failures.length} sales invoices:
+				<ul style="padding-left: 20px; padding-top: 5px;">
+					${failures.map(d => `<li>${d.docname}</li>`).join('')}
+				</ul>
+			`;
+			frappe.msgprint({
+				message: message,
+				title: __('Bulk E-Invoice Cancellation Complete'),
+				indicator: 'orange'
+			});
+		}
+	});
 };

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -5,17 +5,17 @@
 frappe.provide("erpnext.accounts");
 
 
-erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends erpnext.selling.SellingController {
-	setup(doc) {
+erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.extend({
+	setup: function(doc) {
 		this.setup_posting_date_time_check();
-		super.setup(doc);
-	}
-	company() {
+		this._super(doc);
+	},
+	company: function() {
 		erpnext.accounts.dimensions.update_dimension(this.frm, this.frm.doctype);
-	}
-	onload() {
+	},
+	onload: function() {
 		var me = this;
-		super.onload();
+		this._super();
 
 		this.frm.ignore_doctypes_on_cancel_all = ['POS Invoice', 'Timesheet', 'POS Invoice Merge Log', 'POS Closing Entry'];
 		if(!this.frm.doc.__islocal && !this.frm.doc.customer && this.frm.doc.debit_to) {
@@ -35,11 +35,11 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 		}
 		erpnext.queries.setup_warehouse_query(this.frm);
 		erpnext.accounts.dimensions.setup_dimension_filters(this.frm, this.frm.doctype);
-	}
+	},
 
-	refresh(doc, dt, dn) {
+	refresh: function(doc, dt, dn) {
 		const me = this;
-		super.refresh();
+		this._super();
 		if(cur_frm.msgbox && cur_frm.msgbox.$wrapper.is(":visible")) {
 			// hide new msgbox
 			cur_frm.msgbox.hide();
@@ -138,28 +138,28 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				}, __('Create'));
 			}
 		}
-	}
+	},
 
-	make_maintenance_schedule() {
+	make_maintenance_schedule: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_maintenance_schedule",
 			frm: cur_frm
 		})
-	}
+	},
 
-	on_submit(doc, dt, dn) {
+	on_submit: function(doc, dt, dn) {
 		var me = this;
 
 		if (frappe.get_route()[0] != 'Form') {
 			return
 		}
 
-		doc.items.forEach((row) => {
+		$.each(doc["items"], function(i, row) {
 			if(row.delivery_note) frappe.model.clear_doc("Delivery Note", row.delivery_note)
-		});
-	}
+		})
+	},
 
-	set_default_print_format() {
+	set_default_print_format: function() {
 		// set default print format to POS type or Credit Note
 		if(cur_frm.doc.is_pos) {
 			if(cur_frm.pos_print_format) {
@@ -180,9 +180,9 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				cur_frm.meta._default_print_format = null;
 			}
 		}
-	}
+	},
 
-	sales_order_btn() {
+	sales_order_btn: function() {
 		var me = this;
 		this.$sales_order_btn = this.frm.add_custom_button(__('Sales Order'),
 			function() {
@@ -201,9 +201,9 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 					}
 				})
 			}, __("Get Items From"));
-	}
+	},
 
-	quotation_btn() {
+	quotation_btn: function() {
 		var me = this;
 		this.$quotation_btn = this.frm.add_custom_button(__('Quotation'),
 			function() {
@@ -225,9 +225,9 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 					}
 				})
 			}, __("Get Items From"));
-	}
+	},
 
-	delivery_note_btn() {
+	delivery_note_btn: function() {
 		var me = this;
 		this.$delivery_note_btn = this.frm.add_custom_button(__('Delivery Note'),
 			function() {
@@ -253,12 +253,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 					}
 				});
 			}, __("Get Items From"));
-	}
+	},
 
-	tc_name() {
+	tc_name: function() {
 		this.get_terms();
-	}
-	customer() {
+	},
+	customer: function() {
 		if (this.frm.doc.is_pos){
 			var pos_profile = this.frm.doc.pos_profile;
 		}
@@ -289,16 +289,16 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				}
 			});
 		}
-	}
+	},
 
-	make_inter_company_invoice() {
+	make_inter_company_invoice: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_inter_company_purchase_invoice",
 			frm: me.frm
 		});
-	}
+	},
 
-	debit_to() {
+	debit_to: function() {
 		var me = this;
 		if(this.frm.doc.debit_to) {
 			me.frm.call({
@@ -316,12 +316,12 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				}
 			});
 		}
-	}
+	},
 
-	allocated_amount() {
+	allocated_amount: function() {
 		this.calculate_total_advance();
 		this.frm.refresh_fields();
-	}
+	},
 
 	write_off_outstanding_amount_automatically() {
 		if (cint(this.frm.doc.write_off_outstanding_amount_automatically)) {
@@ -334,39 +334,39 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 
 		this.calculate_outstanding_amount(false);
 		this.frm.refresh_fields();
-	}
+	},
 
-	write_off_amount() {
+	write_off_amount: function() {
 		this.set_in_company_currency(this.frm.doc, ["write_off_amount"]);
 		this.write_off_outstanding_amount_automatically();
-	}
+	},
 
-	items_add(doc, cdt, cdn) {
+	items_add: function(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
 		this.frm.script_manager.copy_from_first_row("items", row, ["income_account", "discount_account", "cost_center"]);
-	}
+	},
 
-	set_dynamic_labels() {
-		super.set_dynamic_labels();
+	set_dynamic_labels: function() {
+		this._super();
 		this.frm.events.hide_fields(this.frm)
-	}
+	},
 
-	items_on_form_rendered() {
+	items_on_form_rendered: function() {
 		erpnext.setup_serial_or_batch_no();
-	}
+	},
 
-	packed_items_on_form_rendered(doc, grid_row) {
+	packed_items_on_form_rendered: function(doc, grid_row) {
 		erpnext.setup_serial_or_batch_no();
-	}
+	},
 
-	make_sales_return() {
+	make_sales_return: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.make_sales_return",
 			frm: cur_frm
 		})
-	}
+	},
 
-	asset(frm, cdt, cdn) {
+	asset: function(frm, cdt, cdn) {
 		var row = locals[cdt][cdn];
 		if(row.asset) {
 			frappe.call({
@@ -380,18 +380,18 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 				}
 			})
 		}
-	}
+	},
 
-	is_pos(frm){
+	is_pos: function(frm){
 		this.set_pos_data();
-	}
+	},
 
-	pos_profile() {
+	pos_profile: function() {
 		this.frm.doc.taxes = []
 		this.set_pos_data();
-	}
+	},
 
-	set_pos_data() {
+	set_pos_data: function() {
 		if(this.frm.doc.is_pos) {
 			this.frm.set_value("allocate_advances_automatically", 0);
 			if(!this.frm.doc.company) {
@@ -421,13 +421,13 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 			}
 		}
 		else this.frm.trigger("refresh");
-	}
+	},
 
-	amount(){
+	amount: function(){
 		this.write_off_outstanding_amount_automatically()
-	}
+	},
 
-	change_amount(){
+	change_amount: function(){
 		if(this.frm.doc.paid_amount > this.frm.doc.grand_total){
 			this.calculate_write_off_amount();
 		}else {
@@ -436,18 +436,18 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 		}
 
 		this.frm.refresh_fields();
-	}
+	},
 
-	loyalty_amount(){
+	loyalty_amount: function(){
 		this.calculate_outstanding_amount();
 		this.frm.refresh_field("outstanding_amount");
 		this.frm.refresh_field("paid_amount");
 		this.frm.refresh_field("base_paid_amount");
-	}
+	},
 
 	currency() {
 		var me = this;
-		super.currency();
+		this._super();
 		if (this.frm.doc.timesheets) {
 			this.frm.doc.timesheets.forEach((d) => {
 				let row = frappe.get_doc(d.doctype, d.name)
@@ -456,10 +456,10 @@ erpnext.accounts.SalesInvoiceController = class SalesInvoiceController extends e
 			frm.trigger("calculate_timesheet_totals");
 		}
 	}
-};
+});
 
 // for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({frm: cur_frm}));
+$.extend(cur_frm.cscript, new erpnext.accounts.SalesInvoiceController({frm: cur_frm}));
 
 cur_frm.cscript['Make Delivery Note'] = function() {
 	frappe.model.open_mapped_doc({
@@ -1000,12 +1000,14 @@ frappe.ui.form.on('Sales Invoice', {
 	}
 });
 
+
 frappe.ui.form.on("Sales Invoice Timesheet", {
 	timesheets_remove(frm) {
 		frm.trigger("calculate_timesheet_totals");
 	}
 });
 
+
 var set_timesheet_detail_rate = function(cdt, cdn, currency, timelog) {
 	frappe.call({
 		method: "erpnext.projects.doctype.timesheet.timesheet.get_timesheet_detail_rate",
@@ -1051,3 +1053,276 @@ var select_loyalty_program = function(frm, loyalty_programs) {
 
 	dialog.show();
 }
+
+// Healthcare
+var get_healthcare_services_to_invoice = function(frm) {
+	var me = this;
+	let selected_patient = '';
+	var dialog = new frappe.ui.Dialog({
+		title: __("Get Items from Healthcare Services"),
+		fields:[
+			{
+				fieldtype: 'Link',
+				options: 'Patient',
+				label: 'Patient',
+				fieldname: "patient",
+				reqd: true
+			},
+			{ fieldtype: 'Section Break'	},
+			{ fieldtype: 'HTML', fieldname: 'results_area' }
+		]
+	});
+	var $wrapper;
+	var $results;
+	var $placeholder;
+	dialog.set_values({
+		'patient': frm.doc.patient
+	});
+	dialog.fields_dict["patient"].df.onchange = () => {
+		var patient = dialog.fields_dict.patient.input.value;
+		if(patient && patient!=selected_patient){
+			selected_patient = patient;
+			var method = "erpnext.healthcare.utils.get_healthcare_services_to_invoice";
+			var args = {patient: patient, company: frm.doc.company};
+			var columns = (["service", "reference_name", "reference_type"]);
+			get_healthcare_items(frm, true, $results, $placeholder, method, args, columns);
+		}
+		else if(!patient){
+			selected_patient = '';
+			$results.empty();
+			$results.append($placeholder);
+		}
+	}
+	$wrapper = dialog.fields_dict.results_area.$wrapper.append(`<div class="results"
+		style="border: 1px solid #d1d8dd; border-radius: 3px; height: 300px; overflow: auto;"></div>`);
+	$results = $wrapper.find('.results');
+	$placeholder = $(`<div class="multiselect-empty-state">
+				<span class="text-center" style="margin-top: -40px;">
+					<i class="fa fa-2x fa-heartbeat text-extra-muted"></i>
+					<p class="text-extra-muted">No billable Healthcare Services found</p>
+				</span>
+			</div>`);
+	$results.on('click', '.list-item--head :checkbox', (e) => {
+		$results.find('.list-item-container .list-row-check')
+			.prop("checked", ($(e.target).is(':checked')));
+	});
+	set_primary_action(frm, dialog, $results, true);
+	dialog.show();
+};
+
+var get_healthcare_items = function(frm, invoice_healthcare_services, $results, $placeholder, method, args, columns) {
+	var me = this;
+	$results.empty();
+	frappe.call({
+		method: method,
+		args: args,
+		callback: function(data) {
+			if(data.message){
+				$results.append(make_list_row(columns, invoice_healthcare_services));
+				for(let i=0; i<data.message.length; i++){
+					$results.append(make_list_row(columns, invoice_healthcare_services, data.message[i]));
+				}
+			}else {
+				$results.append($placeholder);
+			}
+		}
+	});
+}
+
+var make_list_row= function(columns, invoice_healthcare_services, result={}) {
+	var me = this;
+	// Make a head row by default (if result not passed)
+	let head = Object.keys(result).length === 0;
+	let contents = ``;
+	columns.forEach(function(column) {
+		contents += `<div class="list-item__content ellipsis">
+			${
+				head ? `<span class="ellipsis">${__(frappe.model.unscrub(column))}</span>`
+
+				:(column !== "name" ? `<span class="ellipsis">${__(result[column])}</span>`
+					: `<a class="list-id ellipsis">
+						${__(result[column])}</a>`)
+			}
+		</div>`;
+	})
+
+	let $row = $(`<div class="list-item">
+		<div class="list-item__content" style="flex: 0 0 10px;">
+			<input type="checkbox" class="list-row-check" ${result.checked ? 'checked' : ''}>
+		</div>
+		${contents}
+	</div>`);
+
+	$row = list_row_data_items(head, $row, result, invoice_healthcare_services);
+	return $row;
+};
+
+var set_primary_action= function(frm, dialog, $results, invoice_healthcare_services) {
+	var me = this;
+	dialog.set_primary_action(__('Add'), function() {
+		let checked_values = get_checked_values($results);
+		if(checked_values.length > 0){
+			if(invoice_healthcare_services) {
+				frm.set_value("patient", dialog.fields_dict.patient.input.value);
+			}
+			frm.set_value("items", []);
+			add_to_item_line(frm, checked_values, invoice_healthcare_services);
+			dialog.hide();
+		}
+		else{
+			if(invoice_healthcare_services){
+				frappe.msgprint(__("Please select Healthcare Service"));
+			}
+			else{
+				frappe.msgprint(__("Please select Drug"));
+			}
+		}
+	});
+};
+
+var get_checked_values= function($results) {
+	return $results.find('.list-item-container').map(function() {
+		let checked_values = {};
+		if ($(this).find('.list-row-check:checkbox:checked').length > 0 ) {
+			checked_values['dn'] = $(this).attr('data-dn');
+			checked_values['dt'] = $(this).attr('data-dt');
+			checked_values['item'] = $(this).attr('data-item');
+			if($(this).attr('data-rate') != 'undefined'){
+				checked_values['rate'] = $(this).attr('data-rate');
+			}
+			else{
+				checked_values['rate'] = false;
+			}
+			if($(this).attr('data-income-account') != 'undefined'){
+				checked_values['income_account'] = $(this).attr('data-income-account');
+			}
+			else{
+				checked_values['income_account'] = false;
+			}
+			if($(this).attr('data-qty') != 'undefined'){
+				checked_values['qty'] = $(this).attr('data-qty');
+			}
+			else{
+				checked_values['qty'] = false;
+			}
+			if($(this).attr('data-description') != 'undefined'){
+				checked_values['description'] = $(this).attr('data-description');
+			}
+			else{
+				checked_values['description'] = false;
+			}
+			return checked_values;
+		}
+	}).get();
+};
+
+var get_drugs_to_invoice = function(frm) {
+	var me = this;
+	let selected_encounter = '';
+	var dialog = new frappe.ui.Dialog({
+		title: __("Get Items from Prescriptions"),
+		fields:[
+			{ fieldtype: 'Link', options: 'Patient', label: 'Patient', fieldname: "patient", reqd: true },
+			{ fieldtype: 'Link', options: 'Patient Encounter', label: 'Patient Encounter', fieldname: "encounter", reqd: true,
+				description:'Quantity will be calculated only for items which has "Nos" as UoM. You may change as required for each invoice item.',
+				get_query: function(doc) {
+					return {
+						filters: {
+							patient: dialog.get_value("patient"),
+							company: frm.doc.company,
+							docstatus: 1
+						}
+					};
+				}
+			},
+			{ fieldtype: 'Section Break' },
+			{ fieldtype: 'HTML', fieldname: 'results_area' }
+		]
+	});
+	var $wrapper;
+	var $results;
+	var $placeholder;
+	dialog.set_values({
+		'patient': frm.doc.patient,
+		'encounter': ""
+	});
+	dialog.fields_dict["encounter"].df.onchange = () => {
+		var encounter = dialog.fields_dict.encounter.input.value;
+		if(encounter && encounter!=selected_encounter){
+			selected_encounter = encounter;
+			var method = "erpnext.healthcare.utils.get_drugs_to_invoice";
+			var args = {encounter: encounter};
+			var columns = (["drug_code", "quantity", "description"]);
+			get_healthcare_items(frm, false, $results, $placeholder, method, args, columns);
+		}
+		else if(!encounter){
+			selected_encounter = '';
+			$results.empty();
+			$results.append($placeholder);
+		}
+	}
+	$wrapper = dialog.fields_dict.results_area.$wrapper.append(`<div class="results"
+		style="border: 1px solid #d1d8dd; border-radius: 3px; height: 300px; overflow: auto;"></div>`);
+	$results = $wrapper.find('.results');
+	$placeholder = $(`<div class="multiselect-empty-state">
+				<span class="text-center" style="margin-top: -40px;">
+					<i class="fa fa-2x fa-heartbeat text-extra-muted"></i>
+					<p class="text-extra-muted">No Drug Prescription found</p>
+				</span>
+			</div>`);
+	$results.on('click', '.list-item--head :checkbox', (e) => {
+		$results.find('.list-item-container .list-row-check')
+			.prop("checked", ($(e.target).is(':checked')));
+	});
+	set_primary_action(frm, dialog, $results, false);
+	dialog.show();
+};
+
+var list_row_data_items = function(head, $row, result, invoice_healthcare_services) {
+	if(invoice_healthcare_services){
+		head ? $row.addClass('list-item--head')
+			: $row = $(`<div class="list-item-container"
+				data-dn= "${result.reference_name}" data-dt= "${result.reference_type}" data-item= "${result.service}"
+				data-rate = ${result.rate}
+				data-income-account = "${result.income_account}"
+				data-qty = ${result.qty}
+				data-description = "${result.description}">
+				</div>`).append($row);
+	}
+	else{
+		head ? $row.addClass('list-item--head')
+			: $row = $(`<div class="list-item-container"
+				data-item= "${result.drug_code}"
+				data-qty = ${result.quantity}
+				data-description = "${result.description}">
+				</div>`).append($row);
+	}
+	return $row
+};
+
+var add_to_item_line = function(frm, checked_values, invoice_healthcare_services){
+	if(invoice_healthcare_services){
+		frappe.call({
+			doc: frm.doc,
+			method: "set_healthcare_services",
+			args:{
+				checked_values: checked_values
+			},
+			callback: function() {
+				frm.trigger("validate");
+				frm.refresh_fields();
+			}
+		});
+	}
+	else{
+		for(let i=0; i<checked_values.length; i++){
+			var si_item = frappe.model.add_child(frm.doc, 'Sales Invoice Item', 'items');
+			frappe.model.set_value(si_item.doctype, si_item.name, 'item_code', checked_values[i]['item']);
+			frappe.model.set_value(si_item.doctype, si_item.name, 'qty', 1);
+			if(checked_values[i]['qty'] > 1){
+				frappe.model.set_value(si_item.doctype, si_item.name, 'qty', parseFloat(checked_values[i]['qty']));
+			}
+		}
+		frm.refresh_fields();
+	}
+};

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -40,6 +40,7 @@ from erpnext.assets.doctype.asset.depreciation import (
 	post_depreciation_entries,
 )
 from erpnext.controllers.selling_controller import SellingController
+from erpnext.healthcare.utils import manage_invoice_submit_cancel
 from erpnext.projects.doctype.timesheet.timesheet import get_projectwise_timesheet_data
 from erpnext.setup.doctype.company.company import update_company_current_month_sales
 from erpnext.stock.doctype.batch.batch import set_batch_nos
@@ -259,6 +260,13 @@ class SalesInvoice(SellingController):
 		if self.redeem_loyalty_points and not self.is_consolidated and self.loyalty_points:
 			self.apply_loyalty_points()
 
+		# Healthcare Service Invoice.
+		domain_settings = frappe.get_doc('Domain Settings')
+		active_domains = [d.domain for d in domain_settings.active_domains]
+
+		if "Healthcare" in active_domains:
+			manage_invoice_submit_cancel(self, "on_submit")
+
 		self.process_common_party_accounting()
 
 	def validate_pos_return(self):
@@ -293,6 +301,8 @@ class SalesInvoice(SellingController):
 
 	def before_cancel(self):
 		self.check_if_consolidated_invoice()
+
+		super(SalesInvoice, self).before_cancel()
 		self.update_time_sheet(None)
 
 	def on_cancel(self):
@@ -341,6 +351,12 @@ class SalesInvoice(SellingController):
 
 		unlink_inter_company_doc(self.doctype, self.name, self.inter_company_invoice_reference)
 
+		# Healthcare Service Invoice.
+		domain_settings = frappe.get_doc('Domain Settings')
+		active_domains = [d.domain for d in domain_settings.active_domains]
+
+		if "Healthcare" in active_domains:
+			manage_invoice_submit_cancel(self, "on_cancel")
 		self.unlink_sales_invoice_from_timesheets()
 		self.ignore_linked_doctypes = ('GL Entry', 'Stock Ledger Entry', 'Repost Item Valuation')
 
@@ -887,10 +903,8 @@ class SalesInvoice(SellingController):
 			)
 
 	def make_tax_gl_entries(self, gl_entries):
-		enable_discount_accounting = cint(frappe.db.get_single_value('Accounts Settings', 'enable_discount_accounting'))
-
 		for tax in self.get("taxes"):
-			amount, base_amount = self.get_tax_amounts(tax, enable_discount_accounting)
+			amount, base_amount = self.get_tax_amounts(tax, self.enable_discount_accounting)
 
 			if flt(tax.base_tax_amount_after_discount_amount):
 				account_currency = get_account_currency(tax.account_head)
@@ -921,8 +935,6 @@ class SalesInvoice(SellingController):
 
 	def make_item_gl_entries(self, gl_entries):
 		# income account gl entries
-		enable_discount_accounting = cint(frappe.db.get_single_value('Accounts Settings', 'enable_discount_accounting'))
-
 		for item in self.get("items"):
 			if flt(item.base_net_amount, item.precision("base_net_amount")):
 				if item.is_fixed_asset:
@@ -956,7 +968,7 @@ class SalesInvoice(SellingController):
 						income_account = (item.income_account
 							if (not item.enable_deferred_revenue or self.is_return) else item.deferred_revenue_account)
 
-						amount, base_amount = self.get_amount_and_base_amount(item, enable_discount_accounting)
+						amount, base_amount = self.get_amount_and_base_amount(item, self.enable_discount_accounting)
 
 						account_currency = get_account_currency(income_account)
 						gl_entries.append(
@@ -1420,6 +1432,45 @@ class SalesInvoice(SellingController):
 			if points_to_redeem < 1: # since points_to_redeem is integer
 				break
 
+	# Healthcare
+	@frappe.whitelist()
+	def set_healthcare_services(self, checked_values):
+		self.set("items", [])
+		from erpnext.stock.get_item_details import get_item_details
+		for checked_item in checked_values:
+			item_line = self.append("items", {})
+			price_list, price_list_currency = frappe.db.get_values("Price List", {"selling": 1}, ['name', 'currency'])[0]
+			args = {
+				'doctype': "Sales Invoice",
+				'item_code': checked_item['item'],
+				'company': self.company,
+				'customer': frappe.db.get_value("Patient", self.patient, "customer"),
+				'selling_price_list': price_list,
+				'price_list_currency': price_list_currency,
+				'plc_conversion_rate': 1.0,
+				'conversion_rate': 1.0
+			}
+			item_details = get_item_details(args)
+			item_line.item_code = checked_item['item']
+			item_line.qty = 1
+			if checked_item['qty']:
+				item_line.qty = checked_item['qty']
+			if checked_item['rate']:
+				item_line.rate = checked_item['rate']
+			else:
+				item_line.rate = item_details.price_list_rate
+			item_line.amount = float(item_line.rate) * float(item_line.qty)
+			if checked_item['income_account']:
+				item_line.income_account = checked_item['income_account']
+			if checked_item['dt']:
+				item_line.reference_dt = checked_item['dt']
+			if checked_item['dn']:
+				item_line.reference_dn = checked_item['dn']
+			if checked_item['description']:
+				item_line.description = checked_item['description']
+
+		self.set_missing_values(for_validate = True)
+
 	def set_status(self, update=False, status=None, update_modified=True):
 		if self.is_new():
 			if self.get('amended_from'):

erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

@@ -11,10 +11,8 @@ from frappe.model.naming import make_autoname
 from frappe.utils import add_days, flt, getdate, nowdate
 from six import iteritems
 
-import erpnext
 from erpnext.accounts.doctype.account.test_account import create_account, get_inventory_account
 from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
-from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import WarehouseMissingError
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import (
 	unlink_payment_on_cancel_of_invoice,
 )
@@ -1123,6 +1121,15 @@ class TestSalesInvoice(unittest.TestCase):
 
 	def test_gle_made_when_asset_is_returned(self):
 		create_asset_data()
+
+		pi = frappe.new_doc('Purchase Invoice')
+		pi.supplier = '_Test Supplier'
+		pi.append('items', {
+			'item_code': 'Macbook Pro',
+			'qty': 1
+		})
+		pi.set_missing_values()
+
 		asset = create_asset(item_code="Macbook Pro")
 
 		si = create_sales_invoice(item_code="Macbook Pro", asset=asset.name, qty=1, rate=90000)
@@ -1164,6 +1171,18 @@ class TestSalesInvoice(unittest.TestCase):
 		self.assertEqual(debit_amount, 10.0)
 		self.assertEqual(incoming_rate, 10.0)
 
+	def test_incoming_rate_for_stand_alone_credit_note(self):
+		return_si = create_sales_invoice(is_return=1, update_stock=1, qty=-1, rate=90000, incoming_rate=10,
+			company='_Test Company with perpetual inventory', warehouse='Stores - TCP1', debit_to='Debtors - TCP1',
+			income_account='Sales - TCP1', expense_account='Cost of Goods Sold - TCP1', cost_center='Main - TCP1')
+
+		incoming_rate = frappe.db.get_value('Stock Ledger Entry', {'voucher_no': return_si.name}, 'incoming_rate')
+		debit_amount = frappe.db.get_value('GL Entry',
+			{'voucher_no': return_si.name, 'account': 'Stock In Hand - TCP1'}, 'debit')
+
+		self.assertEqual(debit_amount, 10.0)
+		self.assertEqual(incoming_rate, 10.0)
+
 	def test_discount_on_net_total(self):
 		si = frappe.copy_doc(test_records[2])
 		si.apply_discount_on = "Net Total"
@@ -1938,89 +1957,6 @@ class TestSalesInvoice(unittest.TestCase):
 		self.assertEqual(target_doc.company, "_Test Company 1")
 		self.assertEqual(target_doc.supplier, "_Test Internal Supplier")
 
-	def test_inter_company_transaction_without_default_warehouse(self):
-		"Check mapping (expense account) of inter company SI to PI in absence of default warehouse."
-		# setup
-		old_negative_stock = frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
-		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
-
-		old_perpetual_inventory = erpnext.is_perpetual_inventory_enabled('_Test Company 1')
-		frappe.local.enable_perpetual_inventory['_Test Company 1'] = 1
-
-		frappe.db.set_value("Company", '_Test Company 1', "stock_received_but_not_billed", "Stock Received But Not Billed - _TC1")
-		frappe.db.set_value("Company", '_Test Company 1', "expenses_included_in_valuation", "Expenses Included In Valuation - _TC1")
-
-
-		if not frappe.db.exists("Customer", "_Test Internal Customer"):
-			customer = frappe.get_doc({
-				"customer_group": "_Test Customer Group",
-				"customer_name": "_Test Internal Customer",
-				"customer_type": "Individual",
-				"doctype": "Customer",
-				"territory": "_Test Territory",
-				"is_internal_customer": 1,
-				"represents_company": "_Test Company 1"
-			})
-
-			customer.append("companies", {
-				"company": "Wind Power LLC"
-			})
-
-			customer.insert()
-
-		if not frappe.db.exists("Supplier", "_Test Internal Supplier"):
-			supplier = frappe.get_doc({
-				"supplier_group": "_Test Supplier Group",
-				"supplier_name": "_Test Internal Supplier",
-				"doctype": "Supplier",
-				"is_internal_supplier": 1,
-				"represents_company": "Wind Power LLC"
-			})
-
-			supplier.append("companies", {
-				"company": "_Test Company 1"
-			})
-
-			supplier.insert()
-
-		# begin test
-		si = create_sales_invoice(
-			company = "Wind Power LLC",
-			customer = "_Test Internal Customer",
-			debit_to = "Debtors - WP",
-			warehouse = "Stores - WP",
-			income_account = "Sales - WP",
-			expense_account = "Cost of Goods Sold - WP",
-			cost_center = "Main - WP",
-			currency = "USD",
-			update_stock = 1,
-			do_not_save = 1
-		)
-		si.selling_price_list = "_Test Price List Rest of the World"
-		si.submit()
-
-		target_doc = make_inter_company_transaction("Sales Invoice", si.name)
-
-		# in absence of warehouse Stock Received But Not Billed is set as expense account while mapping
-		# mapping is not obstructed
-		self.assertIsNone(target_doc.items[0].warehouse)
-		self.assertEqual(target_doc.items[0].expense_account, "Stock Received But Not Billed - _TC1")
-
-		target_doc.items[0].update({"cost_center": "Main - _TC1"})
-
-		# missing warehouse is validated on save, after mapping
-		self.assertRaises(WarehouseMissingError, target_doc.save)
-
-		target_doc.items[0].update({"warehouse": "Stores - _TC1"})
-		target_doc.save()
-
-		# after warehouse is set, linked account or default inventory account is set
-		self.assertEqual(target_doc.items[0].expense_account, 'Stock In Hand - _TC1')
-
-		# tear down
-		frappe.local.enable_perpetual_inventory['_Test Company 1'] = old_perpetual_inventory
-		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", old_negative_stock)
-
 	def test_sle_for_target_warehouse(self):
 		se = make_stock_entry(
 			item_code="138-CMS Shoe",
@@ -2158,6 +2094,54 @@ class TestSalesInvoice(unittest.TestCase):
 		self.assertEqual(data['billLists'][0]['actualFromStateCode'],7)
 		self.assertEqual(data['billLists'][0]['fromStateCode'],27)
 
+	def test_einvoice_submission_without_irn(self):
+		# init
+		einvoice_settings = frappe.get_doc('E Invoice Settings')
+		einvoice_settings.enable = 1
+		einvoice_settings.applicable_from = nowdate()
+		einvoice_settings.append('credentials', {
+			'company': '_Test Company',
+			'gstin': '27AAECE4835E1ZR',
+			'username': 'test',
+			'password': 'test'
+		})
+		einvoice_settings.save()
+
+		country = frappe.flags.country
+		frappe.flags.country = 'India'
+
+		si = make_sales_invoice_for_ewaybill()
+		self.assertRaises(frappe.ValidationError, si.submit)
+
+		si.irn = 'test_irn'
+		si.submit()
+
+		# reset
+		einvoice_settings = frappe.get_doc('E Invoice Settings')
+		einvoice_settings.enable = 0
+		frappe.flags.country = country
+
+	def test_einvoice_json(self):
+		from erpnext.regional.india.e_invoice.utils import make_einvoice, validate_totals
+
+		si = get_sales_invoice_for_e_invoice()
+		si.discount_amount = 100
+		si.save()
+
+		einvoice = make_einvoice(si)
+		self.assertTrue(einvoice['EwbDtls'])
+		validate_totals(einvoice)
+
+		si.apply_discount_on = 'Net Total'
+		si.save()
+		einvoice = make_einvoice(si)
+		validate_totals(einvoice)
+
+		[d.set('included_in_print_rate', 1) for d in si.taxes]
+		si.save()
+		einvoice = make_einvoice(si)
+		validate_totals(einvoice)
+
 	def test_item_tax_net_range(self):
 		item = create_item("T Shirt")
 
@@ -2395,11 +2379,11 @@ def get_sales_invoice_for_e_invoice():
 
 	return si
 
+
 def make_test_address_for_ewaybill():
 	if not frappe.db.exists('Address', '_Test Address for Eway bill-Billing'):
 		address = frappe.get_doc({
 			"address_line1": "_Test Address Line 1",
-			"address_line2": "_Test Address Line 2",
 			"address_title": "_Test Address for Eway bill",
 			"address_type": "Billing",
 			"city": "_Test City",
@@ -2421,12 +2405,11 @@ def make_test_address_for_ewaybill():
 
 		address.save()
 
-	if not frappe.db.exists('Address', '_Test Customer-Address for Eway bill-Billing'):
+	if not frappe.db.exists('Address', '_Test Customer-Address for Eway bill-Shipping'):
 		address = frappe.get_doc({
 			"address_line1": "_Test Address Line 1",
-			"address_line2": "_Test Address Line 2",
 			"address_title": "_Test Customer-Address for Eway bill",
-			"address_type": "Billing",
+			"address_type": "Shipping",
 			"city": "_Test City",
 			"state": "Test State",
 			"country": "India",
@@ -2446,34 +2429,9 @@ def make_test_address_for_ewaybill():
 
 		address.save()
 
-	if not frappe.db.exists('Address', '_Test Customer-Address for Eway bill-Shipping'):
-		address = frappe.get_doc({
-			"address_line1": "_Test Address Line 1",
-			"address_line2": "_Test Address Line 2",
-			"address_title": "_Test Customer-Address for Eway bill",
-			"address_type": "Shipping",
-			"city": "_Test City",
-			"state": "Test State",
-			"country": "India",
-			"doctype": "Address",
-			"is_primary_address": 1,
-			"phone": "+910000000000",
-			"gst_state": "Maharashtra",
-			"gst_state_number": "27",
-			"pincode": "410098"
-		}).insert()
-
-		address.append("links", {
-			"link_doctype": "Customer",
-			"link_name": "_Test Customer"
-		})
-
-		address.save()
-
 	if not frappe.db.exists('Address', '_Test Dispatch-Address for Eway bill-Shipping'):
 		address = frappe.get_doc({
 			"address_line1": "_Test Dispatch Address Line 1",
-			"address_line2": "_Test Dispatch Address Line 2",
 			"address_title": "_Test Dispatch-Address for Eway bill",
 			"address_type": "Shipping",
 			"city": "_Test City",
@@ -2488,6 +2446,11 @@ def make_test_address_for_ewaybill():
 			"pincode": "1100101"
 		}).insert()
 
+		address.append("links", {
+			"link_doctype": "Company",
+			"link_name": "_Test Company"
+		})
+
 		address.save()
 
 def make_test_transporter_for_ewaybill():
@@ -2527,8 +2490,7 @@ def make_sales_invoice_for_ewaybill():
 
 	si.distance = 2000
 	si.company_address = "_Test Address for Eway bill-Billing"
-	si.customer_address = "_Test Customer-Address for Eway bill-Billing"
-	si.shipping_address_name = "_Test Customer-Address for Eway bill-Shipping"
+	si.customer_address = "_Test Customer-Address for Eway bill-Shipping"
 	si.dispatch_address_name = "_Test Dispatch-Address for Eway bill-Shipping"
 	si.vehicle_no = "KA12KA1234"
 	si.gst_category = "Registered Regular"
@@ -2597,9 +2559,9 @@ def create_sales_invoice(**args):
 		"price_list_rate": args.price_list_rate if args.get("price_list_rate") is not None else 100,
 		"income_account": args.income_account or "Sales - _TC",
 		"expense_account": args.expense_account or "Cost of Goods Sold - _TC",
+		"asset": args.asset or None,
 		"discount_account": args.discount_account or None,
 		"discount_amount": args.discount_amount or 0,
-		"asset": args.asset or None,
 		"cost_center": args.cost_center or "_Test Cost Center - _TC",
 		"serial_no": args.serial_no,
 		"conversion_factor": 1,

erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

@@ -745,6 +745,7 @@
    "fieldname": "asset",
    "fieldtype": "Link",
    "label": "Asset",
+   "no_copy": 1,
    "options": "Asset"
   },
   {
@@ -841,4 +842,4 @@
  "permissions": [],
  "sort_field": "modified",
  "sort_order": "DESC"
-}
+}

erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js

@@ -4,3 +4,26 @@
 cur_frm.cscript.tax_table = "Sales Taxes and Charges";
 
 {% include "erpnext/public/js/controllers/accounts.js" %}
+
+frappe.tour['Sales Taxes and Charges Template'] = [
+	{
+		fieldname: "title",
+		title: __("Title"),
+		description: __("A name by which you will identify this template. You can change this later."),
+	},
+	{
+		fieldname: "company",
+		title: __("Company"),
+		description: __("Company for which this tax template will be applicable"),
+	},
+	{
+		fieldname: "is_default",
+		title: __("Is this Default?"),
+		description: __("Set this template as the default for all sales transactions"),
+	},
+	{
+		fieldname: "taxes",
+		title: __("Taxes Table"),
+		description: __("You can add a row for a tax rule here. These rules can be applied on the net total, or can be a flat amount."),
+	}
+];

erpnext/accounts/doctype/subscription/subscription.py

@@ -397,25 +397,21 @@ class Subscription(Document):
 			)
 
 		# Discounts
-		if self.is_trialling():
-			invoice.additional_discount_percentage = 100
-		else:
-			if self.additional_discount_percentage:
-				invoice.additional_discount_percentage = self.additional_discount_percentage
+		if self.additional_discount_percentage:
+			invoice.additional_discount_percentage = self.additional_discount_percentage
 
-			if self.additional_discount_amount:
-				invoice.discount_amount = self.additional_discount_amount
+		if self.additional_discount_amount:
+			invoice.discount_amount = self.additional_discount_amount
 
-			if self.additional_discount_percentage or self.additional_discount_amount:
-				discount_on = self.apply_additional_discount
-				invoice.apply_discount_on = discount_on if discount_on else 'Grand Total'
+		if self.additional_discount_percentage or self.additional_discount_amount:
+			discount_on = self.apply_additional_discount
+			invoice.apply_discount_on = discount_on if discount_on else 'Grand Total'
 
 		# Subscription period
 		invoice.from_date = self.current_invoice_start
 		invoice.to_date = self.current_invoice_end
 
 		invoice.flags.ignore_mandatory = True
-
 		invoice.set_missing_values()
 		invoice.save()
 

erpnext/accounts/doctype/tax_rule/tax_rule.py

@@ -102,7 +102,7 @@ class TaxRule(Document):
 	def validate_use_for_shopping_cart(self):
 		'''If shopping cart is enabled and no tax rule exists for shopping cart, enable this one'''
 		if (not self.use_for_shopping_cart
-			and cint(frappe.db.get_single_value('Shopping Cart Settings', 'enabled'))
+			and cint(frappe.db.get_single_value('E Commerce Settings', 'enabled'))
 			and not frappe.db.get_value('Tax Rule', {'use_for_shopping_cart': 1, 'name': ['!=', self.name]})):
 
 			self.use_for_shopping_cart = 1

erpnext/accounts/form_tour/accounts_settings/accounts_settings.json

@@ -1,113 +0,0 @@
-{
- "creation": "2021-06-29 17:00:18.273054",
- "docstatus": 0,
- "doctype": "Form Tour",
- "idx": 0,
- "is_standard": 1,
- "modified": "2021-06-29 17:00:26.145996",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Accounts Settings",
- "owner": "Administrator",
- "reference_doctype": "Accounts Settings",
- "save_on_complete": 0,
- "steps": [
-  {
-   "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.",
-   "field": "",
-   "fieldname": "over_billing_allowance",
-   "fieldtype": "Currency",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Over Billing Allowance (%)",
-   "parent_field": "",
-   "position": "Right",
-   "title": "Over Billing Allowance Percentage"
-  },
-  {
-   "description": "Select the role that is allowed to overbill a transactions.",
-   "field": "",
-   "fieldname": "role_allowed_to_over_bill",
-   "fieldtype": "Link",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Role Allowed to Over Bill ",
-   "parent_field": "",
-   "position": "Right",
-   "title": "Role Allowed to Over Bill"
-  },
-  {
-   "description": "If checked, system will unlink the payment against the respective invoice.",
-   "field": "",
-   "fieldname": "unlink_payment_on_cancellation_of_invoice",
-   "fieldtype": "Check",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Unlink Payment on Cancellation of Invoice",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Unlink Payment on Cancellation of Invoice"
-  },
-  {
-   "description": "Similar to the previous option, this unlinks any advance payments made against Purchase/Sales Orders.",
-   "field": "",
-   "fieldname": "unlink_advance_payment_on_cancelation_of_order",
-   "fieldtype": "Check",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Unlink Advance Payment on Cancellation of Order",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Unlink Advance Payment on Cancellation of Order"
-  },
-  {
-   "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.",
-   "field": "",
-   "fieldname": "determine_address_tax_category_from",
-   "fieldtype": "Select",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Determine Address Tax Category From",
-   "parent_field": "",
-   "position": "Right",
-   "title": "Determine Address Tax Category From"
-  },
-  {
-   "description": "Freeze accounting transactions up to specified date, nobody can make/modify entry except the specified Role.",
-   "field": "",
-   "fieldname": "acc_frozen_upto",
-   "fieldtype": "Date",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Accounts Frozen Till Date",
-   "parent_field": "",
-   "position": "Right",
-   "title": "Accounts Frozen Upto"
-  },
-  {
-   "description": "Users with this Role are allowed to set frozen accounts and create/modify accounting entries against frozen accounts.",
-   "field": "",
-   "fieldname": "frozen_accounts_modifier",
-   "fieldtype": "Link",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Role Allowed to Set Frozen Accounts and Edit Frozen Entries",
-   "parent_field": "",
-   "position": "Right",
-   "title": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries"
-  },
-  {
-   "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.",
-   "field": "",
-   "fieldname": "credit_controller",
-   "fieldtype": "Link",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Credit Controller",
-   "parent_field": "",
-   "position": "Left",
-   "title": "Credit Controller"
-  }
- ],
- "title": "Accounts Settings"
-}

erpnext/accounts/form_tour/purchase_invoice/purchase_invoice.json

@@ -1,96 +0,0 @@
-{
- "creation": "2021-06-29 16:31:48.558826",
- "docstatus": 0,
- "doctype": "Form Tour",
- "idx": 0,
- "is_standard": 1,
- "modified": "2021-06-29 16:31:48.558826",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Purchase Invoice",
- "owner": "Administrator",
- "reference_doctype": "Purchase Invoice",
- "save_on_complete": 1,
- "steps": [
-  {
-   "description": "Select Supplier",
-   "field": "",
-   "fieldname": "supplier",
-   "fieldtype": "Link",
-   "has_next_condition": 1,
-   "is_table_field": 0,
-   "label": "Supplier",
-   "next_step_condition": "supplier",
-   "parent_field": "",
-   "position": "Right",
-   "title": "Select Supplier"
-  },
-  {
-   "description": "Add items in the table",
-   "field": "",
-   "fieldname": "items",
-   "fieldtype": "Table",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Items",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "List of Items"
-  },
-  {
-   "child_doctype": "Purchase Invoice Item",
-   "description": "Select an item",
-   "field": "",
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "has_next_condition": 0,
-   "is_table_field": 1,
-   "label": "Item",
-   "parent_field": "",
-   "parent_fieldname": "items",
-   "position": "Right",
-   "title": "Select Item"
-  },
-  {
-   "child_doctype": "Purchase Invoice Item",
-   "description": "Enter the quantity",
-   "field": "",
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "has_next_condition": 0,
-   "is_table_field": 1,
-   "label": "Accepted Qty",
-   "parent_field": "",
-   "parent_fieldname": "items",
-   "position": "Right",
-   "title": "Enter Quantity"
-  },
-  {
-   "child_doctype": "Purchase Invoice Item",
-   "description": "Enter rate of the item",
-   "field": "",
-   "fieldname": "rate",
-   "fieldtype": "Currency",
-   "has_next_condition": 0,
-   "is_table_field": 1,
-   "label": "Rate",
-   "parent_field": "",
-   "parent_fieldname": "items",
-   "position": "Right",
-   "title": "Enter Rate"
-  },
-  {
-   "description": "You can add taxes here",
-   "field": "",
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Purchase Taxes and Charges",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Select taxes"
-  }
- ],
- "title": "Purchase Invoice"
-}

erpnext/accounts/form_tour/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json

@@ -1,65 +0,0 @@
-{
- "creation": "2021-08-24 12:28:18.044902",
- "docstatus": 0,
- "doctype": "Form Tour",
- "idx": 0,
- "is_standard": 1,
- "modified": "2021-08-24 12:28:18.044902",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Sales Taxes and Charges Template",
- "owner": "Administrator",
- "reference_doctype": "Sales Taxes and Charges Template",
- "save_on_complete": 0,
- "steps": [
-  {
-   "description": "A name by which you will identify this template. You can change this later.",
-   "field": "",
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Title",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Title"
-  },
-  {
-   "description": "Company for which this tax template will be applicable",
-   "field": "",
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Company",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Company"
-  },
-  {
-   "description": "Set this template as the default for all sales transactions",
-   "field": "",
-   "fieldname": "is_default",
-   "fieldtype": "Check",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Default",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Is this Default Tax Template?"
-  },
-  {
-   "description": "You can add a row for a tax rule here. These rules can be applied on the net total, or can be a flat amount.",
-   "field": "",
-   "fieldname": "taxes",
-   "fieldtype": "Table",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Sales Taxes and Charges",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Taxes Table"
-  }
- ],
- "title": "Sales Taxes and Charges Template"
-}

erpnext/accounts/module_onboarding/accounts/accounts.json

@@ -13,15 +13,12 @@
  "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/accounts",
  "idx": 0,
  "is_complete": 0,
- "modified": "2021-08-13 11:59:35.690443",
+ "modified": "2020-10-30 15:41:15.547225",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts",
  "owner": "Administrator",
  "steps": [
-  {
-   "step": "Company"
-  },
   {
    "step": "Chart of Accounts"
   },
@@ -29,19 +26,22 @@
    "step": "Setup Taxes"
   },
   {
-   "step": "Accounts Settings"
+   "step": "Create a Product"
   },
   {
-   "step": "Cost Centers for Report and Budgeting"
+   "step": "Create a Supplier"
   },
   {
    "step": "Create Your First Purchase Invoice"
   },
   {
-   "step": "Updating Opening Balances"
+   "step": "Create a Customer"
   },
   {
-   "step": "Financial Statements"
+   "step": "Create Your First Sales Invoice"
+  },
+  {
+   "step": "Configure Account Settings"
   }
  ],
  "subtitle": "Accounts, Invoices, Taxation, and more.",

erpnext/accounts/onboarding_step/accounts_settings/accounts_settings.json

@@ -1,21 +0,0 @@
-{
- "action": "Show Form Tour",
- "action_label": "Take a quick walk-through of Accounts Settings",
- "creation": "2021-06-29 16:42:03.400731",
- "description": "# Account Settings\n\nIn ERPNext, Accounting features are configurable as per your business needs. Accounts Settings is the place to define some of your accounting preferences like:\n\n - Credit Limit and over billing settings\n - Taxation preferences\n - Deferred accounting preferences\n",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 1,
- "is_skipped": 0,
- "modified": "2021-08-13 11:50:06.227835",
- "modified_by": "Administrator",
- "name": "Accounts Settings",
- "owner": "Administrator",
- "reference_document": "Accounts Settings",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Accounts Settings",
- "validate_action": 1
-}

erpnext/accounts/onboarding_step/chart_of_accounts/chart_of_accounts.json

@@ -1,10 +1,10 @@
 {
- "action": "Watch Video",
- "action_label": "Learn more about Chart of Accounts",
+ "action": "Go to Page",
+ "action_label": "View Chart of Accounts",
  "callback_message": "You can continue with the onboarding after exploring this page",
  "callback_title": "Awesome Work",
  "creation": "2020-05-13 19:58:20.928127",
- "description": "# Chart Of Accounts\n\nERPNext sets up a simple chart of accounts for each Company you create, but you can modify it according to business and legal requirements.",
+ "description": "# Chart Of Accounts\n\nThe Chart of Accounts is the blueprint of the accounts in your organization.\nIt is a tree view of the names of the Accounts (Ledgers and Groups) that a Company requires to manage its books of accounts. ERPNext sets up a simple chart of accounts for each Company you create, but you can modify it according to your needs and legal requirements.\n\nFor each company, Chart of Accounts signifies the way to classify the accounting entries, mostly\nbased on statutory (tax, compliance to government regulations) requirements.\n\nThere's a brief video tutorial about chart of accounts in the next step.",
  "docstatus": 0,
  "doctype": "Onboarding Step",
  "idx": 0,
@@ -12,7 +12,7 @@
  "is_complete": 0,
  "is_single": 0,
  "is_skipped": 0,
- "modified": "2021-08-13 11:46:25.878506",
+ "modified": "2020-10-30 14:35:59.474920",
  "modified_by": "Administrator",
  "name": "Chart of Accounts",
  "owner": "Administrator",
@@ -21,6 +21,5 @@
  "show_form_tour": 0,
  "show_full_form": 0,
  "title": "Review Chart of Accounts",
- "validate_action": 0,
- "video_url": "https://www.youtube.com/embed/AcfMCT7wLLo"
+ "validate_action": 0
 }

erpnext/accounts/onboarding_step/company/company.json

@@ -1,22 +0,0 @@
-{
- "action": "Go to Page",
- "action_label": "Let's Review your Company",
- "creation": "2021-06-29 14:47:42.497318",
- "description": "# Company\n\nIn ERPNext, you can also create multiple companies, and establish relationships (group/subsidiary) among them.\n\nWithin the company master, you can capture various default accounts for that Company and set crucial settings related to the accounting methodology followed for a company. \n",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-13 11:43:35.767341",
- "modified_by": "Administrator",
- "name": "Company",
- "owner": "Administrator",
- "path": "app/company",
- "reference_document": "Company",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Review Company",
- "validate_action": 1
-}

erpnext/accounts/onboarding_step/cost_centers_for_report_and_budgeting/cost_centers_for_report_and_budgeting.json

@@ -1,21 +0,0 @@
-{
- "action": "Go to Page",
- "action_label": "View Cost Center Tree",
- "creation": "2021-07-12 12:02:05.726608",
- "description": "# Cost Centers for Budgeting and Analysis\n\nWhile your Books of Accounts are framed to fulfill statutory requirements, you can set up Cost Center and Accounting Dimensions to address your companies reporting and budgeting requirements.\n\nClick here to learn more about how  <b>[Cost Center](https://docs.erpnext.com/docs/v13/user/manual/en/accounts/cost-center)</b> and <b> [Dimensions](https://docs.erpnext.com/docs/v13/user/manual/en/accounts/accounting-dimensions)</b> allow you to get advanced financial analytics reports from ERPNext.",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-13 11:55:08.510366",
- "modified_by": "Administrator",
- "name": "Cost Centers for Report and Budgeting",
- "owner": "Administrator",
- "path": "cost-center/view/tree",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Cost Centers for Budgeting and Analysis",
- "validate_action": 1
-}

erpnext/accounts/onboarding_step/create_your_first_purchase_invoice/create_your_first_purchase_invoice.json

@@ -1,15 +1,14 @@
 {
- "action": "Show Form Tour",
- "action_label": "Let\u2019s create your first Purchase Invoice",
+ "action": "Create Entry",
  "creation": "2020-05-14 22:10:07.049704",
- "description": "# Create your first Purchase Invoice\n\nA Purchase Invoice is a bill received from a Supplier for a product(s) or service(s) delivery to your company. You can track payables through Purchase Invoice and process Payment Entries against it.\n\nPurchase Invoices can also be created against a Purchase Order or Purchase Receipt.",
+ "description": "# What's a Purchase Invoice?\n\nA Purchase Invoice is a bill you receive from your Suppliers against which you need to make the payment.\nPurchase Invoice is the exact opposite of your Sales Invoice. Here you accrue expenses to your Supplier. \n\nThe following is what a typical purchase cycle looks like, however you can create a purchase invoice directly as well.\n\n![Purchase Flow](https://docs.erpnext.com/docs/assets/img/accounts/pi-flow.png)\n\n",
  "docstatus": 0,
  "doctype": "Onboarding Step",
  "idx": 0,
  "is_complete": 0,
  "is_single": 0,
  "is_skipped": 0,
- "modified": "2021-08-13 11:56:11.677253",
+ "modified": "2020-10-30 15:30:26.337773",
  "modified_by": "Administrator",
  "name": "Create Your First Purchase Invoice",
  "owner": "Administrator",

erpnext/accounts/onboarding_step/financial_statements/financial_statements.json

@@ -1,23 +0,0 @@
-{
- "action": "View Report",
- "creation": "2021-07-12 12:08:47.026115",
- "description": "# Financial Statements\n\nIn ERPNext, you can get crucial financial reports like [Balance Sheet] and [Profit and Loss] statements with a click of a button. You can run in the report for a different period and plot analytics charts premised on statement data. For more reports, check sections like Financial Statements, General Ledger, and Profitability reports.\n\n<b>[Check Accounting reports](https://docs.erpnext.com/docs/v13/user/manual/en/accounts/accounting-reports)</b>",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-13 11:59:18.767407",
- "modified_by": "Administrator",
- "name": "Financial Statements",
- "owner": "Administrator",
- "reference_report": "General Ledger",
- "report_description": "General Ledger",
- "report_reference_doctype": "GL Entry",
- "report_type": "Script Report",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Financial Statements",
- "validate_action": 1
-}

erpnext/accounts/onboarding_step/setup_taxes/setup_taxes.json

@@ -1,21 +1,21 @@
 {
  "action": "Create Entry",
- "action_label": "Manage Sales Tax Templates",
+ "action_label": "Make a Sales Tax Template",
  "creation": "2020-05-13 19:29:43.844463",
- "description": "# Setting up Taxes\n\nERPNext lets you configure your taxes so that they are automatically applied in your buying and selling transactions. You can configure them globally or even on Items. ERPNext taxes are pre-configured for most regions.\n",
+ "description": "# Setting up Taxes\n\nAny sophisticated accounting system, including ERPNext will have automatic tax calculations for your transactions. These calculations are based on user defined rules in compliance to local rules and regulations.\n\nERPNext allows this via *Tax Templates*. These templates can be used in Sales Orders and Sales Invoices. Other types of charges that may apply to your invoices (like shipping, insurance etc.) can also be configured as taxes.\n\nFor Tax Accounts that you want to use in the tax templates, go to:\n\n`> Accounting > Taxes > Sales Taxes and Charges Template`\n\nYou can read more about these templates in our documentation [here](https://docs.erpnext.com/docs/user/manual/en/selling/sales-taxes-and-charges-template)\n",
  "docstatus": 0,
  "doctype": "Onboarding Step",
  "idx": 0,
  "is_complete": 0,
  "is_single": 0,
  "is_skipped": 0,
- "modified": "2021-08-13 11:48:37.238610",
+ "modified": "2020-10-30 14:54:18.087383",
  "modified_by": "Administrator",
  "name": "Setup Taxes",
  "owner": "Administrator",
  "reference_document": "Sales Taxes and Charges Template",
  "show_form_tour": 1,
  "show_full_form": 1,
- "title": "Setting up Taxes",
+ "title": "Lets create a Tax Template for Sales ",
  "validate_action": 0
 }

erpnext/accounts/onboarding_step/updating_opening_balances/updating_opening_balances.json

@@ -1,22 +0,0 @@
-{
- "action": "Watch Video",
- "action_label": "Learn how to update opening balances",
- "creation": "2021-07-12 11:53:50.525030",
- "description": "# Updating Opening Balances\n\nOnce you close the financial statement in previous accounting software, you can update the same as opening in your ERPNext's Balance Sheet accounts. This will allow you to get complete financial statements from ERPNext in the coming years, and discontinue the parallel accounting system right away.",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "intro_video_url": "https://www.youtube.com/embed/U5wPIvEn-0c",
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-13 11:56:45.483418",
- "modified_by": "Administrator",
- "name": "Updating Opening Balances",
- "owner": "Administrator",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Updating Opening Balances",
- "validate_action": 1,
- "video_url": "https://www.youtube.com/embed/U5wPIvEn-0c"
-}

erpnext/accounts/print_format/gst_e_invoice/gst_e_invoice.html

@@ -0,0 +1,162 @@
+{%- from "templates/print_formats/standard_macros.html" import add_header, render_field, print_value -%}
+{%- set einvoice = json.loads(doc.signed_einvoice) -%}
+
+<div class="page-break">
+	<div {% if print_settings.repeat_header_footer %} id="header-html" class="hidden-pdf" {% endif %}>
+		{% if letter_head and not no_letterhead %}
+			<div class="letter-head">{{ letter_head }}</div>
+		{% endif %}
+		<div class="print-heading">
+			<h2>E Invoice<br><small>{{ doc.name }}</small></h2>
+		</div>
+	</div>
+	{% if print_settings.repeat_header_footer %}
+	<div id="footer-html" class="visible-pdf">
+		{% if not no_letterhead and footer %}
+		<div class="letter-head-footer">
+			{{ footer }}
+		</div>
+		{% endif %}
+		<p class="text-center small page-number visible-pdf">
+			{{ _("Page {0} of {1}").format('<span class="page"></span>', '<span class="topage"></span>') }}
+		</p>
+	</div>
+	{% endif %}
+	<h5 class="font-bold" style="margin-top: 0px;">1. Transaction Details</h5>
+	<div class="row section-break" style="border-bottom: 1px solid #d1d8dd; padding-bottom: 10px;">
+		<div class="col-xs-8 column-break">
+			<div class="row data-field">
+				<div class="col-xs-4"><label>IRN</label></div>
+				<div class="col-xs-8 value">{{ einvoice.Irn }}</div>
+			</div>
+			<div class="row data-field">
+				<div class="col-xs-4"><label>Ack. No</label></div>
+				<div class="col-xs-8 value">{{ einvoice.AckNo }}</div>
+			</div>
+			<div class="row data-field">
+				<div class="col-xs-4"><label>Ack. Date</label></div>
+				<div class="col-xs-8 value">{{ frappe.utils.format_datetime(einvoice.AckDt, "dd/MM/yyyy hh:mm:ss") }}</div>
+			</div>
+			<div class="row data-field">
+				<div class="col-xs-4"><label>Category</label></div>
+				<div class="col-xs-8 value">{{ einvoice.TranDtls.SupTyp }}</div>
+			</div>
+			<div class="row data-field">
+				<div class="col-xs-4"><label>Document Type</label></div>
+				<div class="col-xs-8 value">{{ einvoice.DocDtls.Typ }}</div>
+			</div>
+			<div class="row data-field">
+				<div class="col-xs-4"><label>Document No</label></div>
+				<div class="col-xs-8 value">{{ einvoice.DocDtls.No }}</div>
+			</div>
+		</div>
+		<div class="col-xs-4 column-break">
+			<img src="{{ doc.qrcode_image }}" width="175px" style="float: right;">
+		</div>
+	</div>
+	<h5 class="font-bold" style="margin-top: 15px; margin-bottom: 10px;">2. Party Details</h5>
+	<div class="row section-break" style="border-bottom: 1px solid #d1d8dd; padding-bottom: 10px;">
+		{%- set seller = einvoice.SellerDtls -%}
+		<div class="col-xs-6 column-break">
+			<h5 style="margin-bottom: 5px;">Seller</h5>
+			<p>{{ seller.Gstin }}</p>
+			<p>{{ seller.LglNm }}</p>
+			<p>{{ seller.Addr1 }}</p>
+			{%- if seller.Addr2 -%} <p>{{ seller.Addr2 }}</p> {% endif %}
+			<p>{{ seller.Loc }}</p>
+			<p>{{ frappe.db.get_value("Address", doc.company_address, "gst_state") }} - {{ seller.Pin }}</p>
+
+			{%- if einvoice.ShipDtls -%}
+				{%- set shipping = einvoice.ShipDtls -%}
+				<h5 style="margin-bottom: 5px;">Shipping</h5>
+				<p>{{ shipping.Gstin }}</p>
+				<p>{{ shipping.LglNm }}</p>
+				<p>{{ shipping.Addr1 }}</p>
+				{%- if shipping.Addr2 -%} <p>{{ shipping.Addr2 }}</p> {% endif %}
+				<p>{{ shipping.Loc }}</p>
+				<p>{{ frappe.db.get_value("Address", doc.shipping_address_name, "gst_state") }} - {{ shipping.Pin }}</p>
+			{% endif %}
+		</div>
+		{%- set buyer = einvoice.BuyerDtls -%}
+		<div class="col-xs-6 column-break">
+			<h5 style="margin-bottom: 5px;">Buyer</h5>
+			<p>{{ buyer.Gstin }}</p>
+			<p>{{ buyer.LglNm }}</p>
+			<p>{{ buyer.Addr1 }}</p>
+			{%- if buyer.Addr2 -%} <p>{{ buyer.Addr2 }}</p> {% endif %}
+			<p>{{ buyer.Loc }}</p>
+			<p>{{ frappe.db.get_value("Address", doc.customer_address, "gst_state") }} - {{ buyer.Pin }}</p>
+		</div>
+	</div>
+	<div style="overflow-x: auto;">
+		<h5 class="font-bold" style="margin-top: 15px; margin-bottom: 10px;">3. Item Details</h5>
+		<table class="table table-bordered">
+			<thead>
+				<tr>
+					<th class="text-left" style="width: 3%;">Sr. No.</th>
+					<th class="text-left">Item</th>
+					<th class="text-left" style="width: 10%;">HSN Code</th>
+					<th class="text-left" style="width: 5%;">Qty</th>
+					<th class="text-left" style="width: 5%;">UOM</th>
+					<th class="text-left">Rate</th>
+					<th class="text-left" style="width: 5%;">Discount</th>
+					<th class="text-left">Taxable Amount</th>
+					<th class="text-left" style="width: 7%;">Tax Rate</th>
+					<th class="text-left" style="width: 5%;">Other Charges</th>
+					<th class="text-left">Total</th>
+				</tr>
+			</thead>
+			<tbody>
+				{% for item in einvoice.ItemList %}
+					<tr>
+						<td class="text-left" style="width: 3%;">{{ item.SlNo }}</td>
+						<td class="text-left">{{ item.PrdDesc }}</td>
+						<td class="text-left" style="width: 10%;">{{ item.HsnCd }}</td>
+						<td class="text-right" style="width: 5%;">{{ item.Qty }}</td>
+						<td class="text-left" style="width: 5%;">{{ item.Unit }}</td>
+						<td class="text-right">{{ frappe.utils.fmt_money(item.UnitPrice, None, "INR") }}</td>
+						<td class="text-right" style="width: 5%;">{{ frappe.utils.fmt_money(item.Discount, None, "INR") }}</td>
+						<td class="text-right">{{ frappe.utils.fmt_money(item.AssAmt, None, "INR") }}</td>
+						<td class="text-right" style="width: 7%;">{{ item.GstRt + item.CesRt }} %</td>
+						<td class="text-right" style="width: 5%;">{{ frappe.utils.fmt_money(0, None, "INR") }}</td>
+						<td class="text-right">{{ frappe.utils.fmt_money(item.TotItemVal, None, "INR") }}</td>
+					</tr>
+				{% endfor %}
+			</tbody>
+		</table>
+	</div>
+	<div style="overflow-x: auto;">
+		<h5 class="font-bold" style="margin-bottom: 0px;">4. Value Details</h5>
+		<table class="table table-bordered">
+			<thead>
+				<tr>
+					<th class="text-left">Taxable Amount</th>
+					<th class="text-left">CGST</th>
+					<th class="text-left"">SGST</th>
+					<th class="text-left">IGST</th>
+					<th class="text-left">CESS</th>
+					<th class="text-left" style="width: 10%;">State CESS</th>
+					<th class="text-left">Discount</th>
+					<th class="text-left" style="width: 10%;">Other Charges</th>
+					<th class="text-left" style="width: 10%;">Round Off</th>
+					<th class="text-left">Total Value</th>
+				</tr>
+			</thead>
+			<tbody>
+				{%- set value_details = einvoice.ValDtls -%}
+				<tr>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.AssVal, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.CgstVal, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.SgstVal, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.IgstVal, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.CesVal, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(0, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.Discount, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.OthChrg, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.RndOffAmt, None, "INR") }}</td>
+					<td class="text-right">{{ frappe.utils.fmt_money(value_details.TotInvVal, None, "INR") }}</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+</div>

erpnext/accounts/print_format/gst_e_invoice/gst_e_invoice.json

@@ -0,0 +1,24 @@
+{
+ "align_labels_right": 1,
+ "creation": "2020-10-10 18:01:21.032914",
+ "custom_format": 0,
+ "default_print_language": "en-US",
+ "disabled": 1,
+ "doc_type": "Sales Invoice",
+ "docstatus": 0,
+ "doctype": "Print Format",
+ "font": "Default",
+ "html": "",
+ "idx": 0,
+ "line_breaks": 1,
+ "modified": "2020-10-23 19:54:40.634936",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "GST E-Invoice",
+ "owner": "Administrator",
+ "print_format_builder": 0,
+ "print_format_type": "Jinja",
+ "raw_printing": 0,
+ "show_section_headings": 1,
+ "standard": "Yes"
+}

erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py

@@ -115,7 +115,7 @@ def prepare_companywise_opening_balance(asset_data, liability_data, equity_data,
 		# opening_value = Aseet - liability - equity
 		for data in [asset_data, liability_data, equity_data]:
 			account_name = get_root_account_name(data[0].root_type, company)
-			opening_value += (get_opening_balance(account_name, data, company) or 0.0)
+			opening_value += get_opening_balance(account_name, data, company)
 
 		opening_balance[company] = opening_value
 

erpnext/accounts/report/gross_profit/gross_profit.py

@@ -273,6 +273,8 @@ class GrossProfitGenerator(object):
 		new_row.gross_profit = flt(new_row.base_amount - new_row.buying_amount, self.currency_precision)
 		new_row.gross_profit_percent = flt(((new_row.gross_profit / new_row.base_amount) * 100.0), self.currency_precision) \
 			if new_row.base_amount else 0
+		new_row.buying_rate = flt(new_row.buying_amount / flt(new_row.qty), self.float_precision) if flt(new_row.qty) else 0
+		new_row.base_rate = flt(new_row.base_amount / flt(new_row.qty), self.float_precision) if flt(new_row.qty) else 0
 
 	def add_to_totals(self, new_row):
 		for key in self.totals:

erpnext/accounts/report/tax_detail/tax_detail.js

@@ -1,451 +0,0 @@
-// Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-// Contributed by Case Solved and sponsored by Nulight Studios
-/* eslint-disable */
-
-frappe.provide('frappe.query_reports');
-
-frappe.query_reports["Tax Detail"] = {
-	filters: [
-		{
-			fieldname: "company",
-			label: __("Company"),
-			fieldtype: "Link",
-			options: "Company",
-			default: frappe.defaults.get_user_default("company"),
-			reqd: 1
-		},
-		{
-			fieldname: "from_date",
-			label: __("From Date"),
-			fieldtype: "Date",
-			default: frappe.datetime.month_start(frappe.datetime.get_today()),
-			reqd: 1,
-			width: "60px"
-		},
-		{
-			fieldname: "to_date",
-			label: __("To Date"),
-			fieldtype: "Date",
-			default: frappe.datetime.month_end(frappe.datetime.get_today()),
-			reqd: 1,
-			width: "60px"
-		},
-		{
-			fieldname: "report_name",
-			label: __("Report Name"),
-			fieldtype: "Read Only",
-			default: frappe.query_report.report_name,
-			hidden: 1,
-			reqd: 1
-		},
-		{
-			fieldname: "mode",
-			label: __("Mode"),
-			fieldtype: "Read Only",
-			default: "edit",
-			hidden: 1,
-			reqd: 1
-		}
-	],
-	onload: function onload(report) {
-		// Remove Add Column and Save from menu
-		report.page.add_inner_button(__("New Report"), () => new_report(), __("Custom Report"));
-		report.page.add_inner_button(__("Load Report"), () => load_report(), __("Custom Report"));
-		hide_filters(report);
-	}
-};
-
-function hide_filters(report) {
-	report.page.page_form[0].querySelectorAll('.form-group.frappe-control').forEach(function setHidden(field) {
-		if (field.dataset.fieldtype == "Read Only") {
-			field.classList.add("hidden");
-		}
-	});
-}
-
-erpnext.TaxDetail = class TaxDetail {
-	constructor() {
-		this.patch();
-		this.load_report();
-	}
-	// Monkey patch the QueryReport class
-	patch() {
-		this.qr = frappe.query_report;
-		this.super = {
-			refresh_report: this.qr.refresh_report,
-			show_footer_message: this.qr.show_footer_message
-		}
-		this.qr.refresh_report = () => this.refresh_report();
-		this.qr.show_footer_message = () => this.show_footer_message();
-	}
-	show_footer_message() {
-		// The last thing to run after datatable_render in refresh()
-		this.super.show_footer_message.apply(this.qr);
-		if (this.qr.report_name !== 'Tax Detail') {
-			this.show_help();
-			if (this.loading) {
-				this.set_section('');
-			} else {
-				this.reload_component('');
-			}
-		}
-		this.loading = false;
-	}
-	refresh_report() {
-		// Infrequent report build (onload), load filters & data
-		// super function runs a refresh() serially
-		// already run within frappe.run_serially
-		this.loading = true;
-		this.super.refresh_report.apply(this.qr);
-		if (this.qr.report_name !== 'Tax Detail') {
-			frappe.call({
-				method: 'erpnext.accounts.report.tax_detail.tax_detail.get_custom_reports',
-				args: {name: this.qr.report_name}
-			}).then((r) => {
-				const data = JSON.parse(r.message[this.qr.report_name]['json']);
-				this.create_controls();
-				this.sections = data.sections || {};
-				this.controls['show_detail'].set_input(data.show_detail);
-			});
-		}
-	}
-	load_report() {
-		// One-off report build like titles, menu, etc
-		// Run when this object is created which happens in qr.load_report
-		this.qr.menu_items = this.get_menu_items();
-	}
-	get_menu_items() {
-		// Replace Save action
-		let new_items = [];
-		const save = __('Save');
-
-		for (let item of this.qr.menu_items) {
-			if (item.label === save) {
-				new_items.push({
-					label: save,
-					action: () => this.save_report(),
-					standard: false
-				});
-			} else {
-				new_items.push(item);
-			}
-		}
-		return new_items;
-	}
-	save_report() {
-		this.check_datatable();
-		if (this.qr.report_name !== 'Tax Detail') {
-			frappe.call({
-				method:'erpnext.accounts.report.tax_detail.tax_detail.save_custom_report',
-				args: {
-					reference_report: 'Tax Detail',
-					report_name: this.qr.report_name,
-					data: {
-						columns: this.qr.get_visible_columns(),
-						sections: this.sections,
-						show_detail: this.controls['show_detail'].get_input_value()
-					}
-				},
-				freeze: true
-			}).then((r) => {
-				this.set_section('');
-			});
-		}
-	}
-	check_datatable() {
-		if (!this.qr.datatable) {
-			frappe.throw(__('Please change the date range to load data first'));
-		}
-	}
-	set_section(name) {
-		// Sets the given section name and then reloads the data
-		if (name && !this.sections[name]) {
-			this.sections[name] = {};
-		}
-		let options = Object.keys(this.sections);
-		options.unshift('');
-		this.controls['section_name'].$wrapper.find("select").empty().add_options(options);
-		const org_mode = this.qr.get_filter_value('mode');
-		let refresh = false;
-		if (name) {
-			this.controls['section_name'].set_input(name);
-			this.qr.set_filter_value('mode', 'edit');
-			if (org_mode === 'run') {
-				refresh = true;
-			}
-		} else {
-			this.controls['section_name'].set_input('');
-			this.qr.set_filter_value('mode', 'run');
-			if (org_mode === 'edit') {
-				refresh = true;
-			}
-		}
-		if (refresh) {
-			this.qr.refresh();
-		}
-		this.reload_component('');
-	}
-	reload_component(component_name) {
-		const section_name = this.controls['section_name'].get_input_value();
-		if (section_name) {
-			const section = this.sections[section_name];
-			const component_names = Object.keys(section);
-			component_names.unshift('');
-			this.controls['component'].$wrapper.find("select").empty().add_options(component_names);
-			this.controls['component'].set_input(component_name);
-			if (component_name) {
-				this.controls['component_type'].set_input(section[component_name].type);
-			}
-		} else {
-			this.controls['component'].$wrapper.find("select").empty();
-			this.controls['component'].set_input('');
-		}
-		this.set_table_filters();
-	}
-	set_table_filters() {
-		let filters = {};
-		const section_name = this.controls['section_name'].get_input_value();
-		const component_name = this.controls['component'].get_input_value();
-		if (section_name && component_name) {
-			const component_type = this.sections[section_name][component_name].type;
-			if (component_type === 'filter') {
-				filters = this.sections[section_name][component_name]['filters'];
-			}
-		}
-		this.setAppliedFilters(filters);
-	}
-	setAppliedFilters(filters) {
-		if (this.qr.datatable) {
-			Array.from(this.qr.datatable.header.querySelectorAll('.dt-filter')).map(function setFilters(input) {
-				let idx = input.dataset.colIndex;
-				if (filters[idx]) {
-					input.value = filters[idx];
-				} else {
-					input.value = null;
-				}
-			});
-			this.qr.datatable.columnmanager.applyFilter(filters);
-		}
-	}
-	delete(name, type) {
-		if (type === 'section') {
-			delete this.sections[name];
-			const new_section = Object.keys(this.sections)[0] || '';
-			this.set_section(new_section);
-		}
-		if (type === 'component') {
-			const cur_section = this.controls['section_name'].get_input_value();
-			delete this.sections[cur_section][name];
-			this.reload_component('');
-		}
-	}
-	create_controls() {
-		let controls = {};
-		// SELECT in data.js
-		controls['section_name'] = this.qr.page.add_field({
-			label: __('Section'),
-			fieldtype: 'Select',
-			fieldname: 'section_name',
-			change: (e) => {
-				this.set_section(this.controls['section_name'].get_input_value());
-			}
-		});
-		// BUTTON in button.js
-		controls['new_section'] = this.qr.page.add_field({
-			label: __('New Section'),
-			fieldtype: 'Button',
-			fieldname: 'new_section',
-			click: () => {
-				frappe.prompt({
-					label: __('Section Name'),
-					fieldname: 'name',
-					fieldtype: 'Data'
-				}, (values) => {
-					this.set_section(values.name);
-				});
-			}
-		});
-		controls['delete_section'] = this.qr.page.add_field({
-			label: __('Delete Section'),
-			fieldtype: 'Button',
-			fieldname: 'delete_section',
-			click: () => {
-				let cur_section = this.controls['section_name'].get_input_value();
-				if (cur_section) {
-					frappe.confirm(__('Are you sure you want to delete section') + ' ' + cur_section + '?',
-					() => {this.delete(cur_section, 'section')});
-				}
-			}
-		});
-		controls['component'] = this.qr.page.add_field({
-			label: __('Component'),
-			fieldtype: 'Select',
-			fieldname: 'component',
-			change: (e) => {
-				this.reload_component(this.controls['component'].get_input_value());
-			}
-		});
-		controls['component_type'] = this.qr.page.add_field({
-			label: __('Component Type'),
-			fieldtype: 'Select',
-			fieldname: 'component_type',
-			default: 'filter',
-			options: [
-				{label: __('Filtered Row Subtotal'), value: 'filter'},
-				{label: __('Section Subtotal'), value: 'section'}
-			]
-		});
-		controls['add_component'] = this.qr.page.add_field({
-			label: __('Add Component'),
-			fieldtype: 'Button',
-			fieldname: 'add_component',
-			click: () => {
-				this.check_datatable();
-				let section_name = this.controls['section_name'].get_input_value();
-				if (section_name) {
-					const component_type = this.controls['component_type'].get_input_value();
-					let idx = 0;
-					const names = Object.keys(this.sections[section_name]);
-					if (names.length > 0) {
-						const idxs = names.map((key) => parseInt(key.match(/\d+$/)) || 0);
-						idx = Math.max(...idxs) + 1;
-					}
-					const filters = this.qr.datatable.columnmanager.getAppliedFilters();
-					if (component_type === 'filter') {
-						const name = 'Filter' + idx.toString();
-						let data = {
-							type: component_type,
-							filters: filters
-						}
-						this.sections[section_name][name] = data;
-						this.reload_component(name);
-					} else if (component_type === 'section') {
-						if (filters && Object.keys(filters).length !== 0) {
-							frappe.show_alert({
-								message: __('Column filters ignored'),
-								indicator: 'yellow'
-							});
-						}
-						let data = {
-							type: component_type
-						}
-						frappe.prompt({
-							label: __('Section'),
-							fieldname: 'section',
-							fieldtype: 'Select',
-							options: Object.keys(this.sections)
-						}, (values) => {
-							this.sections[section_name][values.section] = data;
-							this.reload_component(values.section);
-						});
-					} else {
-						frappe.throw(__('Please select the Component Type first'));
-					}
-				} else {
-					frappe.throw(__('Please select the Section first'));
-				}
-			}
-		});
-		controls['delete_component'] = this.qr.page.add_field({
-			label: __('Delete Component'),
-			fieldtype: 'Button',
-			fieldname: 'delete_component',
-			click: () => {
-				const component = this.controls['component'].get_input_value();
-				if (component) {
-					frappe.confirm(__('Are you sure you want to delete component') + ' ' + component + '?',
-					() => {this.delete(component, 'component')});
-				}
-			}
-		});
-		controls['save'] = this.qr.page.add_field({
-			label: __('Save & Run'),
-			fieldtype: 'Button',
-			fieldname: 'save',
-			click: () => {
-				this.save_report();
-			}
-		});
-		controls['show_detail'] = this.qr.page.add_field({
-			label: __('Show Detail'),
-			fieldtype: 'Check',
-			fieldname: 'show_detail',
-			default: 1
-		});
-		this.controls = controls;
-	}
-	show_help() {
-		const help = __('Your custom report is built from General Ledger Entries within the date range. You can add multiple sections to the report using the New Section button. Each component added to a section adds a subset of the data into the specified section. Beware of duplicated data rows. The Filtered Row component type saves the datatable column filters to specify the added data. The Section component type refers to the data in a previously defined section, but it cannot refer to its parent section. The Amount column is summed to give the section subtotal. Use the Show Detail box to see the data rows included in each section in the final report. Once finished, hit Save & Run. Report contributed by');
-		this.qr.$report_footer.append('<div class="col-md-12"><strong>' + __('Help') + `: </strong>${help}<a href="https://www.casesolved.co.uk"> Case Solved</a></div>`);
-	}
-}
-
-if (!window.taxdetail) {
-	window.taxdetail = new erpnext.TaxDetail();
-}
-
-function get_reports(cb) {
-	frappe.call({
-		method: 'erpnext.accounts.report.tax_detail.tax_detail.get_custom_reports',
-		freeze: true
-	}).then((r) => {
-		cb(r.message);
-	})
-}
-
-function new_report() {
-	const dialog = new frappe.ui.Dialog({
-		title: __('New Report'),
-		fields: [
-			{
-				fieldname: 'report_name',
-				label: __('Report Name'),
-				fieldtype: 'Data',
-				default: 'VAT Return'
-			}
-		],
-		primary_action_label: __('Create'),
-		primary_action: function new_report_pa(values) {
-			frappe.call({
-				method:'erpnext.accounts.report.tax_detail.tax_detail.save_custom_report',
-				args: {
-					reference_report: 'Tax Detail',
-					report_name: values.report_name,
-					data: {
-						columns: [],
-						sections: {},
-						show_detail: 1
-					}
-				},
-				freeze: true
-			}).then((r) => {
-				frappe.set_route('query-report', values.report_name);
-			});
-			dialog.hide();
-		}
-	});
-	dialog.show();
-}
-
-function load_report() {
-	get_reports(function load_report_cb(reports) {
-		const dialog = new frappe.ui.Dialog({
-			title: __('Load Report'),
-			fields: [
-				{
-					fieldname: 'report_name',
-					label: __('Report Name'),
-					fieldtype: 'Select',
-					options: Object.keys(reports)
-				}
-			],
-			primary_action_label: __('Load'),
-			primary_action: function load_report_pa(values) {
-				dialog.hide();
-				frappe.set_route('query-report', values.report_name);
-			}
-		});
-		dialog.show();
-	});
-}

erpnext/accounts/report/tax_detail/tax_detail.json

@@ -1,32 +0,0 @@
-{
- "add_total_row": 0,
- "columns": [],
- "creation": "2021-02-19 16:44:21.175113",
- "disable_prepared_report": 0,
- "disabled": 0,
- "docstatus": 0,
- "doctype": "Report",
- "filters": [],
- "idx": 0,
- "is_standard": "Yes",
- "modified": "2021-02-19 16:44:21.175113",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Tax Detail",
- "owner": "Administrator",
- "prepared_report": 0,
- "ref_doctype": "GL Entry",
- "report_name": "Tax Detail",
- "report_type": "Script Report",
- "roles": [
-  {
-   "role": "Accounts User"
-  },
-  {
-   "role": "Accounts Manager"
-  },
-  {
-   "role": "Auditor"
-  }
- ]
-}

erpnext/accounts/report/tax_detail/tax_detail.py

@@ -1,298 +0,0 @@
-# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-# Contributed by Case Solved and sponsored by Nulight Studios
-
-from __future__ import unicode_literals
-
-import json
-
-import frappe
-from frappe import _
-
-# NOTE: Payroll is implemented using Journal Entries which are included as GL Entries
-
-# field lists in multiple doctypes will be coalesced
-required_sql_fields = {
-	("GL Entry", 1): ["posting_date"],
-	("Account",): ["root_type", "account_type"],
-	("GL Entry", 2): ["account", "voucher_type", "voucher_no", "debit", "credit"],
-	("Purchase Invoice Item", "Sales Invoice Item"): ["base_net_amount", "item_tax_rate", "item_tax_template", "item_group", "item_name"],
-	("Purchase Invoice", "Sales Invoice"): ["taxes_and_charges", "tax_category"],
-}
-
-
-def execute(filters=None):
-	if not filters:
-		return [], []
-
-	fieldlist = required_sql_fields
-	fieldstr = get_fieldstr(fieldlist)
-
-	gl_entries = frappe.db.sql("""
-		select {fieldstr}
-		from `tabGL Entry` ge
-		inner join `tabAccount` a on
-			ge.account=a.name and ge.company=a.company
-		left join `tabSales Invoice` si on
-			ge.company=si.company and ge.voucher_type='Sales Invoice' and ge.voucher_no=si.name
-		left join `tabSales Invoice Item` sii on
-			a.root_type='Income' and si.name=sii.parent
-		left join `tabPurchase Invoice` pi on
-			ge.company=pi.company and ge.voucher_type='Purchase Invoice' and ge.voucher_no=pi.name
-		left join `tabPurchase Invoice Item` pii on
-			a.root_type='Expense' and pi.name=pii.parent
-		where
-			ge.company=%(company)s and
-			ge.posting_date>=%(from_date)s and
-			ge.posting_date<=%(to_date)s
-		order by ge.posting_date, ge.voucher_no
-		""".format(fieldstr=fieldstr), filters, as_dict=1)
-
-	report_data = modify_report_data(gl_entries)
-	summary = None
-	if filters['mode'] == 'run' and filters['report_name'] != 'Tax Detail':
-		report_data, summary = run_report(filters['report_name'], report_data)
-
-	# return columns, data, message, chart, report_summary
-	return get_columns(fieldlist), report_data, None, None, summary
-
-def run_report(report_name, data):
-	"Applies the sections and filters saved in the custom report"
-	report_config = json.loads(frappe.get_doc('Report', report_name).json)
-	# Columns indexed from 1 wrt colno
-	columns = report_config.get('columns')
-	sections = report_config.get('sections', {})
-	show_detail = report_config.get('show_detail', 1)
-	report = {}
-	new_data = []
-	summary = []
-	for section_name, section in sections.items():
-		report[section_name] = {'rows': [], 'subtotal': 0.0}
-		for component_name, component in section.items():
-			if component['type'] == 'filter':
-				for row in data:
-					matched = True
-					for colno, filter_string in component['filters'].items():
-						filter_field = columns[int(colno) - 1]['fieldname']
-						if not filter_match(row[filter_field], filter_string):
-							matched = False
-							break
-					if matched:
-						report[section_name]['rows'] += [row]
-						report[section_name]['subtotal'] += row['amount']
-			if component['type'] == 'section':
-				if component_name == section_name:
-					frappe.throw(_("A report component cannot refer to its parent section") + ": " + section_name)
-				try:
-					report[section_name]['rows'] += report[component_name]['rows']
-					report[section_name]['subtotal'] += report[component_name]['subtotal']
-				except KeyError:
-					frappe.throw(_("A report component can only refer to an earlier section") + ": " + section_name)
-
-		if show_detail:
-			new_data += report[section_name]['rows']
-		new_data += [{'voucher_no': section_name, 'amount': report[section_name]['subtotal']}]
-		summary += [{'label': section_name, 'datatype': 'Currency', 'value': report[section_name]['subtotal']}]
-		if show_detail:
-			new_data += [{}]
-	return new_data or data, summary or None
-
-def filter_match(value, string):
-	"Approximation to datatable filters"
-	import datetime
-	if string == '':
-		return True
-	if value is None:
-		value = -999999999999999
-	elif isinstance(value, datetime.date):
-		return True
-
-	if isinstance(value, str):
-		value = value.lower()
-		string = string.lower()
-		if string[0] == '<':
-			return True if string[1:].strip() else False
-		elif string[0] == '>':
-			return False if string[1:].strip() else True
-		elif string[0] == '=':
-			return string[1:] in value if string[1:] else False
-		elif string[0:2] == '!=':
-			return string[2:] not in value
-		elif len(string.split(':')) == 2:
-			pre, post = string.split(':')
-			return (True if not pre.strip() and post.strip() in value else False)
-		else:
-			return string in value
-	else:
-		if string[0] in ['<', '>', '=']:
-			operator = string[0]
-			if operator == '=':
-				operator = '=='
-			string = string[1:].strip()
-		elif string[0:2] == '!=':
-			operator = '!='
-			string = string[2:].strip()
-		elif len(string.split(':')) == 2:
-			pre, post = string.split(':')
-			try:
-				return (True if float(pre) <= value and float(post) >= value else False)
-			except ValueError:
-				return (False if pre.strip() else True)
-		else:
-			return string in str(value)
-
-	try:
-		num = float(string) if string.strip() else 0
-		return frappe.safe_eval(f'{value} {operator} {num}')
-	except ValueError:
-		if operator == '<':
-			return True
-		return False
-
-
-def abbrev(dt):
-	return ''.join(l[0].lower() for l in dt.split(' ')) + '.'
-
-def doclist(dt, dfs):
-	return [abbrev(dt) + f for f in dfs]
-
-def as_split(fields):
-	for field in fields:
-		split = field.split(' as ')
-		yield (split[0], split[1] if len(split) > 1 else split[0])
-
-def coalesce(doctypes, fields):
-	coalesce = []
-	for name, new_name in as_split(fields):
-		sharedfields = ', '.join(abbrev(dt) + name for dt in doctypes)
-		coalesce += [f'coalesce({sharedfields}) as {new_name}']
-	return coalesce
-
-def get_fieldstr(fieldlist):
-	fields = []
-	for doctypes, docfields in fieldlist.items():
-		if len(doctypes) == 1 or isinstance(doctypes[1], int):
-			fields += doclist(doctypes[0], docfields)
-		else:
-			fields += coalesce(doctypes, docfields)
-	return ', '.join(fields)
-
-def get_columns(fieldlist):
-	columns = {}
-	for doctypes, docfields in fieldlist.items():
-		fieldmap = {name: new_name for name, new_name in as_split(docfields)}
-		for doctype in doctypes:
-			if isinstance(doctype, int):
-				break
-			meta = frappe.get_meta(doctype)
-			# get column field metadata from the db
-			fieldmeta = {}
-			for field in meta.get('fields'):
-				if field.fieldname in fieldmap.keys():
-					new_name = fieldmap[field.fieldname]
-					fieldmeta[new_name] = {
-						"label": _(field.label),
-						"fieldname": new_name,
-						"fieldtype": field.fieldtype,
-						"options": field.options
-					}
-			# edit the columns to match the modified data
-			for field in fieldmap.values():
-				col = modify_report_columns(doctype, field, fieldmeta[field])
-				if col:
-					columns[col["fieldname"]] = col
-	# use of a dict ensures duplicate columns are removed
-	return list(columns.values())
-
-def modify_report_columns(doctype, field, column):
-	"Because data is rearranged into other columns"
-	if doctype in ["Sales Invoice Item", "Purchase Invoice Item"]:
-		if field in ["item_tax_rate", "base_net_amount"]:
-			return None
-
-	if doctype == "GL Entry" and field in ["debit", "credit"]:
-		column.update({"label": _("Amount"), "fieldname": "amount"})
-
-	if field == "taxes_and_charges":
-		column.update({"label": _("Taxes and Charges Template")})
-	return column
-
-def modify_report_data(data):
-	import json
-	new_data = []
-	for line in data:
-		if line.debit:
-			line.amount = -line.debit
-		else:
-			line.amount = line.credit
-		# Remove Invoice GL Tax Entries and generate Tax entries from the invoice lines
-		if "Invoice" in line.voucher_type:
-			if line.account_type not in ("Tax", "Round Off"):
-				new_data += [line]
-				if line.item_tax_rate:
-					tax_rates = json.loads(line.item_tax_rate)
-					for account, rate in tax_rates.items():
-						tax_line = line.copy()
-						tax_line.account_type = "Tax"
-						tax_line.account = account
-						if line.voucher_type == "Sales Invoice":
-							line.amount = line.base_net_amount
-							tax_line.amount = line.base_net_amount * (rate / 100)
-						if line.voucher_type == "Purchase Invoice":
-							line.amount = -line.base_net_amount
-							tax_line.amount = -line.base_net_amount * (rate / 100)
-						new_data += [tax_line]
-		else:
-			new_data += [line]
-	return new_data
-
-
-# JS client utilities
-
-custom_report_dict = {
-	'ref_doctype': 'GL Entry',
-	'report_type': 'Custom Report',
-	'reference_report': 'Tax Detail'
-}
-
-@frappe.whitelist()
-def get_custom_reports(name=None):
-	filters = custom_report_dict.copy()
-	if name:
-		filters['name'] = name
-	reports = frappe.get_list('Report',
-		filters = filters,
-		fields = ['name', 'json'],
-		as_list=False
-	)
-	reports_dict = {rep.pop('name'): rep for rep in reports}
-	# Prevent custom reports with the same name
-	reports_dict['Tax Detail'] = {'json': None}
-	return reports_dict
-
-@frappe.whitelist()
-def save_custom_report(reference_report, report_name, data):
-	if reference_report != 'Tax Detail':
-		frappe.throw(_("The wrong report is referenced."))
-	if report_name == 'Tax Detail':
-		frappe.throw(_("The parent report cannot be overwritten."))
-
-	doc = {
-		'doctype': 'Report',
-		'report_name': report_name,
-		'is_standard': 'No',
-		'module': 'Accounts',
-		'json': data
-	}
-	doc.update(custom_report_dict)
-
-	try:
-		newdoc = frappe.get_doc(doc)
-		newdoc.insert()
-		frappe.msgprint(_("Report created successfully"))
-	except frappe.exceptions.DuplicateEntryError:
-		dbdoc = frappe.get_doc('Report', report_name)
-		dbdoc.update(doc)
-		dbdoc.save()
-		frappe.msgprint(_("Report updated successfully"))
-	return report_name

erpnext/accounts/report/tax_detail/test_tax_detail.json

@@ -1,840 +0,0 @@
-[
- {
-  "account_manager": null,
-  "accounts": [],
-  "companies": [],
-  "credit_limits": [],
-  "customer_details": null,
-  "customer_group": "All Customer Groups",
-  "customer_name": "_Test Customer",
-  "customer_pos_id": null,
-  "customer_primary_address": null,
-  "customer_primary_contact": null,
-  "customer_type": "Company",
-  "default_bank_account": null,
-  "default_commission_rate": 0.0,
-  "default_currency": null,
-  "default_price_list": null,
-  "default_sales_partner": null,
-  "disabled": 0,
-  "dn_required": 0,
-  "docstatus": 0,
-  "doctype": "Customer",
-  "email_id": null,
-  "gender": null,
-  "image": null,
-  "industry": null,
-  "is_frozen": 0,
-  "is_internal_customer": 0,
-  "language": "en",
-  "lead_name": null,
-  "loyalty_program": null,
-  "loyalty_program_tier": null,
-  "market_segment": null,
-  "mobile_no": null,
-  "modified": "2021-02-15 05:18:03.624724",
-  "name": "_Test Customer",
-  "naming_series": "CUST-.YYYY.-",
-  "pan": null,
-  "parent": null,
-  "parentfield": null,
-  "parenttype": null,
-  "payment_terms": null,
-  "primary_address": null,
-  "represents_company": "",
-  "sales_team": [],
-  "salutation": null,
-  "so_required": 0,
-  "tax_category": null,
-  "tax_id": null,
-  "tax_withholding_category": null,
-  "territory": "All Territories",
-  "website": null
- },{
-  "accounts": [],
-  "allow_purchase_invoice_creation_without_purchase_order": 0,
-  "allow_purchase_invoice_creation_without_purchase_receipt": 0,
-  "companies": [],
-  "country": "United Kingdom",
-  "default_bank_account": null,
-  "default_currency": null,
-  "default_price_list": null,
-  "disabled": 0,
-  "docstatus": 0,
-  "doctype": "Supplier",
-  "hold_type": "",
-  "image": null,
-  "is_frozen": 0,
-  "is_internal_supplier": 0,
-  "is_transporter": 0,
-  "language": "en",
-  "modified": "2021-03-31 16:47:10.109316",
-  "name": "_Test Supplier",
-  "naming_series": "SUP-.YYYY.-",
-  "on_hold": 0,
-  "pan": null,
-  "parent": null,
-  "parentfield": null,
-  "parenttype": null,
-  "payment_terms": null,
-  "prevent_pos": 0,
-  "prevent_rfqs": 0,
-  "release_date": null,
-  "represents_company": null,
-  "supplier_details": null,
-  "supplier_group": "Raw Material",
-  "supplier_name": "_Test Supplier",
-  "supplier_type": "Company",
-  "tax_category": null,
-  "tax_id": null,
-  "tax_withholding_category": null,
-  "warn_pos": 0,
-  "warn_rfqs": 0,
-  "website": null
- },{
-  "account_currency": "GBP",
-  "account_name": "Debtors",
-  "account_number": "",
-  "account_type": "Receivable",
-  "balance_must_be": "",
-  "company": "_T",
-  "disabled": 0,
-  "docstatus": 0,
-  "doctype": "Account",
-  "freeze_account": "No",
-  "include_in_gross": 0,
-  "inter_company_account": 0,
-  "is_group": 0,
-  "lft": 58,
-  "modified": "2021-03-26 04:44:19.955468",
-  "name": "Debtors - _T",
-  "old_parent": null,
-  "parent": null,
-  "parent_account": "Application of Funds (Assets) - _T",
-  "parentfield": null,
-  "parenttype": null,
-  "report_type": "Balance Sheet",
-  "rgt": 59,
-  "root_type": "Asset",
-  "tax_rate": 0.0
- },{
-  "account_currency": "GBP",
-  "account_name": "Sales",
-  "account_number": "",
-  "account_type": "Income Account",
-  "balance_must_be": "",
-  "company": "_T",
-  "disabled": 0,
-  "docstatus": 0,
-  "doctype": "Account",
-  "freeze_account": "No",
-  "include_in_gross": 0,
-  "inter_company_account": 0,
-  "is_group": 0,
-  "lft": 291,
-  "modified": "2021-03-26 04:50:21.697703",
-  "name": "Sales - _T",
-  "old_parent": null,
-  "parent": null,
-  "parent_account": "Income - _T",
-  "parentfield": null,
-  "parenttype": null,
-  "report_type": "Profit and Loss",
-  "rgt": 292,
-  "root_type": "Income",
-  "tax_rate": 0.0
- },{
-  "account_currency": "GBP",
-  "account_name": "VAT on Sales",
-  "account_number": "",
-  "account_type": "Tax",
-  "balance_must_be": "",
-  "company": "_T",
-  "disabled": 0,
-  "docstatus": 0,
-  "doctype": "Account",
-  "freeze_account": "No",
-  "include_in_gross": 0,
-  "inter_company_account": 0,
-  "is_group": 0,
-  "lft": 317,
-  "modified": "2021-03-26 04:50:21.697703",
-  "name": "VAT on Sales - _T",
-  "old_parent": null,
-  "parent": null,
-  "parent_account": "Source of Funds (Liabilities) - _T",
-  "parentfield": null,
-  "parenttype": null,
-  "report_type": "Balance Sheet",
-  "rgt": 318,
-  "root_type": "Liability",
-  "tax_rate": 0.0
- },{
-  "account_currency": "GBP",
-  "account_name": "Cost of Goods Sold",
-  "account_number": "",
-  "account_type": "Cost of Goods Sold",
-  "balance_must_be": "",
-  "company": "_T",
-  "disabled": 0,
-  "docstatus": 0,
-  "doctype": "Account",
-  "freeze_account": "No",
-  "include_in_gross": 0,
-  "inter_company_account": 0,
-  "is_group": 0,
-  "lft": 171,
-  "modified": "2021-03-26 04:44:19.994857",
-  "name": "Cost of Goods Sold - _T",
-  "old_parent": null,
-  "parent": null,
-  "parent_account": "Expenses - _T",
-  "parentfield": null,
-  "parenttype": null,
-  "report_type": "Profit and Loss",
-  "rgt": 172,
-  "root_type": "Expense",
-  "tax_rate": 0.0
- },{
-  "account_currency": "GBP",
-  "account_name": "VAT on Purchases",
-  "account_number": "",
-  "account_type": "Tax",
-  "balance_must_be": "",
-  "company": "_T",
-  "disabled": 0,
-  "docstatus": 0,
-  "doctype": "Account",
-  "freeze_account": "No",
-  "include_in_gross": 0,
-  "inter_company_account": 0,
-  "is_group": 0,
-  "lft": 80,
-  "modified": "2021-03-26 04:44:19.961983",
-  "name": "VAT on Purchases - _T",
-  "old_parent": null,
-  "parent": null,
-  "parent_account": "Application of Funds (Assets) - _T",
-  "parentfield": null,
-  "parenttype": null,
-  "report_type": "Balance Sheet",
-  "rgt": 81,
-  "root_type": "Asset",
-  "tax_rate": 0.0
- },{
-  "account_currency": "GBP",
-  "account_name": "Creditors",
-  "account_number": "",
-  "account_type": "Payable",
-  "balance_must_be": "",
-  "company": "_T",
-  "disabled": 0,
-  "docstatus": 0,
-  "doctype": "Account",
-  "freeze_account": "No",
-  "include_in_gross": 0,
-  "inter_company_account": 0,
-  "is_group": 0,
-  "lft": 302,
-  "modified": "2021-03-26 04:50:21.697703",
-  "name": "Creditors - _T",
-  "old_parent": null,
-  "parent": null,
-  "parent_account": "Source of Funds (Liabilities) - _T",
-  "parentfield": null,
-  "parenttype": null,
-  "report_type": "Balance Sheet",
-  "rgt": 303,
-  "root_type": "Liability",
-  "tax_rate": 0.0
- },{
-  "additional_discount_percentage": 0.0,
-  "address_display": null,
-  "adjust_advance_taxes": 0,
-  "advances": [],
-  "against_expense_account": "Cost of Goods Sold - _T",
-  "allocate_advances_automatically": 0,
-  "amended_from": null,
-  "apply_discount_on": "Grand Total",
-  "apply_tds": 0,
-  "auto_repeat": null,
-  "base_discount_amount": 0.0,
-  "base_grand_total": 511.68,
-  "base_in_words": "GBP Five Hundred And Eleven and Sixty Eight Pence only.",
-  "base_net_total": 426.4,
-  "base_paid_amount": 0.0,
-  "base_rounded_total": 511.68,
-  "base_rounding_adjustment": 0.0,
-  "base_taxes_and_charges_added": 85.28,
-  "base_taxes_and_charges_deducted": 0.0,
-  "base_total": 426.4,
-  "base_total_taxes_and_charges": 85.28,
-  "base_write_off_amount": 0.0,
-  "bill_date": null,
-  "bill_no": null,
-  "billing_address": null,
-  "billing_address_display": null,
-  "buying_price_list": "Standard Buying",
-  "cash_bank_account": null,
-  "clearance_date": null,
-  "company": "_T",
-  "contact_display": null,
-  "contact_email": null,
-  "contact_mobile": null,
-  "contact_person": null,
-  "conversion_rate": 1.0,
-  "cost_center": null,
-  "credit_to": "Creditors - _T",
-  "currency": "GBP",
-  "disable_rounded_total": 0,
-  "discount_amount": 0.0,
-  "docstatus": 0,
-  "doctype": "Purchase Invoice",
-  "due_date": null,
-  "from_date": null,
-  "grand_total": 511.68,
-  "group_same_items": 0,
-  "hold_comment": null,
-  "ignore_pricing_rule": 0,
-  "in_words": "GBP Five Hundred And Eleven and Sixty Eight Pence only.",
-  "inter_company_invoice_reference": null,
-  "is_internal_supplier": 0,
-  "is_opening": "No",
-  "is_paid": 0,
-  "is_return": 0,
-  "is_subcontracted": "No",
-  "items": [
-   {
-    "allow_zero_valuation_rate": 0,
-    "amount": 426.4,
-    "asset_category": null,
-    "asset_location": null,
-    "base_amount": 426.4,
-    "base_net_amount": 426.4,
-    "base_net_rate": 5.33,
-    "base_price_list_rate": 5.33,
-    "base_rate": 5.33,
-    "base_rate_with_margin": 0.0,
-    "batch_no": null,
-    "bom": null,
-    "brand": null,
-    "conversion_factor": 0.0,
-    "cost_center": "Main - _T",
-    "deferred_expense_account": null,
-    "description": "<div class=\"ql-editor read-mode\"><p>Fluid to make widgets</p></div>",
-    "discount_amount": 0.0,
-    "discount_percentage": 0.0,
-    "enable_deferred_expense": 0,
-    "expense_account": "Cost of Goods Sold - _T",
-    "from_warehouse": null,
-    "image": null,
-    "include_exploded_items": 0,
-    "is_fixed_asset": 0,
-    "is_free_item": 0,
-    "item_code": null,
-    "item_group": null,
-    "item_name": "Widget Fluid 1Litre",
-    "item_tax_amount": 0.0,
-    "item_tax_rate": "{\"VAT on Purchases - _T\": 20.0}",
-    "item_tax_template": null,
-    "landed_cost_voucher_amount": 0.0,
-    "manufacturer": null,
-    "manufacturer_part_no": null,
-    "margin_rate_or_amount": 0.0,
-    "margin_type": "",
-    "net_amount": 426.4,
-    "net_rate": 5.33,
-    "page_break": 0,
-    "parent": null,
-    "parentfield": "items",
-    "parenttype": "Purchase Invoice",
-    "po_detail": null,
-    "pr_detail": null,
-    "price_list_rate": 5.33,
-    "pricing_rules": null,
-    "project": null,
-    "purchase_invoice_item": null,
-    "purchase_order": null,
-    "purchase_receipt": null,
-    "qty": 80.0,
-    "quality_inspection": null,
-    "rate": 5.33,
-    "rate_with_margin": 0.0,
-    "received_qty": 0.0,
-    "rejected_qty": 0.0,
-    "rejected_serial_no": null,
-    "rejected_warehouse": null,
-    "rm_supp_cost": 0.0,
-    "sales_invoice_item": null,
-    "serial_no": null,
-    "service_end_date": null,
-    "service_start_date": null,
-    "service_stop_date": null,
-    "stock_qty": 0.0,
-    "stock_uom": "Nos",
-    "stock_uom_rate": 0.0,
-    "total_weight": 0.0,
-    "uom": "Nos",
-    "valuation_rate": 0.0,
-    "warehouse": null,
-    "weight_per_unit": 0.0,
-    "weight_uom": null
-   }
-  ],
-  "language": "en",
-  "letter_head": null,
-  "mode_of_payment": null,
-  "modified": "2021-04-03 03:33:09.180453",
-  "name": null,
-  "naming_series": "ACC-PINV-.YYYY.-",
-  "net_total": 426.4,
-  "on_hold": 0,
-  "other_charges_calculation": "<div class=\"tax-break-up\" style=\"overflow-x: auto;\">\n\t<table class=\"table table-bordered table-hover\">\n\t\t<thead>\n\t\t\t<tr>\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t<th class=\"text-left\">Item</th>\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t<th class=\"text-right\">Taxable Amount</th>\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t<th class=\"text-right\">VAT on Purchases</th>\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t</tr>\n\t\t</thead>\n\t\t<tbody>\n\t\t\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td>Widget Fluid 1Litre</td>\n\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\u00a3 426.40\n\t\t\t\t\t\t\n\t\t\t\t\t</td>\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t(20.0%)\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\u00a3 85.28\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\n\t\t</tbody>\n\t</table>\n</div>",
-  "outstanding_amount": 511.68,
-  "paid_amount": 0.0,
-  "parent": null,
-  "parentfield": null,
-  "parenttype": null,
-  "party_account_currency": "GBP",
-  "payment_schedule": [],
-  "payment_terms_template": null,
-  "plc_conversion_rate": 1.0,
-  "posting_date": null,
-  "posting_time": "16:59:56.789522",
-  "price_list_currency": "GBP",
-  "pricing_rules": [],
-  "project": null,
-  "rejected_warehouse": null,
-  "release_date": null,
-  "remarks": "No Remarks",
-  "represents_company": null,
-  "return_against": null,
-  "rounded_total": 511.68,
-  "rounding_adjustment": 0.0,
-  "scan_barcode": null,
-  "select_print_heading": null,
-  "set_from_warehouse": null,
-  "set_posting_time": 0,
-  "set_warehouse": null,
-  "shipping_address": null,
-  "shipping_address_display": "",
-  "shipping_rule": null,
-  "status": "Unpaid",
-  "supplied_items": [],
-  "supplier": "_Test Supplier",
-  "supplier_address": null,
-  "supplier_name": "_Test Supplier",
-  "supplier_warehouse": "Stores - _T",
-  "tax_category": null,
-  "tax_id": null,
-  "tax_withholding_category": null,
-  "taxes": [
-   {
-    "account_head": "VAT on Purchases - _T",
-    "add_deduct_tax": "Add",
-    "base_tax_amount": 85.28,
-    "base_tax_amount_after_discount_amount": 85.28,
-    "base_total": 511.68,
-    "category": "Total",
-    "charge_type": "On Net Total",
-    "cost_center": "Main - _T",
-    "description": "VAT on Purchases",
-    "included_in_print_rate": 0,
-    "item_wise_tax_detail": "{\"Widget Fluid 1Litre\":[20.0,85.28]}",
-    "parent": null,
-    "parentfield": "taxes",
-    "parenttype": "Purchase Invoice",
-    "rate": 0.0,
-    "row_id": null,
-    "tax_amount": 85.28,
-    "tax_amount_after_discount_amount": 85.28,
-    "total": 511.68
-   }
-  ],
-  "taxes_and_charges": null,
-  "taxes_and_charges_added": 85.28,
-  "taxes_and_charges_deducted": 0.0,
-  "tc_name": null,
-  "terms": null,
-  "title": "_Purchase Invoice",
-  "to_date": null,
-  "total": 426.4,
-  "total_advance": 0.0,
-  "total_net_weight": 0.0,
-  "total_qty": 80.0,
-  "total_taxes_and_charges": 85.28,
-  "unrealized_profit_loss_account": null,
-  "update_stock": 0,
-  "write_off_account": null,
-  "write_off_amount": 0.0,
-  "write_off_cost_center": null
- },{
-  "account_for_change_amount": null,
-  "additional_discount_percentage": 0.0,
-  "address_display": null,
-  "advances": [],
-  "against_income_account": "Sales - _T",
-  "allocate_advances_automatically": 0,
-  "amended_from": null,
-  "apply_discount_on": "Grand Total",
-  "auto_repeat": null,
-  "base_change_amount": 0.0,
-  "base_discount_amount": 0.0,
-  "base_grand_total": 868.25,
-  "base_in_words": "GBP Eight Hundred And Sixty Eight and Twenty Five Pence only.",
-  "base_net_total": 825.0,
-  "base_paid_amount": 0.0,
-  "base_rounded_total": 868.25,
-  "base_rounding_adjustment": 0.0,
-  "base_total": 825.0,
-  "base_total_taxes_and_charges": 43.25,
-  "base_write_off_amount": 0.0,
-  "c_form_applicable": "No",
-  "c_form_no": null,
-  "campaign": null,
-  "cash_bank_account": null,
-  "change_amount": 0.0,
-  "commission_rate": 0.0,
-  "company": "_T",
-  "company_address": null,
-  "company_address_display": null,
-  "company_tax_id": null,
-  "contact_display": null,
-  "contact_email": null,
-  "contact_mobile": null,
-  "contact_person": null,
-  "conversion_rate": 1.0,
-  "cost_center": null,
-  "currency": "GBP",
-  "customer": "_Test Customer",
-  "customer_address": null,
-  "customer_group": "All Customer Groups",
-  "customer_name": "_Test Customer",
-  "debit_to": "Debtors - _T",
-  "discount_amount": 0.0,
-  "docstatus": 0,
-  "doctype": "Sales Invoice",
-  "due_date": null,
-  "from_date": null,
-  "grand_total": 868.25,
-  "group_same_items": 0,
-  "ignore_pricing_rule": 0,
-  "in_words": "GBP Eight Hundred And Sixty Eight and Twenty Five Pence only.",
-  "inter_company_invoice_reference": null,
-  "is_consolidated": 0,
-  "is_discounted": 0,
-  "is_internal_customer": 0,
-  "is_opening": "No",
-  "is_pos": 0,
-  "is_return": 0,
-  "items": [
-   {
-    "actual_batch_qty": 0.0,
-    "actual_qty": 0.0,
-    "allow_zero_valuation_rate": 0,
-    "amount": 200.0,
-    "asset": null,
-    "barcode": null,
-    "base_amount": 200.0,
-    "base_net_amount": 200.0,
-    "base_net_rate": 50.0,
-    "base_price_list_rate": 0.0,
-    "base_rate": 50.0,
-    "base_rate_with_margin": 0.0,
-    "batch_no": null,
-    "brand": null,
-    "conversion_factor": 1.0,
-    "cost_center": "Main - _T",
-    "customer_item_code": null,
-    "deferred_revenue_account": null,
-    "delivered_by_supplier": 0,
-    "delivered_qty": 0.0,
-    "delivery_note": null,
-    "description": "<div class=\"ql-editor read-mode\"><p>Used</p></div>",
-    "discount_amount": 0.0,
-    "discount_percentage": 0.0,
-    "dn_detail": null,
-    "enable_deferred_revenue": 0,
-    "expense_account": null,
-    "finance_book": null,
-    "image": null,
-    "income_account": "Sales - _T",
-    "incoming_rate": 0.0,
-    "is_fixed_asset": 0,
-    "is_free_item": 0,
-    "item_code": null,
-    "item_group": null,
-    "item_name": "Dunlop tyres",
-    "item_tax_rate": "{\"VAT on Sales - _T\": 20.0}",
-    "item_tax_template": null,
-    "margin_rate_or_amount": 0.0,
-    "margin_type": "",
-    "net_amount": 200.0,
-    "net_rate": 50.0,
-    "page_break": 0,
-    "parent": null,
-    "parentfield": "items",
-    "parenttype": "Sales Invoice",
-    "price_list_rate": 0.0,
-    "pricing_rules": null,
-    "project": null,
-    "qty": 4.0,
-    "quality_inspection": null,
-    "rate": 50.0,
-    "rate_with_margin": 0.0,
-    "sales_invoice_item": null,
-    "sales_order": null,
-    "serial_no": null,
-    "service_end_date": null,
-    "service_start_date": null,
-    "service_stop_date": null,
-    "so_detail": null,
-    "stock_qty": 4.0,
-    "stock_uom": "Nos",
-    "stock_uom_rate": 50.0,
-    "target_warehouse": null,
-    "total_weight": 0.0,
-    "uom": "Nos",
-    "warehouse": null,
-    "weight_per_unit": 0.0,
-    "weight_uom": null
-   },
-   {
-    "actual_batch_qty": 0.0,
-    "actual_qty": 0.0,
-    "allow_zero_valuation_rate": 0,
-    "amount": 65.0,
-    "asset": null,
-    "barcode": null,
-    "base_amount": 65.0,
-    "base_net_amount": 65.0,
-    "base_net_rate": 65.0,
-    "base_price_list_rate": 0.0,
-    "base_rate": 65.0,
-    "base_rate_with_margin": 0.0,
-    "batch_no": null,
-    "brand": null,
-    "conversion_factor": 1.0,
-    "cost_center": "Main - _T",
-    "customer_item_code": null,
-    "deferred_revenue_account": null,
-    "delivered_by_supplier": 0,
-    "delivered_qty": 0.0,
-    "delivery_note": null,
-    "description": "<div class=\"ql-editor read-mode\"><p>Used</p></div>",
-    "discount_amount": 0.0,
-    "discount_percentage": 0.0,
-    "dn_detail": null,
-    "enable_deferred_revenue": 0,
-    "expense_account": null,
-    "finance_book": null,
-    "image": null,
-    "income_account": "Sales - _T",
-    "incoming_rate": 0.0,
-    "is_fixed_asset": 0,
-    "is_free_item": 0,
-    "item_code": "",
-    "item_group": null,
-    "item_name": "Continental tyres",
-    "item_tax_rate": "{\"VAT on Sales - _T\": 5.0}",
-    "item_tax_template": null,
-    "margin_rate_or_amount": 0.0,
-    "margin_type": "",
-    "net_amount": 65.0,
-    "net_rate": 65.0,
-    "page_break": 0,
-    "parent": null,
-    "parentfield": "items",
-    "parenttype": "Sales Invoice",
-    "price_list_rate": 0.0,
-    "pricing_rules": null,
-    "project": null,
-    "qty": 1.0,
-    "quality_inspection": null,
-    "rate": 65.0,
-    "rate_with_margin": 0.0,
-    "sales_invoice_item": null,
-    "sales_order": null,
-    "serial_no": null,
-    "service_end_date": null,
-    "service_start_date": null,
-    "service_stop_date": null,
-    "so_detail": null,
-    "stock_qty": 1.0,
-    "stock_uom": null,
-    "stock_uom_rate": 65.0,
-    "target_warehouse": null,
-    "total_weight": 0.0,
-    "uom": "Nos",
-    "warehouse": null,
-    "weight_per_unit": 0.0,
-    "weight_uom": null
-   },
-   {
-    "actual_batch_qty": 0.0,
-    "actual_qty": 0.0,
-    "allow_zero_valuation_rate": 0,
-    "amount": 560.0,
-    "asset": null,
-    "barcode": null,
-    "base_amount": 560.0,
-    "base_net_amount": 560.0,
-    "base_net_rate": 70.0,
-    "base_price_list_rate": 0.0,
-    "base_rate": 70.0,
-    "base_rate_with_margin": 0.0,
-    "batch_no": null,
-    "brand": null,
-    "conversion_factor": 1.0,
-    "cost_center": "Main - _T",
-    "customer_item_code": null,
-    "deferred_revenue_account": null,
-    "delivered_by_supplier": 0,
-    "delivered_qty": 0.0,
-    "delivery_note": null,
-    "description": "<div class=\"ql-editor read-mode\"><p>New</p></div>",
-    "discount_amount": 0.0,
-    "discount_percentage": 0.0,
-    "dn_detail": null,
-    "enable_deferred_revenue": 0,
-    "expense_account": null,
-    "finance_book": null,
-    "image": null,
-    "income_account": "Sales - _T",
-    "incoming_rate": 0.0,
-    "is_fixed_asset": 0,
-    "is_free_item": 0,
-    "item_code": null,
-    "item_group": null,
-    "item_name": "Toyo tyres",
-    "item_tax_rate": "{\"VAT on Sales - _T\": 0.0}",
-    "item_tax_template": null,
-    "margin_rate_or_amount": 0.0,
-    "margin_type": "",
-    "net_amount": 560.0,
-    "net_rate": 70.0,
-    "page_break": 0,
-    "parent": null,
-    "parentfield": "items",
-    "parenttype": "Sales Invoice",
-    "price_list_rate": 0.0,
-    "pricing_rules": null,
-    "project": null,
-    "qty": 8.0,
-    "quality_inspection": null,
-    "rate": 70.0,
-    "rate_with_margin": 0.0,
-    "sales_invoice_item": null,
-    "sales_order": null,
-    "serial_no": null,
-    "service_end_date": null,
-    "service_start_date": null,
-    "service_stop_date": null,
-    "so_detail": null,
-    "stock_qty": 8.0,
-    "stock_uom": null,
-    "stock_uom_rate": 70.0,
-    "target_warehouse": null,
-    "total_weight": 0.0,
-    "uom": "Nos",
-    "warehouse": null,
-    "weight_per_unit": 0.0,
-    "weight_uom": null
-   }
-  ],
-  "language": "en",
-  "letter_head": null,
-  "loyalty_amount": 0.0,
-  "loyalty_points": 0,
-  "loyalty_program": null,
-  "loyalty_redemption_account": null,
-  "loyalty_redemption_cost_center": null,
-  "modified": "2021-02-16 05:18:59.755144",
-  "name": null,
-  "naming_series": "ACC-SINV-.YYYY.-",
-  "net_total": 825.0,
-  "other_charges_calculation": "<div class=\"tax-break-up\" style=\"overflow-x: auto;\">\n\t<table class=\"table table-bordered table-hover\">\n\t\t<thead>\n\t\t\t<tr>\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t<th class=\"text-left\">Item</th>\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t<th class=\"text-right\">Taxable Amount</th>\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t\t\t<th class=\"text-right\">VAT on Sales</th>\n\t\t\t\t\t\n\t\t\t\t\n\t\t\t</tr>\n\t\t</thead>\n\t\t<tbody>\n\t\t\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td>Dunlop tyres</td>\n\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\u00a3 200.00\n\t\t\t\t\t\t\n\t\t\t\t\t</td>\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t(20.0%)\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\u00a3 40.00\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td>Continental tyres</td>\n\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\u00a3 65.00\n\t\t\t\t\t\t\n\t\t\t\t\t</td>\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t(5.0%)\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\u00a3 3.25\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\n\t\t\t\t<tr>\n\t\t\t\t\t<td>Toyo tyres</td>\n\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t\u00a3 560.00\n\t\t\t\t\t\t\n\t\t\t\t\t</td>\n\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\t<td class='text-right'>\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t(0.0%)\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t\t\t\u00a3 0.00\n\t\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t</td>\n\t\t\t\t\t\t\n\t\t\t\t\t\n\t\t\t\t</tr>\n\t\t\t\n\t\t</tbody>\n\t</table>\n</div>",
-  "outstanding_amount": 868.25,
-  "packed_items": [],
-  "paid_amount": 0.0,
-  "parent": null,
-  "parentfield": null,
-  "parenttype": null,
-  "party_account_currency": "GBP",
-  "payment_schedule": [],
-  "payment_terms_template": null,
-  "payments": [],
-  "plc_conversion_rate": 1.0,
-  "po_date": null,
-  "po_no": "",
-  "pos_profile": null,
-  "posting_date": null,
-  "posting_time": "5:19:02.994077",
-  "price_list_currency": "GBP",
-  "pricing_rules": [],
-  "project": null,
-  "redeem_loyalty_points": 0,
-  "remarks": "No Remarks",
-  "represents_company": "",
-  "return_against": null,
-  "rounded_total": 868.25,
-  "rounding_adjustment": 0.0,
-  "sales_partner": null,
-  "sales_team": [],
-  "scan_barcode": null,
-  "select_print_heading": null,
-  "selling_price_list": "Standard Selling",
-  "set_posting_time": 0,
-  "set_target_warehouse": null,
-  "set_warehouse": null,
-  "shipping_address": null,
-  "shipping_address_name": "",
-  "shipping_rule": null,
-  "source": null,
-  "status": "Overdue",
-  "tax_category": "",
-  "tax_id": null,
-  "taxes": [
-   {
-    "account_head": "VAT on Sales - _T",
-    "base_tax_amount": 43.25,
-    "base_tax_amount_after_discount_amount": 43.25,
-    "base_total": 868.25,
-    "charge_type": "On Net Total",
-    "cost_center": "Main - _T",
-    "description": "VAT on Sales",
-    "included_in_print_rate": 0,
-    "item_wise_tax_detail": "{\"Dunlop tyres\":[20.0,40.0],\"Continental tyres\":[5.0,3.25],\"Toyo tyres\":[0.0,0.0]}",
-    "parent": null,
-    "parentfield": "taxes",
-    "parenttype": "Sales Invoice",
-    "rate": 0.0,
-    "row_id": null,
-    "tax_amount": 43.25,
-    "tax_amount_after_discount_amount": 43.25,
-    "total": 868.25
-   }
-  ],
-  "taxes_and_charges": null,
-  "tc_name": null,
-  "terms": null,
-  "territory": "All Territories",
-  "timesheets": [],
-  "title": "_Sales Invoice",
-  "to_date": null,
-  "total": 825.0,
-  "total_advance": 0.0,
-  "total_billing_amount": 0.0,
-  "total_commission": 0.0,
-  "total_net_weight": 0.0,
-  "total_qty": 13.0,
-  "total_taxes_and_charges": 43.25,
-  "unrealized_profit_loss_account": null,
-  "update_billed_amount_in_sales_order": 0,
-  "update_stock": 0,
-  "write_off_account": null,
-  "write_off_amount": 0.0,
-  "write_off_cost_center": null,
-  "write_off_outstanding_amount_automatically": 0
- }
-]

erpnext/accounts/report/tax_detail/test_tax_detail.py

@@ -1,186 +0,0 @@
-from __future__ import unicode_literals
-
-import datetime
-import json
-import os
-import unittest
-
-import frappe
-from frappe.utils import (
-	add_to_date,
-	get_first_day,
-	get_last_day,
-	get_year_ending,
-	get_year_start,
-	getdate,
-)
-
-from .tax_detail import filter_match, save_custom_report
-
-
-class TestTaxDetail(unittest.TestCase):
-	def load_testdocs(self):
-		from erpnext.accounts.utils import FiscalYearError, get_fiscal_year
-		datapath, _ = os.path.splitext(os.path.realpath(__file__))
-		with open(datapath + '.json', 'r') as fp:
-			docs = json.load(fp)
-
-		now = getdate()
-		self.from_date = get_first_day(now)
-		self.to_date = get_last_day(now)
-
-		try:
-			get_fiscal_year(now, company="_T")
-		except FiscalYearError:
-			docs = [{
-				"companies": [{
-					"company": "_T",
-					"parent": "_Test Fiscal",
-					"parentfield": "companies",
-					"parenttype": "Fiscal Year"
-				}],
-				"doctype": "Fiscal Year",
-				"year": "_Test Fiscal",
-				"year_end_date": get_year_ending(now),
-				"year_start_date": get_year_start(now)
-			}] + docs
-
-		docs = [{
-			"abbr": "_T",
-			"company_name": "_T",
-			"country": "United Kingdom",
-			"default_currency": "GBP",
-			"doctype": "Company",
-			"name": "_T"
-		}] + docs
-
-		for doc in docs:
-			try:
-				db_doc = frappe.get_doc(doc)
-				if 'Invoice' in db_doc.doctype:
-					db_doc.due_date = add_to_date(now, days=1)
-					db_doc.insert()
-					# Create GL Entries:
-					db_doc.submit()
-				else:
-					db_doc.insert()
-			except frappe.exceptions.DuplicateEntryError:
-				pass
-
-	def load_defcols(self):
-		self.company = frappe.get_doc('Company', '_T')
-		custom_report = frappe.get_doc('Report', 'Tax Detail')
-		self.default_columns, _ = custom_report.run_query_report(
-			filters={
-				'from_date': '2021-03-01',
-				'to_date': '2021-03-31',
-				'company': self.company.name,
-				'mode': 'run',
-				'report_name': 'Tax Detail'
-			}, user=frappe.session.user)
-
-	def rm_testdocs(self):
-		"Remove the Company and all data"
-		from erpnext.setup.doctype.company.company import create_transaction_deletion_request
-		create_transaction_deletion_request(self.company.name)
-
-	def test_report(self):
-		self.load_testdocs()
-		self.load_defcols()
-		report_name = save_custom_report(
-			'Tax Detail',
-			'_Test Tax Detail',
-			json.dumps({
-				'columns': self.default_columns,
-				'sections': {
-					'Box1':{'Filter0':{'type':'filter','filters':{'4':'VAT on Sales'}}},
-					'Box2':{'Filter0':{'type':'filter','filters':{'4':'Acquisition'}}},
-					'Box3':{'Box1':{'type':'section'},'Box2':{'type':'section'}},
-					'Box4':{'Filter0':{'type':'filter','filters':{'4':'VAT on Purchases'}}},
-					'Box5':{'Box3':{'type':'section'},'Box4':{'type':'section'}},
-					'Box6':{'Filter0':{'type':'filter','filters':{'3':'!=Tax','4':'Sales'}}},
-					'Box7':{'Filter0':{'type':'filter','filters':{'2':'Expense','3':'!=Tax'}}},
-					'Box8':{'Filter0':{'type':'filter','filters':{'3':'!=Tax','4':'Sales','12':'EU'}}},
-					'Box9':{'Filter0':{'type':'filter','filters':{'2':'Expense','3':'!=Tax','12':'EU'}}}
-				},
-				'show_detail': 1
-			}))
-		data = frappe.desk.query_report.run(report_name,
-			filters={
-				'from_date': self.from_date,
-				'to_date': self.to_date,
-				'company': self.company.name,
-				'mode': 'run',
-				'report_name': report_name
-			}, user=frappe.session.user)
-
-		self.assertListEqual(data.get('columns'), self.default_columns)
-		expected = (('Box1', 43.25), ('Box2', 0.0), ('Box3', 43.25), ('Box4', -85.28), ('Box5', -42.03),
-			('Box6', 825.0), ('Box7', -426.40), ('Box8', 0.0), ('Box9', 0.0))
-		exrow = iter(expected)
-		for row in data.get('result'):
-			if row.get('voucher_no') and not row.get('posting_date'):
-				label, value = next(exrow)
-				self.assertDictEqual(row, {'voucher_no': label, 'amount': value})
-		self.assertListEqual(data.get('report_summary'),
-			[{'label': label, 'datatype': 'Currency', 'value': value} for label, value in expected])
-
-		self.rm_testdocs()
-
-	def test_filter_match(self):
-		# None - treated as -inf number except range
-		self.assertTrue(filter_match(None, '!='))
-		self.assertTrue(filter_match(None, '<'))
-		self.assertTrue(filter_match(None, '<jjj'))
-		self.assertTrue(filter_match(None, '  :  '))
-		self.assertTrue(filter_match(None, ':56'))
-		self.assertTrue(filter_match(None, ':de'))
-		self.assertFalse(filter_match(None, '3.4'))
-		self.assertFalse(filter_match(None, '='))
-		self.assertFalse(filter_match(None, '=3.4'))
-		self.assertFalse(filter_match(None, '>3.4'))
-		self.assertFalse(filter_match(None, '   <'))
-		self.assertFalse(filter_match(None, 'ew'))
-		self.assertFalse(filter_match(None, ' '))
-		self.assertFalse(filter_match(None, ' f :'))
-
-		# Numbers
-		self.assertTrue(filter_match(3.4, '3.4'))
-		self.assertTrue(filter_match(3.4, '.4'))
-		self.assertTrue(filter_match(3.4, '3'))
-		self.assertTrue(filter_match(-3.4, '< -3'))
-		self.assertTrue(filter_match(-3.4, '> -4'))
-		self.assertTrue(filter_match(3.4, '= 3.4 '))
-		self.assertTrue(filter_match(3.4, '!=4.5'))
-		self.assertTrue(filter_match(3.4, ' 3 : 4 '))
-		self.assertTrue(filter_match(0.0, '  :  '))
-		self.assertFalse(filter_match(3.4, '=4.5'))
-		self.assertFalse(filter_match(3.4, ' = 3.4 '))
-		self.assertFalse(filter_match(3.4, '!=3.4'))
-		self.assertFalse(filter_match(3.4, '>6'))
-		self.assertFalse(filter_match(3.4, '<-4.5'))
-		self.assertFalse(filter_match(3.4, '4.5'))
-		self.assertFalse(filter_match(3.4, '5:9'))
-
-		# Strings
-		self.assertTrue(filter_match('ACC-SINV-2021-00001', 'SINV'))
-		self.assertTrue(filter_match('ACC-SINV-2021-00001', 'sinv'))
-		self.assertTrue(filter_match('ACC-SINV-2021-00001', '-2021'))
-		self.assertTrue(filter_match(' ACC-SINV-2021-00001', ' acc'))
-		self.assertTrue(filter_match('ACC-SINV-2021-00001', '=2021'))
-		self.assertTrue(filter_match('ACC-SINV-2021-00001', '!=zz'))
-		self.assertTrue(filter_match('ACC-SINV-2021-00001', '<   zzz  '))
-		self.assertTrue(filter_match('ACC-SINV-2021-00001', '  :  sinv  '))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', '  sinv  :'))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', ' acc'))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', '= 2021 '))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', '!=sinv'))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', ' >'))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', '>aa'))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', ' <'))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', '<   '))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', ' ='))
-		self.assertFalse(filter_match('ACC-SINV-2021-00001', '='))
-
-		# Date - always match
-		self.assertTrue(filter_match(datetime.date(2021, 3, 19), ' kdsjkldfs '))

erpnext/accounts/utils.py

@@ -579,10 +579,10 @@ def remove_ref_doc_link_from_pe(ref_type, ref_no):
 		frappe.msgprint(_("Payment Entries {0} are un-linked").format("\n".join(linked_pe)))
 
 @frappe.whitelist()
-def get_company_default(company, fieldname, ignore_validation=False):
+def get_company_default(company, fieldname):
 	value = frappe.get_cached_value('Company',  company,  fieldname)
 
-	if not ignore_validation and not value:
+	if not value:
 		throw(_("Please set default {0} in Company {1}")
 			.format(frappe.get_meta("Company").get_label(fieldname), company))
 

erpnext/agriculture/setup.py

@@ -1,8 +1,11 @@
 from __future__ import unicode_literals
+
 import frappe
 from frappe import _
+
 from erpnext.setup.utils import insert_record
 
+
 def setup_agriculture():
 	if frappe.get_all('Agriculture Analysis Criteria'):
 		# already setup

erpnext/agriculture/workspace/agriculture/agriculture.json

@@ -1,20 +1,22 @@
 {
+ "category": "Domains",
  "charts": [],
- "content": "[{\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Crops & Lands\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Analytics\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Diseases & Fertilizers\", \"col\": 4}}]",
  "creation": "2020-03-02 17:23:34.339274",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Workspace",
- "for_user": "",
+ "extends_another_page": 0,
  "hide_custom": 0,
  "icon": "agriculture",
  "idx": 0,
+ "is_standard": 1,
  "label": "Agriculture",
  "links": [
   {
    "hidden": 0,
    "is_query_report": 0,
    "label": "Crops & Lands",
-   "link_count": 0,
    "onboard": 0,
    "type": "Card Break"
   },
@@ -23,7 +25,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Crop",
-   "link_count": 0,
    "link_to": "Crop",
    "link_type": "DocType",
    "onboard": 1,
@@ -34,7 +35,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Crop Cycle",
-   "link_count": 0,
    "link_to": "Crop Cycle",
    "link_type": "DocType",
    "onboard": 1,
@@ -45,7 +45,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Location",
-   "link_count": 0,
    "link_to": "Location",
    "link_type": "DocType",
    "onboard": 1,
@@ -55,7 +54,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Analytics",
-   "link_count": 0,
    "onboard": 0,
    "type": "Card Break"
   },
@@ -64,7 +62,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Plant Analysis",
-   "link_count": 0,
    "link_to": "Plant Analysis",
    "link_type": "DocType",
    "onboard": 0,
@@ -75,7 +72,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Soil Analysis",
-   "link_count": 0,
    "link_to": "Soil Analysis",
    "link_type": "DocType",
    "onboard": 0,
@@ -86,7 +82,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Water Analysis",
-   "link_count": 0,
    "link_to": "Water Analysis",
    "link_type": "DocType",
    "onboard": 0,
@@ -97,7 +92,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Soil Texture",
-   "link_count": 0,
    "link_to": "Soil Texture",
    "link_type": "DocType",
    "onboard": 0,
@@ -108,7 +102,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Weather",
-   "link_count": 0,
    "link_to": "Weather",
    "link_type": "DocType",
    "onboard": 0,
@@ -119,7 +112,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Agriculture Analysis Criteria",
-   "link_count": 0,
    "link_to": "Agriculture Analysis Criteria",
    "link_type": "DocType",
    "onboard": 0,
@@ -129,7 +121,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Diseases & Fertilizers",
-   "link_count": 0,
    "onboard": 0,
    "type": "Card Break"
   },
@@ -138,7 +129,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Disease",
-   "link_count": 0,
    "link_to": "Disease",
    "link_type": "DocType",
    "onboard": 1,
@@ -149,23 +139,19 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Fertilizer",
-   "link_count": 0,
    "link_to": "Fertilizer",
    "link_type": "DocType",
    "onboard": 1,
    "type": "Link"
   }
  ],
- "modified": "2021-08-05 12:15:54.595198",
+ "modified": "2020-12-01 13:38:38.477493",
  "modified_by": "Administrator",
  "module": "Agriculture",
  "name": "Agriculture",
  "owner": "Administrator",
- "parent_page": "",
- "public": 1,
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
  "restrict_to_domain": "Agriculture",
- "roles": [],
- "sequence_id": 3,
- "shortcuts": [],
- "title": "Agriculture"
+ "shortcuts": []
 }

erpnext/assets/doctype/asset_repair/asset_repair.json

@@ -176,7 +176,6 @@
    "fieldtype": "Section Break"
   },
   {
-   "collapsible": 1,
    "fieldname": "accounting_dimensions_section",
    "fieldtype": "Section Break",
    "label": "Accounting Dimensions"

erpnext/assets/form_tour/asset/asset.json

@@ -1,125 +0,0 @@
-{
- "creation": "2021-08-24 16:55:10.923434",
- "docstatus": 0,
- "doctype": "Form Tour",
- "idx": 0,
- "is_standard": 1,
- "modified": "2021-08-24 16:55:10.923434",
- "modified_by": "Administrator",
- "module": "Assets",
- "name": "Asset",
- "owner": "Administrator",
- "reference_doctype": "Asset",
- "save_on_complete": 0,
- "steps": [
-  {
-   "description": "Select Naming Series based on which Asset ID will be generated",
-   "field": "",
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Naming Series",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Naming Series"
-  },
-  {
-   "description": "Select an Asset Item",
-   "field": "",
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Item Code",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Item Code"
-  },
-  {
-   "description": "Select a Location",
-   "field": "",
-   "fieldname": "location",
-   "fieldtype": "Link",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Location",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Location"
-  },
-  {
-   "description": "Check Is Existing Asset",
-   "field": "",
-   "fieldname": "is_existing_asset",
-   "fieldtype": "Check",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Is Existing Asset",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Is Existing Asset?"
-  },
-  {
-   "description": "Set Available for use date",
-   "field": "",
-   "fieldname": "available_for_use_date",
-   "fieldtype": "Date",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Available-for-use Date",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Available For Use Date"
-  },
-  {
-   "description": "Set Gross purchase amount",
-   "field": "",
-   "fieldname": "gross_purchase_amount",
-   "fieldtype": "Currency",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Gross Purchase Amount",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Gross Purchase Amount"
-  },
-  {
-   "description": "Set Purchase Date",
-   "field": "",
-   "fieldname": "purchase_date",
-   "fieldtype": "Date",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Purchase Date",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Purchase Date"
-  },
-  {
-   "description": "Check Calculate Depreciation",
-   "field": "",
-   "fieldname": "calculate_depreciation",
-   "fieldtype": "Check",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Calculate Depreciation",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Calculate Depreciation"
-  },
-  {
-   "description": "Enter depreciation which has already been booked for this asset",
-   "field": "",
-   "fieldname": "opening_accumulated_depreciation",
-   "fieldtype": "Currency",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Opening Accumulated Depreciation",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Accumulated Depreciation"
-  }
- ],
- "title": "Asset"
-}

erpnext/assets/form_tour/asset_category/asset_category.json

@@ -1,65 +0,0 @@
-{
- "creation": "2021-08-24 12:48:20.763173",
- "docstatus": 0,
- "doctype": "Form Tour",
- "idx": 0,
- "is_standard": 1,
- "modified": "2021-08-24 12:48:20.763173",
- "modified_by": "Administrator",
- "module": "Assets",
- "name": "Asset Category",
- "owner": "Administrator",
- "reference_doctype": "Asset Category",
- "save_on_complete": 0,
- "steps": [
-  {
-   "description": "Name Asset category. You can create categories based on Asset Types like Furniture, Property, Electronics etc.",
-   "field": "",
-   "fieldname": "asset_category_name",
-   "fieldtype": "Data",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Asset Category Name",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Asset Category Name"
-  },
-  {
-   "description": "Check to enable Capital Work in Progress accounting",
-   "field": "",
-   "fieldname": "enable_cwip_accounting",
-   "fieldtype": "Check",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Enable Capital Work in Progress Accounting",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Enable CWIP Accounting"
-  },
-  {
-   "description": "Add a row to define Depreciation Method and other details. Note that you can leave Finance Book blank to have it's accounting done in the primary books of accounts.",
-   "field": "",
-   "fieldname": "finance_books",
-   "fieldtype": "Table",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Finance Books",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Finance Book Detail"
-  },
-  {
-   "description": "Select the Fixed Asset and Depreciation accounts applicable for this Asset Category type",
-   "field": "",
-   "fieldname": "accounts",
-   "fieldtype": "Table",
-   "has_next_condition": 0,
-   "is_table_field": 0,
-   "label": "Accounts",
-   "parent_field": "",
-   "position": "Bottom",
-   "title": "Accounts"
-  }
- ],
- "title": "Asset Category"
-}

erpnext/assets/module_onboarding/assets/assets.json

@@ -13,26 +13,26 @@
  "documentation_url": "https://docs.erpnext.com/docs/user/manual/en/asset",
  "idx": 0,
  "is_complete": 0,
- "modified": "2021-08-24 17:50:41.573281",
+ "modified": "2020-07-08 14:05:51.828497",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Assets",
  "owner": "Administrator",
  "steps": [
   {
-   "step": "Fixed Asset Accounts"
+   "step": "Introduction to Assets"
   },
   {
-   "step": "Asset Category"
+   "step": "Create a Fixed Asset Item"
   },
   {
-   "step": "Asset Item"
+   "step": "Create an Asset Category"
   },
   {
-   "step": "Asset Purchase"
+   "step": "Purchase an Asset Item"
   },
   {
-   "step": "Existing Asset"
+   "step": "Create an Asset"
   }
  ],
  "subtitle": "Assets, Depreciations, Repairs, and more.",

erpnext/assets/onboarding_step/asset_category/asset_category.json

@@ -1,21 +0,0 @@
-{
- "action": "Show Form Tour",
- "action_label": "Let's review existing Asset Category",
- "creation": "2021-08-13 14:26:18.656303",
- "description": "# Asset Category\n\nAn Asset Category classifies different assets of a Company.\n\nYou can create an Asset Category based on the type of assets. For example, all your desktops and laptops can be part of an Asset Category named \"Electronic Equipments\". Create a separate category for furniture. Also, you can update default properties for each category, like:\n - Depreciation type and duration\n - Fixed asset account\n - Depreciation account\n",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-24 12:49:37.665239",
- "modified_by": "Administrator",
- "name": "Asset Category",
- "owner": "Administrator",
- "reference_document": "Asset Category",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Define Asset Category",
- "validate_action": 1
-}

erpnext/assets/onboarding_step/asset_item/asset_item.json

@@ -1,21 +0,0 @@
-{
- "action": "Show Form Tour",
- "action_label": "Let's create a new Asset item",
- "creation": "2021-08-13 14:27:07.277167",
- "description": "# Asset Item\n\nAsset items are created based on Asset Category. You can create one or multiple items against once Asset Category. The sales and purchase transaction for Asset is done via Asset Item. ",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-16 13:59:18.362233",
- "modified_by": "Administrator",
- "name": "Asset Item",
- "owner": "Administrator",
- "reference_document": "Item",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Create an Asset Item",
- "validate_action": 1
-}

erpnext/assets/onboarding_step/asset_purchase/asset_purchase.json

@@ -1,21 +0,0 @@
-{
- "action": "Show Form Tour",
- "action_label": "Let's create a Purchase Receipt",
- "creation": "2021-08-13 14:27:53.678621",
- "description": "# Purchase an Asset\n\nAssets purchases process if done following the standard Purchase cycle. If capital work in progress is enabled in Asset Category, Asset will be created as soon as Purchase Receipt is created for it. You can quickly create a Purchase Receipt for Asset and see its impact on books of accounts.",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-24 17:26:57.180637",
- "modified_by": "Administrator",
- "name": "Asset Purchase",
- "owner": "Administrator",
- "reference_document": "Purchase Receipt",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Purchase an Asset",
- "validate_action": 1
-}

erpnext/assets/onboarding_step/existing_asset/existing_asset.json

@@ -1,21 +0,0 @@
-{
- "action": "Show Form Tour",
- "action_label": "Add an existing Asset",
- "creation": "2021-08-13 14:28:30.650459",
- "description": "# Add an Existing Asset\n\nIf you are just starting with ERPNext, you will need to enter Assets you already possess. You can add them as existing fixed assets in ERPNext. Please note that you will have to make a Journal Entry separately updating the opening balance in the fixed asset account.",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-16 14:03:48.850471",
- "modified_by": "Administrator",
- "name": "Existing Asset",
- "owner": "Administrator",
- "reference_document": "Asset",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Add an Existing Asset",
- "validate_action": 1
-}

erpnext/assets/onboarding_step/fixed_asset_accounts/fixed_asset_accounts.json

@@ -1,21 +0,0 @@
-{
- "action": "Go to Page",
- "action_label": "Let's walk-through Chart of Accounts to review setup",
- "creation": "2021-08-13 14:23:09.297765",
- "description": "# Fixed Asset Accounts\n\nWith the company, a host of fixed asset accounts are pre-configured. To ensure your asset transactions are leading to correct accounting entries, you can review and set up following asset accounts as per your business  requirements.\n - Fixed asset accounts (Asset account)\n - Accumulated depreciation\n - Capital Work in progress (CWIP) account\n - Asset Depreciation account (Expense account)",
- "docstatus": 0,
- "doctype": "Onboarding Step",
- "idx": 0,
- "is_complete": 0,
- "is_single": 0,
- "is_skipped": 0,
- "modified": "2021-08-24 17:46:37.646174",
- "modified_by": "Administrator",
- "name": "Fixed Asset Accounts",
- "owner": "Administrator",
- "path": "app/account/view/tree",
- "show_form_tour": 0,
- "show_full_form": 0,
- "title": "Review Fixed Asset Accounts",
- "validate_action": 1
-}

erpnext/assets/workspace/assets/assets.json

@@ -1,25 +1,27 @@
 {
+ "category": "Modules",
  "charts": [
   {
    "chart_name": "Asset Value Analytics",
    "label": "Asset Value Analytics"
   }
  ],
- "content": "[{\"type\": \"onboarding\", \"data\": {\"onboarding_name\":\"Assets\", \"col\": 12}}, {\"type\": \"chart\", \"data\": {\"chart_name\": \"Asset Value Analytics\", \"col\": 12}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Asset\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Asset Category\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Fixed Asset Register\", \"col\": 4}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Dashboard\", \"col\": 4}}, {\"type\": \"spacer\", \"data\": {\"col\": 12}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Assets\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Maintenance\", \"col\": 4}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Reports\", \"col\": 4}}]",
  "creation": "2020-03-02 15:43:27.634865",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
  "docstatus": 0,
  "doctype": "Workspace",
- "for_user": "",
+ "extends_another_page": 0,
  "hide_custom": 0,
  "icon": "assets",
  "idx": 0,
+ "is_standard": 1,
  "label": "Assets",
  "links": [
   {
    "hidden": 0,
    "is_query_report": 0,
    "label": "Assets",
-   "link_count": 0,
    "onboard": 0,
    "type": "Card Break"
   },
@@ -28,7 +30,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset",
-   "link_count": 0,
    "link_to": "Asset",
    "link_type": "DocType",
    "onboard": 1,
@@ -39,7 +40,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Location",
-   "link_count": 0,
    "link_to": "Location",
    "link_type": "DocType",
    "onboard": 1,
@@ -50,7 +50,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Category",
-   "link_count": 0,
    "link_to": "Asset Category",
    "link_type": "DocType",
    "onboard": 1,
@@ -61,7 +60,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Movement",
-   "link_count": 0,
    "link_to": "Asset Movement",
    "link_type": "DocType",
    "onboard": 0,
@@ -71,7 +69,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Maintenance",
-   "link_count": 0,
    "onboard": 0,
    "type": "Card Break"
   },
@@ -80,7 +77,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Maintenance Team",
-   "link_count": 0,
    "link_to": "Asset Maintenance Team",
    "link_type": "DocType",
    "onboard": 1,
@@ -91,7 +87,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Maintenance",
-   "link_count": 0,
    "link_to": "Asset Maintenance",
    "link_type": "DocType",
    "onboard": 1,
@@ -102,7 +97,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Maintenance Log",
-   "link_count": 0,
    "link_to": "Asset Maintenance Log",
    "link_type": "DocType",
    "onboard": 0,
@@ -113,7 +107,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Value Adjustment",
-   "link_count": 0,
    "link_to": "Asset Value Adjustment",
    "link_type": "DocType",
    "onboard": 0,
@@ -124,7 +117,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Repair",
-   "link_count": 0,
    "link_to": "Asset Repair",
    "link_type": "DocType",
    "onboard": 0,
@@ -134,7 +126,6 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Reports",
-   "link_count": 0,
    "onboard": 0,
    "type": "Card Break"
   },
@@ -143,7 +134,6 @@
    "hidden": 0,
    "is_query_report": 1,
    "label": "Asset Depreciation Ledger",
-   "link_count": 0,
    "link_to": "Asset Depreciation Ledger",
    "link_type": "Report",
    "onboard": 0,
@@ -154,7 +144,6 @@
    "hidden": 0,
    "is_query_report": 1,
    "label": "Asset Depreciations and Balances",
-   "link_count": 0,
    "link_to": "Asset Depreciations and Balances",
    "link_type": "Report",
    "onboard": 0,
@@ -165,23 +154,20 @@
    "hidden": 0,
    "is_query_report": 0,
    "label": "Asset Maintenance",
-   "link_count": 0,
    "link_to": "Asset Maintenance",
    "link_type": "Report",
    "onboard": 0,
    "type": "Link"
   }
  ],
- "modified": "2021-08-05 12:15:54.839453",
+ "modified": "2020-12-01 13:38:37.977119",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Assets",
+ "onboarding": "Assets",
  "owner": "Administrator",
- "parent_page": "",
- "public": 1,
- "restrict_to_domain": "",
- "roles": [],
- "sequence_id": 4,
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
  "shortcuts": [
   {
    "label": "Asset",
@@ -203,6 +189,5 @@
    "link_to": "Asset",
    "type": "Dashboard"
   }
- ],
- "title": "Assets"
+ ]
 }

erpnext/buying/doctype/purchase_order/purchase_order.js

@@ -102,8 +102,8 @@ frappe.ui.form.on("Purchase Order Item", {
 	}
 });
 
-erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends erpnext.buying.BuyingController {
-	setup() {
+erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend({
+	setup: function() {
 		this.frm.custom_make_buttons = {
 			'Purchase Receipt': 'Purchase Receipt',
 			'Purchase Invoice': 'Purchase Invoice',
@@ -111,13 +111,13 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 			'Payment Entry': 'Payment',
 		}
 
-		super.setup();
+		this._super();
 
-	}
+	},
 
-	refresh(doc, cdt, cdn) {
+	refresh: function(doc, cdt, cdn) {
 		var me = this;
-		super.refresh();
+		this._super();
 		var allow_receipt = false;
 		var is_drop_ship = false;
 
@@ -223,9 +223,9 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 		} else if(doc.docstatus===0) {
 			cur_frm.cscript.add_from_mappers();
 		}
-	}
+	},
 
-	get_items_from_open_material_requests() {
+	get_items_from_open_material_requests: function() {
 		erpnext.utils.map_current_doc({
 			method: "erpnext.stock.doctype.material_request.material_request.make_purchase_order_based_on_supplier",
 			args: {
@@ -243,17 +243,17 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 			},
 			get_query_method: "erpnext.stock.doctype.material_request.material_request.get_material_requests_based_on_supplier"
 		});
-	}
+	},
 
-	validate() {
+	validate: function() {
 		set_schedule_date(this.frm);
-	}
+	},
 
-	has_unsupplied_items() {
-		return this.frm.doc['supplied_items'].some(item => item.required_qty > item.supplied_qty);
-	}
+	has_unsupplied_items: function() {
+		return this.frm.doc['supplied_items'].some(item => item.required_qty > item.supplied_qty)
+	},
 
-	make_stock_entry() {
+	make_stock_entry: function() {
 		var items = $.map(cur_frm.doc.items, function(d) { return d.bom ? d.item_code : false; });
 		var me = this;
 
@@ -368,9 +368,9 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 			me.dialog.hide();
 		});
 
-	}
+	},
 
-	_make_rm_stock_entry(rm_items) {
+	_make_rm_stock_entry: function(rm_items) {
 		frappe.call({
 			method:"erpnext.buying.doctype.purchase_order.purchase_order.make_rm_stock_entry",
 			args: {
@@ -383,31 +383,31 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 				frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
 			}
 		});
-	}
+	},
 
-	make_inter_company_order(frm) {
+	make_inter_company_order: function(frm) {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.buying.doctype.purchase_order.purchase_order.make_inter_company_sales_order",
 			frm: frm
 		});
-	}
+	},
 
-	make_purchase_receipt() {
+	make_purchase_receipt: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
 			frm: cur_frm,
 			freeze_message: __("Creating Purchase Receipt ...")
 		})
-	}
+	},
 
-	make_purchase_invoice() {
+	make_purchase_invoice: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_invoice",
 			frm: cur_frm
 		})
-	}
+	},
 
-	add_from_mappers() {
+	add_from_mappers: function() {
 		var me = this;
 		this.frm.add_custom_button(__('Material Request'),
 			function() {
@@ -516,13 +516,13 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 				}
 			});
 		}, __("Tools"));
-	}
+	},
 
-	tc_name() {
+	tc_name: function() {
 		this.get_terms();
-	}
+	},
 
-	items_add(doc, cdt, cdn) {
+	items_add: function(doc, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
 		if(doc.schedule_date) {
 			row.schedule_date = doc.schedule_date;
@@ -530,13 +530,13 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 		} else {
 			this.frm.script_manager.copy_from_first_row("items", row, ["schedule_date"]);
 		}
-	}
+	},
 
-	unhold_purchase_order(){
+	unhold_purchase_order: function(){
 		cur_frm.cscript.update_status("Resume", "Draft")
-	}
+	},
 
-	hold_purchase_order(){
+	hold_purchase_order: function(){
 		var me = this;
 		var d = new frappe.ui.Dialog({
 			title: __('Reason for Hold'),
@@ -570,31 +570,31 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 			}
 		});
 		d.show();
-	}
+	},
 
-	unclose_purchase_order(){
+	unclose_purchase_order: function(){
 		cur_frm.cscript.update_status('Re-open', 'Submitted')
-	}
+	},
 
-	close_purchase_order(){
+	close_purchase_order: function(){
 		cur_frm.cscript.update_status('Close', 'Closed')
-	}
+	},
 
-	delivered_by_supplier(){
+	delivered_by_supplier: function(){
 		cur_frm.cscript.update_status('Deliver', 'Delivered')
-	}
+	},
 
-	items_on_form_rendered() {
+	items_on_form_rendered: function() {
+		set_schedule_date(this.frm);
+	},
+
+	schedule_date: function() {
 		set_schedule_date(this.frm);
 	}
-
-	schedule_date() {
-		set_schedule_date(this.frm);
-	}
-};
+});
 
 // for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm}));
+$.extend(cur_frm.cscript, new erpnext.buying.PurchaseOrderController({frm: cur_frm}));
 
 cur_frm.cscript.update_status= function(label, status){
 	frappe.call({

erpnext/buying/doctype/request_for_quotation/request_for_quotation.js

@@ -205,10 +205,10 @@ frappe.ui.form.on("Request for Quotation Supplier",{
 
 })
 
-erpnext.buying.RequestforQuotationController = class RequestforQuotationController extends erpnext.buying.BuyingController {
-	refresh() {
+erpnext.buying.RequestforQuotationController = erpnext.buying.BuyingController.extend({
+	refresh: function() {
 		var me = this;
-		super.refresh();
+		this._super();
 		if (this.frm.doc.docstatus===0) {
 			this.frm.add_custom_button(__('Material Request'),
 				function() {
@@ -302,17 +302,17 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
 					me.get_suppliers_button(me.frm);
 				}, __("Tools"));
 		}
-	}
+	},
 
-	calculate_taxes_and_totals() {
+	calculate_taxes_and_totals: function() {
 		return;
-	}
+	},
 
-	tc_name() {
+	tc_name: function() {
 		this.get_terms();
-	}
+	},
 
-	get_suppliers_button (frm) {
+	get_suppliers_button: function (frm) {
 		var doc = frm.doc;
 		var dialog = new frappe.ui.Dialog({
 			title: __("Get Suppliers"),
@@ -410,8 +410,8 @@ erpnext.buying.RequestforQuotationController = class RequestforQuotationControll
 		});
 
 		dialog.show();
-	}
-};
+	},
+});
 
 // for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({frm: cur_frm}));
+$.extend(cur_frm.cscript, new erpnext.buying.RequestforQuotationController({frm: cur_frm}));

erpnext/buying/doctype/supplier_quotation/supplier_quotation.js

@@ -4,19 +4,19 @@
 // attach required files
 {% include 'erpnext/public/js/controllers/buying.js' %};
 
-erpnext.buying.SupplierQuotationController = class SupplierQuotationController extends erpnext.buying.BuyingController {
-	setup() {
+erpnext.buying.SupplierQuotationController = erpnext.buying.BuyingController.extend({
+	setup: function() {
 		this.frm.custom_make_buttons = {
 			'Purchase Order': 'Purchase Order',
 			'Quotation': 'Quotation'
 		}
 
-		super.setup();
-	}
+		this._super();
+	},
 
-	refresh() {
+	refresh: function() {
 		var me = this;
-		super.refresh();
+		this._super();
 
 		if (this.frm.doc.__islocal && !this.frm.doc.valid_till) {
 			this.frm.set_value('valid_till', frappe.datetime.add_months(this.frm.doc.transaction_date, 1));
@@ -77,25 +77,25 @@ erpnext.buying.SupplierQuotationController = class SupplierQuotationController e
 				})
 			}, __("Get Items From"));
 		}
-	}
+	},
 
-	make_purchase_order() {
+	make_purchase_order: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_purchase_order",
 			frm: cur_frm
 		})
-	}
-	make_quotation() {
+	},
+	make_quotation: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.buying.doctype.supplier_quotation.supplier_quotation.make_quotation",
 			frm: cur_frm
 		})
 
 	}
-};
+});
 
 // for backward compatibility: combine new and previous states
-extend_cscript(cur_frm.cscript, new erpnext.buying.SupplierQuotationController({frm: cur_frm}));
+$.extend(cur_frm.cscript, new erpnext.buying.SupplierQuotationController({frm: cur_frm}));
 
 cur_frm.fields_dict['items'].grid.get_field('project').get_query =
 	function(doc, cdt, cdn) {

erpnext/buying/onboarding_slide/add_a_few_suppliers/add_a_few_suppliers.json

@@ -1,49 +0,0 @@
-{
- "add_more_button": 1,
- "app": "ERPNext",
- "creation": "2019-11-15 14:45:32.626641",
- "docstatus": 0,
- "doctype": "Onboarding Slide",
- "domains": [],
- "help_links": [
-  {
-   "label": "Learn More",
-   "video_id": "zsrrVDk6VBs"
-  }
- ],
- "idx": 0,
- "image_src": "",
- "is_completed": 0,
- "max_count": 3,
- "modified": "2019-12-09 17:54:18.452038",
- "modified_by": "Administrator",
- "name": "Add A Few Suppliers",
- "owner": "Administrator",
- "ref_doctype": "Supplier",
- "slide_desc": "",
- "slide_fields": [
-  {
-   "align": "",
-   "fieldname": "supplier_name",
-   "fieldtype": "Data",
-   "label": "Supplier Name",
-   "placeholder": "",
-   "reqd": 1
-  },
-  {
-   "align": "",
-   "fieldtype": "Column Break",
-   "reqd": 0
-  },
-  {
-   "align": "",
-   "fieldname": "supplier_email",
-   "fieldtype": "Data",
-   "label": "Supplier Email",
-   "reqd": 1
-  }
- ],
- "slide_order": 50,
- "slide_title": "Add A Few Suppliers",
- "slide_type": "Create"
-}