Merge branch 'v11-pre-release' into version-11

* fix: Added description and title to supplier selection popup in Material Request

* Update material_request.js

cleanup

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>

.eslintrc

@@ -4,10 +4,6 @@
 		"node": true,
 		"es6": true
 	},
-	"parserOptions": {
-		"ecmaVersion": 6,
-		"sourceType": "module"
-	},
 	"extends": "eslint:recommended",
 	"rules": {
 		"indent": [
@@ -54,9 +50,9 @@
 	"root": true,
 	"globals": {
 		"frappe": true,
-		"Vue": true,
 		"erpnext": true,
 		"hub": true,
+
 		"$": true,
 		"jQuery": true,
 		"moment": true,
@@ -137,12 +133,6 @@
 		"get_server_fields": true,
 		"set_multiple": true,
 		"QUnit": true,
-		"Chart": true,
-		"Cypress": true,
-		"cy": true,
-		"it": true,
-		"context": true,
-		"before": true,
-		"beforeEach": true
+		"Chart": true
 	}
 }

.flake8

@@ -1,32 +0,0 @@
-[flake8]
-ignore =
-    E121,
-    E126,
-    E127,
-    E128,
-    E203,
-    E225,
-    E226,
-    E231,
-    E241,
-    E251,
-    E261,
-    E265,
-    E302,
-    E303,
-    E305,
-    E402,
-    E501,
-    E741,
-    W291,
-    W292,
-    W293,
-    W391,
-    W503,
-    W504,
-    F403,
-    B007,
-    B950,
-    W191,
-
-max-line-length = 200

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,47 +0,0 @@
----
-name: Bug report
-about: Report a bug encountered while using ERPNext
-labels: bug
----
-
-<!--
-Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
-
-1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
-    - For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
-    - For documentation issues, refer to https://github.com/frappe/erpnext_com
-2. Use the search function before creating a new issue. Duplicates will be closed and directed to
-   the original discussion.
-3. When making a bug report, make sure you provide all required information. The easier it is for
-   maintainers to reproduce, the faster it'll be fixed.
-4. If you think you know what the reason for the bug is, share it with us. Maybe put in a PR 😉
--->
-
-## Description of the issue
-
-## Context information (for bug reports)
-
-**Output of `bench version`**
-```
-(paste here)
-```
-
-## Steps to reproduce the issue
-
-1.
-2.
-3.
-
-### Observed result
-
-### Expected result
-
-### Stacktrace / full error message
-
-```
-(paste here)
-```
-
-## Additional information
-
-OS version / distribution, `ERPNext` install method, etc.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,28 +0,0 @@
----
-name: Feature request
-about: Suggest an idea to improve ERPNext
-labels: feature-request
----
-
-<!--
-Welcome to ERPNext issue tracker! Before creating an issue, please heed the following:
-
-1. This tracker should only be used to report bugs and request features / enhancements to ERPNext
-    - For questions and general support, checkout the manual https://erpnext.com/docs/user/manual/en or use https://discuss.erpnext.com
-    - For documentation issues, refer to https://github.com/frappe/erpnext_com
-2. Use the search function before creating a new issue. Duplicates will be closed and directed to
-   the original discussion.
-3. When making a feature request, make sure to be as verbose as possible. The better you convey your message, the     greater the drive to make it happen.
--->
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question-about-using-erpnext.md

@@ -1,17 +0,0 @@
----
-name: Question about using ERPNext
-about: This is not the appropriate channel
-labels: invalid
----
-
-Please post on our forums:
-
-for questions about using `ERPNext`: https://discuss.erpnext.com
-
-for questions about using the `Frappe Framework`: https://discuss.frappe.io
-
-for questions about using `bench`, probably the best place to start is the [bench repo](https://github.com/frappe/bench)
-
-For documentation issues, use the [ERPNext Documentation](https://erpnext.com/docs/) or [Frappe Framework Documentation](https://frappe.io/docs/user/en) or the [developer cheetsheet](https://github.com/frappe/frappe/wiki/Developer-Cheatsheet)
-
-> **Posts that are not bug reports or feature requests will not be addressed on this issue tracker.**

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,33 +1,2 @@
-<!--
+Please read the pull request checklist to make sure your changes are merged: https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
 
-Some key notes before you open a PR:
-
- 1. Select which branch should this PR be merged in?
- 2. PR name follows [convention](http://karma-runner.github.io/4.0/dev/git-commit-msg.html)
- 3. All tests pass locally, UI and Unit tests
- 4. All business logic and validations must be on the server-side
- 5. Update necessary Documentation
- 6. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes
-
-
-Also, if you're new here
-
-- Documentation Guidelines => https://github.com/frappe/erpnext/wiki/Updating-Documentation
-
-- Contribution Guide => https://github.com/frappe/erpnext/blob/develop/.github/CONTRIBUTING.md
-
-- Pull Request Checklist => https://github.com/frappe/erpnext/wiki/Pull-Request-Checklist
-
--->
-
-> Please provide enough information so that others can review your pull request:
-
-<!-- You can skip this if you're fixing a typo or updating existing documentation -->
-
-> Explain the **details** for making this change. What existing problem does the pull request solve?
-
-<!-- Example: When "Adding a function to do X", explain why it is necessary to have a way to do X. -->
-
-> Screenshots/GIFs
-
-<!-- Add images/recordings to better visualize the change: expected/current behviour -->

.github/workflows/backport.yml

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

.github/workflows/docker-release.yml

@@ -1,14 +0,0 @@
-name: Trigger Docker build on release
-on:
-  release:
-    types: [released]
-jobs:
-  curl:
-    runs-on: ubuntu-latest
-    container:
-      image: alpine:latest
-    steps:
-    - name: curl
-      run: |
-        apk add curl bash
-        curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token ${{ secrets.TRAVIS_CI_TOKEN }}" -d '{"request":{"branch":"master"}}' https://api.travis-ci.com/repo/frappe%2Ffrappe_docker/requests

.gitignore

@@ -12,6 +12,6 @@ erpnext/docs/current
 *.swo
 __pycache__
 *~
-.idea/
 .vscode/
 node_modules/
+.idea/

.pylintrc

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

.travis.yml

@@ -16,11 +16,11 @@ jobs:
   include:
   - name: "Python 2.7 Server Side Test"
     python: 2.7
-    script: bench --site test_site run-tests --app erpnext
+    script: bench --site test_site run-tests --app erpnext --coverage
 
   - name: "Python 3.6 Server Side Test"
     python: 3.6
-    script: bench --site test_site run-tests --app erpnext
+    script: bench --site test_site run-tests --app erpnext --coverage
 
   - name: "Python 2.7 Patch Test"
     python: 2.7
@@ -40,7 +40,8 @@ install:
   - cd ~
   - nvm install 10
 
-  - pip install -U frappe-bench --only-binary='all'
+  - git clone https://github.com/frappe/bench --depth 1
+  - pip install -e ./bench
 
   - git clone https://github.com/frappe/frappe --branch $TRAVIS_BRANCH --depth 1
   - bench init --skip-assets --frappe-path ~/frappe --python $(which python) frappe-bench
@@ -62,7 +63,6 @@ install:
   - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
   - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
   - sudo chmod o+x /usr/local/bin/wkhtmltopdf
-  - sudo apt-get install libcups2-dev
 
   - cd ~/frappe-bench
 
@@ -74,3 +74,7 @@ install:
   - bench get-app erpnext $TRAVIS_BUILD_DIR
   - bench start &
   - bench --site test_site reinstall --yes
+
+after_script:
+  - pip install python-coveralls
+  - coveralls -b apps/erpnext -d ../../sites/.coverage

README.md

@@ -1,11 +1,11 @@
 <div align="center">
-    <img src="https://raw.githubusercontent.com/frappe/erpnext/develop/erpnext/public/images/erpnext-logo.png" height="128">
+    <img src="https://github.com/frappe/design/blob/master/logos/logo-2019/erpnext-logo.png" height="128">
     <h2>ERPNext</h2>
     <p align="center">
         <p>ERP made simple</p>
     </p>
 
-[![Build Status](https://travis-ci.com/frappe/erpnext.svg)](https://travis-ci.com/frappe/erpnext)
+[![Build Status](https://travis-ci.com/frappe/erpnext.png)](https://travis-ci.com/frappe/erpnext)
 [![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
 [![Coverage Status](https://coveralls.io/repos/github/frappe/erpnext/badge.svg?branch=develop)](https://coveralls.io/github/frappe/erpnext?branch=develop)
 
@@ -49,7 +49,7 @@ The ERPNext code is licensed as GNU General Public License (v3) and the Document
 ## Contributing
 
 1. [Issue Guidelines](https://github.com/frappe/erpnext/wiki/Issue-Guidelines)
-1. [Report Security Vulnerabilities](https://erpnext.com/security)
+1. [Report Security Vulnerabilities](https://erpnext.com/report)
 1. [Pull Request Requirements](https://github.com/frappe/erpnext/wiki/Contribution-Guidelines)
 1. [Translations](https://translate.erpnext.com)
 1. [Chart of Accounts](https://charts.erpnext.com)

SECURITY.md

@@ -1,7 +0,0 @@
-# Security Policy
-
-The ERPNext team and community take security issues seriously. To report a security issue, fill out the form at [https://erpnext.com/security/report](https://erpnext.com/security/report).
-
-You can help us make ERPNext and all it's users more secure by following the [Reporting guidelines](https://erpnext.com/security).
-
-We appreciate your efforts to responsibly disclose your findings. We'll endeavor to respond quickly, and will keep you updated throughout the process.

erpnext/__init__.py

@@ -5,7 +5,7 @@ import frappe
 from erpnext.hooks import regional_overrides
 from frappe.utils import getdate
 
-__version__ = '12.31.0'
+__version__ = '11.1.72'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/custom/address.json

@@ -1,58 +0,0 @@
-{
- "custom_fields": [
-  {
-   "_assign": null, 
-   "_comments": null, 
-   "_liked_by": null, 
-   "_user_tags": null, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": null, 
-   "columns": 0, 
-   "creation": "2018-12-28 22:29:21.828090", 
-   "default": null, 
-   "depends_on": null, 
-   "description": null, 
-   "docstatus": 0, 
-   "dt": "Address", 
-   "fetch_from": null, 
-   "fieldname": "tax_category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "idx": 14, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "insert_after": "fax", 
-   "label": "Tax Category", 
-   "modified": "2018-12-28 22:29:21.828090", 
-   "modified_by": "Administrator", 
-   "name": "Address-tax_category", 
-   "no_copy": 0, 
-   "options": "Tax Category", 
-   "owner": "Administrator", 
-   "parent": null, 
-   "parentfield": null, 
-   "parenttype": null, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": null, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "translatable": 0, 
-   "unique": 0, 
-   "width": null
-  }
- ], 
- "custom_perms": [], 
- "doctype": "Address", 
- "property_setters": [], 
- "sync_on_migrate": 1
-}

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js

@@ -1,22 +0,0 @@
-frappe.provide('frappe.dashboards.chart_sources');
-
-frappe.dashboards.chart_sources["Account Balance Timeline"] = {
-	method: "erpnext.accounts.dashboard_chart_source.account_balance_timeline.account_balance_timeline.get",
-	filters: [
-		{
-			fieldname: "company",
-			label: __("Company"),
-			fieldtype: "Link",
-			options: "Company",
-			default: frappe.defaults.get_user_default("Company"),
-			reqd: 1
-		},
-		{
-			fieldname: "account",
-			label: __("Account"),
-			fieldtype: "Link",
-			options: "Account",
-			reqd: 1
-		},
-	]
-};

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.json

@@ -1,13 +0,0 @@
-{
- "creation": "2019-02-06 07:57:10.377718",
- "docstatus": 0,
- "doctype": "Dashboard Chart Source",
- "idx": 0,
- "modified": "2019-04-09 18:30:49.943174",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Account Balance Timeline",
- "owner": "Administrator",
- "source_name": "Account Balance Timeline",
- "timeseries": 1
-}

erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py

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

erpnext/accounts/deferred_revenue.py

@@ -29,7 +29,7 @@ def validate_service_stop_date(doc):
 			if date_diff(item.service_stop_date, item.service_end_date) > 0:
 				frappe.throw(_("Service Stop Date cannot be after Service End Date"))
 
-		if old_stop_dates and old_stop_dates.get(item.name) and item.service_stop_date!=old_stop_dates.get(item.name):
+		if old_stop_dates and old_stop_dates.get(item.name) and item.service_stop_date!=old_stop_dates[item.name]:
 			frappe.throw(_("Cannot change Service Stop Date for item in row {0}".format(item.idx)))
 
 def convert_deferred_expense_to_expense(start_date=None, end_date=None):
@@ -159,7 +159,7 @@ def book_deferred_income_or_expense(doc, posting_date=None):
 			total_days, total_booking_days, account_currency)
 
 		make_gl_entries(doc, credit_account, debit_account, against,
-			amount, base_amount, end_date, project, account_currency, item.cost_center, item)
+			amount, base_amount, end_date, project, account_currency, item.cost_center, item.name)
 
 		if getdate(end_date) < getdate(posting_date) and not last_gl_entry:
 			_book_deferred_revenue_or_expense(item)
@@ -170,7 +170,7 @@ def book_deferred_income_or_expense(doc, posting_date=None):
 			_book_deferred_revenue_or_expense(item)
 
 def make_gl_entries(doc, credit_account, debit_account, against,
-	amount, base_amount, posting_date, project, account_currency, cost_center, item):
+	amount, base_amount, posting_date, project, account_currency, cost_center, voucher_detail_no):
 	# GL Entry for crediting the amount in the deferred expense
 	from erpnext.accounts.general_ledger import make_gl_entries
 
@@ -184,10 +184,10 @@ def make_gl_entries(doc, credit_account, debit_account, against,
 			"credit": base_amount,
 			"credit_in_account_currency": amount,
 			"cost_center": cost_center,
-			"voucher_detail_no": item.name,
+			"voucher_detail_no": voucher_detail_no,
 			'posting_date': posting_date,
 			'project': project
-		}, account_currency, item=item)
+		}, account_currency)
 	)
 	# GL Entry to debit the amount from the expense
 	gl_entries.append(
@@ -197,10 +197,10 @@ def make_gl_entries(doc, credit_account, debit_account, against,
 			"debit": base_amount,
 			"debit_in_account_currency": amount,
 			"cost_center": cost_center,
-			"voucher_detail_no": item.name,
+			"voucher_detail_no": voucher_detail_no,
 			'posting_date': posting_date,
 			'project': project
-		}, account_currency, item=item)
+		}, account_currency)
 	)
 
 	if gl_entries:

erpnext/accounts/doctype/account/account.py

@@ -89,35 +89,34 @@ class Account(NestedSet):
 				throw(_("Root cannot be edited."), RootNotEditable)
 
 		if not self.parent_account and not self.is_group:
-			frappe.throw(_("The root account {0} must be a group").format(frappe.bold(self.name)))
+			frappe.throw(_("Root Account must be a group"))
 
 	def validate_root_company_and_sync_account_to_children(self):
 		# ignore validation while creating new compnay or while syncing to child companies
 		if frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation:
 			return
+
 		ancestors = get_root_company(self.company)
 		if ancestors:
 			if frappe.get_value("Company", self.company, "allow_account_creation_against_child_company"):
 				return
+
 			if not frappe.db.get_value("Account",
 				{'account_name': self.account_name, 'company': ancestors[0]}, 'name'):
 				frappe.throw(_("Please add the account to root level Company - %s" % ancestors[0]))
-		elif self.parent_account:
+		else:
 			descendants = get_descendants_of('Company', self.company)
 			if not descendants: return
-			parent_acc_name_map = {}
-			parent_acc_name, parent_acc_number = frappe.db.get_value('Account', self.parent_account, \
-				["account_name", "account_number"])
-			filters = {
-				"company": ["in", descendants],
-				"account_name": parent_acc_name,
-			}
-			if parent_acc_number:
-				filters["account_number"] = parent_acc_number
 
-			for d in frappe.db.get_values('Account', filters=filters, fieldname=["company", "name"], as_dict=True):
+			parent_acc_name_map = {}
+			parent_acc_name = frappe.db.get_value('Account', self.parent_account, "account_name")
+			for d in frappe.db.get_values('Account',
+				{"company": ["in", descendants], "account_name": parent_acc_name},
+				["company", "name"], as_dict=True):
 				parent_acc_name_map[d["company"]] = d["name"]
+
 			if not parent_acc_name_map: return
+
 			self.create_account_for_child_company(parent_acc_name_map, descendants, parent_acc_name)
 
 	def validate_group_or_ledger(self):
@@ -175,6 +174,7 @@ class Account(NestedSet):
 				filters["account_number"] = self.account_number
 
 			child_account = frappe.db.get_value("Account", filters, 'name')
+
 			if not child_account:
 				doc = frappe.copy_doc(self)
 				doc.flags.ignore_root_company_validation = True
@@ -244,8 +244,6 @@ class Account(NestedSet):
 
 		super(Account, self).on_trash(True)
 
-@frappe.whitelist()
-@frappe.validate_and_sanitize_search_inputs
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql("""select name from tabAccount
 		where is_group = 1 and docstatus != 2 and company = %s

erpnext/accounts/doctype/account/account_tree.js

@@ -1,7 +1,7 @@
 frappe.provide("frappe.treeview_settings")
 
 frappe.treeview_settings["Account"] = {
-	breadcrumb: "Accounts",
+	breadcrumbs: "Accounts",
 	title: __("Chart Of Accounts"),
 	get_tree_root: false,
 	filters: [
@@ -14,9 +14,6 @@ frappe.treeview_settings["Account"] = {
 			on_change: function() {
 				var me = frappe.treeview_settings['Account'].treeview;
 				var company = me.page.fields_dict.company.get_value();
-				if (!company) {
-					frappe.throw(__("Please set a Company"));
-				}
 				frappe.call({
 					method: "erpnext.accounts.doctype.account.account.get_root_company",
 					args: {
@@ -93,13 +90,13 @@ frappe.treeview_settings["Account"] = {
 			frappe.set_route('List', 'Period Closing Voucher', {company: get_company()});
 		}, __('View'));
 
-
+		// make
 		treeview.page.add_inner_button(__("Journal Entry"), function() {
 			frappe.new_doc('Journal Entry', {company: get_company()});
-		}, __('Create'));
+		}, __('Make'));
 		treeview.page.add_inner_button(__("New Company"), function() {
 			frappe.new_doc('Company');
-		}, __('Create'));
+		}, __('Make'));
 
 		// financial statements
 		for (let report of ['Trial Balance', 'General Ledger', 'Balance Sheet',

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

@@ -9,8 +9,8 @@ from unidecode import unidecode
 from six import iteritems
 from frappe.utils.nestedset import rebuild_tree
 
-def create_charts(company, chart_template=None, existing_company=None, custom_chart=None):
-	chart = custom_chart or get_chart(chart_template, existing_company)
+def create_charts(company, chart_template=None, existing_company=None):
+	chart = get_chart(chart_template, existing_company)
 	if chart:
 		accounts = []
 
@@ -40,7 +40,7 @@ def create_charts(company, chart_template=None, existing_company=None, custom_ch
 						"report_type": report_type,
 						"account_number": account_number,
 						"account_type": child.get("account_type"),
-						"account_currency": child.get('account_currency') or frappe.db.get_value('Company',  company,  "default_currency"),
+						"account_currency": frappe.db.get_value('Company',  company,  "default_currency"),
 						"tax_rate": child.get("tax_rate")
 					})
 
@@ -207,9 +207,9 @@ def validate_bank_account(coa, bank_account):
 	return (bank_account in accounts)
 
 @frappe.whitelist()
-def build_tree_from_json(chart_template, chart_data=None):
+def build_tree_from_json(chart_template):
 	''' get chart template from its folder and parse the json to be rendered as tree '''
-	chart = chart_data or get_chart(chart_template)
+	chart = get_chart(chart_template)
 
 	# if no template selected, return as it is
 	if not chart:
@@ -225,7 +225,7 @@ def build_tree_from_json(chart_template, chart_data=None):
 
 			account['parent_account'] = parent
 			account['expandable'] = True if identify_is_group(child) else False
-			account['value'] = (cstr(child.get('account_number')).strip() + ' - ' + account_name) \
+			account['value'] = (child.get('account_number') + ' - ' + account_name) \
 				if child.get('account_number') else account_name
 			accounts.append(account)
 			_import_accounts(child, account['value'])

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

@@ -1,465 +1,466 @@
 {
-    "country_code": "ae", 
-    "name": "U.A.E - Chart of Accounts", 
+    "country_code": "ae",
+    "name": "U.A.E - Chart of Accounts",
     "tree": {
         "Assets": {
             "Current Assets": {
                 "Accounts Receivable": {
                     "Corporate Credit Cards": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Other Receivable": {
                         "Accrued Rebates Due from Suppliers": {
                             "account_type": "Receivable"
-                        }, 
+                        },
                         "Accrued Income from Suppliers": {
                             "account_type": "Receivable"
-                        }, 
+                        },
                         "Other Debtors": {
                             "account_type": "Receivable"
-                        }, 
+                        },
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Post Dated Cheques Received": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Staff Receivable": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Trade Receivable": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "Trade in Opening Fees": {
                         "account_type": "Receivable"
-                    }, 
+                    },
                     "account_type": "Receivable"
-                }, 
+                },
                 "Cash in Hand & Banks": {
                     "Banks": {
-                        "Bank Margin On LC & LG": {}, 
-                        "Banks Blocked Deposits": {}, 
-                        "Banks Call Deposit Accounts": {}, 
+                        "Bank Margin On LC & LG": {},
+                        "Banks Blocked Deposits": {},
+                        "Banks Call Deposit Accounts": {},
                         "Banks Current Accounts": {
                             "account_type": "Bank"
-                        }, 
+                        },
                         "account_type": "Bank"
-                    }, 
+                    },
                     "Cash in Hand": {
                         "Cash in Safe": {
                             "Main Safe": {
                                 "account_type": "Cash"
-                            }, 
+                            },
                             "Main Safe - Foreign Currency": {
                                 "account_type": "Cash"
                             }
-                        }, 
+                        },
                         "Petty Cash": {
-                            "Petty Cash - Administration": {
+                            "Petty Cash - Admininistration": {
                                 "account_type": "Cash"
-                            }, 
+                            },
                             "Petty Cash - Others": {
                                 "account_type": "Cash"
                             }
-                        }, 
+                        },
                         "account_type": "Cash"
-                    }, 
+                    },
                     "Cash in Transit": {
                         "Credit Cards": {
                             "Gateway Credit Cards": {
                                 "account_type": "Bank"
-                            }, 
+                            },
                             "Manual Visa & Master Cards": {
                                 "account_type": "Bank"
-                            }, 
+                            },
                             "PayPal Account": {
                                 "account_type": "Bank"
-                            }, 
+                            },
                             "Visa & Master Credit Cards": {
                                 "account_type": "Bank"
                             }
                         }
                     }
-                }, 
+                },
                 "Inventory": {
                     "Consigned Stock": {
-                        "Handling Difference in Inventory": {
-                            "account_type": "Stock Adjustment"
-                        }, 
+                        "Handling Difference in Inventory": {},
                         "Items Delivered to Customs on temporary Base": {}
-                    }, 
+                    },
                     "Stock in Hand": {
                         "account_type": "Stock"
                     }
-                }, 
+                },
                 "Preliminary and Preoperating Expenses": {
                     "Preoperating Expenses": {}
-                }, 
+                },
                 "Prepayments & Deposits": {
                     "Deposits": {
-                        "Deposit - Office Rent": {}, 
-                        "Deposit Others": {}, 
-                        "Deposit to Immigration (Visa)": {}, 
+                        "Deposit - Office Rent": {},
+                        "Deposit Others": {},
+                        "Deposit to Immigration (Visa)": {},
                         "Deposits - Customs": {}
-                    }, 
+                    },
                     "Prepaid Taxes": {
-                        "Sales Taxes Receivables": {}, 
+                        "Sales Taxes Receivables": {},
                         "Withholding Tax Receivables": {}
-                    }, 
+                    },
                     "Prepayments": {
-                        "Other Prepayments": {}, 
-                        "PrePaid Advertisement Expenses": {}, 
-                        "Prepaid Bank Guarantee": {}, 
-                        "Prepaid Consultancy Fees": {}, 
-                        "Prepaid Employees Housing": {}, 
-                        "Prepaid Finance charge for Loans": {}, 
-                        "Prepaid Legal Fees": {}, 
-                        "Prepaid License Fees": {}, 
-                        "Prepaid Life Insurance": {}, 
-                        "Prepaid Maintenance": {}, 
-                        "Prepaid Medical Insurance": {}, 
-                        "Prepaid Office Rent": {}, 
-                        "Prepaid Other Insurance": {}, 
-                        "Prepaid Schooling Fees": {}, 
-                        "Prepaid Site Hosting Fees": {}, 
+                        "Other Prepayments": {},
+                        "PrePaid Advertisement Expenses": {},
+                        "Prepaid Bank Guarantee": {},
+                        "Prepaid Consultancy Fees": {},
+                        "Prepaid Employees Housing": {},
+                        "Prepaid Finance charge for Loans": {},
+                        "Prepaid Legal Fees": {},
+                        "Prepaid License Fees": {},
+                        "Prepaid Life Insurance": {},
+                        "Prepaid Maintenance": {},
+                        "Prepaid Medical Insurance": {},
+                        "Prepaid Office Rent": {},
+                        "Prepaid Other Insurance": {},
+                        "Prepaid Schooling Fees": {},
+                        "Prepaid Site Hosting Fees": {},
                         "Prepaid Sponsorship Fees": {}
                     }
                 }
-            }, 
+            },
             "Long Term Assets": {
                 "Fixed Assets": {
                     "Accumulated Depreciation": {
                         "Acc. Depreciation of Motor Vehicles": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "Acc. Deprn.Computer Hardware & Software": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "Acc.Deprn.of Furniture & Office Equipment": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "Amortisation on Leasehold Improvement": {
                             "account_type": "Accumulated Depreciation"
-                        }, 
+                        },
                         "account_type": "Accumulated Depreciation"
-                    }, 
+                    },
                     "Fixed Assets (Cost Price)": {
                         "Computer Hardware & Software": {
                             "account_type": "Fixed Asset"
-                        }, 
+                        },
                         "Furniture and Equipment": {
                             "account_type": "Fixed Asset"
-                        }, 
-                        "Leasehold Improvement": {}, 
+                        },
+                        "Leasehold Improvement": {},
                         "Motor Vehicles": {
                             "account_type": "Fixed Asset"
-                        }, 
-                        "Work In Progress": {}, 
+                        },
+                        "Work In Progress": {},
                         "account_type": "Fixed Asset"
                     }
-                }, 
+                },
                 "Intangible Assets": {
-                    "Computer Card Renewal": {}, 
-                    "Disposal of Outlets": {}, 
+                    "Computer Card Renewal": {},
+                    "Disposal of Outlets": {},
                     "Registration of Trademarks": {}
-                }, 
-                "Intercompany Accounts": {}, 
+                },
+                "Intercompany Accounts": {},
                 "Investments": {
                     "Investments in Subsidiaries": {}
                 }
-            }, 
+            },
             "root_type": "Asset"
-        }, 
+        },
         "Closing And Temporary Accounts": {
             "Closing Accounts": {
                 "Closing Account": {}
-            }, 
+            },
             "root_type": "Liability"
-        }, 
+        },
         "Expenses": {
             "Commercial Expenses": {
-                "Consultancy Fees": {}, 
+                "Consultancy Fees": {},
                 "Provision for Doubtful Debts": {}
-            }, 
+            },
             "Cost of Sale": {
                 "Cost Of Goods Sold": {
-                    "Cost Of Goods Sold I/C Sales": {}, 
+                    "Cost Of Goods Sold I/C Sales": {},
                     "Cost of Goods Sold in Trading": {
                         "account_type": "Cost of Goods Sold"
-                    }, 
+                    },
                     "account_type": "Cost of Goods Sold"
-                }, 
+                },
                 "Expenses Included In Valuation": {
                     "account_type": "Expenses Included In Valuation"
+                },
+                "Stock Adjustment": {
+                    "account_type": "Stock Adjustment"
                 }
-            }, 
+            },
             "Depreciation": {
                 "Depreciation & Amortization": {
-                    "Amortization on Leasehold Improvement": {}, 
+                    "Amortization on Leasehold Improvement": {},
                     "Depreciation Of Computer Hard & Soft": {
                         "account_type": "Depreciation"
-                    }, 
+                    },
                     "Depreciation Of Furniture & Office Equipment\n\t\t\t": {
                         "account_type": "Depreciation"
-                    }, 
+                    },
                     "Depreciation Of Motor Vehicles": {
                         "account_type": "Depreciation"
                     }
                 }
-            }, 
+            },
             "Direct Expenses": {
                 "Financial Charges": {
-                    "Air Miles Card Charges": {}, 
-                    "Amex Credit Cards Charges": {}, 
-                    "Bank Finance & Loan Charges": {}, 
-                    "Credit Card Charges": {}, 
-                    "Credit Card Swipe Charges": {}, 
+                    "Air Miles Card Charges": {},
+                    "Amex Credit Cards Charges": {},
+                    "Bank Finance & Loan Charges": {},
+                    "Credit Card Charges": {},
+                    "Credit Card Swipe Charges": {},
                     "PayPal Charges": {}
                 }
-            }, 
+            },
             "MISC Charges": {
                 "Other Charges": {
                     "Capital Loss": {
-                        "Disposal of Business Branch": {}, 
-                        "Loss On Fixed Assets Disposal": {}, 
+                        "Disposal of Business Branch": {},
+                        "Loss On Fixed Assets Disposal": {},
                         "Loss on Difference on Exchange": {}
-                    }, 
+                    },
                     "Other Non Operating Exp": {
                         "Other Non Operating Expenses": {}
-                    }, 
+                    },
                     "Previous Year Adjustments": {
                         "Previous Year Adjustments Account": {}
-                    }, 
+                    },
                     "Royalty Fees": {
                         "Royalty to Parent Co.": {}
-                    }, 
+                    },
                     "Tax / Zakat Expenses": {
                         "Income Tax": {
                             "account_type": "Tax"
-                        }, 
-                        "Zakat": {}, 
+                        },
+                        "Zakat": {},
                         "account_type": "Tax"
                     }
                 }
-            }, 
+            },
             "Share Resources": {
                 "Share Resource Expenses Account": {}
-            }, 
+            },
             "Store Operating Expenses": {
                 "Selling, General & Admin Expenses": {
                     "Advertising Expenses": {
                         "Other - Advertising Expenses": {}
-                    }, 
+                    },
                     "Bank & Finance Charges": {
                         "Other Bank Charges": {}
-                    }, 
+                    },
                     "Communications": {
-                        "Courier": {}, 
-                        "Others - Communication": {}, 
-                        "Telephone": {}, 
+                        "Courier": {},
+                        "Others - Communication": {},
+                        "Telephone": {},
                         "Web Site Hosting Fees": {}
-                    }, 
+                    },
                     "Office & Various Expenses": {
-                        "Cleaning": {}, 
-                        "Conveyance Expenses": {}, 
-                        "Gifts & Donations": {}, 
-                        "Insurance": {}, 
-                        "Kitchen and Buffet Expenses": {}, 
-                        "Maintenance": {}, 
-                        "Others - Office Various Expenses": {}, 
-                        "Security & Guard": {}, 
-                        "Stationary From Suppliers": {}, 
-                        "Stationary Out Of Stock": {}, 
-                        "Subscriptions": {}, 
-                        "Training": {}, 
+                        "Cleaning": {},
+                        "Conveyance Expenses": {},
+                        "Gifts & Donations": {},
+                        "Insurance": {},
+                        "Kitchen and Buffet Expenses": {},
+                        "Maintenance": {},
+                        "Others - Office Various Expenses": {},
+                        "Security & Guard": {},
+                        "Stationary From Suppliers": {},
+                        "Stationary Out Of Stock": {},
+                        "Subscriptions": {},
+                        "Training": {},
                         "Vehicle Expenses": {}
-                    }, 
+                    },
                     "Personnel Cost": {
-                        "Basic Salary": {}, 
-                        "End Of Service Indemnity": {}, 
-                        "Housing Allowance": {}, 
-                        "Leave Salary": {}, 
-                        "Leave Ticket": {}, 
-                        "Life Insurance": {}, 
-                        "Medical Insurance": {}, 
-                        "Personnel Cost Others": {}, 
-                        "Sales Commission": {}, 
-                        "Staff School Allowances": {}, 
-                        "Transportation Allowance": {}, 
-                        "Uniform": {}, 
+                        "Basic Salary": {},
+                        "End Of Service Indemnity": {},
+                        "Housing Allowance": {},
+                        "Leave Salary": {},
+                        "Leave Ticket": {},
+                        "Life Insurance": {},
+                        "Medical Insurance": {},
+                        "Personnel Cost Others": {},
+                        "Sales Commission": {},
+                        "Staff School Allowances": {},
+                        "Transportation Allowance": {},
+                        "Uniform": {},
                         "Visa Expenses": {}
-                    }, 
+                    },
                     "Professional & Legal Fees": {
-                        "Audit Fees": {}, 
-                        "Legal fees": {}, 
-                        "Others - Professional Fees": {}, 
-                        "Sponsorship Fees": {}, 
+                        "Audit Fees": {},
+                        "Legal fees": {},
+                        "Others - Professional Fees": {},
+                        "Sponsorship Fees": {},
                         "Trade License Fees": {}
-                    }, 
+                    },
                     "Provision & Write Off": {
-                        "Amortisation of Preoperating Expenses": {}, 
-                        "Cash Shortage": {}, 
-                        "Others - Provision & Write off": {}, 
-                        "Write Off Inventory": {}, 
+                        "Amortisation of Preoperating Expenses": {},
+                        "Cash Shortage": {},
+                        "Others - Provision & Write off": {},
+                        "Write Off Inventory": {},
                         "Write Off Receivables & Payables": {}
-                    }, 
+                    },
                     "Rent Expenses": {
-                        "Office Rent": {}, 
+                        "Office Rent": {},
                         "Warehouse Rent": {}
-                    }, 
+                    },
                     "Travel Expenses": {
-                        "Air tickets": {}, 
-                        "Hotel": {}, 
-                        "Meals": {}, 
-                        "Others": {}, 
+                        "Air tickets": {},
+                        "Hotel": {},
+                        "Meals": {},
+                        "Others": {},
                         "Per Diem": {}
-                    }, 
+                    },
                     "Utilities": {
-                        "Other Utility Cahrges": {}, 
+                        "Other Utility Cahrges": {},
                         "Water & Electricity": {}
                     }
                 }
-            }, 
+            },
             "root_type": "Expense"
-        }, 
+        },
         "Liabilities": {
             "Current Liabilities": {
                 "Accounts Payable": {
                     "Payables": {
-                        "Advance Payable to Suppliers": {
+                        "Advance Paybale to Suppliers": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Consigned Payable": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Other Payable": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Post Dated Cheques Paid": {
                             "account_type": "Payable"
-                        }, 
-                        "Staff Payable": {}, 
+                        },
+                        "Staff Payable": {},
                         "Suppliers Price Protection": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "Trade Payable": {
                             "account_type": "Payable"
-                        }, 
+                        },
                         "account_type": "Payable"
                     }
-                }, 
+                },
                 "Accruals & Provisions": {
                     "Accruals": {
                         "Accrued Personnel Cost": {
-                            "Accrued - Commissions": {}, 
-                            "Accrued - Leave Salary": {}, 
-                            "Accrued - Leave Tickets": {}, 
-                            "Accrued - Salaries": {}, 
-                            "Accrued Other Personnel Cost": {}, 
-                            "Accrued Salaries Increment": {}, 
+                            "Accrued - Commissions": {},
+                            "Accrued - Leave Salary": {},
+                            "Accrued - Leave Tickets": {},
+                            "Accrued - Salaries": {},
+                            "Accrued Other Personnel Cost": {},
+                            "Accrued Salaries Increment": {},
                             "Accrued-Staff Bonus": {}
                         }
-                    }, 
+                    },
                     "Accrued Expenses": {
                         "Accrued Other Expenses": {
-                            "Accrued - Audit Fees": {}, 
-                            "Accrued - Office Rent": {}, 
-                            "Accrued - Sponsorship": {}, 
-                            "Accrued - Telephone": {}, 
-                            "Accrued - Utilities": {}, 
+                            "Accrued - Audit Fees": {},
+                            "Accrued - Office Rent": {},
+                            "Accrued - Sponsorship": {},
+                            "Accrued - Telephone": {},
+                            "Accrued - Utilities": {},
                             "Accrued Others": {}
                         }
-                    }, 
+                    },
                     "Other Current Liabilities": {
-                        "Accrued Dubai Customs": {}, 
-                        "Deferred income": {}, 
+                        "Accrued Dubai Customs": {},
+                        "Deferred income": {},
                         "Shipping & Handling": {}
-                    }, 
+                    },
                     "Provisions": {
                         "Tax Payables": {
-                            "Income Tax Payable": {}, 
-                            "Sales Tax Payable": {}, 
+                            "Income Tax Payable": {},
+                            "Sales Tax Payable": {},
                             "Withholding Tax Payable": {}
                         }
-                    }, 
+                    },
                     "Short Term Loan": {}
-                }, 
+                },
                 "Duties and Taxes": {
-                    "account_type": "Tax", 
+                    "account_type": "Tax",
                     "is_group": 1
-                }, 
+                },
                 "Reservations & Credit Notes": {
                     "Credit Notes": {
-                        "Credit Notes to Customers": {}, 
+                        "Credit Notes to Customers": {},
                         "Reservations": {}
                     }
-                }, 
+                },
                 "Stock Liabilities": {
                     "Stock Received But Not Billed": {
                         "account_type": "Stock Received But Not Billed"
                     }
-                }, 
+                },
                 "Unearned Income": {}
-            }, 
+            },
             "Long Term Liabilities": {
                 "Long Term Loans & Provisions": {}
-            }, 
+            },
             "root_type": "Liability"
-        }, 
+        },
         "Revenue": {
             "Direct Revenue": {
                 "Other Direct Revenue": {
                     "Other Revenue - Operating": {
-                        "Advertising Income": {}, 
-                        "Branding Income": {}, 
-                        "Early Setmt Margin from Suppliers": {}, 
-                        "Marketing Rebate from Suppliers": {}, 
-                        "Rebate from Suppliers": {}, 
-                        "Service Income": {}, 
+                        "Advertising Income": {},
+                        "Branding Income": {},
+                        "Early Setmt Margin from Suppliers": {},
+                        "Marketing Rebate from Suppliers": {},
+                        "Rebate from Suppliers": {},
+                        "Service Income": {},
                         "Space Rental Income": {}
                     }
                 }
-            }, 
+            },
             "Indirect Revenue": {
                 "Other Indirect Revenue": {
-                    "Capital Gain": {}, 
-                    "Excess In Till": {}, 
-                    "Gain On Difference Of Exchange": {}, 
-                    "Management Consultancy Fees": {}, 
+                    "Capital Gain": {},
+                    "Excess In Till": {},
+                    "Gain On Difference Of Exchange": {},
+                    "Management Consultancy Fees": {},
                     "Other Income": {}
-                }, 
+                },
                 "Other Revenue - Non Operating": {
-                    "Interest Revenue": {}, 
-                    "Interest from FD": {}, 
-                    "Products Listing Fees from Suppliers": {}, 
+                    "Interest Revenue": {},
+                    "Interest from FD": {},
+                    "Products Listing Fees from Suppliers": {},
                     "Trade Opening Fees from suppliers": {}
                 }
-            }, 
+            },
             "Sales": {
                 "Sales from Other Regions": {
                     "Sales from Other Region": {}
-                }, 
+                },
                 "Sales of same region": {
-                    "Management Consultancy Fees 1": {}, 
-                    "Sales Account": {}, 
+                    "Management Consultancy Fees 1": {},
+                    "Sales Account": {},
                     "Sales of I/C": {}
                 }
-            }, 
+            },
             "root_type": "Income"
-        }, 
+        },
         "Share Holder Equity": {
             "Capital": {
-                "Contributed Capital": {}, 
-                "Share Capital": {}, 
-                "Shareholders Current A/c": {}, 
-                "Sub Ordinated Loan": {}, 
+                "Contributed Capital": {},
+                "Share Capital": {},
+                "Shareholders Current A/c": {},
+                "Sub Ordinated Loan": {},
                 "Treasury Stocks": {}
-            }, 
+            },
             "Retained Earnings": {
-                "Current Year Results": {}, 
-                "Dividends Paid": {}, 
+                "Current Year Results": {},
+                "Dividends Paid": {},
                 "Previous Years Results": {}
-            }, 
-            "account_type": "Equity", 
+            },
+            "account_type": "Equity",
             "root_type": "Equity"
         }
     }

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

@@ -407,10 +407,6 @@
                         "Bewertungskorrektur zu Forderungen aus Lieferungen und Leistungen": {
                             "account_number": "9960"
                         },
-                        "Debitoren": {
-                            "is_group": 1,
-                            "account_number": "10000"
-                        },
                         "Forderungen aus Lieferungen und Leistungen": {
                             "account_number": "1200",
                             "account_type": "Receivable"
@@ -663,22 +659,16 @@
                                 "account_number": "1400"
                             },
                             "Abziehbare Vorsteuer 7 %": {
-                                "account_number": "1401",
-                                "account_type": "Tax",
-                                "tax_rate": 7.0
+                                "account_number": "1401"
                             },
                             "Abziehbare Vorsteuer aus innergem. Erwerb": {
                                 "account_number": "1402"
                             },
                             "Abziehbare Vorsteuer aus innergem. Erwerb 19%": {
-                                "account_number": "1404",
-                                "account_type": "Tax",
-                                "tax_rate": 19.0
+                                "account_number": "1404"
                             },
                             "Abziehbare Vorsteuer 19 %": {
-                                "account_number": "1406",
-                                "account_type": "Tax",
-                                "tax_rate": 19.0
+                                "account_number": "1406"
                             },
                             "Abziehbare Vorsteuer nach \u00a7 13b UStG 19 %": {
                                 "account_number": "1407"
@@ -910,8 +900,75 @@
             },
             "is_group": 1
         },
-        "Passiva - Verbindlichkeiten": {
+        "Passiva": {
             "root_type": "Liability",
+            "A - Eigenkapital": {
+                "account_type": "Equity",
+                "is_group": 1,
+                "I - Gezeichnetes Kapital": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "II - Kapitalr\u00fccklage": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "III - Gewinnr\u00fccklagen": {
+                    "account_type": "Equity",
+                    "1 - gesetzliche R\u00fccklage": {
+                        "account_type": "Equity",
+                        "is_group": 1
+                    },
+                    "2 - R\u00fccklage f. Anteile an einem herrschenden oder mehrheitlich beteiligten Unternehmen": {
+                        "account_type": "Equity",
+                        "is_group": 1
+                    },
+                    "3 - satzungsm\u00e4\u00dfige R\u00fccklagen": {
+                        "account_type": "Equity",
+                        "is_group": 1
+                    },
+                    "4 - andere Gewinnr\u00fccklagen": {
+                        "account_type": "Equity",
+                        "is_group": 1,
+                        "Gewinnr\u00fccklagen aus den \u00dcbergangsvorschriften BilMoG": {
+                            "is_group": 1,
+                            "Gewinnr\u00fccklagen (BilMoG)": {
+                                "account_number": "2963"
+                            },
+                            "Gewinnr\u00fccklagen aus Zuschreibung Sachanlageverm\u00f6gen (BilMoG)": {
+                                "account_number": "2964"
+                            },
+                            "Gewinnr\u00fccklagen aus Zuschreibung Finanzanlageverm\u00f6gen (BilMoG)": {
+                                "account_number": "2965"
+                            },
+                            "Gewinnr\u00fccklagen aus Aufl\u00f6sung der Sonderposten mit R\u00fccklageanteil (BilMoG)": {
+                                "account_number": "2966"
+                            }
+                        },
+                        "Latente Steuern (Gewinnr\u00fccklage Haben) aus erfolgsneutralen Verrechnungen": {
+                            "account_number": "2967"
+                        },
+                        "Latente Steuern (Gewinnr\u00fccklage Soll) aus erfolgsneutralen Verrechnungen": {
+                            "account_number": "2968"
+                        },
+                        "Rechnungsabgrenzungsposten (Gewinnr\u00fccklage Soll) aus erfolgsneutralen Verrechnungen": {
+                            "account_number": "2969"
+                        }
+                    },
+                    "is_group": 1
+                },
+                "IV - Gewinnvortrag/Verlustvortrag": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "V - Jahres\u00fcberschu\u00df/Jahresfehlbetrag": {
+                    "account_type": "Equity",
+                    "is_group": 1
+                },
+                "Einlagen stiller Gesellschafter": {
+                    "account_number": "9295"
+                }
+            },
             "B - R\u00fcckstellungen": {
                 "is_group": 1,
                 "1 - R\u00fcckstellungen f. Pensionen und \u00e4hnliche Verplicht.": {
@@ -1020,7 +1077,7 @@
                     }
                 }
             },
-            "C - Verbindlichkeiten": {
+            "C - Verb.": {
                 "account_type": "Payable",
                 "1 - Anleihen": {
                     "is_group": 1,
@@ -1137,14 +1194,6 @@
                     "Bewertungskorrektur zu Verb. aus Lieferungen und Leistungen": {
                         "account_number": "9964"
                     },
-                    "Kreditoren": {
-                        "account_number": "70000",
-                        "is_group": 1,
-                        "Wareneingangs-­Verrechnungskonto" : {
-                            "account_number": "70001",
-                            "account_type": "Stock Received But Not Billed"
-                        }
-                    },
                     "Verb. aus Lieferungen und Leistungen": {
                         "account_number": "3300",
                         "account_type": "Payable"
@@ -1427,21 +1476,17 @@
                         },
                         "Umsatzsteuer 7 %": {
                             "account_number": "3801",
-                            "account_type": "Tax",
-                            "tax_rate": 7.0
+                            "account_type": "Tax"
                         },
                         "Umsatzsteuer aus innergem. Erwerb": {
                             "account_number": "3802"
                         },
                         "Umsatzsteuer aus innergem. Erwerb 19 %": {
-                            "account_number": "3804",
-                            "account_type": "Tax",
-                            "tax_rate": 19.0
+                            "account_number": "3804"
                         },
                         "Umsatzsteuer 19 %": {
                             "account_number": "3806",
-                            "account_type": "Tax",
-                            "tax_rate": 19.0
+                            "account_type": "Tax"
                         },
                         "Umsatzsteuer aus im Inland steuerpfl. EU-Lieferungen": {
                             "account_number": "3807"
@@ -1528,143 +1573,6 @@
             },
             "is_group": 1
         },
-        "Passiva - Eigenkapital": {
-            "root_type": "Equity",
-            "A - Eigenkapital": {
-                "account_type": "Equity",
-                "is_group": 1,
-                "I - Gezeichnetes Kapital": {
-                    "account_type": "Equity",
-                    "is_group": 1,
-                    "Gezeichnetes Kapital": {
-                        "account_number": "2900",
-                        "account_type": "Equity"
-                    },
-                    "Gesch\u00e4ftsguthaben der verbleibenden Mitglieder": {
-                        "account_number": "2901"
-                    },
-                    "Gesch\u00e4ftsguthaben der ausscheidenden Mitglieder": {
-                        "account_number": "2902"
-                    },
-                    "Gesch\u00e4ftsguthaben aus gek\u00fcndigten Gesch\u00e4ftsanteilen": {
-                        "account_number": "2903"
-                    },
-                    "R\u00fcckst\u00e4ndige f\u00e4llige Einzahlungen auf Gesch\u00e4ftsanteile, vermerkt": {
-                        "account_number": "2906"
-                    },
-                    "Gegenkonto R\u00fcckst\u00e4ndige f\u00e4llige Einzahlungen auf Gesch\u00e4ftsanteile, vermerkt": {
-                        "account_number": "2907"
-                    },
-                    "Kapitalerh\u00f6hung aus Gesellschaftsmitteln": {
-                        "account_number": "2908"
-                    },
-                    "Ausstehende Einlagen auf das gezeichnete Kapital, nicht eingefordert": {
-                        "account_number": "2910"
-                    }
-                },
-                "II - Kapitalr\u00fccklage": {
-                    "account_type": "Equity",
-                    "is_group": 1,
-                    "Kapitalr\u00fccklage": {
-                        "account_number": "2920"
-                    },
-                    "Kapitalr\u00fccklage durch Ausgabe von Anteilen \u00fcber Nennbetrag": {
-                        "account_number": "2925"
-                    },
-                    "Kapitalr\u00fccklage durch Ausgabe von Schuldverschreibungen": {
-                        "account_number": "2926"
-                    },
-                    "Kapitalr\u00fccklage durch Zuzahlungen gegen Gew\u00e4hrung eines Vorzugs": {
-                        "account_number": "2927"
-                    },
-                    "Kapitalr\u00fccklage durch Zuzahlungen in das Eigenkapital": {
-                        "account_number": "2928"
-                    },
-                    "Nachschusskapital (Gegenkonto 1299)": {
-                        "account_number": "2929"
-                    }
-                },
-                "III - Gewinnr\u00fccklagen": {
-                    "account_type": "Equity",
-                    "1 - gesetzliche R\u00fccklage": {
-                        "account_type": "Equity",
-                        "is_group": 1,
-                        "Gesetzliche R\u00fccklage": {
-                            "account_number": "2930"
-                        }
-                    },
-                    "2 - R\u00fccklage f. Anteile an einem herrschenden oder mehrheitlich beteiligten Unternehmen": {
-                        "account_type": "Equity",
-                        "is_group": 1,
-                        "R\u00fccklage f. Anteile an einem herrschenden oder mehrheitlich beteiligten Unternehmen": {
-                            "account_number": "2935"
-                        }
-                    },
-                    "3 - satzungsm\u00e4\u00dfige R\u00fccklagen": {
-                        "account_type": "Equity",
-                        "is_group": 1,
-                        "Satzungsm\u00e4\u00dfige R\u00fccklagen": {
-                            "account_number": "2950"
-                        }
-                    },
-                    "4 - andere Gewinnr\u00fccklagen": {
-                        "account_type": "Equity",
-                        "is_group": 1,
-                        "Andere Gewinnr\u00fccklagen": {
-                            "account_number": "2960"
-                        },
-                        "Andere Gewinnr\u00fccklagen aus dem Erwerb eigener Anteile": {
-                            "account_number": "2961"
-                        },
-                        "Eigenkapitalanteil von Wertaufholungen": {
-                            "account_number": "2962"
-                        },
-                        "Gewinnr\u00fccklagen aus den \u00dcbergangsvorschriften BilMoG": {
-                            "is_group": 1,
-                            "Gewinnr\u00fccklagen (BilMoG)": {
-                                "account_number": "2963"
-                            },
-                            "Gewinnr\u00fccklagen aus Zuschreibung Sachanlageverm\u00f6gen (BilMoG)": {
-                                "account_number": "2964"
-                            },
-                            "Gewinnr\u00fccklagen aus Zuschreibung Finanzanlageverm\u00f6gen (BilMoG)": {
-                                "account_number": "2965"
-                            },
-                            "Gewinnr\u00fccklagen aus Aufl\u00f6sung der Sonderposten mit R\u00fccklageanteil (BilMoG)": {
-                                "account_number": "2966"
-                            }
-                        },
-                        "Latente Steuern (Gewinnr\u00fccklage Haben) aus erfolgsneutralen Verrechnungen": {
-                            "account_number": "2967"
-                        },
-                        "Latente Steuern (Gewinnr\u00fccklage Soll) aus erfolgsneutralen Verrechnungen": {
-                            "account_number": "2968"
-                        },
-                        "Rechnungsabgrenzungsposten (Gewinnr\u00fccklage Soll) aus erfolgsneutralen Verrechnungen": {
-                            "account_number": "2969"
-                        }
-                    },
-                    "is_group": 1
-                },
-                "IV - Gewinnvortrag/Verlustvortrag": {
-                    "account_type": "Equity",
-                    "is_group": 1,
-                    "Gewinnvortrag vor Verwendung": {
-                        "account_number": "2970"
-                    },
-                    "Verlustvortrag vor Verwendung": {
-                        "account_number": "2978"
-                    }
-                },
-                "V - Jahres\u00fcberschu\u00df/Jahresfehlbetrag": {
-                    "account_type": "Equity",
-                    "is_group": 1
-                },
-                "Einlagen stiller Gesellschafter": {
-                    "account_number": "9295"
-                }
-            }
-        },
         "1 - Umsatzerl\u00f6se": {
             "root_type": "Income",
             "is_group": 1,
@@ -1774,6 +1682,90 @@
                     "account_type": "Income Account"
                 }
             },
+            "Erl\u00f6sschm\u00e4lerungen (Gruppe)": {
+                "is_group": 1,
+                "Erl\u00f6sschm\u00e4lerungen": {
+                    "account_number": "4700"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus steuerfreien Ums\u00e4tzen \u00a7 4 Nr. 1a UStG": {
+                    "account_number": "4705"
+                },
+                "Erl\u00f6sschm\u00e4lerungen 7 % USt": {
+                    "account_number": "4710"
+                },
+                "Erl\u00f6sschm\u00e4lerungen 19 % USt": {
+                    "account_number": "4720"
+                },
+                "Erl\u00f6sschm\u00e4lerungen 16 % USt": {
+                    "account_number": "4723"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus steuerfreien innergem. Lieferungen": {
+                    "account_number": "4724"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 7 % USt": {
+                    "account_number": "4725"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 19 % USt": {
+                    "account_number": "4726"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus im anderen EU-Land steuerpfl. Lieferungen": {
+                    "account_number": "4727"
+                },
+                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 16 % USt": {
+                    "account_number": "4729"
+                },
+                "Gew\u00e4hrte Skonti (Gruppe)": {
+                    "is_group": 1,
+                    "Gew. Skonti": {
+                        "account_number": "4730"
+                    },
+                    "Gew. Skonti 7 % USt": {
+                        "account_number": "4731"
+                    },
+                    "Gew. Skonti 19 % USt": {
+                        "account_number": "4736"
+                    },
+                    "Gew. Skonti aus Lieferungen von Mobilfunkger./Schaltkr., f. die der Leistungsempf. die Ust. schuldet": {
+                        "account_number": "4738"
+                    },
+                    "Gew. Skonti aus Leistungen, f. die der Leistungsempf. die Umsatzsteuer nach \u00a7 13b UStG schuldet": {
+                        "account_number": "4741"
+                    },
+                    "Gew. Skonti aus Erl\u00f6sen aus im anderen EU-Land steuerpfl. Leistungen, f. die der Leistungsempf. die Ust. schuldet": {
+                        "account_number": "4742"
+                    },
+                    "Gew. Skonti aus steuerfreien innergem. Lieferungen \u00a7 4 Nr. 1b UStG": {
+                        "account_number": "4743"
+                    },
+                    "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen": {
+                        "account_number": "4745"
+                    },
+                    "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 7% USt": {
+                        "account_number": "4746"
+                    },
+                    "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 19% USt": {
+                        "account_number": "4748"
+                    }
+                },
+                "Gew\u00e4hrte Boni 7 % USt": {
+                    "account_number": "4750"
+                },
+                "Gew\u00e4hrte Boni 19 % USt": {
+                    "account_number": "4760"
+                },
+                "Gew\u00e4hrte Boni": {
+                    "account_number": "4769"
+                },
+                "Gew\u00e4hrte Rabatte": {
+                    "account_number": "4770"
+                },
+                "Gew\u00e4hrte Rabatte 7 % USt": {
+                    "account_number": "4780"
+                },
+                "Gew\u00e4hrte Rabatte 19 % USt": {
+                    "account_number": "4790"
+                }
+            },
             "Grundst\u00fccksertr\u00e4ge (Gruppe)": {
                 "is_group": 1,
                 "Grundst\u00fccksertr\u00e4ge": {
@@ -2057,6 +2049,48 @@
                     "Erh. Skonti aus Erwerb Waren als letzter Abnehmer innerh. Dreiecksgesch. 19% Vorst. u. 19% Ust.": {
                         "account_number": "5793"
                     }
+                },
+                "Erhaltene Boni (Gruppe)": {
+                    "is_group": 1,
+                    "Erhaltene Boni 7 % Vorsteuer": {
+                        "account_number": "5750"
+                    },
+                    "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                        "account_number": "5753"
+                    },
+                    "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                        "account_number": "5754"
+                    },
+                    "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                        "account_number": "5755"
+                    },
+                    "Erhaltene Boni 19 % Vorsteuer": {
+                        "account_number": "5760"
+                    },
+                    "Erhaltene Boni": {
+                        "account_number": "5769"
+                    }
+                },
+                "Erhaltene Rabatte (Gruppe)": {
+                    "is_group": 1,
+                    "Erhaltene Rabatte": {
+                        "account_number": "5770"
+                    },
+                    "Erhaltene Rabatte 7 % Vorsteuer": {
+                        "account_number": "5780"
+                    },
+                    "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
+                        "account_number": "5783"
+                    },
+                    "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
+                        "account_number": "5784"
+                    },
+                    "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
+                        "account_number": "5785"
+                    },
+                    "Erhaltene Rabatte 19 % Vorsteuer": {
+                        "account_number": "5790"
+                    }
                 }
             },
             "Bezugsnebenkosten (Gruppe)": {
@@ -2376,48 +2410,6 @@
         "6 - sonstige betriebliche Ertr\u00e4ge": {
             "root_type": "Income",
             "is_group": 1,
-            "Erhaltene Boni (Gruppe)": {
-                "is_group": 1,
-                "Erhaltene Boni 7 % Vorsteuer": {
-                    "account_number": "5750"
-                },
-                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
-                    "account_number": "5753"
-                },
-                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
-                    "account_number": "5754"
-                },
-                "Erhaltene Boni aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
-                    "account_number": "5755"
-                },
-                "Erhaltene Boni 19 % Vorsteuer": {
-                    "account_number": "5760"
-                },
-                "Erhaltene Boni": {
-                    "account_number": "5769"
-                }
-            },
-            "Erhaltene Rabatte (Gruppe)": {
-                "is_group": 1,
-                "Erhaltene Rabatte": {
-                    "account_number": "5770"
-                },
-                "Erhaltene Rabatte 7 % Vorsteuer": {
-                    "account_number": "5780"
-                },
-                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe": {
-                    "account_number": "5783"
-                },
-                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 7% Vorsteuer": {
-                    "account_number": "5784"
-                },
-                "Erhaltene Rabatte aus Einkauf Roh-, Hilfs- und Betriebsstoffe 19% Vorsteuer": {
-                    "account_number": "5785"
-                },
-                "Erhaltene Rabatte 19 % Vorsteuer": {
-                    "account_number": "5790"
-                }
-            },
             "Andere aktivierte Eigenleistungen": {
                 "account_number": "4820"
             },
@@ -2487,26 +2479,29 @@
             "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchgewinn)": {
                 "account_number": "4849"
             },
-            "Erl\u00f6se aus Verk\u00e4ufen immaterieller VG (bei Buchgewinn)": {
-                "account_number": "4850"
-            },
-            "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchgewinn)": {
-                "account_number": "4851"
-            },
-            "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (inl\u00e4ndische Kap.Ges., bei Buchgewinn)": {
-                "account_number": "4852"
-            },
-            "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchvergewinn)": {
-                "account_number": "4855"
-            },
-            "Anlagenabg\u00e4nge immaterielle VG (Restbuchwert bei Buchgewinn)": {
-                "account_number": "4856"
-            },
-            "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchgewinn)": {
-                "account_number": "4857"
-            },
-            "Anlagenabg\u00e4nge Finanzanlagen (inl\u00e4ndische Kap.Ges., Restbuchwert bei Buchgewinn)": {
-                "account_number": "4858"
+            "Erl\u00f6se aus Verk\u00e4ufen immaterieller VG (bei Buchgewinn) (Gruppe)": {
+                "is_group": 1,
+                "Erl\u00f6se aus Verk\u00e4ufen immaterieller VG (bei Buchgewinn)": {
+                    "account_number": "4850"
+                },
+                "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchgewinn)": {
+                    "account_number": "4851"
+                },
+                "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (inl\u00e4ndische Kap.Ges., bei Buchgewinn)": {
+                    "account_number": "4852"
+                },
+                "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchvergewinn)": {
+                    "account_number": "4855"
+                },
+                "Anlagenabg\u00e4nge immaterielle VG (Restbuchwert bei Buchgewinn)": {
+                    "account_number": "4856"
+                },
+                "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchgewinn)": {
+                    "account_number": "4857"
+                },
+                "Anlagenabg\u00e4nge Finanzanlagen (inl\u00e4ndische Kap.Ges., Restbuchwert bei Buchgewinn)": {
+                    "account_number": "4858"
+                }
             },
             "Ertr\u00e4ge aus Zuschreibungen des Sachanlageverm\u00f6gens": {
                 "account_number": "4910",
@@ -2629,17 +2624,20 @@
             "Entnahme von Gegenst\u00e4nden ohne USt": {
                 "account_number": "4605"
             },
-            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 7 % USt": {
-                "account_number": "4630"
-            },
-            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt": {
-                "account_number": "4637"
-            },
-            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternnehmens ohne USt (Telefon-Nutzung)": {
-                "account_number": "4638"
-            },
-            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt (Kfz-Nutzung)": {
-                "account_number": "4639"
+            "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 7 % USt (Gruppe)": {
+                "is_group": 1,
+                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 7 % USt": {
+                    "account_number": "4630"
+                },
+                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt": {
+                    "account_number": "4637"
+                },
+                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternnehmens ohne USt (Telefon-Nutzung)": {
+                    "account_number": "4638"
+                },
+                "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens ohne USt (Kfz-Nutzung)": {
+                    "account_number": "4639"
+                }
             },
             "Verwendung von Gegenst\u00e4nden f. Zwecke au\u00dferhalb des Unternehmens 19 % USt (Gruppe)": {
                 "is_group": 1,
@@ -2677,11 +2675,14 @@
             "Unentgeltliche Zuwendung von Gegenst\u00e4nden ohne USt": {
                 "account_number": "4689"
             },
-            "Nicht steuerbare Ums\u00e4tze (Innenums\u00e4tze)": {
-                "account_number": "4690"
-            },
-            "Umsatzsteuerverg\u00fctungen, z.B. nach \u00a7 24 UStG": {
-                "account_number": "4695"
+            "Nicht steuerbare Ums\u00e4tze (Innenums\u00e4tze) (Gruppe)": {
+                "is_group": 1,
+                "Nicht steuerbare Ums\u00e4tze (Innenums\u00e4tze)": {
+                    "account_number": "4690"
+                },
+                "Umsatzsteuerverg\u00fctungen, z.B. nach \u00a7 24 UStG": {
+                    "account_number": "4695"
+                }
             },
             "Au\u00dferordentliche Ertr\u00e4ge (Gruppe)": {
                 "is_group": 1,
@@ -2691,128 +2692,47 @@
                 "Au\u00dferordentliche Ertr\u00e4ge finanzwirksam": {
                     "account_number": "7401"
                 },
-                "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam": {
-                    "account_number": "7450"
+                "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam (Gruppe)": {
+                    "is_group": 1,
+                    "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam": {
+                        "account_number": "7450"
+                    },
+                    "Ertr\u00e4ge durch Verschmelzung und Umwandlung": {
+                        "account_number": "7451"
+                    },
+                    "Ertr\u00e4ge durch den Verkauf von bedeutenden Beteiligungen": {
+                        "account_number": "7452"
+                    },
+                    "Ert\u00e4ge durch den Verkauf von bedeutenden Grundst\u00fccken": {
+                        "account_number": "7453"
+                    },
+                    "Gewinn aus der Ver\u00e4u\u00dferung oder der Aufgabe von Gesch\u00e4ftsaktivit\u00e4ten nach Steuern": {
+                        "account_number": "7454"
+                    }
                 },
-                "Ertr\u00e4ge durch Verschmelzung und Umwandlung": {
-                    "account_number": "7451"
-                },
-                "Ertr\u00e4ge durch den Verkauf von bedeutenden Beteiligungen": {
-                    "account_number": "7452"
-                },
-                "Ert\u00e4ge durch den Verkauf von bedeutenden Grundst\u00fccken": {
-                    "account_number": "7453"
-                },
-                "Gewinn aus der Ver\u00e4u\u00dferung oder der Aufgabe von Gesch\u00e4ftsaktivit\u00e4ten nach Steuern": {
-                    "account_number": "7454"
-                },
-                "Au\u00dferordentliche Ertr\u00e4ge aus der Anwendung von \u00dcbergangsvorschriften": {
-                    "account_number": "7460"
-                },
-                "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Sachanlageverm\u00f6gen": {
-                    "account_number": "7461"
-                },
-                "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Finanzanlageverm\u00f6gen": {
-                    "account_number": "7462"
-                },
-                "Au\u00dferordentliche Ertr\u00e4ge: Wertpapiere im Umlaufverm\u00f6gen": {
-                    "account_number": "7463"
-                },
-                "Au\u00dferordentliche Ertr\u00e4ge: latente Steuern": {
-                    "account_number": "7464"
+                "Au\u00dferordentliche Ertr\u00e4ge aus der Anwendung von \u00dcbergangsvorschriften (Gruppe)": {
+                    "is_group": 1,
+                    "Au\u00dferordentliche Ertr\u00e4ge aus der Anwendung von \u00dcbergangsvorschriften": {
+                        "account_number": "7460"
+                    },
+                    "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Sachanlageverm\u00f6gen": {
+                        "account_number": "7461"
+                    },
+                    "Au\u00dferordentliche Ertr\u00e4ge: Zuschreibung f. Finanzanlageverm\u00f6gen": {
+                        "account_number": "7462"
+                    },
+                    "Au\u00dferordentliche Ertr\u00e4ge: Wertpapiere im Umlaufverm\u00f6gen": {
+                        "account_number": "7463"
+                    },
+                    "Au\u00dferordentliche Ertr\u00e4ge: latente Steuern": {
+                        "account_number": "7464"
+                    }
                 }
             }
         },
         "7 - sonstige betriebliche Aufwendungen": {
             "root_type": "Expense",
             "is_group": 1,
-            "Erl\u00f6sschm\u00e4lerungen (Gruppe)": {
-                "is_group": 1,
-                "Erl\u00f6sschm\u00e4lerungen": {
-                    "account_number": "4700"
-                },
-                "Erl\u00f6sschm\u00e4lerungen aus steuerfreien Ums\u00e4tzen \u00a7 4 Nr. 1a UStG": {
-                    "account_number": "4705"
-                },
-                "Erl\u00f6sschm\u00e4lerungen 7 % USt": {
-                    "account_number": "4710"
-                },
-                "Erl\u00f6sschm\u00e4lerungen 19 % USt": {
-                    "account_number": "4720"
-                },
-                "Erl\u00f6sschm\u00e4lerungen 16 % USt": {
-                    "account_number": "4723"
-                },
-                "Erl\u00f6sschm\u00e4lerungen aus steuerfreien innergem. Lieferungen": {
-                    "account_number": "4724"
-                },
-                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 7 % USt": {
-                    "account_number": "4725"
-                },
-                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 19 % USt": {
-                    "account_number": "4726"
-                },
-                "Erl\u00f6sschm\u00e4lerungen aus im anderen EU-Land steuerpfl. Lieferungen": {
-                    "account_number": "4727"
-                },
-                "Erl\u00f6sschm\u00e4lerungen aus im Inland steuerpfl. EU-Lieferungen 16 % USt": {
-                    "account_number": "4729"
-                }
-            },
-            "Gew\u00e4hrte Skonti (Gruppe)": {
-                "is_group": 1,
-                "Gew. Skonti": {
-                    "account_number": "4730"
-                },
-                "Gew. Skonti 7 % USt": {
-                    "account_number": "4731"
-                },
-                "Gew. Skonti 19 % USt": {
-                    "account_number": "4736"
-                },
-                "Gew. Skonti aus Lieferungen von Mobilfunkger./Schaltkr., f. die der Leistungsempf. die Ust. schuldet": {
-                    "account_number": "4738"
-                },
-                "Gew. Skonti aus Leistungen, f. die der Leistungsempf. die Umsatzsteuer nach \u00a7 13b UStG schuldet": {
-                    "account_number": "4741"
-                },
-                "Gew. Skonti aus Erl\u00f6sen aus im anderen EU-Land steuerpfl. Leistungen, f. die der Leistungsempf. die Ust. schuldet": {
-                    "account_number": "4742"
-                },
-                "Gew. Skonti aus steuerfreien innergem. Lieferungen \u00a7 4 Nr. 1b UStG": {
-                    "account_number": "4743"
-                },
-                "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen": {
-                    "account_number": "4745"
-                },
-                "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 7% USt": {
-                    "account_number": "4746"
-                },
-                "Gew. Skonti aus im Inland steuerpfl. EU-Lieferungen 19% USt": {
-                    "account_number": "4748"
-                }
-            },
-            "Gew\u00e4hrte Boni (Gruppe)": {
-                "is_group": 1,
-                "Gew\u00e4hrte Boni 7 % USt": {
-                    "account_number": "4750"
-                },
-                "Gew\u00e4hrte Boni 19 % USt": {
-                    "account_number": "4760"
-                },
-                "Gew\u00e4hrte Boni": {
-                    "account_number": "4769"
-                },
-                "Gew\u00e4hrte Rabatte": {
-                    "account_number": "4770"
-                },
-                "Gew\u00e4hrte Rabatte 7 % USt": {
-                    "account_number": "4780"
-                },
-                "Gew\u00e4hrte Rabatte 19 % USt": {
-                    "account_number": "4790"
-                }
-            },
             "Sonstige betriebliche Aufwendungen": {
                 "account_number": "6300"
             },
@@ -2906,79 +2826,103 @@
                     "account_number": "6398"
                 }
             },
-            "Versicherungen": {
-                "account_number": "6400"
-            },
-            "Versicherungen f. Geb\u00e4ude, die zum Betriebsverm\u00f6gen geh\u00f6ren": {
-                "account_number": "6405"
-            },
-            "Netto-Pr\u00e4mie f. R\u00fcckdeckung k\u00fcnftiger Versorgungsleistungen": {
-                "account_number": "6410"
-            },
-            "Beitr\u00e4ge": {
-                "account_number": "6420"
-            },
-            "Sonstige Abgaben": {
-                "account_number": "6430"
-            },
-            "Steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
-                "account_number": "6436"
-            },
-            "Steuerlich nicht abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
-                "account_number": "6437"
-            },
-            "Ausgleichsabgabe i. S. d. Schwerbehindertengesetzes": {
-                "account_number": "6440"
-            },
-            "Reparaturen und Instandhaltung von Bauten": {
-                "account_number": "6450"
-            },
-            "Reparaturen und Instandhaltung von technischenAnlagen und Maschinen": {
-                "account_number": "6460"
-            },
-            "Reparaturen und Instandhaltung von anderen Anlagen und Betriebs- und Gesch\u00e4ftsausstattung": {
-                "account_number": "6470"
-            },
-            "Zuf\u00fchrung zu Aufwandsr\u00fcckstellungen": {
-                "account_number": "6475"
-            },
-            "Reparaturen und Instandhaltung von anderen Anlagen": {
-                "account_number": "6485"
-            },
-            "Sonstige Reparaturen und Instandhaltungen": {
-                "account_number": "6490"
-            },
-            "Wartungskosten f. Hard- und Software": {
-                "account_number": "6495"
-            },
-            "Mietleasing (bewegliche Wirtschaftsg\u00fcter)": {
-                "account_number": "6498"
+            "Versicherungen (Gruppe)": {
+                "is_group": 1,
+                "Versicherungen": {
+                    "account_number": "6400"
+                },
+                "Versicherungen f. Geb\u00e4ude, die zum Betriebsverm\u00f6gen geh\u00f6ren": {
+                    "account_number": "6405"
+                },
+                "Netto-Pr\u00e4mie f. R\u00fcckdeckung k\u00fcnftiger Versorgungsleistungen": {
+                    "account_number": "6410"
+                },
+                "Beitr\u00e4ge": {
+                    "account_number": "6420"
+                },
+                "Sonstige Abgaben": {
+                    "account_number": "6430"
+                },
+                "Steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
+                    "account_number": "6436"
+                },
+                "Steuerlich nicht abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {
+                    "account_number": "6437"
+                },
+                "Ausgleichsabgabe i. S. d. Schwerbehindertengesetzes": {
+                    "account_number": "6440"
+                },
+                "Reparaturen und Instandhaltung von Bauten": {
+                    "account_number": "6450"
+                },
+                "Reparaturen und Instandhaltung von technischenAnlagen und Maschinen": {
+                    "account_number": "6460"
+                },
+                "Reparaturen und Instandhaltung von anderen Anlagen und Betriebs- und Gesch\u00e4ftsausstattung": {
+                    "account_number": "6470"
+                },
+                "Zuf\u00fchrung zu Aufwandsr\u00fcckstellungen": {
+                    "account_number": "6475"
+                },
+                "Reparaturen und Instandhaltung von anderen Anlagen": {
+                    "account_number": "6485"
+                },
+                "Sonstige Reparaturen und Instandhaltungen": {
+                    "account_number": "6490"
+                },
+                "Wartungskosten f. Hard- und Software": {
+                    "account_number": "6495"
+                },
+                "Mietleasing (bewegliche Wirtschaftsg\u00fcter)": {
+                    "account_number": "6498"
+                }
             },
             "Fahrzeugkosten (Gruppe)": {
                 "is_group": 1,
                 "Fahrzeugkosten": {
                     "account_number": "6500"
                 },
-                "Kfz-Versicherungen": {
-                    "account_number": "6520"
+                "Kfz-Versicherungen (Gruppe)": {
+                    "is_group": 1,
+                    "Kfz-Versicherungen": {
+                        "account_number": "6520"
+                    }
                 },
-                "Laufende Kfz-Betriebskosten": {
-                    "account_number": "6530"
+                "Laufende Kfz-Betriebskosten (Gruppe)": {
+                    "is_group": 1,
+                    "Laufende Kfz-Betriebskosten": {
+                        "account_number": "6530"
+                    }
                 },
-                "Kfz-Reparaturen": {
-                    "account_number": "6540"
+                "Kfz-Reparaturen (Gruppe)": {
+                    "is_group": 1,
+                    "Kfz-Reparaturen": {
+                        "account_number": "6540"
+                    }
                 },
-                "Garagenmiete": {
-                    "account_number": "6550"
+                "Garagenmiete (Gruppe)": {
+                    "is_group": 1,
+                    "Garagenmiete": {
+                        "account_number": "6550"
+                    }
                 },
-                "Mietleasing Kfz": {
-                    "account_number": "6560"
+                "Mietleasing Kfz (Gruppe)": {
+                    "is_group": 1,
+                    "Mietleasing Kfz": {
+                        "account_number": "6560"
+                    }
                 },
-                "Sonstige Kfz-Kosten": {
-                    "account_number": "6570"
+                "Sonstige Kfz-Kosten (Gruppe)": {
+                    "is_group": 1,
+                    "Sonstige Kfz-Kosten": {
+                        "account_number": "6570"
+                    }
                 },
-                "Mautgeb\u00fchren": {
-                    "account_number": "6580"
+                "Mautgeb\u00fchren (Gruppe)": {
+                    "is_group": 1,
+                    "Mautgeb\u00fchren": {
+                        "account_number": "6580"
+                    }
                 },
                 "Kfz-Kosten f. betrieblich genutzte zum Privatverm\u00f6gen geh\u00f6rende Kraftfahrzeuge": {
                     "account_number": "6590"
@@ -3040,23 +2984,20 @@
                 "Nicht abzugsf\u00e4hige Betriebsausgaben aus Werbe- und Repr\u00e4sentationskosten": {
                     "account_number": "6645"
                 },
-                "Reisekosten Arbeitnehmer (Gruppe)": {
-                    "is_group": 1,
-                    "Reisekosten Arbeitnehmer": {
-                        "account_number": "6650"
-                    },
-                    "Reisekosten Arbeitnehmer \u00dcbernachtungsaufwand": {
-                        "account_number": "6660"
-                    },
-                    "Reisekosten Arbeitnehmer Fahrtkosten": {
-                        "account_number": "6663"
-                    },
-                    "Reisekosten Arbeitnehmer Verpflegungsmehraufwand": {
-                        "account_number": "6664"
-                    },
-                    "Kilometergelderstattung Arbeitnehmer": {
-                        "account_number": "6668"
-                    }
+                "Reisekosten Arbeitnehmer": {
+                    "account_number": "6650"
+                },
+                "Reisekosten Arbeitnehmer \u00dcbernachtungsaufwand": {
+                    "account_number": "6660"
+                },
+                "Reisekosten Arbeitnehmer Fahrtkosten": {
+                    "account_number": "6663"
+                },
+                "Reisekosten Arbeitnehmer Verpflegungsmehraufwand": {
+                    "account_number": "6664"
+                },
+                "Kilometergelderstattung Arbeitnehmer": {
+                    "account_number": "6668"
                 },
                 "Reisekosten Unternehmer (Gruppe)": {
                     "is_group": 1,
@@ -3668,6 +3609,18 @@
             "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen f. sonstige Steuern": {
                 "account_number": "7694"
             }
+        },
+        "Debitoren": {
+            "root_type": "Asset",
+            "is_group": 1
+        },
+        "Kreditoren": {
+            "root_type": "Liability",
+            "is_group": 1,
+            "Wareneingangs-­Verrechnungskonto" : {
+                "account_number": "70001",
+                "account_type": "Stock Received But Not Billed"
+            }
         }
     }
 }

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

@@ -1,809 +0,0 @@
-{
-    "country_code": "sv",
-    "name": "El Salvador Standard",
-    "tree": {
-        "100000 - ACTIVOS - xmC": {
-            "11000000 - ACTIVOS CORRIENTES - xmC": {
-                "11010000 - EFECTIVO Y EQUIVALENTES AL EFECTIVO - xmC": {
-                    "11010100 - Caja general - xmC": {
-                        "account_number": "11010100",
-                        "account_type": "Cash"
-                    },
-                    "Caja chica": {
-                        "account_number": "11010200",
-                        "account_type": "Cash",
-                        "is_group": 1
-                    },
-                    "Efectivo en bancos": {
-                        "account_number": "11010300",
-                        "account_type": "Bank",
-                        "is_group": 1
-                    },
-                    "account_number": "11010000",
-                    "account_type": "Cash"
-                },
-                "CUENTAS POR COBRAR ARRENDAMIENTOS FINANCIEROS": {
-                    "Arrendamientos financieros por cobrar": {
-                        "account_number": "11040100",
-                        "is_group": 1
-                    },
-                    "Estimaci\u00f3n para cuentas de cobro dudoso (CR)": {
-                        "account_number": "11040200",
-                        "is_group": 1
-                    },
-                    "account_number": "11040000"
-                },
-                "DEUDORES COMERCIALES Y OTRAS CUENTAS POR COBRAR": {
-                    "11030100 - Deudores comerciales - xmC": {
-                        "account_number": "11030100",
-                        "account_type": "Receivable"
-                    },
-                    "Estimaci\u00f3n para cuentas de cobro dudoso (CR)": {
-                        "account_number": "11030200",
-                        "account_type": "Receivable",
-                        "is_group": 1
-                    },
-                    "Otras cuentas por cobrar no comerciales": {
-                        "account_number": "11030300",
-                        "account_type": "Receivable",
-                        "is_group": 1
-                    },
-                    "account_number": "11030000",
-                    "account_type": "Receivable"
-                },
-                "GASTOS PAGADOS POR ANTICIPADO": {
-                    "Adelantos a empleados": {
-                        "account_number": "110904",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "Papeler\u00eda y \u00fatiles en existencia": {
-                        "account_number": "11090300",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "Primas de seguros aun no vendidas": {
-                        "account_number": "11090100",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "Rentas aun no corridas por los inmuebles": {
-                        "account_number": "11090200",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "account_number": "11090000",
-                    "account_type": "Temporary"
-                },
-                "INVENTARIOS": {
-                    "11050100 - Inventarios en bodega al costo - xmC": {
-                        "account_number": "11050100",
-                        "account_type": "Stock"
-                    },
-                    "11050300 - Pedidos en transito - xmC": {
-                        "account_number": "11050300",
-                        "account_type": "Stock Received But Not Billed"
-                    },
-                    "Estimaci\u00f3n para obsolescencia de inventarios o de lento movimiento (CR)": {
-                        "account_number": "11050200",
-                        "account_type": "Stock",
-                        "is_group": 1
-                    },
-                    "Mercader\u00edas en consignaci\u00f3n": {
-                        "account_number": "11050400",
-                        "account_type": "Stock",
-                        "is_group": 1
-                    },
-                    "account_number": "11050000",
-                    "account_type": "Stock"
-                },
-                "INVERSIONES TEMPORALES": {
-                    "Acciones": {
-                        "account_number": "11020100",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "Bonos": {
-                        "account_number": "11020200",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "C\u00e9dulas hipotecarias": {
-                        "account_number": "11020300",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "account_number": "11020000",
-                    "account_type": "Temporary"
-                },
-                "IVA CREDITO FISCAL": {
-                    "IVA compras locales": {
-                        "account_number": "11060100",
-                        "account_type": "Tax",
-                        "is_group": 1,
-                        "tax_rate": 13.0
-                    },
-                    "IVA importaciones": {
-                        "account_number": "11060200",
-                        "account_type": "Tax",
-                        "is_group": 1,
-                        "tax_rate": 13.0
-                    },
-                    "account_number": "11060000",
-                    "account_type": "Tax",
-                    "tax_rate": 13.0
-                },
-                "IVA PERCIBIDO": {
-                    "account_number": "IVA PERCIBIDO",
-                    "account_type": "Tax",
-                    "is_group": 1,
-                    "tax_rate": 1.0
-                },
-                "IVA RETENIDO": {
-                    "account_number": "11070000",
-                    "account_type": "Tax",
-                    "is_group": 1,
-                    "tax_rate": 1.0
-                },
-                "account_number": "11000000"
-            },
-            "12000000 - ACTIVOS NO CORRIENTES - xmC": {
-                "ACTIVOS INTANGIBLES": {
-                    "Concesiones y franquicias": {
-                        "account_number": "12080300",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Derechos de llave": {
-                        "account_number": "12080100",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Patentes y marcas de fabrica": {
-                        "account_number": "12080200",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Software": {
-                        "account_number": "12080400",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "account_number": "12080000",
-                    "account_type": "Fixed Asset"
-                },
-                "CUENTAS POR COBRAR ARRENDAMIENTOS FINANCIEROS A LARGO PLAZO": {
-                    "Arrendamientos financieros por cobrar a largo plazo": {
-                        "account_number": "12060100",
-                        "account_type": "Receivable",
-                        "is_group": 1
-                    },
-                    "Estimaci\u00f3n para cuentas de cobro dudoso a largo plazo (CR)": {
-                        "account_number": "12060200",
-                        "account_type": "Receivable",
-                        "is_group": 1
-                    },
-                    "account_number": "12060000",
-                    "account_type": "Receivable"
-                },
-                "DEPRECIACION ACUMULUDA (CR)": {
-                    "12030100 - Deprec. acumulada de propiedades, planta y equipo propio al costo - xmC": {
-                        "account_number": "12030100",
-                        "account_type": "Accumulated Depreciation"
-                    },
-                    "Deprec. acumulada de prop., planta y equipo bajo arrend. Financiero": {
-                        "account_number": "12030200",
-                        "account_type": "Accumulated Depreciation",
-                        "is_group": 1
-                    },
-                    "Deprec. acumulada de revaluaos de propiedades, planta y equipo": {
-                        "account_number": "12030300",
-                        "account_type": "Accumulated Depreciation",
-                        "is_group": 1
-                    },
-                    "account_number": "12030000",
-                    "account_type": "Accumulated Depreciation"
-                },
-                "DEUDORES COMERCIALES Y OTRAS CUENTAS POR COBRAR A LARGO PLAZO": {
-                    "12050100 - Deudores comerciales a largo plazo - xmC": {
-                        "account_number": "12050100",
-                        "account_type": "Receivable",
-                        "is_group": 1
-                    },
-                    "Cuentas por cobrar no comerciales a largo plazo": {
-                        "account_number": "12050300",
-                        "account_type": "Receivable",
-                        "is_group": 1
-                    },
-                    "Estimaci\u00f3n para cuentas de cobro dudoso a largo plazo (CR)": {
-                        "account_number": "12050200",
-                        "account_type": "Receivable",
-                        "is_group": 1
-                    },
-                    "account_number": "12050000",
-                    "account_type": "Receivable"
-                },
-                "IMPUESTO SOBRE LA RENTA DIFERIDO-ACTIVO": {
-                    "12070200 - Pago anticipados de impuestos sobre la renta - xmC": {
-                        "account_number": "12070200",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "Cr\u00e9dito impuestos sobre la renta de a\u00f1os anteriores": {
-                        "account_number": "12070100",
-                        "account_type": "Tax",
-                        "is_group": 1
-                    },
-                    "account_number": "12070000",
-                    "account_type": "Tax"
-                },
-                "INVERSIONES PERMANENTES": {
-                    "Inversiones en asociadas": {
-                        "account_number": "12040200",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Inversiones en negocios conjuntos": {
-                        "account_number": "12040300",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Inversiones en subsidiarias": {
-                        "account_number": "12040100",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "account_number": "12040000",
-                    "account_type": "Fixed Asset"
-                },
-                "PROPIEDADES, PLANTA Y EQUIPO": {
-                    "12010300 - Maquinarias y equipos - xmC": {
-                        "account_number": "12010300",
-                        "account_type": "Fixed Asset"
-                    },
-                    "Edificios": {
-                        "account_number": "12010200",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Mobiliario y equipo": {
-                        "account_number": "12010400",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Terrenos": {
-                        "account_number": "12010100",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Veh\u00edculos": {
-                        "account_number": "12010500",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "account_number": "12010000",
-                    "account_type": "Fixed Asset"
-                },
-                "REVALUACIONES DE PROPIEDADES, PLANTA Y EQUIPO": {
-                    "Revaluaci\u00f3n de edificios": {
-                        "account_number": "12020200",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Revaluaci\u00f3n de maquinarias y equipo": {
-                        "account_number": "12020300",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Revaluaci\u00f3n de mobiliario y equipo": {
-                        "account_number": "12020400",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Revaluaci\u00f3n de terrenos": {
-                        "account_number": "12020100",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "Revaluaci\u00f3n de veh\u00edculos": {
-                        "account_number": "12020500",
-                        "account_type": "Fixed Asset",
-                        "is_group": 1
-                    },
-                    "account_number": "12020000",
-                    "account_type": "Fixed Asset"
-                },
-                "account_number": "12000000",
-                "account_type": "Fixed Asset"
-            },
-            "account_number": "100000",
-            "root_type": "Asset"
-        },
-        "20000000 - PASIVOS - xmC": {
-            "PASIVOS CORRIENTES": {
-                "ACREEDORES COMERCIALES Y OTRAS CUENTAS POR PAGAR": {
-                    "21020100 - Cuentas por pagar comerciales - xmC": {
-                        "account_number": "21020100",
-                        "account_type": "Payable"
-                    },
-                    "Documentos por pagar comerciales": {
-                        "account_number": "21020200",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "account_number": "21020000",
-                    "account_type": "Payable"
-                },
-                "BENEFICIOS A EMPLEADOS POR PAGAR": {
-                    "Beneficios a corto plazo por pagar": {
-                        "account_number": "21050100",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "Beneficios post empleo por pagar": {
-                        "account_number": "21050200",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "account_number": "21050000",
-                    "account_type": "Payable"
-                },
-                "DIVIDENDOS POR PAGAR": {
-                    "account_number": "21080000",
-                    "account_type": "Payable",
-                    "is_group": 1
-                },
-                "IMPUESTO SOBRE LA RENTA CORRIENTE POR PAGAR": {
-                    "account_number": "21070000",
-                    "account_type": "Tax",
-                    "is_group": 1
-                },
-                "IVA DEBITOS FISCALES": {
-                    "Por ventas a consumidores": {
-                        "account_number": "21060200",
-                        "account_type": "Tax",
-                        "is_group": 1
-                    },
-                    "Por ventas a contribuyentes": {
-                        "account_number": "21060100",
-                        "account_type": "Tax",
-                        "is_group": 1
-                    },
-                    "account_number": "21060000",
-                    "account_type": "Tax"
-                },
-                "OBLIGACIONES BAJO ARRENDAMIENTOS FINANCIEROS PORCION CORRIENTE": {
-                    "Contratos bajo arrendamientos financieros": {
-                        "account_number": "21030100",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "account_number": "21030000",
-                    "account_type": "Payable"
-                },
-                "OTROS ACREEDORES, RETENCIONES Y DESCUENTOS": {
-                    "Cuentas por pagar a accionistas": {
-                        "account_number": "21040400",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "Descuentos": {
-                        "account_number": "21040300",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "Otros acreedores": {
-                        "account_number": "21040100",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "Retenciones": {
-                        "account_number": "21040200",
-                        "account_type": "Payable",
-                        "is_group": 1
-                    },
-                    "account_number": "21040000",
-                    "account_type": "Payable"
-                },
-                "PRESTAMOS Y SOBREGIROS BANCARIOS": {
-                    "Porci\u00f3n corriente de prestamos bancarios a largo plazo": {
-                        "account_number": "21010300",
-                        "is_group": 1
-                    },
-                    "Prestamos bancarios a corto plazo": {
-                        "account_number": "21010100",
-                        "is_group": 1
-                    },
-                    "Sobregiros bancarios": {
-                        "account_number": "21010200",
-                        "is_group": 1
-                    },
-                    "account_number": "21010000"
-                },
-                "account_number": "21000000"
-            },
-            "PASIVOS NO CORRIENTES": {
-                "ANTICIPOS Y GARANTIAS DE CLIENTES": {
-                    "Anticipos de clientes": {
-                        "account_number": "22040100",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "Garant\u00edas de clientes": {
-                        "account_number": "22040200",
-                        "account_type": "Temporary",
-                        "is_group": 1
-                    },
-                    "account_number": "22040000",
-                    "account_type": "Temporary"
-                },
-                "INTERES MINOTARIO": {
-                    "Inter\u00e9s de accionista minotarios": {
-                        "account_number": "22050100",
-                        "is_group": 1
-                    },
-                    "account_number": "22050000"
-                },
-                "OBLIGACIONES BAJO ARRENDAMIENTOS FINANCIEROS A LARGO PLAZO": {
-                    "Contratos bajo arrendamientos financieros": {
-                        "account_number": "22030100",
-                        "is_group": 1
-                    },
-                    "account_number": "22030000"
-                },
-                "OTROS PRESTAMOS A LARGO PLAZO": {
-                    "account_number": "22020000",
-                    "is_group": 1
-                },
-                "PRESTAMOS BANCARIOS A LARGO PLAZO": {
-                    "account_number": "22010000",
-                    "is_group": 1
-                },
-                "account_number": "22000000"
-            },
-            "PROVISIONES": {
-                "IMPUESTOS SOBRE LA RENTA COMPLEMENTARIO": {
-                    "Ejercicios anteriores": {
-                        "account_number": "23010100",
-                        "account_type": "Tax",
-                        "is_group": 1
-                    },
-                    "account_number": "23010000",
-                    "account_type": "Tax"
-                },
-                "PROVISION PARA OBLIGACIONES LABORALES": {
-                    "Indemnizaci\u00f3n": {
-                        "account_number": "23020100",
-                        "is_group": 1
-                    },
-                    "account_number": "23020000"
-                },
-                "account_number": "23000000"
-            },
-            "account_number": "20000000",
-            "root_type": "Liability"
-        },
-        "30000000 - PATRIMONIO - xmC": {
-            "CAPITAL, RESERVAS Y RESULTADOS": {
-                "CAPITAL SOCIAL": {
-                    "Capital Social M\u00ednimo": {
-                        "Capital Social M\u00ednimo NO Pagado": {
-                            "account_number": "31010102",
-                            "account_type": "Equity",
-                            "is_group": 1
-                        },
-                        "Capital Social M\u00ednimo Suscrito": {
-                            "account_number": "31010101",
-                            "account_type": "Equity",
-                            "is_group": 1
-                        },
-                        "account_number": "31010100",
-                        "account_type": "Equity"
-                    },
-                    "Capital Social Variable": {
-                        "Capital Social Variable NO Pagado": {
-                            "account_number": "31010202",
-                            "account_type": "Equity",
-                            "is_group": 1
-                        },
-                        "Capital Social Variable Suscrito": {
-                            "account_number": "31010201",
-                            "account_type": "Equity",
-                            "is_group": 1
-                        },
-                        "account_number": "31010200",
-                        "account_type": "Equity"
-                    },
-                    "account_number": "31010000",
-                    "account_type": "Equity"
-                },
-                "DIVIDENDOS PAGADOS": {
-                    "account_number": "31060000",
-                    "account_type": "Equity",
-                    "is_group": 1
-                },
-                "GANANCIAS NO DISTRIBUIDAS": {
-                    "De ejercicios anteriores": {
-                        "account_number": "31020100",
-                        "account_type": "Equity",
-                        "is_group": 1
-                    },
-                    "Del presente ejercicio": {
-                        "account_number": "31020200",
-                        "account_type": "Equity",
-                        "is_group": 1
-                    },
-                    "account_number": "31020000",
-                    "account_type": "Equity"
-                },
-                "GANANCIAS RESTRINGIDAS": {
-                    "Reserva legal": {
-                        "account_number": "31030100",
-                        "account_type": "Equity",
-                        "is_group": 1
-                    },
-                    "account_number": "31030000",
-                    "account_type": "Equity"
-                },
-                "PERDIDAS ACUMULADAS (CR)": {
-                    "De ejercicios anteriores": {
-                        "account_number": "31050100",
-                        "account_type": "Equity",
-                        "is_group": 1
-                    },
-                    "Del presente ejercicio": {
-                        "account_number": "31050200",
-                        "account_type": "Equity",
-                        "is_group": 1
-                    },
-                    "account_number": "31050000",
-                    "account_type": "Equity"
-                },
-                "SUPERAVIT POR REVALUACIONES": {
-                    "Super\u00e1vit por revaluaci\u00f3n de activos": {
-                        "account_number": "31040100",
-                        "account_type": "Equity",
-                        "is_group": 1
-                    },
-                    "account_number": "31040000",
-                    "account_type": "Equity"
-                },
-                "account_number": "31000000",
-                "account_type": "Equity"
-            },
-            "account_number": "30000000",
-            "root_type": "Equity"
-        },
-        "40000000 - CUENTAS DE RESULTADO DEUDORAS - xmC": {
-            "COSTOS Y GASTOS DE OPERACI\u00d3N": {
-                "41010000 - COSTO DE LAS VENTAS - xmC": {
-                    "account_number": "41010000",
-                    "account_type": "Cost of Goods Sold"
-                },
-                "GASTOS DE DEPARTAMENTO DE OPERACIONES": {
-                    "41020600 - Depreciaciones y amortizaciones - xmC": {
-                        "account_number": "41020600",
-                        "account_type": "Depreciation"
-                    },
-                    "41020900 - Redondeos - xmC": {
-                        "account_number": "41020900",
-                        "account_type": "Round Off"
-                    },
-                    "Gastos operativos": {
-                        "account_number": "41020700",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Mantenimientos": {
-                        "account_number": "41020400",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Materiales y suministros": {
-                        "Ajustes de Inventario": {
-                            "account_number": "41020201",
-                            "account_type": "Stock Adjustment"
-                        },
-                        "account_number": "41020200",
-                        "account_type": "Chargeable"
-                    },
-                    "Seguros": {
-                        "account_number": "41020500",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Servicios b\u00e1sicos": {
-                        "account_number": "41020300",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Servicios y honorarios profesionales": {
-                        "account_number": "41020800",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Sueldos y prestaciones laborales": {
-                        "account_number": "41020100",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "account_number": "41020000",
-                    "account_type": "Expense Account"
-                },
-                "GASTOS DE VENTAS Y DISTRIBUCION": {
-                    "Depreciaciones y amortizaciones": {
-                        "account_number": "41030600",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Gastos operativos": {
-                        "account_number": "41030700",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Mantenimientos": {
-                        "account_number": "41030400",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Materiales y suministros": {
-                        "account_number": "41030200",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Seguros": {
-                        "account_number": "41030500",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Servicios b\u00e1sicos": {
-                        "account_number": "41030300",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Servicios y honorarios profesionales": {
-                        "account_number": "41030800",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "Sueldos y prestaciones laborales": {
-                        "account_number": "41030100",
-                        "account_type": "Chargeable",
-                        "is_group": 1
-                    },
-                    "account_number": "41030000",
-                    "account_type": "Expense Account"
-                },
-                "account_number": "41000000",
-                "account_type": "Expense Account"
-            },
-            "GASTOS DE IMPUESTO SOBRE LA RENTA": {
-                "GASTOS DE IMPUESTO SOBRE LA RENTA CORRIENTE": {
-                    "account_number": "43010000",
-                    "account_type": "Expense Account",
-                    "is_group": 1
-                },
-                "account_number": "43000000",
-                "account_type": "Expense Account"
-            },
-            "GASTOS DE NO OPERACI\u00d3N": {
-                "42020000 - GASTOS NO DEDUCIBLES - xmC": {
-                    "Garant\u00eda por venta de productos": {
-                        "account_number": "42020200",
-                        "account_type": "Expense Account",
-                        "is_group": 1
-                    },
-                    "Impuesto sobre la renta complementario": {
-                        "account_number": "42020100",
-                        "account_type": "Tax",
-                        "is_group": 1
-                    },
-                    "account_number": "42020000",
-                    "account_type": "Expense Account"
-                },
-                "GASTOS FINANCIEROS": {
-                    "42010100 - Intereses - xmC": {
-                        "account_number": "42010100",
-                        "account_type": "Expense Account",
-                        "is_group": 1
-                    },
-                    "42010300 - Diferenciales cambiarios - xmC": {
-                        "account_number": "42010300",
-                        "account_type": "Expense Account",
-                        "is_group": 1
-                    },
-                    "Comisiones bancarias": {
-                        "account_number": "42010200",
-                        "account_type": "Expense Account",
-                        "is_group": 1
-                    },
-                    "account_number": "42010000",
-                    "account_type": "Expense Account"
-                },
-                "account_number": "42000000",
-                "account_type": "Expense Account"
-            },
-            "account_number": "40000000",
-            "root_type": "Expense"
-        },
-        "50000000 - CUENTAS DE RESULTADO ACREEDORAS - xmC": {
-            "INGRESOS DE NO OPERACI\u00d3N": {
-                "DIVIDENDOS GANADOS": {
-                    "Dividendos devengados por inversiones": {
-                        "account_number": "52020100",
-                        "account_type": "Income Account",
-                        "is_group": 1
-                    },
-                    "account_number": "52020000",
-                    "account_type": "Income Account"
-                },
-                "INGRESOS FINANCIEROS": {
-                    "Comisiones": {
-                        "account_number": "52010200",
-                        "account_type": "Income Account",
-                        "is_group": 1
-                    },
-                    "Diferenciales cambiarios": {
-                        "account_number": "52010300",
-                        "account_type": "Income Account",
-                        "is_group": 1
-                    },
-                    "Intereses": {
-                        "account_number": "52010100",
-                        "account_type": "Income Account",
-                        "is_group": 1
-                    },
-                    "account_number": "52010000",
-                    "account_type": "Income Account"
-                },
-                "OTROS INGRESOS": {
-                    "Ingresos por activos dados en arrendamientos financieros": {
-                        "account_number": "52030200",
-                        "account_type": "Income Account",
-                        "is_group": 1
-                    },
-                    "Ingresos por conversi\u00f3n": {
-                        "account_number": "52030100",
-                        "account_type": "Income Account",
-                        "is_group": 1
-                    },
-                    "Reintegros de seguros": {
-                        "account_number": "52030300",
-                        "account_type": "Income Account",
-                        "is_group": 1
-                    },
-                    "account_number": "52030000",
-                    "account_type": "Income Account"
-                },
-                "account_number": "52000000",
-                "account_type": "Income Account"
-            },
-            "INGRESOS POR OPERACIONES CONTINUAS": {
-                "51010000 - VENTAS DE BIENES - xmC": {
-                    "account_number": "51010000",
-                    "account_type": "Income Account"
-                },
-                "VENTAS DE SERVICIOS": {
-                    "account_number": "51020000",
-                    "account_type": "Income Account",
-                    "is_group": 1
-                },
-                "account_number": "51000000",
-                "account_type": "Income Account"
-            },
-            "account_number": "50000000",
-            "root_type": "Income"
-        },
-        "60000000 - CUENTA LIQUIDADORA DE RESULTADOS - xmC": {
-            "CUENTA DE CIERRE": {
-                "PERDIDAS Y GANANCIAS": {
-                    "account_number": "61010000",
-                    "is_group": 1
-                },
-                "account_number": "61000000"
-            },
-            "account_number": "60000000",
-            "root_type": "Income"
-        }
-    }
-}

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

@@ -72,14 +72,16 @@
                 "138-Autres subventions d'investissement (m\u00eame ventilation que celle du compte 131)": {}, 
                 "139-Subventions d'investissement inscrites au compte de r\u00e9sultat": {
                     "1391-Subventions d'\u00e9quipement": {
-                        "13911-Etat": {},
-                        "13912-R\u00e9gions": {},
-                        "13913-D\u00e9partements": {},
-                        "13914-Communes": {},
-                        "13915-Collectivit\u00e9s publiques": {},
-                        "13916-Entreprises publiques": {},
-                        "13917-Entreprises et organismes priv\u00e9s": {},
-                        "13918-Autres": {}
+                        "13911-Subventions d'\u00e9quipement": {
+                            "13911-Etat": {}, 
+                            "13912-R\u00e9gions": {}, 
+                            "13913-D\u00e9partements": {}, 
+                            "13914-Communes": {}, 
+                            "13915-Collectivit\u00e9s publiques": {}, 
+                            "13916-Entreprises publiques": {}, 
+                            "13917-Entreprises et organismes priv\u00e9s": {}, 
+                            "13918-Autres": {}
+                        }
                     }, 
                     "1398-Autres subventions d'investissement (m\u00eame ventilation que celle du compte 1391)": {}
                 }
@@ -534,8 +536,8 @@
                     "3312-Produits en cours P2": {}
                 }, 
                 "335-Travaux en cours": {
-                    "3351-Travaux en cours T1": {},
-                    "3352-Travaux en cours T2": {}
+                    "Travaux en cours T1": {}, 
+                    "Travaux en cours T2": {}
                 }
             }, 
             "34-En-cours de production de services": {
@@ -593,9 +595,7 @@
                 "371-Marchandises (ou groupe) A": {}, 
                 "372-Marchandises (ou groupe) B": {}
             }, 
-            "38-Stocks en voie d'acheminement, mis en d\u00e9p\u00f4t ou donn\u00e9s en consignation (en cas d'inventaire permanent en comptabilit\u00e9 g\u00e9n\u00e9rale)": {
-                "account_type": "Stock"
-            },
+            "38-Stocks en voie d'acheminement, mis en d\u00e9p\u00f4t ou donn\u00e9s en consignation (en cas d'inventaire permanent en comptabilit\u00e9 g\u00e9n\u00e9rale)": {}, 
             "39-D\u00e9pr\u00e9ciations des stocks et en-cours": {
                 "391-D\u00e9pr\u00e9ciations des mati\u00e8res premi\u00e8res (et fournitures)": {
                     "3911-Mati\u00e8res (ou groupe) A": {}, 

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

@@ -245,9 +245,6 @@ def get():
                     "account_number": "2200"
                 },
                 _("Duties and Taxes"): {
-                    _("TDS Payable"): {
-                        "account_number": "2310"
-                    },
                     "account_type": "Tax",
                     "is_group": 1,
                     "account_number": "2300"

erpnext/accounts/doctype/account/test_account.py

@@ -69,7 +69,6 @@ class TestAccount(unittest.TestCase):
 			acc.account_name = "Accumulated Depreciation"
 			acc.parent_account = "Fixed Assets - _TC"
 			acc.company = "_Test Company"
-			acc.account_type = "Accumulated Depreciation"
 			acc.insert()
 
 		doc = frappe.get_doc("Account", "Securities and Deposits - _TC")
@@ -143,14 +142,12 @@ def _make_test_records(verbose):
 		["_Test Write Off", "Indirect Expenses", 0, None, None],
 		["_Test Exchange Gain/Loss", "Indirect Expenses", 0, None, None],
 
-		["_Test Account Sales", "Direct Income", 0, None, None],
-
 		# related to Account Inventory Integration
 		["_Test Account Stock In Hand", "Current Assets", 0, None, None],
 
 		# fixed asset depreciation
 		["_Test Fixed Asset", "Current Assets", 0, "Fixed Asset", None],
-		["_Test Accumulated Depreciations", "Current Assets", 0, "Accumulated Depreciation", None],
+		["_Test Accumulated Depreciations", "Current Assets", 0, None, None],
 		["_Test Depreciations", "Expenses", 0, None, None],
 		["_Test Gain/Loss on Asset Disposal", "Expenses", 0, None, None],
 
@@ -161,7 +158,7 @@ def _make_test_records(verbose):
 		["_Test Payable USD", "Current Liabilities", 0, "Payable", "USD"]
 	]
 
-	for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"], ["_Test Company with perpetual inventory", "TCP1"]]:
+	for company, abbr in [["_Test Company", "_TC"], ["_Test Company 1", "_TC1"]]:
 		test_objects = make_test_objects("Account", [{
 				"doctype": "Account",
 				"account_name": account_name,

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js

@@ -1,66 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Accounting Dimension', {
-
-	refresh: function(frm) {
-		frm.set_query('document_type', () => {
-			let invalid_doctypes = frappe.model.core_doctypes_list;
-			invalid_doctypes.push('Accounting Dimension', 'Project',
-				'Cost Center', 'Accounting Dimension Detail');
-
-			return {
-				filters: {
-					name: ['not in', invalid_doctypes]
-				}
-			};
-		});
-
-		if (!frm.is_new()) {
-			frm.add_custom_button(__('Show {0}', [frm.doc.document_type]), function () {
-				frappe.set_route("List", frm.doc.document_type);
-			});
-
-			let button = frm.doc.disabled ? "Enable" : "Disable";
-
-			frm.add_custom_button(__(button), function() {
-
-				frm.set_value('disabled', 1 - frm.doc.disabled);
-
-				frappe.call({
-					method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.disable_dimension",
-					args: {
-						doc: frm.doc
-					},
-					freeze: true,
-					callback: function(r) {
-						let message = frm.doc.disabled ? "Dimension Disabled" : "Dimension Enabled";
-						frm.save();
-						frappe.show_alert({message:__(message), indicator:'green'});
-					}
-				});
-			});
-		}
-
-		frm.toggle_enable('document_type', frm.doc.__islocal);
-	},
-
-	document_type: function(frm) {
-
-		frm.set_value('label', frm.doc.document_type);
-		frm.set_value('fieldname', frappe.model.scrub(frm.doc.document_type));
-
-		frappe.db.get_value('Accounting Dimension', {'document_type': frm.doc.document_type}, 'document_type', (r) => {
-			if (r && r.document_type) {
-				frm.set_df_property('document_type', 'description', "Document type is already set as dimension");
-			}
-		});
-	},
-});
-
-frappe.ui.form.on('Accounting Dimension Detail', {
-	dimension_defaults_add: function(frm, cdt, cdn) {
-		let row = locals[cdt][cdn];
-		row.reference_document = frm.doc.document_type;
-	}
-});

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json

@@ -1,85 +0,0 @@
-{
- "actions": [],
- "autoname": "field:label",
- "creation": "2019-05-04 18:13:37.002352",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "document_type",
-  "label",
-  "fieldname",
-  "dimension_defaults",
-  "disabled"
- ],
- "fields": [
-  {
-   "fieldname": "label",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Dimension Name",
-   "unique": 1
-  },
-  {
-   "fieldname": "fieldname",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Fieldname"
-  },
-  {
-   "fieldname": "document_type",
-   "fieldtype": "Link",
-   "label": "Reference Document Type",
-   "options": "DocType",
-   "reqd": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Disable",
-   "read_only": 1
-  },
-  {
-   "fieldname": "dimension_defaults",
-   "fieldtype": "Table",
-   "label": "Dimension Defaults",
-   "options": "Accounting Dimension Detail"
-  }
- ],
- "links": [],
- "modified": "2020-03-22 20:34:39.805728",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Accounting Dimension",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "ASC",
- "track_changes": 1
-}

erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py

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

erpnext/accounts/doctype/accounting_dimension/test_accounting_dimension.py

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

erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json

@@ -1,65 +0,0 @@
-{
- "creation": "2019-07-16 17:53:18.718831",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "company",
-  "reference_document",
-  "default_dimension",
-  "mandatory_for_bs",
-  "mandatory_for_pl"
- ],
- "fields": [
-  {
-   "columns": 2,
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "options": "Company"
-  },
-  {
-   "fieldname": "reference_document",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "label": "Reference Document",
-   "options": "DocType",
-   "read_only": 1
-  },
-  {
-   "columns": 2,
-   "fieldname": "default_dimension",
-   "fieldtype": "Dynamic Link",
-   "in_list_view": 1,
-   "label": "Default Dimension",
-   "options": "reference_document"
-  },
-  {
-   "columns": 3,
-   "default": "0",
-   "fieldname": "mandatory_for_bs",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Mandatory For Balance Sheet"
-  },
-  {
-   "columns": 3,
-   "default": "0",
-   "fieldname": "mandatory_for_pl",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Mandatory For Profit and Loss Account"
-  }
- ],
- "istable": 1,
- "modified": "2019-08-15 11:59:09.389891",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Accounting Dimension Detail",
- "owner": "Administrator",
- "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.py

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

erpnext/accounts/doctype/accounting_period/accounting_period.py

@@ -41,8 +41,8 @@ class AccountingPeriod(Document):
 
 	def get_doctypes_for_closing(self):
 		docs_for_closing = []
-		doctypes = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Payroll Entry", \
-			"Bank Reconciliation", "Asset", "Stock Entry"]
+		doctypes = ["Sales Invoice", "Purchase Invoice", "Journal Entry", "Payroll Entry", "Bank Reconciliation",
+			"Asset", "Purchase Order", "Sales Order", "Leave Application", "Leave Allocation", "Stock Entry"]
 		closed_doctypes = [{"document_type": doctype, "closed": 1} for doctype in doctypes]
 		for closed_doctype in closed_doctypes:
 			docs_for_closing.append(closed_doctype)

erpnext/accounts/doctype/accounts_settings/accounts_settings.json

@@ -1,210 +1,769 @@
 {
+ "allow_copy": 0,
+ "allow_events_in_timeline": 0,
+ "allow_guest_to_view": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
  "creation": "2013-06-24 15:49:57",
+ "custom": 0,
  "description": "Settings for Accounts",
+ "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Other",
  "editable_grid": 1,
  "engine": "InnoDB",
- "field_order": [
-  "auto_accounting_for_stock",
-  "acc_frozen_upto",
-  "frozen_accounts_modifier",
-  "determine_address_tax_category_from",
-  "over_billing_allowance",
-  "column_break_4",
-  "credit_controller",
-  "check_supplier_invoice_uniqueness",
-  "make_payment_via_journal_entry",
-  "unlink_payment_on_cancellation_of_invoice",
-  "unlink_advance_payment_on_cancelation_of_order",
-  "book_asset_depreciation_entry_automatically",
-  "add_taxes_from_item_tax_template",
-  "automatically_fetch_payment_terms",
-  "print_settings",
-  "show_inclusive_tax_in_print",
-  "column_break_12",
-  "show_payment_schedule_in_print",
-  "currency_exchange_section",
-  "allow_stale",
-  "stale_days",
-  "report_settings_sb",
-  "use_custom_cash_flow"
- ],
  "fields": [
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "default": "1",
    "description": "If enabled, the system will post accounting entries for inventory automatically.",
+   "fetch_if_empty": 0,
    "fieldname": "auto_accounting_for_stock",
    "fieldtype": "Check",
    "hidden": 1,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
-   "label": "Make Accounting Entry For Every Stock Movement"
+   "in_standard_filter": 0,
+   "label": "Make Accounting Entry For Every Stock Movement",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "description": "Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",
+   "fetch_if_empty": 0,
    "fieldname": "acc_frozen_upto",
    "fieldtype": "Date",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
-   "label": "Accounts Frozen Upto"
+   "in_standard_filter": 0,
+   "label": "Accounts Frozen Upto",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "description": "Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts",
+   "fetch_if_empty": 0,
    "fieldname": "frozen_accounts_modifier",
    "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "Role Allowed to Set Frozen Accounts & Edit Frozen Entries",
-   "options": "Role"
-  },
-  {
-   "default": "Billing Address",
-   "description": "Address used to determine Tax Category in transactions.",
-   "fieldname": "determine_address_tax_category_from",
-   "fieldtype": "Select",
-   "label": "Determine Address Tax Category From",
-   "options": "Billing Address\nShipping Address"
+   "length": 0,
+   "no_copy": 0,
+   "options": "Role",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "description": "Role that is allowed to submit transactions that exceed credit limits set.",
+   "fetch_if_empty": 0,
    "fieldname": "credit_controller",
    "fieldtype": "Link",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
    "in_list_view": 1,
+   "in_standard_filter": 0,
    "label": "Credit Controller",
-   "options": "Role"
+   "length": 0,
+   "no_copy": 0,
+   "options": "Role",
+   "permlevel": 0,
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
-   "default": "0",
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "check_supplier_invoice_uniqueness",
    "fieldtype": "Check",
-   "label": "Check Supplier Invoice Number Uniqueness"
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Check Supplier Invoice Number Uniqueness",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
-   "default": "0",
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "make_payment_via_journal_entry",
    "fieldtype": "Check",
-   "label": "Make Payment via Journal Entry"
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Make Payment via Journal Entry",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "unlink_payment_on_cancellation_of_invoice",
    "fieldtype": "Check",
-   "label": "Unlink Payment on Cancellation of Invoice"
-  },
-  {
-   "default": "1",
-   "fieldname": "unlink_advance_payment_on_cancelation_of_order",
-   "fieldtype": "Check",
-   "label": "Unlink Advance Payment on Cancellation of Order"
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Unlink Payment on Cancellation of Invoice",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
    "default": "1",
+   "fetch_if_empty": 0,
    "fieldname": "book_asset_depreciation_entry_automatically",
    "fieldtype": "Check",
-   "label": "Book Asset Depreciation Entry Automatically"
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Book Asset Depreciation Entry Automatically",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
-   "default": "1",
-   "fieldname": "add_taxes_from_item_tax_template",
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "allow_cost_center_in_entry_of_bs_account",
    "fieldtype": "Check",
-   "label": "Automatically Add Taxes and Charges from Item Tax Template"
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Allow Cost Center In Entry of Balance Sheet Account",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
-   "fieldname": "print_settings",
-   "fieldtype": "Section Break",
-   "label": "Print Settings"
-  },
-  {
-   "default": "0",
-   "fieldname": "show_inclusive_tax_in_print",
-   "fieldtype": "Check",
-   "label": "Show Inclusive Tax In Print"
-  },
-  {
-   "fieldname": "column_break_12",
-   "fieldtype": "Column Break"
-  },
-  {
-   "default": "0",
-   "fieldname": "show_payment_schedule_in_print",
-   "fieldtype": "Check",
-   "label": "Show Payment Schedule in Print"
-  },
-  {
-   "fieldname": "currency_exchange_section",
-   "fieldtype": "Section Break",
-   "label": "Currency Exchange Settings"
-  },
-  {
-   "default": "1",
-   "fieldname": "allow_stale",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Allow Stale Exchange Rates"
-  },
-  {
-   "default": "1",
-   "depends_on": "eval:doc.allow_stale==0",
-   "fieldname": "stale_days",
-   "fieldtype": "Int",
-   "label": "Stale Days"
-  },
-  {
-   "fieldname": "report_settings_sb",
-   "fieldtype": "Section Break",
-   "label": "Report Settings"
-  },
-  {
-   "default": "0",
-   "description": "Only select if you have setup Cash Flow Mapper documents",
-   "fieldname": "use_custom_cash_flow",
-   "fieldtype": "Check",
-   "label": "Use Custom Cash Flow Format"
-  },
-  {
-   "default": "0",
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
    "fieldname": "automatically_fetch_payment_terms",
    "fieldtype": "Check",
-   "label": "Automatically Fetch Payment Terms"
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Automatically Fetch Payment Terms",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   },
   {
-   "description": "Percentage you are allowed to bill more against the amount ordered. For example: If the order value is $100 for an item and tolerance is set as 10% then you are allowed to bill for $110.",
-   "fieldname": "over_billing_allowance",
-   "fieldtype": "Currency",
-   "label": "Over Billing Allowance (%)"
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "print_settings",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Print Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "show_inclusive_tax_in_print",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Show Inclusive Tax In Print",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "column_break_12",
+   "fieldtype": "Column Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "show_payment_schedule_in_print",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Show Payment Schedule in Print",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "currency_exchange_section",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Currency Exchange Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "fetch_if_empty": 0,
+   "fieldname": "allow_stale",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 1,
+   "in_standard_filter": 0,
+   "label": "Allow Stale Exchange Rates",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "1",
+   "depends_on": "eval:doc.allow_stale==0",
+   "fetch_if_empty": 0,
+   "fieldname": "stale_days",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Stale Days",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fetch_if_empty": 0,
+   "fieldname": "report_settings_sb",
+   "fieldtype": "Section Break",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Report Settings",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "default": "0",
+   "description": "Only select if you have setup Cash Flow Mapper documents",
+   "fetch_if_empty": 0,
+   "fieldname": "use_custom_cash_flow",
+   "fieldtype": "Check",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Use Custom Cash Flow Format",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
   }
  ],
+ "has_web_view": 0,
+ "hide_heading": 0,
+ "hide_toolbar": 0,
  "icon": "icon-cog",
  "idx": 1,
+ "image_view": 0,
+ "in_create": 0,
+ "is_submittable": 0,
  "issingle": 1,
- "modified": "2020-10-08 09:40:12.121145",
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2019-04-17 05:58:23.012494",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
  "owner": "Administrator",
  "permissions": [
   {
+   "amend": 0,
+   "cancel": 0,
    "create": 1,
+   "delete": 0,
    "email": 1,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
    "print": 1,
    "read": 1,
+   "report": 0,
    "role": "Accounts Manager",
+   "set_user_permissions": 0,
    "share": 1,
+   "submit": 0,
    "write": 1
   },
   {
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 0,
    "read": 1,
-   "role": "Sales User"
+   "report": 0,
+   "role": "Sales User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
+   "write": 0
   },
   {
+   "amend": 0,
+   "cancel": 0,
+   "create": 0,
+   "delete": 0,
+   "email": 0,
+   "export": 0,
+   "if_owner": 0,
+   "import": 0,
+   "permlevel": 0,
+   "print": 0,
    "read": 1,
-   "role": "Purchase User"
+   "report": 0,
+   "role": "Purchase User",
+   "set_user_permissions": 0,
+   "share": 0,
+   "submit": 0,
+   "write": 0
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "read_only": 0,
+ "read_only_onload": 0,
+ "show_name_in_global_search": 0,
  "sort_order": "ASC",
- "track_changes": 1
+ "track_changes": 1,
+ "track_seen": 0,
+ "track_views": 0
 }

erpnext/accounts/doctype/accounts_settings/accounts_settings.py

@@ -15,11 +15,9 @@ class AccountsSettings(Document):
 		frappe.clear_cache()
 
 	def validate(self):
-		frappe.db.set_default("add_taxes_from_item_tax_template",
-			self.get("add_taxes_from_item_tax_template", 0))
-
 		self.validate_stale_days()
 		self.enable_payment_schedule_in_print()
+		self.enable_fields_for_cost_center_settings()
 
 	def validate_stale_days(self):
 		if not self.allow_stale and cint(self.stale_days) <= 0:
@@ -32,3 +30,8 @@ class AccountsSettings(Document):
 		for doctype in ("Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"):
 			make_property_setter(doctype, "due_date", "print_hide", show_in_print, "Check")
 			make_property_setter(doctype, "payment_schedule", "print_hide",  0 if show_in_print else 1, "Check")
+
+	def enable_fields_for_cost_center_settings(self):
+		show_field = 0 if cint(self.allow_cost_center_in_entry_of_bs_account) else 1
+		for doctype in ("Sales Invoice", "Purchase Invoice", "Payment Entry"):
+			make_property_setter(doctype, "cost_center", "hidden", show_field, "Check")

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

@@ -1,8 +0,0 @@
-
-frappe.ui.form.on('Accounts Settings', {
-	refresh: function(frm) {
-		frm.set_df_property("acc_frozen_upto", "label", "Books Closed Through");
-		frm.set_df_property("frozen_accounts_modifier", "label", "Role Allowed to Close Books & Make Changes to Closed Periods");
-		frm.set_df_property("credit_controller", "label", "Credit Manager");
-	}
-});

erpnext/accounts/doctype/bank/bank.js

@@ -1,6 +1,5 @@
 // Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
-frappe.provide('erpnext.integrations');
 
 frappe.ui.form.on('Bank', {
 	onload: function(frm) {
@@ -8,12 +7,6 @@ frappe.ui.form.on('Bank', {
 	},
 	refresh: function(frm) {
 		add_fields_to_mapping_table(frm);
-
-		if (frm.doc.plaid_access_token) {
-			frm.add_custom_button(__('Refresh Plaid Link'), () => {
-				new erpnext.integrations.refreshPlaidLink(frm.doc.plaid_access_token);
-			});
-		}
 	}
 });
 
@@ -34,79 +27,4 @@ let add_fields_to_mapping_table = function (frm) {
 		frm.doc.name).options = options;
 
 	frm.fields_dict.bank_transaction_mapping.grid.refresh();
-};
-
-erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
-	constructor(access_token) {
-		this.access_token = access_token;
-		this.plaidUrl = 'https://cdn.plaid.com/link/v2/stable/link-initialize.js';
-		this.init_config();
-	}
-
-	async init_config() {
-		this.plaid_env = await frappe.db.get_single_value('Plaid Settings', 'plaid_env');
-		this.token = await this.get_link_token_for_update();
-		this.init_plaid();
-	}
-
-	async get_link_token_for_update() {
-		const token = frappe.xcall(
-			'erpnext.erpnext_integrations.doctype.plaid_settings.plaid_settings.get_link_token_for_update',
-			{ access_token: this.access_token }
-		)
-		if (!token) {
-			frappe.throw(__('Cannot retrieve link token for update. Check Error Log for more information'));
-		}
-		return token;
-	}
-
-	init_plaid() {
-		const me = this;
-		me.loadScript(me.plaidUrl)
-			.then(() => {
-				me.onScriptLoaded(me);
-			})
-			.then(() => {
-				if (me.linkHandler) {
-					me.linkHandler.open();
-				}
-			})
-			.catch((error) => {
-				me.onScriptError(error);
-			});
-	}
-
-	loadScript(src) {
-		return new Promise(function (resolve, reject) {
-			if (document.querySelector("script[src='" + src + "']")) {
-				resolve();
-				return;
-			}
-			const el = document.createElement('script');
-			el.type = 'text/javascript';
-			el.async = true;
-			el.src = src;
-			el.addEventListener('load', resolve);
-			el.addEventListener('error', reject);
-			el.addEventListener('abort', reject);
-			document.head.appendChild(el);
-		});
-	}
-
-	onScriptLoaded(me) {
-		me.linkHandler = Plaid.create({
-			env: me.plaid_env,
-			token: me.token,
-			onSuccess: me.plaid_success
-		});
-	}
-
-	onScriptError(error) {
-		frappe.msgprint(__("There was an issue connecting to Plaid's authentication server. Check browser console for more information"));
-		console.log(error);
-	}
-
-	plaid_success(token, response) {
-		frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
-	}
 };

erpnext/accounts/doctype/bank/bank_dashboard.py

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

erpnext/accounts/doctype/bank_account/bank_account.js

@@ -20,7 +20,7 @@ frappe.ui.form.on('Bank Account', {
 	},
 	refresh: function(frm) {
 		frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Bank Account' }
-
+		
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
 		if (frm.doc.__islocal) {
@@ -37,9 +37,5 @@ frappe.ui.form.on('Bank Account', {
 				});
 			});
 		}
-	},
-
-	is_company_account: function(frm) {
-		frm.set_df_property('account', 'reqd', frm.doc.is_company_account);
 	}
 });

erpnext/accounts/doctype/bank_account/bank_account_dashboard.py

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

erpnext/accounts/doctype/bank_guarantee/bank_guarantee.py

@@ -6,7 +6,6 @@ from __future__ import unicode_literals
 import frappe, json
 from frappe.model.document import Document
 from frappe import _
-from frappe.desk.search import sanitize_searchfield
 
 class BankGuarantee(Document):
 	def validate(self):
@@ -23,8 +22,5 @@ class BankGuarantee(Document):
 
 @frappe.whitelist()
 def get_vouchar_detials(column_list, doctype, docname):
-	column_list = json.loads(column_list)
-	for col in column_list:
-		sanitize_searchfield(col) 
 	return frappe.db.sql(''' select {columns} from `tab{doctype}` where name=%s'''
-		.format(columns=", ".join(column_list), doctype=doctype), docname, as_dict=1)[0]
+		.format(columns=", ".join(json.loads(column_list)), doctype=doctype), docname, as_dict=1)[0]

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js

@@ -3,28 +3,20 @@
 
 frappe.ui.form.on("Bank Reconciliation", {
 	setup: function(frm) {
-		frm.add_fetch("account", "account_currency", "account_currency");
+		frm.add_fetch("bank_account", "account_currency", "account_currency");
 	},
 
 	onload: function(frm) {
 
 		let default_bank_account =  frappe.defaults.get_user_default("Company")? 
 			locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
-		frm.set_value("account", default_bank_account);
-
-		frm.set_query("account", function() {
-			return {
-				"filters": {
-					"account_type": ["in",["Bank","Cash"]],
-					"is_group": 0
-				}
-			};
-		});
+		frm.set_value("bank_account", default_bank_account);
 
 		frm.set_query("bank_account", function() {
 			return {
 				"filters": {
-					"is_company_account": 1
+					"account_type": ["in",["Bank","Cash"]],
+					"is_group": 0
 				}
 			};
 		});

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json

@@ -1,6 +1,5 @@
 {
  "allow_copy": 1, 
- "allow_events_in_timeline": 0, 
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
@@ -14,14 +13,12 @@
  "fields": [
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_from": "bank_account.account", 
-   "fetch_if_empty": 1, 
-   "fieldname": "account", 
+   "description": "Select account head of the bank where cheque was deposited.", 
+   "fieldname": "bank_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -30,7 +27,7 @@
    "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Account", 
+   "label": "Bank Account", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
@@ -43,17 +40,14 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "account_currency", 
    "fieldtype": "Link", 
    "hidden": 1, 
@@ -76,17 +70,14 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "from_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -108,17 +99,14 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "to_date", 
    "fieldtype": "Date", 
    "hidden": 0, 
@@ -140,82 +128,14 @@
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Select the Bank Account to reconcile.",
-   "fetch_if_empty": 0, 
-   "fieldname": "bank_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Bank Account", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "include_reconciled_entries", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -237,17 +157,14 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "include_pos_transactions", 
    "fieldtype": "Check", 
    "hidden": 0, 
@@ -270,17 +187,14 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "get_payment_entries", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -303,49 +217,14 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_10", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 1, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "payment_entries", 
    "fieldtype": "Table", 
    "hidden": 0, 
@@ -368,17 +247,14 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "update_clearance_date", 
    "fieldtype": "Button", 
    "hidden": 0, 
@@ -401,17 +277,14 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fetch_if_empty": 0, 
    "fieldname": "total_amount", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -434,21 +307,22 @@
    "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
-   "translatable": 0, 
    "unique": 0
   }
  ], 
  "has_web_view": 0, 
+ "hide_heading": 1, 
  "hide_toolbar": 1, 
  "icon": "fa fa-check", 
  "idx": 1, 
+ "image_view": 0, 
  "in_create": 0, 
  "is_submittable": 0, 
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2020-01-22 00:00:00.000000", 
+ "modified": "2018-03-07 18:58:48.658687", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation", 
@@ -456,6 +330,7 @@
  "permissions": [
   {
    "amend": 0, 
+   "apply_user_permissions": 0, 
    "cancel": 0, 
    "create": 1, 
    "delete": 0, 
@@ -476,9 +351,9 @@
  ], 
  "quick_entry": 1, 
  "read_only": 1, 
+ "read_only_onload": 0, 
  "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
  "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
-}
+ "track_seen": 0
+}

erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py

@@ -13,15 +13,14 @@ form_grid_templates = {
 
 class BankReconciliation(Document):
 	def get_payment_entries(self):
-		if not (self.from_date and self.to_date):
-			frappe.throw(_("From Date and To Date are Mandatory"))
-
-		if not self.account:
-			frappe.throw(_("Account is mandatory to get payment entries"))
+		if not (self.bank_account and self.from_date and self.to_date):
+			msgprint(_("Bank Account, From Date and To Date are Mandatory"))
+			return
 
 		condition = ""
 		if not self.include_reconciled_entries:
-			condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
+			condition = "and (clearance_date is null or clearance_date='0000-00-00')"
+
 
 		journal_entries = frappe.db.sql("""
 			select
@@ -32,15 +31,12 @@ class BankReconciliation(Document):
 			from
 				`tabJournal Entry` t1, `tabJournal Entry Account` t2
 			where
-				t2.parent = t1.name and t2.account = %(account)s and t1.docstatus=1
-				and t1.posting_date >= %(from)s and t1.posting_date <= %(to)s
-				and ifnull(t1.is_opening, 'No') = 'No' {condition}
+				t2.parent = t1.name and t2.account = %s and t1.docstatus=1
+				and t1.posting_date >= %s and t1.posting_date <= %s
+				and ifnull(t1.is_opening, 'No') = 'No' {0}
 			group by t2.account, t1.name
 			order by t1.posting_date ASC, t1.name DESC
-		""".format(condition=condition), {"account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1)
-
-		if self.bank_account:
-			condition += 'and bank_account = %(bank_account)s'
+		""".format(condition), (self.bank_account, self.from_date, self.to_date), as_dict=1)
 
 		payment_entries = frappe.db.sql("""
 			select
@@ -53,43 +49,29 @@ class BankReconciliation(Document):
 			from `tabPayment Entry`
 			where
 				(paid_from=%(account)s or paid_to=%(account)s) and docstatus=1
-				and posting_date >= %(from)s and posting_date <= %(to)s
-				{condition}
+				and posting_date >= %(from)s and posting_date <= %(to)s {0}
 			order by
 				posting_date ASC, name DESC
-		""".format(condition=condition), {"account": self.account, "from":self.from_date,
-				"to": self.to_date, "bank_account": self.bank_account}, as_dict=1)
+		""".format(condition),
+		        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
 
-		
-		pos_sales_invoices, pos_purchase_invoices = [], []
+		pos_entries = []
 		if self.include_pos_transactions:
-			pos_sales_invoices = frappe.db.sql("""
+			pos_entries = frappe.db.sql("""
 				select
 					"Sales Invoice Payment" as payment_document, sip.name as payment_entry, sip.amount as debit,
-					si.posting_date, si.customer as against_account, sip.clearance_date,
+					si.posting_date, si.debit_to as against_account, sip.clearance_date,
 					account.account_currency, 0 as credit
 				from `tabSales Invoice Payment` sip, `tabSales Invoice` si, `tabAccount` account
 				where
 					sip.account=%(account)s and si.docstatus=1 and sip.parent = si.name
-					and account.name = sip.account and si.posting_date >= %(from)s and si.posting_date <= %(to)s
+					and account.name = sip.account and si.posting_date >= %(from)s and si.posting_date <= %(to)s {0}
 				order by
 					si.posting_date ASC, si.name DESC
-			""", {"account":self.account, "from":self.from_date, "to":self.to_date}, as_dict=1)
+			""".format(condition),
+			        {"account":self.bank_account, "from":self.from_date, "to":self.to_date}, as_dict=1)
 
-			pos_purchase_invoices = frappe.db.sql("""
-				select
-					"Purchase Invoice" as payment_document, pi.name as payment_entry, pi.paid_amount as credit,
-					pi.posting_date, pi.supplier as against_account, pi.clearance_date,
-					account.account_currency, 0 as debit
-				from `tabPurchase Invoice` pi, `tabAccount` account
-				where
-					pi.cash_bank_account=%(account)s and pi.docstatus=1 and account.name = pi.cash_bank_account
-					and pi.posting_date >= %(from)s and pi.posting_date <= %(to)s
-				order by
-					pi.posting_date ASC, pi.name DESC
-			""", {"account": self.account, "from": self.from_date, "to": self.to_date}, as_dict=1)
-
-		entries = sorted(list(payment_entries) + list(journal_entries + list(pos_sales_invoices) + list(pos_purchase_invoices)),
+		entries = sorted(list(payment_entries)+list(journal_entries+list(pos_entries)),
 			key=lambda k: k['posting_date'] or getdate(nowdate()))
 
 		self.set('payment_entries', [])
@@ -114,7 +96,7 @@ class BankReconciliation(Document):
 		for d in self.get('payment_entries'):
 			if d.clearance_date:
 				if not d.payment_document:
-					frappe.throw(_("Row #{0}: Payment document is required to complete the transaction"))
+					frappe.throw(_("Row #{0}: Payment document is required to complete the trasaction"))
 
 				if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
 					frappe.throw(_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}")
@@ -124,8 +106,10 @@ class BankReconciliation(Document):
 				if not d.clearance_date:
 					d.clearance_date = None
 
-				payment_entry = frappe.get_doc(d.payment_document, d.payment_entry)
-				payment_entry.db_set('clearance_date', d.clearance_date)
+				frappe.db.set_value(d.payment_document, d.payment_entry, "clearance_date", d.clearance_date)
+				frappe.db.sql("""update `tab{0}` set clearance_date = %s, modified = %s
+					where name=%s""".format(d.payment_document),
+				(d.clearance_date, nowdate(), d.payment_entry))
 
 				clearance_date_updated = True
 

erpnext/accounts/doctype/bank_statement_transaction_entry/bank_statement_transaction_entry.py

@@ -55,7 +55,7 @@ class BankStatementTransactionEntry(Document):
 
 	def populate_payment_entries(self):
 		if self.bank_statement is None: return
-		file_url = self.bank_statement
+		filename = self.bank_statement.split("/")[-1]
 		if (len(self.new_transaction_items + self.reconciled_transaction_items) > 0):
 			frappe.throw(_("Transactions already retreived from the statement"))
 
@@ -65,7 +65,7 @@ class BankStatementTransactionEntry(Document):
 		if self.bank_settings:
 			mapped_items = frappe.get_doc("Bank Statement Settings", self.bank_settings).mapped_items
 		statement_headers = self.get_statement_headers()
-		transactions = get_transaction_entries(file_url, statement_headers)
+		transactions = get_transaction_entries(filename, statement_headers)
 		for entry in transactions:
 			date = entry[statement_headers["Date"]].strip()
 			#print("Processing entry DESC:{0}-W:{1}-D:{2}-DT:{3}".format(entry["Particulars"], entry["Withdrawals"], entry["Deposits"], entry["Date"]))
@@ -398,21 +398,20 @@ def get_transaction_info(headers, header_index, row):
 			transaction[header] = ""
 	return transaction
 
-def get_transaction_entries(file_url, headers):
+def get_transaction_entries(filename, headers):
 	header_index = {}
 	rows, transactions = [], []
 
-	if (file_url.lower().endswith("xlsx")):
+	if (filename.lower().endswith("xlsx")):
 		from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
-		rows = read_xlsx_file_from_attached_file(file_url=file_url)
-	elif (file_url.lower().endswith("csv")):
+		rows = read_xlsx_file_from_attached_file(file_id=filename)
+	elif (filename.lower().endswith("csv")):
+		from frappe.utils.file_manager import get_file_path
 		from frappe.utils.csvutils import read_csv_content
-		_file = frappe.get_doc("File", {"file_url": file_url})
-		filepath = _file.get_full_path()
+		filepath = get_file_path(filename)
 		with open(filepath,'rb') as csvfile:
 			rows = read_csv_content(csvfile.read())
-	elif (file_url.lower().endswith("xls")):
-		filename = file_url.split("/")[-1]
+	elif (filename.lower().endswith("xls")):
 		rows = get_rows_from_xls_file(filename)
 	else:
 		frappe.throw(_("Only .csv and .xlsx files are supported currently"))
@@ -429,8 +428,8 @@ def get_transaction_entries(file_url, headers):
 	return transactions
 
 def get_rows_from_xls_file(filename):
-	_file = frappe.get_doc("File", {"file_name": filename})
-	filepath = _file.get_full_path()
+	from frappe.utils.file_manager import get_file_path
+	filepath = get_file_path(filename)
 	import xlrd
 	book = xlrd.open_workbook(filepath)
 	sheets = book.sheets()

erpnext/accounts/doctype/bank_transaction/bank_transaction.json

@@ -271,7 +271,6 @@
    "label": "Debit",
    "length": 0,
    "no_copy": 0,
-   "options": "currency",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -305,7 +304,6 @@
    "label": "Credit",
    "length": 0,
    "no_copy": 0,
-   "options": "currency",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -634,7 +632,6 @@
    "label": "Allocated Amount",
    "length": 0,
    "no_copy": 0,
-   "options": "currency",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -734,7 +731,6 @@
    "label": "Unallocated Amount",
    "length": 0,
    "no_copy": 0,
-   "options": "currency",
    "permlevel": 0,
    "precision": "",
    "print_hide": 0,
@@ -759,7 +755,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2021-11-26 12:44:55.244721",
+ "modified": "2019-05-11 05:27:55.244721",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Transaction",

erpnext/accounts/doctype/bank_transaction/bank_transaction.py

@@ -99,7 +99,7 @@ def get_paid_amount(payment_entry, currency):
 		return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "total_amount_reimbursed")
 
 	else:
-		frappe.throw("Please reconcile {0}: {1} manually".format(payment_entry.payment_document, payment_entry.payment_entry))
+		frappe.throw(_("Please reconcile {0}: {1} manually".format(payment_entry.payment_document, payment_entry.payment_entry)))
 
 @frappe.whitelist()
 def unclear_reference_payment(doctype, docname):

erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py

@@ -15,8 +15,8 @@ def upload_bank_statement():
 		with open(frappe.uploaded_file, "rb") as upfile:
 			fcontent = upfile.read()
 	else:
-		fcontent = frappe.local.uploaded_file
-		fname = frappe.local.uploaded_filename
+		from frappe.utils.file_manager import get_uploaded_content
+		fname, fcontent = get_uploaded_content()
 
 	if frappe.safe_encode(fname).lower().endswith("csv".encode('utf-8')):
 		from frappe.utils.csvutils import read_csv_content

erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py

@@ -9,13 +9,11 @@ from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sal
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 from erpnext.accounts.page.bank_reconciliation.bank_reconciliation import reconcile, get_linked_payments
-from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
 
 test_dependencies = ["Item", "Cost Center"]
 
 class TestBankTransaction(unittest.TestCase):
 	def setUp(self):
-		make_pos_profile()
 		add_transactions()
 		add_payments()
 
@@ -29,9 +27,6 @@ class TestBankTransaction(unittest.TestCase):
 		frappe.db.sql("""delete from `tabPayment Entry Reference`""")
 		frappe.db.sql("""delete from `tabPayment Entry`""")
 
-		# Delete POS Profile
-		frappe.db.sql("delete from `tabPOS Profile`")
-
 		frappe.flags.test_bank_transactions_created = False
 		frappe.flags.test_payments_created = False
 
@@ -270,18 +265,14 @@ def add_payments():
 	pe.insert()
 	pe.submit()
 
-	mode_of_payment = frappe.get_doc({
+	company = frappe.db.get_single_value('Global Defaults', 'default_company')
+	frappe.get_doc({
 		"doctype": "Mode of Payment",
 		"name": "Cash"
-	})
-
-	if not frappe.db.get_value('Mode of Payment Account', {'company': "_Test Company", 'parent': "Cash"}):
-		mode_of_payment.append("accounts", {
-			"company": "_Test Company",
-			"default_account": "_Test Bank - _TC"
-		})
-		mode_of_payment.save()
-
+	}).append("accounts", {
+		"company": company,
+		"default_account": "_Test Bank - _TC"
+	}).save()
 	si = create_sales_invoice(customer="Fayva", qty=1, rate=109080, do_not_submit=1)
 	si.is_pos = 1
 	si.append("payments", {

erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json

@@ -110,15 +110,6 @@
    "set_only_once": 0, 
    "translatable": 0, 
    "unique": 0
-  }, 
-  {
-   "depends_on": "eval:doc.docstatus==1",
-   "fieldname": "clearance_date",
-   "fieldtype": "Date",
-   "label": "Clearance Date",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
   }
  ], 
  "has_web_view": 0, 
@@ -131,7 +122,7 @@
  "issingle": 0, 
  "istable": 1, 
  "max_attachments": 0, 
- "modified": "2020-01-22 00:00:00.000000", 
+ "modified": "2018-12-06 10:57:02.635141", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Transaction Payments", 
@@ -147,4 +138,4 @@
  "track_changes": 1, 
  "track_seen": 0, 
  "track_views": 0
-}
+}

erpnext/accounts/doctype/budget/budget.py

@@ -9,14 +9,13 @@ from frappe.utils import flt, getdate, add_months, get_last_day, fmt_money, nowd
 from frappe.model.naming import make_autoname
 from erpnext.accounts.utils import get_fiscal_year
 from frappe.model.document import Document
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
 
 class BudgetError(frappe.ValidationError): pass
 class DuplicateBudgetError(frappe.ValidationError): pass
 
 class Budget(Document):
 	def autoname(self):
-		self.name = make_autoname(self.get(frappe.scrub(self.budget_against))
+		self.name = make_autoname(self.get(frappe.scrub(self.budget_against)) 
 			+ "/" + self.fiscal_year + "/.###")
 
 	def validate(self):
@@ -90,7 +89,7 @@ def validate_expense_against_budget(args):
 
 	if args.get('company') and not args.fiscal_year:
 		args.fiscal_year = get_fiscal_year(args.get('posting_date'), company=args.get('company'))[0]
-		frappe.flags.exception_approver_role = frappe.get_cached_value('Company',
+		frappe.flags.exception_approver_role = frappe.get_cached_value('Company', 
 			args.get('company'),  'exception_budget_approver_role')
 
 	if not args.account:
@@ -99,43 +98,43 @@ def validate_expense_against_budget(args):
 	if not (args.get('account') and args.get('cost_center')) and args.item_code:
 		args.cost_center, args.account = get_item_details(args)
 
-	if not args.account:
+	if not (args.cost_center or args.project) and not args.account:
 		return
 
-	for budget_against in ['project', 'cost_center'] + get_accounting_dimensions():
+	for budget_against in ['project', 'cost_center']:
 		if (args.get(budget_against) and args.account
 				and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"})):
 
-			doctype = frappe.unscrub(budget_against)
+			if args.project and budget_against == 'project':
+				condition = "and b.project='%s'" % frappe.db.escape(args.project)
+				args.budget_against_field = "Project"
+			
+			elif args.cost_center and budget_against == 'cost_center':
+				cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+				condition = """and exists(select name from `tabCost Center` 
+					where lft<=%s and rgt>=%s and name=b.cost_center)""" % (cc_lft, cc_rgt)
+				args.budget_against_field = "Cost Center"
 
-			if frappe.get_cached_value('DocType', doctype, 'is_tree'):
-				lft, rgt = frappe.db.get_value(doctype, args.get(budget_against), ["lft", "rgt"])
-				condition = """and exists(select name from `tab%s`
-					where lft<=%s and rgt>=%s and name=b.%s)""" % (doctype, lft, rgt, budget_against) #nosec
-				args.is_tree = True
-			else:
-				condition = "and b.%s=%s" % (budget_against, frappe.db.escape(args.get(budget_against)))
-				args.is_tree = False
-
-			args.budget_against_field = budget_against
-			args.budget_against_doctype = doctype
+			args.budget_against = args.get(budget_against)
 
 			budget_records = frappe.db.sql("""
 				select
 					b.{budget_against_field} as budget_against, ba.budget_amount, b.monthly_distribution,
 					ifnull(b.applicable_on_material_request, 0) as for_material_request,
-					ifnull(applicable_on_purchase_order, 0) as for_purchase_order,
+					ifnull(applicable_on_purchase_order,0) as for_purchase_order,
 					ifnull(applicable_on_booking_actual_expenses,0) as for_actual_expenses,
 					b.action_if_annual_budget_exceeded, b.action_if_accumulated_monthly_budget_exceeded,
 					b.action_if_annual_budget_exceeded_on_mr, b.action_if_accumulated_monthly_budget_exceeded_on_mr,
 					b.action_if_annual_budget_exceeded_on_po, b.action_if_accumulated_monthly_budget_exceeded_on_po
-				from
+				from 
 					`tabBudget` b, `tabBudget Account` ba
 				where
-					b.name=ba.parent and b.fiscal_year=%s
+					b.name=ba.parent and b.fiscal_year=%s 
 					and ba.account=%s and b.docstatus=1
 					{condition}
-			""".format(condition=condition, budget_against_field=budget_against), (args.fiscal_year, args.account), as_dict=True) #nosec
+			""".format(condition=condition, 
+				budget_against_field=frappe.scrub(args.get("budget_against_field"))),
+				(args.fiscal_year, args.account), as_dict=True)
 
 			if budget_records:
 				validate_budget_records(args, budget_records)
@@ -152,12 +151,12 @@ def validate_budget_records(args, budget_records):
 
 				args["month_end_date"] = get_last_day(args.posting_date)
 
-				compare_expense_with_budget(args, budget_amount,
+				compare_expense_with_budget(args, budget_amount, 
 					_("Accumulated Monthly"), monthly_action, budget.budget_against, amount)
 
 			if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
 				and yearly_action != monthly_action:
-				compare_expense_with_budget(args, flt(budget.budget_amount),
+				compare_expense_with_budget(args, flt(budget.budget_amount), 
 						_("Annual"), yearly_action, budget.budget_against, amount)
 
 def compare_expense_with_budget(args, budget_amount, action_for, action, budget_against, amount=0):
@@ -167,9 +166,9 @@ def compare_expense_with_budget(args, budget_amount, action_for, action, budget_
 		currency = frappe.get_cached_value('Company',  args.company,  'default_currency')
 
 		msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}").format(
-				_(action_for), frappe.bold(args.account), args.budget_against_field,
+				_(action_for), frappe.bold(args.account), args.budget_against_field, 
 				frappe.bold(budget_against),
-				frappe.bold(fmt_money(budget_amount, currency=currency)),
+				frappe.bold(fmt_money(budget_amount, currency=currency)), 
 				frappe.bold(fmt_money(diff, currency=currency)))
 
 		if (frappe.flags.exception_approver_role
@@ -211,10 +210,10 @@ def get_requested_amount(args, budget):
 	item_code = args.get('item_code')
 	condition = get_other_condition(args, budget, 'Material Request')
 
-	data = frappe.db.sql(""" select ifnull((sum(child.stock_qty - child.ordered_qty) * rate), 0) as amount
-		from `tabMaterial Request Item` child, `tabMaterial Request` parent where parent.name = child.parent and
-		child.item_code = %s and parent.docstatus = 1 and child.stock_qty > child.ordered_qty and {0} and
-		parent.material_request_type = 'Purchase' and parent.status != 'Stopped'""".format(condition), item_code, as_list=1)
+	data = frappe.db.sql(""" select ifnull((sum(mri.stock_qty - mri.ordered_qty) * rate), 0) as amount
+		from `tabMaterial Request Item` mri, `tabMaterial Request` mr where mr.name = mri.parent and
+		mri.item_code = %s and mr.docstatus = 1 and mri.stock_qty > mri.ordered_qty and {0} and
+		mr.material_request_type = 'Purchase' and mr.status != 'Stopped'""".format(condition), item_code, as_list=1)
 
 	return data[0][0] if data else 0
 
@@ -222,55 +221,45 @@ def get_ordered_amount(args, budget):
 	item_code = args.get('item_code')
 	condition = get_other_condition(args, budget, 'Purchase Order')
 
-	data = frappe.db.sql(""" select ifnull(sum(child.amount - child.billed_amt), 0) as amount
-		from `tabPurchase Order Item` child, `tabPurchase Order` parent where
-		parent.name = child.parent and child.item_code = %s and parent.docstatus = 1 and child.amount > child.billed_amt
-		and parent.status != 'Closed' and {0}""".format(condition), item_code, as_list=1)
+	data = frappe.db.sql(""" select ifnull(sum(poi.amount - poi.billed_amt), 0) as amount
+		from `tabPurchase Order Item` poi, `tabPurchase Order` po where
+		po.name = poi.parent and poi.item_code = %s and po.docstatus = 1 and poi.amount > poi.billed_amt
+		and po.status != 'Closed' and {0}""".format(condition), item_code, as_list=1)
 
 	return data[0][0] if data else 0
 
 def get_other_condition(args, budget, for_doc):
 	condition = "expense_account = '%s'" % (args.expense_account)
-	budget_against_field = args.get("budget_against_field")
+	budget_against_field = frappe.scrub(args.get("budget_against_field"))
 
 	if budget_against_field and args.get(budget_against_field):
-		condition += " and child.%s = '%s'" % (budget_against_field, args.get(budget_against_field))
+		condition += " and %s = '%s'" %(budget_against_field, args.get(budget_against_field))
 
 	if args.get('fiscal_year'):
 		date_field = 'schedule_date' if for_doc == 'Material Request' else 'transaction_date'
 		start_date, end_date = frappe.db.get_value('Fiscal Year', args.get('fiscal_year'),
 			['year_start_date', 'year_end_date'])
 
-		condition += """ and parent.%s
-			between '%s' and '%s' """ %(date_field, start_date, end_date)
+		alias = 'mr' if for_doc == 'Material Request' else 'po'
+		condition += """ and %s.%s
+			between '%s' and '%s' """ %(alias, date_field, start_date, end_date)
 
 	return condition
 
 def get_actual_expense(args):
-	if not args.budget_against_doctype:
-		args.budget_against_doctype = frappe.unscrub(args.budget_against_field)
-
-	budget_against_field = args.get('budget_against_field')
 	condition1 = " and gle.posting_date <= %(month_end_date)s" \
 		if args.get("month_end_date") else ""
-
-	if args.is_tree:
-		lft_rgt = frappe.db.get_value(args.budget_against_doctype,
-			args.get(budget_against_field), ["lft", "rgt"], as_dict=1)
-
+	if args.budget_against_field == "Cost Center":
+		lft_rgt = frappe.db.get_value(args.budget_against_field, 
+			args.budget_against, ["lft", "rgt"], as_dict=1)
 		args.update(lft_rgt)
+		condition2 = """and exists(select name from `tabCost Center` 
+			where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)"""
+	
+	elif args.budget_against_field == "Project":
+		condition2 = "and exists(select name from `tabProject` where name=gle.project and gle.project = %(budget_against)s)"
 
-		condition2 = """and exists(select name from `tab{doctype}`
-			where lft>=%(lft)s and rgt<=%(rgt)s
-			and name=gle.{budget_against_field})""".format(doctype=args.budget_against_doctype, #nosec
-			budget_against_field=budget_against_field)
-	else:
-		condition2 = """and exists(select name from `tab{doctype}`
-		where name=gle.{budget_against} and
-		gle.{budget_against} = %({budget_against})s)""".format(doctype=args.budget_against_doctype,
-		budget_against = budget_against_field)
-
-	amount  = flt(frappe.db.sql("""
+	return flt(frappe.db.sql("""
 		select sum(gle.debit) - sum(gle.credit)
 		from `tabGL Entry` gle
 		where gle.account=%(account)s
@@ -279,9 +268,7 @@ def get_actual_expense(args):
 			and gle.company=%(company)s
 			and gle.docstatus=1
 			{condition2}
-	""".format(condition1=condition1, condition2=condition2), (args))[0][0]) #nosec
-
-	return amount
+	""".format(condition1=condition1, condition2=condition2), (args))[0][0])
 
 def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
 	distribution = {}

erpnext/accounts/doctype/budget/test_budget.py

@@ -11,42 +11,42 @@ from erpnext.buying.doctype.purchase_order.test_purchase_order import create_pur
 from erpnext.accounts.doctype.budget.budget import get_actual_expense, BudgetError
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
 
-class TestBudget(unittest.TestCase):
+class TestBudget(unittest.TestCase):		
 	def test_monthly_budget_crossed_ignore(self):
-		set_total_expense_zero("2013-02-28", "cost_center")
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
 		budget = make_budget(budget_against="Cost Center")
-
+		
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", posting_date="2013-02-28", submit=True)
 
 		self.assertTrue(frappe.db.get_value("GL Entry",
 			{"voucher_type": "Journal Entry", "voucher_no": jv.name}))
-
+			
 		budget.cancel()
 
 	def test_monthly_budget_crossed_stop1(self):
-		set_total_expense_zero("2013-02-28", "cost_center")
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
 		budget = make_budget(budget_against="Cost Center")
-
+		
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", posting_date="2013-02-28")
 
 		self.assertRaises(BudgetError, jv.submit)
-
+		
 		budget.load_from_db()
 		budget.cancel()
 
 	def test_exception_approver_role(self):
-		set_total_expense_zero("2013-02-28", "cost_center")
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
 		budget = make_budget(budget_against="Cost Center")
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
-
+	
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", posting_date="2013-03-02")
 
@@ -114,49 +114,49 @@ class TestBudget(unittest.TestCase):
 		budget.cancel()
 
 	def test_monthly_budget_crossed_stop2(self):
-		set_total_expense_zero("2013-02-28", "project")
+		set_total_expense_zero("2013-02-28", "Project")
 
 		budget = make_budget(budget_against="Project")
-
+		
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", project="_Test Project", posting_date="2013-02-28")
 
 		self.assertRaises(BudgetError, jv.submit)
-
+		
 		budget.load_from_db()
 		budget.cancel()
 
 	def test_yearly_budget_crossed_stop1(self):
-		set_total_expense_zero("2013-02-28", "cost_center")
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
 		budget = make_budget(budget_against="Cost Center")
-
+		
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC", posting_date="2013-03-28")
 
 		self.assertRaises(BudgetError, jv.submit)
-
+		
 		budget.cancel()
 
 	def test_yearly_budget_crossed_stop2(self):
-		set_total_expense_zero("2013-02-28", "project")
+		set_total_expense_zero("2013-02-28", "Project")
 
 		budget = make_budget(budget_against="Project")
-
+		
 		jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 150000, "_Test Cost Center - _TC", project="_Test Project", posting_date="2013-03-28")
 
 		self.assertRaises(BudgetError, jv.submit)
-
+		
 		budget.cancel()
 
 	def test_monthly_budget_on_cancellation1(self):
-		set_total_expense_zero("2013-02-28", "cost_center")
+		set_total_expense_zero("2013-02-28", "Cost Center")
 
 		budget = make_budget(budget_against="Cost Center")
-
+				
 		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", posting_date="2013-02-28", submit=True)
 
@@ -170,17 +170,17 @@ class TestBudget(unittest.TestCase):
 			{"voucher_type": "Journal Entry", "voucher_no": jv2.name}))
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
-
+		
 		self.assertRaises(BudgetError, jv1.cancel)
-
+		
 		budget.load_from_db()
 		budget.cancel()
 
 	def test_monthly_budget_on_cancellation2(self):
-		set_total_expense_zero("2013-02-28", "project")
+		set_total_expense_zero("2013-02-28", "Project")
 
 		budget = make_budget(budget_against="Project")
-
+				
 		jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", posting_date="2013-02-28", submit=True, project="_Test Project")
 
@@ -194,16 +194,16 @@ class TestBudget(unittest.TestCase):
 			{"voucher_type": "Journal Entry", "voucher_no": jv2.name}))
 
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
-
+		
 		self.assertRaises(BudgetError, jv1.cancel)
-
+		
 		budget.load_from_db()
 		budget.cancel()
 
 	def test_monthly_budget_against_group_cost_center(self):
-		set_total_expense_zero("2013-02-28", "cost_center")
-		set_total_expense_zero("2013-02-28", "cost_center", "_Test Cost Center 2 - _TC")
-
+		set_total_expense_zero("2013-02-28", "Cost Center")
+		set_total_expense_zero("2013-02-28", "Cost Center", "_Test Cost Center 2 - _TC")
+		
 		budget = make_budget(budget_against="Cost Center", cost_center="_Test Company - _TC")
 		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
@@ -211,7 +211,7 @@ class TestBudget(unittest.TestCase):
 			"_Test Bank - _TC", 40000, "_Test Cost Center 2 - _TC", posting_date="2013-02-28")
 
 		self.assertRaises(BudgetError, jv.submit)
-
+		
 		budget.load_from_db()
 		budget.cancel()
 
@@ -239,32 +239,29 @@ class TestBudget(unittest.TestCase):
 		budget.cancel()
 		jv.cancel()
 
+		frappe.delete_doc('Journal Entry', jv.name)
+		frappe.delete_doc('Cost Center', cost_center)
 
 def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
-	if budget_against_field == "project":
+	if budget_against_field == "Project":
 		budget_against = "_Test Project"
 	else:
 		budget_against = budget_against_CC or "_Test Cost Center - _TC"
-
-	args = frappe._dict({
+	existing_expense = get_actual_expense(frappe._dict({
 		"account": "_Test Account Cost for Goods Sold - _TC",
 		"cost_center": "_Test Cost Center - _TC",
 		"monthly_end_date": posting_date,
 		"company": "_Test Company",
 		"fiscal_year": "_Test Fiscal Year 2013",
 		"budget_against_field": budget_against_field,
-	})
-
-	if not args.get(budget_against_field):
-		args[budget_against_field] = budget_against
-
-	existing_expense = get_actual_expense(args)
-
+		"budget_against": budget_against
+	}))
+	
 	if existing_expense:
-		if budget_against_field == "cost_center":
+		if budget_against_field == "Cost Center":
 			make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", posting_date="2013-02-28", submit=True)
-		elif budget_against_field == "project":
+		elif budget_against_field == "Project":
 			make_journal_entry("_Test Account Cost for Goods Sold - _TC",
 			"_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True, project="_Test Project", posting_date="2013-02-28")
 
@@ -284,13 +281,13 @@ def make_budget(**args):
 		frappe.db.sql("delete from `tabBudget Account` where parent = %(name)s", d)
 
 	budget = frappe.new_doc("Budget")
-
+	
 	if budget_against == "Project":
 		budget.project = "_Test Project"
 	else:
 		budget.cost_center =cost_center or "_Test Cost Center - _TC"
-
-
+	
+	
 	budget.fiscal_year = "_Test Fiscal Year 2013"
 	budget.monthly_distribution = "_Test Distribution"
 	budget.company = "_Test Company"
@@ -302,7 +299,7 @@ def make_budget(**args):
 		"account": "_Test Account Cost for Goods Sold - _TC",
 		"budget_amount": 100000
 	})
-
+	
 	if args.applicable_on_material_request:
 		budget.applicable_on_material_request = 1
 		budget.action_if_annual_budget_exceeded_on_mr = args.action_if_annual_budget_exceeded_on_mr or 'Warn'

erpnext/accounts/doctype/c_form/c_form.js

@@ -4,40 +4,24 @@
 //c-form js file
 // -----------------------------
 
-frappe.ui.form.on('C-Form', {
-	setup(frm) {
-		frm.fields_dict.invoices.grid.get_field("invoice_no").get_query = function(doc) {
-			return {
-				filters: {
-					"docstatus": 1,
-					"customer": doc.customer,
-					"company": doc.company,
-					"c_form_applicable": 'Yes',
-					"c_form_no": ''
-				}
-			};
-		}
 
-		frm.fields_dict.state.get_query = function() {
-			return {
-				filters: {
-					country: "India"
-				}
-			};
+cur_frm.fields_dict.invoices.grid.get_field("invoice_no").get_query = function(doc) {
+	return {
+		filters: {
+			"docstatus": 1,
+			"customer": doc.customer,
+			"company": doc.company,
+			"c_form_applicable": 'Yes',
+			"c_form_no": ''
 		}
 	}
-});
+}
 
-frappe.ui.form.on('C-Form Invoice Detail', {
-	invoice_no(frm, cdt, cdn) {
-		let d = frappe.get_doc(cdt, cdn);
+cur_frm.fields_dict.state.get_query = function(doc) {
+	return {filters: { country: "India"}}
+}
 
-		if (d.invoice_no) {
-			frm.call('get_invoice_details', {
-				invoice_no: d.invoice_no
-			}).then(r => {
-				frappe.model.set_value(cdt, cdn, r.message);
-			});
-		}
-	}
-});
+cur_frm.cscript.invoice_no = function(doc, cdt, cdn) {
+	var d = locals[cdt][cdn];
+	return get_server_fields('get_invoice_details', d.invoice_no, 'invoices', doc, cdt, cdn, 1);
+}

erpnext/accounts/doctype/cash_flow_mapper/default_cash_flow_mapper.py

@@ -7,19 +7,19 @@ DEFAULT_MAPPERS = [
         'section_header': 'Cash flows from operating activities',
         'section_leader': 'Adjustments for',
         'section_name': 'Operating Activities',
-        'position': 1,
+        'position': 0,
         'section_subtotal': 'Cash generated from operations',
     },
     {
         'doctype': 'Cash Flow Mapper',
-        'position': 2,
+        'position': 1,
         'section_footer': 'Net cash used in investing activities',
         'section_header': 'Cash flows from investing activities',
         'section_name': 'Investing Activities'
     },
     {
         'doctype': 'Cash Flow Mapper',
-        'position': 3,
+        'position': 2,
         'section_footer': 'Net cash used in financing activites',
         'section_header': 'Cash flows from financing activities',
         'section_name': 'Financing Activities',

erpnext/accounts/doctype/cashier_closing/cashier_closing.json

@@ -1,457 +1,434 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "naming_series:",
- "beta": 0,
- "creation": "2018-06-18 16:51:49.994750",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "POS-CLO-",
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Series",
-   "length": 0,
-   "no_copy": 0,
-   "options": "POS-CLO-",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "User",
-   "length": 0,
-   "no_copy": 0,
-   "options": "User",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "Today",
-   "fieldname": "date",
-   "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "from_time",
-   "fieldtype": "Time",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "From Time",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
-   "fieldname": "time",
-   "fieldtype": "Time",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 1,
-   "label": "To Time",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0.00",
-   "fieldname": "expense",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Expense",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0.00",
-   "fieldname": "custody",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Custody",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0.00",
-   "fieldname": "returns",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Returns",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "2",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0.00",
-   "fieldname": "outstanding_amount",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Outstanding Amount",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "0.0",
-   "fieldname": "payments",
-   "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Payments",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cashier Closing Payments",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "net_amount",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 1,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Net Amount",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amended From",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Cashier Closing",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-02-19 08:35:24.157327",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cashier Closing",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
-}
+    "allow_copy": 0, 
+    "allow_guest_to_view": 0, 
+    "allow_import": 0, 
+    "allow_rename": 0, 
+    "autoname": "naming_series:", 
+    "beta": 0, 
+    "creation": "2018-06-18 16:51:49.994750", 
+    "custom": 0, 
+    "docstatus": 0, 
+    "doctype": "DocType", 
+    "document_type": "", 
+    "editable_grid": 1, 
+    "engine": "InnoDB", 
+    "fields": [
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "POS-CLO-", 
+      "fieldname": "naming_series", 
+      "fieldtype": "Select", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 1, 
+      "in_list_view": 0, 
+      "in_standard_filter": 1, 
+      "label": "Series", 
+      "length": 0, 
+      "no_copy": 0, 
+      "options": "POS-CLO-", 
+      "permlevel": 0, 
+      "precision": "", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 1, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "fieldname": "user", 
+      "fieldtype": "Link", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 1, 
+      "in_standard_filter": 1, 
+      "label": "User", 
+      "length": 0, 
+      "no_copy": 0, 
+      "options": "User", 
+      "permlevel": 0, 
+      "precision": "", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 1, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 1, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "Today", 
+      "fieldname": "date", 
+      "fieldtype": "Date", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 1, 
+      "label": "Date", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 1, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "fieldname": "from_time", 
+      "fieldtype": "Time", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 1, 
+      "label": "From Time", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 0, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 1, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "", 
+      "fieldname": "time", 
+      "fieldtype": "Time", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 1, 
+      "label": "To Time", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 0, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 1, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "0.00", 
+      "fieldname": "expense", 
+      "fieldtype": "Float", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 0, 
+      "label": "Expense", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "2", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 0, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "0.00", 
+      "fieldname": "custody", 
+      "fieldtype": "Float", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 0, 
+      "label": "Custody", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "2", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 0, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "0.00", 
+      "fieldname": "returns", 
+      "fieldtype": "Float", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 0, 
+      "label": "Returns", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "2", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 0, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "0.00", 
+      "fieldname": "outstanding_amount", 
+      "fieldtype": "Float", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 0, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 0, 
+      "label": "Outstanding Amount", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "2", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 1, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "default": "0.0", 
+      "fieldname": "payments", 
+      "fieldtype": "Table", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 0, 
+      "label": "Payments", 
+      "length": 0, 
+      "no_copy": 0, 
+      "options": "Cashier Closing Payments", 
+      "permlevel": 0, 
+      "precision": "", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 0, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "fieldname": "net_amount", 
+      "fieldtype": "Float", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 1, 
+      "in_global_search": 0, 
+      "in_list_view": 1, 
+      "in_standard_filter": 1, 
+      "label": "Net Amount", 
+      "length": 0, 
+      "no_copy": 0, 
+      "permlevel": 0, 
+      "precision": "", 
+      "print_hide": 0, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 1, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }, 
+     {
+      "allow_bulk_edit": 0, 
+      "allow_on_submit": 0, 
+      "bold": 0, 
+      "collapsible": 0, 
+      "columns": 0, 
+      "fieldname": "amended_from", 
+      "fieldtype": "Link", 
+      "hidden": 0, 
+      "ignore_user_permissions": 0, 
+      "ignore_xss_filter": 0, 
+      "in_filter": 0, 
+      "in_global_search": 0, 
+      "in_list_view": 0, 
+      "in_standard_filter": 0, 
+      "label": "Amended From", 
+      "length": 0, 
+      "no_copy": 1, 
+      "options": "Cashier Closing", 
+      "permlevel": 0, 
+      "print_hide": 1, 
+      "print_hide_if_no_value": 0, 
+      "read_only": 1, 
+      "remember_last_selected_value": 0, 
+      "report_hide": 0, 
+      "reqd": 0, 
+      "search_index": 0, 
+      "set_only_once": 0, 
+      "unique": 0
+     }
+    ], 
+    "has_web_view": 0, 
+    "hide_heading": 0, 
+    "hide_toolbar": 0, 
+    "idx": 0, 
+    "image_view": 0, 
+    "in_create": 0, 
+    "is_submittable": 1, 
+    "issingle": 0, 
+    "istable": 0, 
+    "max_attachments": 0, 
+    "modified": "2019-03-14 09:14:26.727129", 
+    "modified_by": "Administrator", 
+    "module": "Accounts", 
+    "name": "Cashier Closing", 
+    "name_case": "", 
+    "owner": "Administrator", 
+    "permissions": [
+     {
+      "amend": 0, 
+      "apply_user_permissions": 0, 
+      "cancel": 0, 
+      "create": 1, 
+      "delete": 1, 
+      "email": 1, 
+      "export": 1, 
+      "if_owner": 0, 
+      "import": 0, 
+      "permlevel": 0, 
+      "print": 1, 
+      "read": 1, 
+      "report": 1, 
+      "role": "System Manager", 
+      "set_user_permissions": 0, 
+      "share": 1, 
+      "submit": 1, 
+      "write": 1
+     }
+    ], 
+    "quick_entry": 0, 
+    "read_only": 0, 
+    "read_only_onload": 0, 
+    "show_name_in_global_search": 0, 
+    "sort_field": "modified", 
+    "sort_order": "DESC", 
+    "track_changes": 1, 
+    "track_seen": 0
+   }

erpnext/accounts/doctype/cashier_closing/cashier_closing.py

@@ -23,13 +23,13 @@ class CashierClosing(Document):
 			where posting_date=%s and posting_time>=%s and posting_time<=%s and owner=%s
 		""", (self.date, self.from_time, self.time, self.user))
 		self.outstanding_amount = flt(values[0][0] if values else 0)
-
+			
 	def make_calculations(self):
 		total = 0.00
 		for i in self.payments:
 			total += flt(i.amount)
 
-		self.net_amount = total + self.outstanding_amount + flt(self.expense) - flt(self.custody) + flt(self.returns)
+		self.net_amount = total + self.outstanding_amount + self.expense - self.custody + self.returns
 
 	def validate_time(self):
 		if self.from_time >= self.time:

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js

@@ -1,174 +0,0 @@
-frappe.ui.form.on('Chart of Accounts Importer', {
-	onload: function (frm) {
-		frm.set_value("company", "");
-		frm.set_value("import_file", "");
-	},
-	refresh: function (frm) {
-		// disable default save
-		frm.disable_save();
-
-		// make company mandatory
-		frm.set_df_property('company', 'reqd', frm.doc.company ? 0 : 1);
-		frm.set_df_property('import_file_section', 'hidden', frm.doc.company ? 0 : 1);
-		frm.set_df_property('chart_preview', 'hidden',
-			$(frm.fields_dict['chart_tree'].wrapper).html()!="" ? 0 : 1);
-
-		// Show import button when file is successfully attached
-		if (frm.page && frm.page.show_import_button) {
-			create_import_button(frm);
-		}
-	},
-
-	download_template: function(frm) {
-		var d = new frappe.ui.Dialog({
-			title: __("Download Template"),
-			fields: [
-				{
-					label : "File Type",
-					fieldname: "file_type",
-					fieldtype: "Select",
-					reqd: 1,
-					options: ["Excel", "CSV"]
-				},
-				{
-					label: "Template Type",
-					fieldname: "template_type",
-					fieldtype: "Select",
-					reqd: 1,
-					options: ["Sample Template", "Blank Template"],
-					change: () => {
-						let template_type = d.get_value('template_type');
-
-						if (template_type === "Sample Template") {
-							d.set_df_property('template_type', 'description',
-								`The Sample Template contains all the required accounts pre filled in the  template.
-								You can add more accounts or change existing accounts in the template as per your choice.`);
-						} else {
-							d.set_df_property('template_type', 'description',
-								`The Blank Template contains just the account type and root type required to build the Chart
-								of Accounts. Please enter the account names and add more rows as per your requirement.`);
-						}
-					}
-				}
-			],
-			primary_action: function() {
-				var data = d.get_values();
-
-				if (!data.template_type) {
-					frappe.throw(__('Please select <b>Template Type</b> to download template'));
-				}
-
-				open_url_post(
-					'/api/method/erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.download_template',
-					{
-						file_type: data.file_type,
-						template_type: data.template_type
-					}
-				);
-
-				d.hide();
-			},
-			primary_action_label: __('Download')
-		});
-		d.show();
-	},
-
-	import_file: function (frm) {
-		if (!frm.doc.import_file) {
-			frm.page.set_indicator("");
-			$(frm.fields_dict['chart_tree'].wrapper).empty(); // empty wrapper on removing file
-		} else {
-			generate_tree_preview(frm);
-			validate_csv_data(frm);
-		}
-	},
-
-	company: function (frm) {
-		if (frm.doc.company) {
-			// validate that no Gl Entry record for the company exists.
-			frappe.call({
-				method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.validate_company",
-				args: {
-					company: frm.doc.company
-				},
-				callback: function(r) {
-					if(r.message===false) {
-						frm.set_value("company", "");
-						frappe.throw(__(`Transactions against the company already exist!
-							Chart Of accounts can be imported for company with no transactions`));
-					} else {
-						frm.trigger("refresh");
-					}
-				}
-			});
-		}
-	}
-});
-
-var validate_csv_data = function(frm) {
-	frappe.call({
-		method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.validate_accounts",
-		args: {file_name: frm.doc.import_file},
-		callback: function(r) {
-			if(r.message && r.message[0]===true) {
-				frm.page["show_import_button"] = true;
-				frm.page["total_accounts"] = r.message[1];
-				frm.trigger("refresh");
-			} else {
-				frm.page.set_indicator(__('Resolve error and upload again.'), 'orange');
-				frappe.throw(__(r.message));
-			}
-		}
-	});
-};
-
-var create_import_button = function(frm) {
-	frm.page.set_primary_action(__("Import"), function () {
-		frappe.call({
-			method: "erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.import_coa",
-			args: {
-				file_name: frm.doc.import_file,
-				company: frm.doc.company
-			},
-			freeze: true,
-			freeze_message: __("Creating Accounts..."),
-			callback: function(r) {
-				if(!r.exc) {
-					clearInterval(frm.page["interval"]);
-					frm.page.set_indicator(__('Import Successfull'), 'blue');
-					create_reset_button(frm);
-				}
-			}
-		});
-	}).addClass('btn btn-primary');
-};
-
-var create_reset_button = function(frm) {
-	frm.page.set_primary_action(__("Reset"), function () {
-		frm.page.clear_primary_action();
-		delete frm.page["show_import_button"];
-		frm.reload_doc();
-	}).addClass('btn btn-primary');
-};
-
-var generate_tree_preview = function(frm) {
-	let parent = __('All Accounts');
-	$(frm.fields_dict['chart_tree'].wrapper).empty(); // empty wrapper to load new data
-
-	// generate tree structure based on the csv data
-	new frappe.ui.Tree({
-		parent: $(frm.fields_dict['chart_tree'].wrapper),
-		label: parent,
-		expandable: true,
-		method: 'erpnext.accounts.doctype.chart_of_accounts_importer.chart_of_accounts_importer.get_coa',
-		args: {
-			file_name: frm.doc.import_file,
-			parent: parent,
-			doctype: 'Chart of Accounts Importer',
-			file_type: frm.doc.file_type
-		},
-		onclick: function(node) {
-			parent = node.value;
-		}
-	});
-};

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json

@@ -1,71 +0,0 @@
-{
- "actions": [],
- "allow_copy": 1,
- "creation": "2019-02-01 12:24:34.761380",
- "description": "Import Chart of Accounts from a csv file",
- "doctype": "DocType",
- "document_type": "Other",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "company",
-  "download_template",
-  "import_file",
-  "chart_preview",
-  "chart_tree"
- ],
- "fields": [
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "options": "Company"
-  },
-  {
-   "depends_on": "company",
-   "fieldname": "import_file",
-   "fieldtype": "Attach",
-   "label": "Attach custom Chart of Accounts file"
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "chart_preview",
-   "fieldtype": "Section Break",
-   "label": "Chart Preview"
-  },
-  {
-   "fieldname": "chart_tree",
-   "fieldtype": "HTML",
-   "label": "Chart Tree"
-  },
-  {
-   "depends_on": "company",
-   "fieldname": "download_template",
-   "fieldtype": "Button",
-   "label": "Download Template"
-  }
- ],
- "hide_toolbar": 1,
- "in_create": 1,
- "issingle": 1,
- "links": [],
- "modified": "2020-02-28 08:49:11.422846",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Chart of Accounts Importer",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "read": 1,
-   "role": "Accounts Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
-}

erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py

@@ -1,376 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-from functools import reduce
-import frappe, csv, os
-from frappe import _
-from frappe.utils import cstr, cint
-from frappe.model.document import Document
-from frappe.utils.csvutils import UnicodeWriter
-from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts, build_tree_from_json
-from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file, read_xls_file_from_attached_file
-
-class ChartofAccountsImporter(Document):
-	pass
-
-@frappe.whitelist()
-def validate_company(company):
-	parent_company, allow_account_creation_against_child_company = frappe.db.get_value('Company',
-		{'name': company}, ['parent_company',
-		'allow_account_creation_against_child_company'])
-
-	if parent_company and (not allow_account_creation_against_child_company):
-		frappe.throw(_("""{0} is a child company. Please import accounts against parent company
-			or enable {1} in company master""").format(frappe.bold(company),
-			frappe.bold('Allow Account Creation Against Child Company')), title='Wrong Company')
-
-	if frappe.db.get_all('GL Entry', {"company": company}, "name", limit=1):
-		return False
-
-@frappe.whitelist()
-def import_coa(file_name, company):
-	# delete existing data for accounts
-	unset_existing_data(company)
-
-	# create accounts
-	file_doc, extension = get_file(file_name)
-
-	if extension  == 'csv':
-		data = generate_data_from_csv(file_doc)
-	else:
-		data = generate_data_from_excel(file_doc, extension)
-
-	forest = build_forest(data)
-	create_charts(company, custom_chart=forest)
-
-	# trigger on_update for company to reset default accounts
-	set_default_accounts(company)
-
-def get_file(file_name):
-	file_doc = frappe.get_doc("File", {"file_url": file_name})
-	parts = file_doc.get_extension()
-	extension = parts[1]
-	extension = extension.lstrip(".")
-
-	if extension not in ('csv',  'xlsx', 'xls'):
-		frappe.throw("Only CSV and Excel files can be used to for importing data. Please check the file format you are trying to upload")
-
-	return  file_doc, extension
-
-def generate_data_from_csv(file_doc, as_dict=False):
-	''' read csv file and return the generated nested tree '''
-
-	file_path = file_doc.get_full_path()
-
-	data = []
-	with open(file_path, 'r') as in_file:
-		csv_reader = list(csv.reader(in_file))
-		headers = csv_reader[0]
-		del csv_reader[0] # delete top row and headers row
-
-		for row in csv_reader:
-			if as_dict:
-				data.append({frappe.scrub(header): row[index] for index, header in enumerate(headers)})
-			else:
-				if not row[1]: row[1] = row[0]
-				data.append(row)
-
-	# convert csv data
-	return data
-
-def generate_data_from_excel(file_doc, extension, as_dict=False):
-	content = file_doc.get_content()
-
-	if extension == "xlsx":
-		rows = read_xlsx_file_from_attached_file(fcontent=content)
-	elif extension == "xls":
-		rows = read_xls_file_from_attached_file(content)
-
-	data = []
-	headers = rows[0]
-	del rows[0]
-
-	for row in rows:
-		if as_dict:
-			data.append({frappe.scrub(header): row[index] for index, header in enumerate(headers)})
-		else:
-			if not row[1]: row[1] = row[0]
-			data.append(row)
-
-	return data
-
-@frappe.whitelist()
-def get_coa(doctype, parent, is_root=False, file_name=None):
-	''' called by tree view (to fetch node's children) '''
-
-	file_doc, extension = get_file(file_name)
-	parent = None if parent==_('All Accounts') else parent
-
-	if extension  == 'csv':
-		data = generate_data_from_csv(file_doc)
-	else:
-		data = generate_data_from_excel(file_doc, extension)
-
-	forest = build_forest(data)
-	accounts = build_tree_from_json("", chart_data=forest) # returns alist of dict in a tree render-able form
-
-	# filter out to show data for the selected node only
-	accounts = [d for d in accounts if d['parent_account']==parent]
-
-	return accounts
-
-def build_forest(data):
-	'''
-		converts list of list into a nested tree
-		if a = [[1,1], [1,2], [3,2], [4,4], [5,4]]
-		tree = {
-			1: {
-				2: {
-					3: {}
-				}
-			},
-			4: {
-				5: {}
-			}
-		}
-	'''
-
-	# set the value of nested dictionary
-	def set_nested(d, path, value):
-		reduce(lambda d, k: d.setdefault(k, {}), path[:-1], d)[path[-1]] = value
-		return d
-
-	# returns the path of any node in list format
-	def return_parent(data, child):
-		from frappe import _
-
-		for row in data:
-			account_name, parent_account = row[0:2]
-			if parent_account == account_name == child:
-				return [parent_account]
-			elif account_name == child:
-				parent_account_list = return_parent(data, parent_account)
-				if not parent_account_list:
-					frappe.throw(_("The parent account {0} does not exists in the uploaded template").format(
-						frappe.bold(parent_account)))
-
-				return [child] + parent_account_list
-
-	charts_map, paths = {}, []
-
-	line_no = 3
-	error_messages = []
-
-	for i in data:
-		account_name, dummy, account_number, is_group, account_type, root_type = i
-
-		if not account_name:
-			error_messages.append("Row {0}: Please enter Account Name".format(line_no))
-
-		charts_map[account_name] = {}
-		if cint(is_group) == 1: charts_map[account_name]["is_group"] = is_group
-		if account_type: charts_map[account_name]["account_type"] = account_type
-		if root_type: charts_map[account_name]["root_type"] = root_type
-		if account_number: charts_map[account_name]["account_number"] = account_number
-		path = return_parent(data, account_name)[::-1]
-		paths.append(path) # List of path is created
-		line_no += 1
-
-	if error_messages:
-		frappe.throw("<br>".join(error_messages))
-
-	out = {}
-	for path in paths:
-		for n, account_name in enumerate(path):
-			set_nested(out, path[:n+1], charts_map[account_name]) # setting the value of nested dictionary.
-
-	return out
-
-def build_response_as_excel(writer):
-	filename = frappe.generate_hash("", 10)
-	with open(filename, 'wb') as f:
-		f.write(cstr(writer.getvalue()).encode('utf-8'))
-	f = open(filename)
-	reader = csv.reader(f)
-
-	from frappe.utils.xlsxutils import make_xlsx
-	xlsx_file = make_xlsx(reader, "Chart Of Accounts Importer Template")
-
-	f.close()
-	os.remove(filename)
-
-	# write out response as a xlsx type
-	frappe.response['filename'] = 'coa_importer_template.xlsx'
-	frappe.response['filecontent'] = xlsx_file.getvalue()
-	frappe.response['type'] = 'binary'
-
-@frappe.whitelist()
-def download_template(file_type, template_type):
-	data = frappe._dict(frappe.local.form_dict)
-
-	writer = get_template(template_type)
-
-	if file_type == 'CSV':
-		# download csv file
-		frappe.response['result'] = cstr(writer.getvalue())
-		frappe.response['type'] = 'csv'
-		frappe.response['doctype'] = 'Chart of Accounts Importer'
-	else:
-		build_response_as_excel(writer)
-
-def get_template(template_type):
-
-	fields = ["Account Name", "Parent Account", "Account Number", "Is Group", "Account Type", "Root Type"]
-	writer = UnicodeWriter()
-	writer.writerow(fields)
-
-	if template_type == 'Blank Template':
-		for root_type in  get_root_types():
-			writer.writerow(['', '', '', 1, '', root_type])
-
-		for account in get_mandatory_group_accounts():
-			writer.writerow(['', '', '', 1, account, "Asset"])
-
-		for account_type in get_mandatory_account_types():
-			writer.writerow(['', '', '', 0, account_type.get('account_type'), account_type.get('root_type')])
-	else:
-		writer = get_sample_template(writer)
-
-	return writer
-
-def get_sample_template(writer):
-	template = [
-		["Application Of Funds(Assets)", "", "", 1, "", "Asset"],
-		["Sources Of Funds(Liabilities)", "", "", 1, "", "Liability"],
-		["Equity", "", "", 1, "", "Equity"],
-		["Expenses", "", "", 1, "", "Expense"],
-		["Income", "", "", 1, "", "Income"],
-		["Bank Accounts", "Application Of Funds(Assets)", "", 1, "Bank", "Asset"],
-		["Cash In Hand", "Application Of Funds(Assets)", "", 1, "Cash", "Asset"],
-		["Stock Assets", "Application Of Funds(Assets)", "", 1, "Stock", "Asset"],
-		["Cost Of Goods Sold", "Expenses", "", 0, "Cost of Goods Sold", "Expense"],
-		["Asset Depreciation", "Expenses", "", 0, "Depreciation", "Expense"],
-		["Fixed Assets", "Application Of Funds(Assets)", "", 0, "Fixed Asset", "Asset"],
-		["Accounts Payable", "Sources Of Funds(Liabilities)", "", 0, "Payable", "Liability"],
-		["Accounts Receivable", "Application Of Funds(Assets)", "", 1, "Receivable", "Asset"],
-		["Stock Expenses", "Expenses", "", 0, "Stock Adjustment", "Expense"],
-		["Sample Bank", "Bank Accounts", "", 0, "Bank", "Asset"],
-		["Cash", "Cash In Hand", "", 0, "Cash", "Asset"],
-		["Stores", "Stock Assets", "", 0, "Stock", "Asset"],
-	]
-
-	for row in template:
-		writer.writerow(row)
-
-	return writer
-
-
-@frappe.whitelist()
-def validate_accounts(file_name):
-
-	file_doc, extension = get_file(file_name)
-
-	if extension  == 'csv':
-		accounts = generate_data_from_csv(file_doc, as_dict=True)
-	else:
-		accounts = generate_data_from_excel(file_doc, extension, as_dict=True)
-
-	accounts_dict = {}
-	for account in accounts:
-		accounts_dict.setdefault(account["account_name"], account)
-		if account["parent_account"] and accounts_dict.get(account["parent_account"]):
-			accounts_dict[account["parent_account"]]["is_group"] = 1
-
-	message = validate_root(accounts_dict)
-	if message: return message
-	message = validate_account_types(accounts_dict)
-	if message: return message
-
-	return [True, len(accounts)]
-
-def validate_root(accounts):
-	roots = [accounts[d] for d in accounts if not accounts[d].get('parent_account')]
-	if len(roots) < 4:
-		return _("Number of root accounts cannot be less than 4")
-
-	error_messages = []
-
-	for account in roots:
-		if not account.get("root_type") and account.get("account_name"):
-			error_messages.append("Please enter Root Type for account- {0}".format(account.get("account_name")))
-		elif account.get("root_type") not in get_root_types() and account.get("account_name"):
-			error_messages.append("Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity".format(account.get("account_name")))
-
-	if error_messages:
-		return "<br>".join(error_messages)
-
-def get_root_types():
-	return ('Asset', 'Liability', 'Expense', 'Income', 'Equity')
-
-def get_report_type(root_type):
-	if root_type in ('Asset', 'Liability', 'Equity'):
-		return 'Balance Sheet'
-	else:
-		return 'Profit and Loss'
-
-def get_mandatory_group_accounts():
-	return ('Bank', 'Cash', 'Stock')
-
-def get_mandatory_account_types():
-	return [
-		{'account_type': 'Cost of Goods Sold', 'root_type': 'Expense'},
-		{'account_type': 'Depreciation', 'root_type': 'Expense'},
-		{'account_type': 'Fixed Asset', 'root_type': 'Asset'},
-		{'account_type': 'Payable', 'root_type': 'Liability'},
-		{'account_type': 'Receivable', 'root_type': 'Asset'},
-		{'account_type': 'Stock Adjustment', 'root_type': 'Expense'},
-		{'account_type': 'Bank', 'root_type': 'Asset'},
-		{'account_type': 'Cash', 'root_type': 'Asset'},
-		{'account_type': 'Stock', 'root_type': 'Asset'}
-	]
-
-
-def validate_account_types(accounts):
-	account_types_for_ledger = ["Cost of Goods Sold", "Depreciation", "Fixed Asset", "Payable", "Receivable", "Stock Adjustment"]
-	account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]
-
-	missing = list(set(account_types_for_ledger) - set(account_types))
-	if missing:
-		return _("Please identify/create Account (Ledger) for type - {0}").format(' , '.join(missing))
-
-	account_types_for_group = ["Bank", "Cash", "Stock"]
-	account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)]
-
-	missing = list(set(account_types_for_group) - set(account_groups))
-	if missing:
-		return _("Please identify/create Account (Group) for type - {0}").format(' , '.join(missing))
-
-def unset_existing_data(company):
-	linked = frappe.db.sql('''select fieldname from tabDocField
-		where fieldtype="Link" and options="Account" and parent="Company"''', as_dict=True)
-
-	# remove accounts data from company
-	update_values = {d.fieldname: '' for d in linked}
-	frappe.db.set_value('Company', company, update_values, update_values)
-
-	# remove accounts data from various doctypes
-	for doctype in ["Account", "Party Account", "Mode of Payment Account", "Tax Withholding Account",
-		"Sales Taxes and Charges Template", "Purchase Taxes and Charges Template"]:
-		frappe.db.sql('''delete from `tab{0}` where `company`="%s"''' # nosec
-			.format(doctype) % (company))
-
-def set_default_accounts(company):
-	from erpnext.setup.doctype.company.company import install_country_fixtures
-	company = frappe.get_doc('Company', company)
-	company.update({
-		"default_receivable_account": frappe.db.get_value("Account",
-			{"company": company.name, "account_type": "Receivable", "is_group": 0}),
-		"default_payable_account": frappe.db.get_value("Account",
-			{"company": company.name, "account_type": "Payable", "is_group": 0})
-	})
-
-	company.save()
-	install_country_fixtures(company.name)
-	company.create_default_tax_template()

erpnext/accounts/doctype/chart_of_accounts_importer/test_chart_of_accounts_importer.js

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

erpnext/accounts/doctype/chart_of_accounts_importer/test_chart_of_accounts_importer.py

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

erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py

@@ -18,14 +18,14 @@ def create_or_update_cheque_print_format(template_name):
 			"doc_type": "Payment Entry",
 			"standard": "No",
 			"custom_format": 1,
-			"print_format_type": "Jinja",
+			"print_format_type": "Server",
 			"name": template_name
 		})
 	else:
 		cheque_print = frappe.get_doc("Print Format", template_name)
-
+	
 	doc = frappe.get_doc("Cheque Print Template", template_name)
-
+	
 	cheque_print.html = """
 <style>
 	.print-format {
@@ -91,9 +91,9 @@ def create_or_update_cheque_print_format(template_name):
 		"signatory_from_top_edge": doc.signatory_from_top_edge,
 		"signatory_from_left_edge": doc.signatory_from_left_edge
 	}
-
+		
 	cheque_print.save(ignore_permissions=True)
-
+	
 	frappe.db.set_value("Cheque Print Template", template_name, "has_print_format", 1)
-
+		
 	return cheque_print

erpnext/accounts/doctype/cost_center/cost_center.js

@@ -18,80 +18,42 @@ frappe.ui.form.on('Cost Center', {
 	},
 	refresh: function(frm) {
 		if (!frm.is_new()) {
-			frm.add_custom_button(__('Update Cost Center Name / Number'), function () {
+			frm.add_custom_button(__('Update Cost Center Number'), function () {
 				frm.trigger("update_cost_center_number");
 			});
 		}
-
-		let intro_txt = '';
-		let doc = frm.doc;
-		frm.toggle_display('cost_center_name', doc.__islocal);
-		frm.toggle_enable(['is_group', 'company'], doc.__islocal);
-
-		if(!doc.__islocal && doc.is_group==1) {
-			intro_txt += __('Note: This Cost Center is a Group. Cannot make accounting entries against groups.');
-		}
-
-		frm.events.hide_unhide_group_ledger(frm);
-
-		frm.toggle_display('sb1', doc.is_group==0);
-		frm.set_intro(intro_txt);
-
-		if(!frm.doc.__islocal) {
-			frm.add_custom_button(__('Chart of Cost Centers'),
-				function() { frappe.set_route("Tree", "Cost Center"); });
-
-			frm.add_custom_button(__('Budget'),
-				function() { frappe.set_route("List", "Budget", {'cost_center': frm.doc.name}); });
-		}
 	},
 	update_cost_center_number: function(frm) {
 		var d = new frappe.ui.Dialog({
-			title: __('Update Cost Center Name / Number'),
+			title: __('Update Cost Center Number'),
 			fields: [
 				{
-					"label": "Cost Center Name",
-					"fieldname": "cost_center_name",
-					"fieldtype": "Data",
-					"reqd": 1,
-					"default": frm.doc.cost_center_name
-				},
-				{
-					"label": "Cost Center Number",
+					"label": 'Cost Center Number',
 					"fieldname": "cost_center_number",
 					"fieldtype": "Data",
-					"default": frm.doc.cost_center_number
-				},
-				{
-					"label": __("Merge with existing"),
-					"fieldname": "merge",
-					"fieldtype": "Check",
-					"default": 0
+					"reqd": 1
 				}
 			],
 			primary_action: function() {
 				var data = d.get_values();
-				if(data.cost_center_name === frm.doc.cost_center_name && data.cost_center_number === frm.doc.cost_center_number) {
+				if(data.cost_center_number === frm.doc.cost_center_number) {
 					d.hide();
 					return;
 				}
-				frappe.dom.freeze();
 				frappe.call({
-					method: "erpnext.accounts.utils.update_cost_center",
+					method: "erpnext.accounts.utils.update_number_field",
 					args: {
-						docname: frm.doc.name,
-						cost_center_name: data.cost_center_name,
-						cost_center_number: cstr(data.cost_center_number),
-						company: frm.doc.company,
-						merge: data.merge
+						doctype_name: frm.doc.doctype,
+						name: frm.doc.name,
+						field_name: d.fields[0].fieldname,
+						number_value: data.cost_center_number,
+						company: frm.doc.company
 					},
 					callback: function(r) {
-						frappe.dom.unfreeze();
 						if(!r.exc) {
 							if(r.message) {
 								frappe.set_route("Form", "Cost Center", r.message);
 							} else {
-								me.frm.set_value("cost_center_name", data.cost_center_name);
 								me.frm.set_value("cost_center_number", data.cost_center_number);
 							}
 							d.hide();
@@ -102,38 +64,62 @@ frappe.ui.form.on('Cost Center', {
 			primary_action_label: __('Update')
 		});
 		d.show();
-	},
-
-	parent_cost_center(frm) {
-		if(!frm.doc.company) {
-			frappe.msgprint(__('Please enter company name first'));
-		}
-	},
-
-	hide_unhide_group_ledger(frm) {
-		let doc = frm.doc;
-		if (doc.is_group == 1) {
-			frm.add_custom_button(__('Convert to Non-Group'),
-				() => frm.events.convert_to_ledger(frm));
-		} else if (doc.is_group == 0) {
-			frm.add_custom_button(__('Convert to Group'),
-				() => frm.events.convert_to_group(frm));
-		}
-	},
-
-	convert_to_group(frm) {
-		frm.call('convert_ledger_to_group').then(r => {
-			if(r.message === 1) {
-				frm.refresh();
-			}
-		});
-	},
-
-	convert_to_ledger(frm) {
-		frm.call('convert_group_to_ledger').then(r => {
-			if(r.message === 1) {
-				frm.refresh();
-			}
-		});
 	}
 });
+
+cur_frm.cscript.refresh = function(doc, cdt, cdn) {
+	var intro_txt = '';
+	cur_frm.toggle_display('cost_center_name', doc.__islocal);
+	cur_frm.toggle_enable(['is_group', 'company'], doc.__islocal);
+
+	if(!doc.__islocal && doc.is_group==1) {
+		intro_txt += __('Note: This Cost Center is a Group. Cannot make accounting entries against groups.');
+	}
+
+	cur_frm.cscript.hide_unhide_group_ledger(doc);
+
+	cur_frm.toggle_display('sb1', doc.is_group==0)
+	cur_frm.set_intro(intro_txt);
+
+	if(!cur_frm.doc.__islocal) {
+		cur_frm.add_custom_button(__('Chart of Cost Centers'),
+			function() { frappe.set_route("Tree", "Cost Center"); });
+
+		cur_frm.add_custom_button(__('Budget'),
+			function() { frappe.set_route("List", "Budget", {'cost_center': cur_frm.doc.name}); });
+	}
+}
+
+cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) {
+	if(!doc.company){
+		frappe.msgprint(__('Please enter company name first'));
+	}
+}
+
+cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
+	if (doc.is_group == 1) {
+		cur_frm.add_custom_button(__('Convert to Non-Group'),
+			function() { cur_frm.cscript.convert_to_ledger(); }, "fa fa-retweet",
+				"btn-default")
+	} else if (doc.is_group == 0) {
+		cur_frm.add_custom_button(__('Convert to Group'),
+			function() { cur_frm.cscript.convert_to_group(); }, "fa fa-retweet",
+				"btn-default")
+	}
+}
+
+cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
+	return $c_obj(cur_frm.doc,'convert_group_to_ledger','',function(r,rt) {
+		if(r.message == 1) {
+			cur_frm.refresh();
+		}
+	});
+}
+
+cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
+	return $c_obj(cur_frm.doc,'convert_ledger_to_group','',function(r,rt) {
+		if(r.message == 1) {
+			cur_frm.refresh();
+		}
+	});
+}

erpnext/accounts/doctype/cost_center/cost_center.json

@@ -1,172 +1,457 @@
 {
- "actions": [],
- "allow_copy": 1,
- "allow_import": 1,
- "creation": "2013-01-23 19:57:17",
- "description": "Track separate Income and Expense for product verticals or divisions.",
- "doctype": "DocType",
- "document_type": "Setup",
- "engine": "InnoDB",
- "field_order": [
-  "sb0",
-  "cost_center_name",
-  "cost_center_number",
-  "parent_cost_center",
-  "company",
-  "cb0",
-  "is_group",
-  "disabled",
-  "lft",
-  "rgt",
-  "old_parent"
- ],
+ "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 1, 
+ "autoname": "field:cost_center_name", 
+ "beta": 0, 
+ "creation": "2013-01-23 19:57:17", 
+ "custom": 0, 
+ "description": "Track separate Income and Expense for product verticals or divisions.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
-   "fieldname": "sb0",
-   "fieldtype": "Section Break"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sb0", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "cost_center_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Cost Center Name",
-   "no_copy": 1,
-   "oldfieldname": "cost_center_name",
-   "oldfieldtype": "Data",
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center Name", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "cost_center_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "cost_center_number",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Cost Center Number",
-   "read_only": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cost_center_number", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Cost Center Number", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "parent_cost_center",
-   "fieldtype": "Link",
-   "ignore_user_permissions": 1,
-   "in_list_view": 1,
-   "label": "Parent Cost Center",
-   "oldfieldname": "parent_cost_center",
-   "oldfieldtype": "Link",
-   "options": "Cost Center",
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "parent_cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Parent Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "parent_cost_center", 
+   "oldfieldtype": "Link", 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Company",
-   "oldfieldname": "company_name",
-   "oldfieldtype": "Link",
-   "options": "Company",
-   "remember_last_selected_value": 1,
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Company", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company_name", 
+   "oldfieldtype": "Link", 
+   "options": "Company", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 1, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "cb0",
-   "fieldtype": "Column Break",
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "cb0", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0, 
    "width": "50%"
-  },
+  }, 
   {
-   "default": "0",
-   "fieldname": "is_group",
-   "fieldtype": "Check",
-   "label": "Is Group"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "is_group", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Is Group", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "lft",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "lft",
-   "no_copy": 1,
-   "oldfieldname": "lft",
-   "oldfieldtype": "Int",
-   "print_hide": 1,
-   "report_hide": 1,
-   "search_index": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "lft", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "lft", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "lft", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "rgt",
-   "fieldtype": "Int",
-   "hidden": 1,
-   "label": "rgt",
-   "no_copy": 1,
-   "oldfieldname": "rgt",
-   "oldfieldtype": "Int",
-   "print_hide": 1,
-   "report_hide": 1,
-   "search_index": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "rgt", 
+   "fieldtype": "Int", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "rgt", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "rgt", 
+   "oldfieldtype": "Int", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "old_parent",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 1,
-   "label": "old_parent",
-   "no_copy": 1,
-   "oldfieldname": "old_parent",
-   "oldfieldtype": "Data",
-   "options": "Cost Center",
-   "print_hide": 1,
-   "report_hide": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "label": "Disabled"
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "old_parent", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "old_parent", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "old_parent", 
+   "oldfieldtype": "Data", 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 1, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
- ],
- "icon": "fa fa-money",
- "idx": 1,
- "is_tree": 1,
- "links": [],
- "modified": "2020-06-12 16:09:30.025214",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Cost Center",
- "nsm_parent_field": "parent_cost_center",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-money", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "menu_index": 0, 
+ "modified": "2018-04-26 15:26:25.325778", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Cost Center", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts Manager",
-   "share": 1,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "export": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Auditor"
-  },
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 1, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Auditor", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
   {
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User"
-  },
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
   {
-   "read": 1,
-   "role": "Sales User"
-  },
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
   {
-   "read": 1,
-   "role": "Purchase User"
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
   }
- ],
- "search_fields": "parent_cost_center, is_group",
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "ASC"
+ ], 
+ "quick_entry": 1, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "search_fields": "parent_cost_center, is_group", 
+ "show_name_in_global_search": 1, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
+ "track_seen": 0
 }

erpnext/accounts/doctype/cost_center/cost_center_dashboard.py

@@ -1,15 +0,0 @@
-from __future__ import unicode_literals
-
-from frappe import _
-
-
-def get_data():
-	return {
-		'fieldname': 'cost_center',
-		'reports': [
-			{
-				'label': _('Reports'),
-				'items': ['Budget Variance Report', 'General Ledger']
-			}
-		]
-	}

erpnext/accounts/doctype/cost_center/cost_center_tree.js

@@ -1,5 +1,5 @@
 frappe.treeview_settings["Cost Center"] = {
-	breadcrumb: "Accounts",
+	breadcrumbs: "Accounts",
 	get_tree_root: false,
 	filters: [{
 		fieldname: "company",

erpnext/accounts/doctype/coupon_code/coupon_code.js

@@ -1,44 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Coupon Code', {
-	setup: function(frm) {
-		frm.set_query("pricing_rule", function() {
-			return {
-				filters: [
-					["Pricing Rule","coupon_code_based", "=", "1"]
-				]
-			};
-		});
-	},
-	coupon_name:function(frm){
-		if (frm.doc.__islocal===1) {
-			frm.trigger("make_coupon_code");
-		}
-	},
-	coupon_type:function(frm){
-		if (frm.doc.__islocal===1) {
-			frm.trigger("make_coupon_code");
-		}
-	},
-	make_coupon_code: function(frm) {
-		var coupon_name=frm.doc.coupon_name;
-		var coupon_code;
-		if (frm.doc.coupon_type=='Gift Card') {
-			coupon_code=Math.random().toString(12).substring(2, 12).toUpperCase();
-		}
-		else if(frm.doc.coupon_type=='Promotional'){
-			coupon_name=coupon_name.replace(/\s/g,'');
-			coupon_code=coupon_name.toUpperCase().slice(0,8);
-		}
-		frm.doc.coupon_code=coupon_code;
-		frm.refresh_field('coupon_code');
-	},
-	refresh: function(frm) {
-		if (frm.doc.pricing_rule) {
-			frm.add_custom_button(__("Add/Edit Coupon Conditions"), function(){
-				frappe.set_route("Form", "Pricing Rule", frm.doc.pricing_rule);
-			});
-		}
-	}
-});

erpnext/accounts/doctype/coupon_code/coupon_code.json

@@ -1,177 +0,0 @@
-{
- "allow_import": 1,
- "autoname": "field:coupon_name",
- "creation": "2018-01-22 14:34:39.701832",
- "doctype": "DocType",
- "document_type": "Other",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "coupon_name",
-  "coupon_type",
-  "customer",
-  "column_break_4",
-  "coupon_code",
-  "pricing_rule",
-  "uses",
-  "valid_from",
-  "valid_upto",
-  "maximum_use",
-  "used",
-  "column_break_11",
-  "description",
-  "amended_from"
- ],
- "fields": [
-  {
-   "description": "e.g. \"Summer Holiday 2019 Offer 20\"",
-   "fieldname": "coupon_name",
-   "fieldtype": "Data",
-   "label": "Coupon Name",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "coupon_type",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Coupon Type",
-   "options": "Promotional\nGift Card",
-   "reqd": 1
-  },
-  {
-   "depends_on": "eval: doc.coupon_type == \"Gift Card\"",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "label": "Customer",
-   "options": "Customer"
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "description": "unique e.g. SAVE20  To be used to get discount",
-   "fieldname": "coupon_code",
-   "fieldtype": "Data",
-   "label": "Coupon Code",
-   "no_copy": 1,
-   "set_only_once": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "pricing_rule",
-   "fieldtype": "Link",
-   "label": "Pricing Rule",
-   "options": "Pricing Rule",
-   "reqd": 1
-  },
-  {
-   "fieldname": "uses",
-   "fieldtype": "Section Break",
-   "label": "Validity and Usage"
-  },
-  {
-   "fieldname": "valid_from",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Valid From"
-  },
-  {
-   "fieldname": "valid_upto",
-   "fieldtype": "Date",
-   "label": "Valid Upto"
-  },
-  {
-   "depends_on": "eval: doc.coupon_type == \"Promotional\"",
-   "fieldname": "maximum_use",
-   "fieldtype": "Int",
-   "label": "Maximum Use"
-  },
-  {
-   "default": "0",
-   "fieldname": "used",
-   "fieldtype": "Int",
-   "label": "Used",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_11",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "label": "Coupon Description"
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Coupon Code",
-   "print_hide": 1,
-   "read_only": 1
-  }
- ],
- "modified": "2019-10-19 14:48:14.602481",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Coupon Code",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Accounts User",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Website Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "coupon_name",
- "track_changes": 1
-}

erpnext/accounts/doctype/coupon_code/coupon_code.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe import _
-from frappe.model.document import Document
-from frappe.utils import (strip)
-class CouponCode(Document):
-	def autoname(self):
-		self.coupon_name = strip(self.coupon_name)
-		self.name = self.coupon_name
-
-		if not self.coupon_code:
-			if self.coupon_type == "Promotional":
-				self.coupon_code =''.join([i for i in self.coupon_name if not i.isdigit()])[0:8].upper()
-			elif self.coupon_type == "Gift Card":
-				self.coupon_code = frappe.generate_hash()[:10].upper()
-		
-	def validate(self):
-		if self.coupon_type == "Gift Card":
-			self.maximum_use = 1
-			if not self.customer:
-				frappe.throw(_("Please select the customer."))

erpnext/accounts/doctype/coupon_code/test_coupon_code.js

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

erpnext/accounts/doctype/coupon_code/test_coupon_code.py

@@ -1,132 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
-from erpnext.stock.get_item_details import get_item_details
-from frappe.test_runner import make_test_objects
-
-def test_create_test_data():
-	frappe.set_user("Administrator")
-	# create test item
-	if not frappe.db.exists("Item","_Test Tesla Car"):
-		item = frappe.get_doc({
-		"description": "_Test Tesla Car",
-		"doctype": "Item",
-		"has_batch_no": 0,
-		"has_serial_no": 0,
-		"inspection_required": 0,
-		"is_stock_item": 1,
-		"opening_stock":100,
-		"is_sub_contracted_item": 0,
-		"item_code": "_Test Tesla Car",
-		"item_group": "_Test Item Group",
-		"item_name": "_Test Tesla Car",
-		"apply_warehouse_wise_reorder_level": 0,
-		"warehouse":"_Test Warehouse - _TC",
-		"gst_hsn_code": "999800",
-		"valuation_rate": 5000,
-		"standard_rate":5000,
-		"item_defaults": [{
-		"company": "_Test Company",
-		"default_warehouse": "_Test Warehouse - _TC",
-		"default_price_list":"_Test Price List",
-		"expense_account": "_Test Account Cost for Goods Sold - _TC",
-		"buying_cost_center": "_Test Cost Center - _TC",
-		"selling_cost_center": "_Test Cost Center - _TC",
-		"income_account": "Sales - _TC"
-		}],
-		"show_in_website": 1,
-		"route":"-test-tesla-car",
-		"website_warehouse": "_Test Warehouse - _TC"
-		})
-		item.insert()
-	# create test item price
-	item_price = frappe.get_list('Item Price', filters={'item_code': '_Test Tesla Car', 'price_list': '_Test Price List'}, fields=['name'])
-	if len(item_price)==0:
-		item_price = frappe.get_doc({
-			"doctype": "Item Price",
-			"item_code": "_Test Tesla Car",
-			"price_list": "_Test Price List",
-			"price_list_rate": 5000
-		})
-		item_price.insert()
-	# create test item pricing rule
-	if not frappe.db.exists("Pricing Rule","_Test Pricing Rule for _Test Item"):
-		item_pricing_rule = frappe.get_doc({
-		"doctype": "Pricing Rule",
-		"title": "_Test Pricing Rule for _Test Item",
-		"apply_on": "Item Code",
-		"items": [{
-			"item_code": "_Test Tesla Car"
-		}],
-		"warehouse":"_Test Warehouse - _TC",
-		"coupon_code_based":1,
-		"selling": 1,
-		"rate_or_discount": "Discount Percentage",
-		"discount_percentage": 30,
-		"company": "_Test Company",
-		"currency":"INR",
-		"for_price_list":"_Test Price List"
-		})
-		item_pricing_rule.insert()
-	# create test item sales partner
-	if not frappe.db.exists("Sales Partner","_Test Coupon Partner"):
-		sales_partner = frappe.get_doc({
-		"doctype": "Sales Partner",
-		"partner_name":"_Test Coupon Partner",
-		"commission_rate":2,
-		"referral_code": "COPART"
-		})
-		sales_partner.insert()
-	# create test item coupon code
-	if not frappe.db.exists("Coupon Code","SAVE30"):
-		coupon_code = frappe.get_doc({
-		"doctype": "Coupon Code",
-		"coupon_name":"SAVE30",
-		"coupon_code":"SAVE30",
-		"pricing_rule": "_Test Pricing Rule for _Test Item",
-		"valid_from": "2014-01-01",
-		"maximum_use":1,
-		"used":0
-		})
-		coupon_code.insert()
-
-
-class TestCouponCode(unittest.TestCase):
-	def setUp(self):
-		test_create_test_data()
-
-	def tearDown(self):
-		frappe.set_user("Administrator")
-
-	def test_1_check_coupon_code_used_before_so(self):
-		coupon_code = frappe.get_doc("Coupon Code", frappe.db.get_value("Coupon Code", {"coupon_name":"SAVE30"}))
-		# reset used coupon code count
-		coupon_code.used=0
-		coupon_code.save()
-		# check no coupon code is used before sales order is made
-		self.assertEqual(coupon_code.get("used"),0)
-
-	def test_2_sales_order_with_coupon_code(self):
-		so = make_sales_order(customer="_Test Customer",selling_price_list="_Test Price List",item_code="_Test Tesla Car", rate=5000,qty=1, do_not_submit=True)
-		so = frappe.get_doc('Sales Order', so.name)
-		# check item price before coupon code is applied
-		self.assertEqual(so.items[0].rate, 5000)
-		so.coupon_code='SAVE30'
-		so.sales_partner='_Test Coupon Partner'
-		so.save()
-		# check item price after coupon code is applied
-		self.assertEqual(so.items[0].rate, 3500)	
-		so.submit()
-
-	def test_3_check_coupon_code_used_after_so(self):
-		doc = frappe.get_doc("Coupon Code", frappe.db.get_value("Coupon Code", {"coupon_name":"SAVE30"}))
-		# check no coupon code is used before sales order is made
-		self.assertEqual(doc.get("used"),1)
-
-
-

erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json

@@ -1,74 +0,0 @@
-{
- "creation": "2019-03-07 12:07:09.416101",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "sales_invoice",
-  "customer",
-  "column_break_3",
-  "posting_date",
-  "outstanding_amount",
-  "debit_to"
- ],
- "fields": [
-  {
-   "fieldname": "sales_invoice",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Invoice",
-   "options": "Sales Invoice",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "fetch_from": "sales_invoice.customer",
-   "fieldname": "customer",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Customer",
-   "options": "Customer",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "sales_invoice.posting_date",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Date",
-   "read_only": 1
-  },
-  {
-   "fetch_from": "sales_invoice.outstanding_amount",
-   "fetch_if_empty": 1,
-   "fieldname": "outstanding_amount",
-   "fieldtype": "Currency",
-   "in_list_view": 1,
-   "label": "Outstanding Amount",
-   "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fetch_from": "sales_invoice.debit_to",
-   "fieldname": "debit_to",
-   "fieldtype": "Link",
-   "label": "Debit to",
-   "options": "Account",
-   "read_only": 1
-  }
- ],
- "istable": 1,
- "modified": "2020-02-20 16:16:20.724620",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Discounted Invoice",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

erpnext/accounts/doctype/discounted_invoice/discounted_invoice.py

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

erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py

@@ -81,11 +81,10 @@ class ExchangeRateRevaluation(Document):
 					sum(debit) - sum(credit) as balance
 				from `tabGL Entry`
 				where account in (%s)
-				and posting_date <= %s
-				group by account, NULLIF(party_type,''), NULLIF(party,'')
+				group by account, party_type, party
 				having sum(debit) != sum(credit)
 				order by account
-			""" % (', '.join(['%s']*len(accounts)), '%s'), tuple(accounts + [self.posting_date]), as_dict=1)
+			""" % ', '.join(['%s']*len(accounts)), tuple(accounts), as_dict=1)
 
 		return account_details
 
@@ -125,9 +124,9 @@ class ExchangeRateRevaluation(Document):
 				"party_type": d.get("party_type"),
 				"party": d.get("party"),
 				"account_currency": d.get("account_currency"),
-				"balance": flt(d.get("balance_in_account_currency"), d.precision("balance_in_account_currency")),
-				dr_or_cr: flt(abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")),
-				"exchange_rate": flt(d.get("new_exchange_rate"), d.precision("new_exchange_rate")),
+				"balance": d.get("balance_in_account_currency"),
+				dr_or_cr: abs(d.get("balance_in_account_currency")),
+				"exchange_rate":d.get("new_exchange_rate"),
 				"reference_type": "Exchange Rate Revaluation",
 				"reference_name": self.name,
 				})
@@ -136,9 +135,9 @@ class ExchangeRateRevaluation(Document):
 				"party_type": d.get("party_type"),
 				"party": d.get("party"),
 				"account_currency": d.get("account_currency"),
-				"balance": flt(d.get("balance_in_account_currency"), d.precision("balance_in_account_currency")),
-				reverse_dr_or_cr: flt(abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")),
-				"exchange_rate": flt(d.get("current_exchange_rate"), d.precision("current_exchange_rate")),
+				"balance": d.get("balance_in_account_currency"),
+				reverse_dr_or_cr: abs(d.get("balance_in_account_currency")),
+				"exchange_rate": d.get("current_exchange_rate"),
 				"reference_type": "Exchange Rate Revaluation",
 				"reference_name": self.name
 				})
@@ -167,9 +166,9 @@ def get_account_details(account, company, posting_date, party_type=None, party=N
 
 	account_details = {}
 	company_currency = erpnext.get_company_currency(company)
-	balance = get_balance_on(account, date=posting_date, party_type=party_type, party=party, in_account_currency=False)
+	balance = get_balance_on(account, party_type=party_type, party=party, in_account_currency=False)
 	if balance:
-		balance_in_account_currency = get_balance_on(account, date=posting_date, party_type=party_type, party=party)
+		balance_in_account_currency = get_balance_on(account, party_type=party_type, party=party)
 		current_exchange_rate = balance / balance_in_account_currency if balance_in_account_currency else 0
 		new_exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
 		new_balance_in_base_currency = balance_in_account_currency * new_exchange_rate

erpnext/accounts/doctype/finance_book/finance_book_dashboard.py

@@ -1,25 +0,0 @@
-from __future__ import unicode_literals
-
-from frappe import _
-
-
-def get_data():
-	return {
-		'fieldname': 'finance_book',
-		'non_standard_fieldnames': {
-			'Asset': 'default_finance_book',
-			'Company': 'default_finance_book'
-		},
-		'transactions': [
-			{
-				'label': _('Assets'),
-				'items': ['Asset', 'Asset Value Adjustment']
-			},
-			{
-				'items': ['Company']
-			},
-			{
-				'items': ['Journal Entry']
-			}
-		]
-	}

erpnext/accounts/doctype/fiscal_year/fiscal_year.js

@@ -1,31 +1,37 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-frappe.ui.form.on('Fiscal Year', {
-	onload: function(frm) {
-		if(frm.doc.__islocal) {
-			frm.set_value("year_start_date",
+$.extend(cur_frm.cscript, {
+	onload: function() {
+		if(cur_frm.doc.__islocal) {
+			cur_frm.set_value("year_start_date",
 				frappe.datetime.add_days(frappe.defaults.get_default("year_end_date"), 1));
 		}
 	},
-	refresh: function (frm) {
-		let doc = frm.doc;
-		frm.toggle_enable('year_start_date', doc.__islocal);
-		frm.toggle_enable('year_end_date', doc.__islocal);
+	refresh: function (doc, dt, dn) {
+		var me = this;
+		this.frm.toggle_enable('year_start_date', doc.__islocal)
+		this.frm.toggle_enable('year_end_date', doc.__islocal)
 
 		if (!doc.__islocal && (doc.name != frappe.sys_defaults.fiscal_year)) {
-			frm.add_custom_button(__("Set as Default"), () => frm.events.set_as_default(frm));
-			frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
+			this.frm.add_custom_button(__("Default"),
+				this.frm.cscript.set_as_default, "fa fa-star");
+			this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
 		} else {
-			frm.set_intro("");
+			this.frm.set_intro("");
 		}
 	},
-	set_as_default: function(frm) {
-		return frm.call('set_as_default');
+	set_as_default: function() {
+		return frappe.call({
+			doc: cur_frm.doc,
+			method: "set_as_default"
+		});
 	},
-	year_start_date: function(frm) {
-		let year_end_date =
-			frappe.datetime.add_days(frappe.datetime.add_months(frm.doc.year_start_date, 12), -1);
-		frm.set_value("year_end_date", year_end_date);
+	year_start_date: function(doc, dt, dn) {
+		var me = this;
+
+		var year_end_date =
+			frappe.datetime.add_days(frappe.datetime.add_months(this.frm.doc.year_start_date, 12), -1);
+		this.frm.set_value("year_end_date", year_end_date);
 	},
 });

erpnext/accounts/doctype/fiscal_year/fiscal_year.json

@@ -1,122 +1,347 @@
 {
- "allow_import": 1,
- "autoname": "field:year",
- "creation": "2013-01-22 16:50:25",
- "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.",
- "doctype": "DocType",
- "document_type": "Setup",
- "engine": "InnoDB",
- "field_order": [
-  "year",
-  "disabled",
-  "is_short_year",
-  "year_start_date",
-  "year_end_date",
-  "companies",
-  "auto_created"
- ],
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 1, 
+ "allow_rename": 0, 
+ "autoname": "field:year", 
+ "beta": 0, 
+ "creation": "2013-01-22 16:50:25", 
+ "custom": 0, 
+ "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Setup", 
+ "editable_grid": 0, 
  "fields": [
   {
-   "description": "For e.g. 2012, 2012-13",
-   "fieldname": "year",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Year Name",
-   "oldfieldname": "year",
-   "oldfieldtype": "Data",
-   "reqd": 1,
-   "unique": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "For e.g. 2012, 2012-13", 
+   "fieldname": "year", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Year Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "year", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "default": "0",
-   "fieldname": "disabled",
-   "fieldtype": "Check",
-   "label": "Disabled"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "disabled", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Disabled", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "year_start_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Year Start Date",
-   "no_copy": 1,
-   "oldfieldname": "year_start_date",
-   "oldfieldtype": "Date",
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "year_start_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Year Start Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "year_start_date", 
+   "oldfieldtype": "Date", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "year_end_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Year End Date",
-   "no_copy": 1,
-   "reqd": 1
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "year_end_date", 
+   "fieldtype": "Date", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Year End Date", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "fieldname": "companies",
-   "fieldtype": "Table",
-   "label": "Companies",
-   "options": "Fiscal Year Company"
-  },
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "companies", 
+   "fieldtype": "Table", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Companies", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Fiscal Year Company", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
+  }, 
   {
-   "default": "0",
-   "fieldname": "auto_created",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Auto Created",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "default": "0",
-   "description": "Less than 12 months.",
-   "fieldname": "is_short_year",
-   "fieldtype": "Check",
-   "label": "Is Short Year",
-   "set_only_once": 1
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": "0", 
+   "fieldname": "auto_created", 
+   "fieldtype": "Check", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Auto Created", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "translatable": 0, 
+   "unique": 0
   }
- ],
- "icon": "fa fa-calendar",
- "idx": 1,
- "modified": "2020-10-03 18:22:04.161315",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Fiscal Year",
- "owner": "Administrator",
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "icon": "fa fa-calendar", 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 0, 
+ "max_attachments": 0, 
+ "modified": "2018-04-25 14:21:41.273354", 
+ "modified_by": "Administrator", 
+ "module": "Accounts", 
+ "name": "Fiscal Year", 
+ "owner": "Administrator", 
  "permissions": [
   {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 1, 
+   "delete": 1, 
+   "email": 1, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 1, 
+   "read": 1, 
+   "report": 1, 
+   "role": "System Manager", 
+   "set_user_permissions": 0, 
+   "share": 1, 
+   "submit": 0, 
    "write": 1
-  },
+  }, 
   {
-   "read": 1,
-   "role": "Sales User"
-  },
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Sales User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
   {
-   "read": 1,
-   "role": "Purchase User"
-  },
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Purchase User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
   {
-   "read": 1,
-   "role": "Accounts User"
-  },
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Accounts User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
   {
-   "read": 1,
-   "role": "Stock User"
-  },
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Stock User", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
+  }, 
   {
-   "read": 1,
-   "role": "Employee"
+   "amend": 0, 
+   "cancel": 0, 
+   "create": 0, 
+   "delete": 0, 
+   "email": 0, 
+   "export": 0, 
+   "if_owner": 0, 
+   "import": 0, 
+   "permlevel": 0, 
+   "print": 0, 
+   "read": 1, 
+   "report": 0, 
+   "role": "Employee", 
+   "set_user_permissions": 0, 
+   "share": 0, 
+   "submit": 0, 
+   "write": 0
   }
- ],
- "show_name_in_global_search": 1,
- "sort_field": "name",
- "sort_order": "DESC"
+ ], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 1, 
+ "sort_field": "name", 
+ "sort_order": "DESC", 
+ "track_changes": 0, 
+ "track_seen": 0
 }

erpnext/accounts/doctype/fiscal_year/fiscal_year.py

@@ -36,11 +36,6 @@ class FiscalYear(Document):
 					frappe.throw(_("Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."))
 
 	def validate_dates(self):
-		if self.is_short_year:
-			# Fiscal Year can be shorter than one year, in some jurisdictions
-			# under certain circumstances. For example, in the USA and Germany.
-			return
-
 		if getdate(self.year_start_date) > getdate(self.year_end_date):
 			frappe.throw(_("Fiscal Year Start Date should be one year earlier than Fiscal Year End Date"),
 				FiscalYearIncorrectDate)

erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py

@@ -1,23 +0,0 @@
-from __future__ import unicode_literals
-
-from frappe import _
-
-
-def get_data():
-	return {
-		'fieldname': 'fiscal_year',
-		'transactions': [
-			{
-				'label': _('Budgets'),
-				'items': ['Budget']
-			},
-			{
-				'label': _('References'),
-				'items': ['Period Closing Voucher', 'Request for Quotation', 'Tax Withholding Category']
-			},
-			{
-				'label': _('Target Details'),
-				'items': ['Sales Person', 'Sales Partner', 'Territory', 'Monthly Distribution']
-			}
-		]
-	}

erpnext/accounts/doctype/fiscal_year/test_fiscal_year.py

@@ -3,13 +3,11 @@
 
 from __future__ import unicode_literals
 
-import unittest
-
-import frappe
-from frappe.utils import now_datetime
+import frappe, unittest
 
 from erpnext.accounts.doctype.fiscal_year.fiscal_year import FiscalYearIncorrectDate
 
+test_records = frappe.get_test_records('Fiscal Year')
 test_ignore = ["Company"]
 
 class TestFiscalYear(unittest.TestCase):
@@ -25,29 +23,3 @@ class TestFiscalYear(unittest.TestCase):
 		})
 
 		self.assertRaises(FiscalYearIncorrectDate, fy.insert)
-
-
-def test_record_generator():
-	test_records = [
-		{
-			"doctype": "Fiscal Year",
-			"year": "_Test Short Fiscal Year 2011",
-			"is_short_year": 1,
-			"year_end_date": "2011-04-01",
-			"year_start_date": "2011-12-31"
-		}
-	]
-
-	start = 2012
-	end = now_datetime().year + 5
-	for year in range(start, end):
-		test_records.append({
-			"doctype": "Fiscal Year",
-			"year": "_Test Fiscal Year {}".format(year),
-			"year_start_date": "{}-01-01".format(year),
-			"year_end_date": "{}-12-31".format(year)
-		})
-
-	return test_records
-
-test_records = test_record_generator()

erpnext/accounts/doctype/fiscal_year/test_records.json

@@ -0,0 +1,62 @@
+[
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2012",
+  "year_end_date": "2012-12-31",
+  "year_start_date": "2012-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2013",
+  "year_end_date": "2013-12-31",
+  "year_start_date": "2013-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2014",
+  "year_end_date": "2014-12-31",
+  "year_start_date": "2014-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2015",
+  "year_end_date": "2015-12-31",
+  "year_start_date": "2015-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2016",
+  "year_end_date": "2016-12-31",
+  "year_start_date": "2016-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2017",
+  "year_end_date": "2017-12-31",
+  "year_start_date": "2017-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2018",
+  "year_end_date": "2018-12-31",
+  "year_start_date": "2018-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2019",
+  "year_end_date": "2019-12-31",
+  "year_start_date": "2019-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2020",
+  "year_end_date": "2020-12-31",
+  "year_start_date": "2020-01-01"
+ },
+ {
+  "doctype": "Fiscal Year",
+  "year": "_Test Fiscal Year 2021",
+  "year_end_date": "2021-12-31",
+  "year_start_date": "2021-01-01"
+ }
+]

erpnext/accounts/doctype/gl_entry/gl_entry.py

@@ -4,25 +4,17 @@
 from __future__ import unicode_literals
 import frappe, erpnext
 from frappe import _
-from frappe.utils import flt, fmt_money, getdate, formatdate, cint
+from frappe.utils import flt, fmt_money, getdate, formatdate
 from frappe.model.document import Document
-from frappe.model.naming import set_name_from_naming_options
 from frappe.model.meta import get_field_precision
 from erpnext.accounts.party import validate_party_gle_currency, validate_party_frozen_disabled
 from erpnext.accounts.utils import get_account_currency
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.exceptions import InvalidAccountCurrency
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_checks_for_pl_and_bs_accounts
 
 exclude_from_linked_with = True
-class GLEntry(Document):
-	def autoname(self):
-		"""
-		Temporarily name doc for fast insertion
-		name will be changed using autoname options (in a scheduled job)
-		"""
-		self.name = frappe.generate_hash(txt="", length=10)
 
+class GLEntry(Document):
 	def validate(self):
 		self.flags.ignore_submit_comment = True
 		self.check_mandatory()
@@ -38,7 +30,6 @@ class GLEntry(Document):
 	def on_update_with_args(self, adv_adj, update_outstanding = 'Yes', from_repost=False):
 		if not from_repost:
 			self.validate_account_details(adv_adj)
-			self.validate_dimensions_for_pl_and_bs()
 			check_freezing_date(self.posting_date, adv_adj)
 
 		validate_frozen_account(self.account, adv_adj)
@@ -75,29 +66,17 @@ class GLEntry(Document):
 			if not self.cost_center and self.voucher_type != 'Period Closing Voucher':
 				frappe.throw(_("{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.")
 					.format(self.voucher_type, self.voucher_no, self.account))
-
-	def validate_dimensions_for_pl_and_bs(self):
-
-		account_type = frappe.db.get_value("Account", self.account, "report_type")
-
-		for dimension in get_checks_for_pl_and_bs_accounts():
-
-			if account_type == "Profit and Loss" \
-				and self.company == dimension.company and dimension.mandatory_for_pl and not dimension.disabled:
-				if not self.get(dimension.fieldname):
-					frappe.throw(_("Accounting Dimension <b>{0}</b> is required for 'Profit and Loss' account {1}.")
-						.format(dimension.label, self.account))
-
-			if account_type == "Balance Sheet" \
-				and self.company == dimension.company and dimension.mandatory_for_bs and not dimension.disabled:
-				if not self.get(dimension.fieldname):
-					frappe.throw(_("Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}.")
-						.format(dimension.label, self.account))
-
+		else:
+			from erpnext.accounts.utils import get_allow_cost_center_in_entry_of_bs_account
+			if not get_allow_cost_center_in_entry_of_bs_account() and self.cost_center:
+				self.cost_center = None
+			if self.project:
+				self.project = None
 
 	def check_pl_account(self):
 		if self.is_opening=='Yes' and \
-				frappe.db.get_value("Account", self.account, "report_type")=="Profit and Loss":
+				frappe.db.get_value("Account", self.account, "report_type")=="Profit and Loss" and \
+				self.voucher_type not in ['Purchase Invoice', 'Sales Invoice']:
 			frappe.throw(_("{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry")
 				.format(self.voucher_type, self.voucher_no, self.account))
 
@@ -108,8 +87,8 @@ class GLEntry(Document):
 			from tabAccount where name=%s""", self.account, as_dict=1)[0]
 
 		if ret.is_group==1:
-			frappe.throw(_('''{0} {1}: Account {2} is a Group Account and group accounts cannot be used in
-				transactions''').format(self.voucher_type, self.voucher_no, self.account))
+			frappe.throw(_("{0} {1}: Account {2} cannot be a Group")
+				.format(self.voucher_type, self.voucher_no, self.account))
 
 		if ret.docstatus==2:
 			frappe.throw(_("{0} {1}: Account {2} is inactive")
@@ -130,18 +109,10 @@ class GLEntry(Document):
 
 			return self.cost_center_company[self.cost_center]
 
-		def _check_is_group():
-			return cint(frappe.get_cached_value('Cost Center', self.cost_center, 'is_group'))
-
 		if self.cost_center and _get_cost_center_company() != self.company:
 			frappe.throw(_("{0} {1}: Cost Center {2} does not belong to Company {3}")
 				.format(self.voucher_type, self.voucher_no, self.cost_center, self.company))
 
-		if not self.flags.from_repost and not self.voucher_type == 'Period Closing Voucher' \
-			and self.cost_center and _check_is_group():
-			frappe.throw(_("""{0} {1}: Cost Center {2} is a group cost center and group cost centers cannot
-				be used in transactions""").format(self.voucher_type, self.voucher_no, frappe.bold(self.cost_center)))
-
 	def validate_party(self):
 		validate_party_frozen_disabled(self.party_type, self.party)
 
@@ -192,25 +163,18 @@ def check_freezing_date(posting_date, adv_adj=False):
 
 def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False):
 	if party_type and party:
-		party_condition = " and party_type={0} and party={1}"\
+		party_condition = " and party_type='{0}' and party='{1}'"\
 			.format(frappe.db.escape(party_type), frappe.db.escape(party))
 	else:
 		party_condition = ""
 
-	if against_voucher_type == "Sales Invoice":
-		party_account = frappe.db.get_value(against_voucher_type, against_voucher, "debit_to")
-		account_condition = "and account in ({0}, {1})".format(frappe.db.escape(account), frappe.db.escape(party_account))
-	else:
-		account_condition = " and account = {0}".format(frappe.db.escape(account))
-
 	# get final outstanding amt
 	bal = flt(frappe.db.sql("""
 		select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 		from `tabGL Entry`
 		where against_voucher_type=%s and against_voucher=%s
-		and voucher_type != 'Invoice Discounting'
-		{0} {1}""".format(party_condition, account_condition),
-		(against_voucher_type, against_voucher))[0][0] or 0.0)
+		and account = %s {0}""".format(party_condition),
+		(against_voucher_type, against_voucher, account))[0][0] or 0.0)
 
 	if against_voucher_type == 'Purchase Invoice':
 		bal = -bal
@@ -233,13 +197,10 @@ def update_outstanding_amt(account, party_type, party, against_voucher_type, aga
 		if bal < 0 and not on_cancel:
 			frappe.throw(_("Outstanding for {0} cannot be less than zero ({1})").format(against_voucher, fmt_money(bal)))
 
+	# Update outstanding amt on against voucher
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]:
 		ref_doc = frappe.get_doc(against_voucher_type, against_voucher)
-
-		# Didn't use db_set for optimisation purpose
-		ref_doc.outstanding_amount = bal
-		frappe.db.set_value(against_voucher_type, against_voucher, 'outstanding_amount', bal)
-
+		ref_doc.db_set('outstanding_amount', bal)
 		ref_doc.set_status(update=True)
 
 def validate_frozen_account(account, adv_adj=None):
@@ -277,24 +238,3 @@ def update_against_account(voucher_type, voucher_no):
 
 		if d.against != new_against:
 			frappe.db.set_value("GL Entry", d.name, "against", new_against)
-
-def on_doctype_update():
-	frappe.db.add_index("GL Entry", ["against_voucher_type", "against_voucher"])
-	frappe.db.add_index("GL Entry", ["voucher_type", "voucher_no"])
-
-def rename_gle_sle_docs():
-	for doctype in ["GL Entry", "Stock Ledger Entry"]:
-		rename_temporarily_named_docs(doctype)
-
-def rename_temporarily_named_docs(doctype):
-	"""Rename temporarily named docs using autoname options"""
-	docs_to_rename = frappe.get_all(doctype, {"to_rename": "1"}, order_by="creation", limit=50000)
-	for doc in docs_to_rename:
-		oldname = doc.name
-		set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc)
-		newname = doc.name
-		frappe.db.sql(
-			"UPDATE `tab{}` SET name = %s, to_rename = 0 where name = %s".format(doctype),
-			(newname, oldname),
-			auto_commit=True
-		)

erpnext/accounts/doctype/gl_entry/test_gl_entry.py

@@ -3,9 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe, unittest
-from frappe.model.naming import parse_naming_series
 from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journal_entry
-from erpnext.accounts.doctype.gl_entry.gl_entry import rename_gle_sle_docs
 
 class TestGLEntry(unittest.TestCase):
 	def test_round_off_entry(self):
@@ -25,32 +23,3 @@ class TestGLEntry(unittest.TestCase):
 			and debit = 0 and credit = '.01'""", jv.name)
 
 		self.assertTrue(round_off_entry)
-
-	def test_rename_entries(self):
-		je = make_journal_entry("_Test Account Cost for Goods Sold - _TC", "_Test Bank - _TC", 100, submit=True)
-		rename_gle_sle_docs()
-		naming_series = parse_naming_series(parts=frappe.get_meta("GL Entry").autoname.split(".")[:-1])
-
-		je = make_journal_entry("_Test Account Cost for Goods Sold - _TC", "_Test Bank - _TC", 100, submit=True)
-
-		gl_entries = frappe.get_all("GL Entry",
-			fields=["name", "to_rename"],
-			filters={"voucher_type": "Journal Entry", "voucher_no": je.name},
-			order_by="creation"
-		)
-		self.assertTrue(all(entry.to_rename == 1 for entry in gl_entries))
-		old_naming_series_current_value = frappe.db.sql("SELECT current from tabSeries where name = %s", naming_series)[0][0]
-
-		rename_gle_sle_docs()
-
-		new_gl_entries = frappe.get_all("GL Entry",
-			fields=["name", "to_rename"],
-			filters={"voucher_type": "Journal Entry", "voucher_no": je.name},
-			order_by="creation"
-		)
-		self.assertTrue(all(entry.to_rename == 0 for entry in new_gl_entries))
-
-		self.assertTrue(all(new.name != old.name for new, old in zip(gl_entries, new_gl_entries)))
-
-		new_naming_series_current_value = frappe.db.sql("SELECT current from tabSeries where name = %s", naming_series)[0][0]
-		self.assertEquals(old_naming_series_current_value + 2, new_naming_series_current_value)

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.js

@@ -1,215 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Invoice Discounting', {
-	setup: (frm) => {
-		frm.set_query("sales_invoice", "invoices", (doc) => {
-			return {
-				"filters": {
-					"docstatus": 1,
-					"company": doc.company,
-					"outstanding_amount": [">", 0]
-				},
-			};
-		});
-
-
-		frm.events.filter_accounts("bank_account", frm, [["account_type", "=", "Bank"]]);
-		frm.events.filter_accounts("bank_charges_account", frm, [["root_type", "=", "Expense"]]);
-		frm.events.filter_accounts("short_term_loan", frm, [["root_type", "=", "Liability"]]);
-		frm.events.filter_accounts("accounts_receivable_discounted", frm, [["account_type", "=", "Receivable"]]);
-		frm.events.filter_accounts("accounts_receivable_credit", frm, [["account_type", "=", "Receivable"]]);
-		frm.events.filter_accounts("accounts_receivable_unpaid", frm, [["account_type", "=", "Receivable"]]);
-
-	},
-
-	filter_accounts: (fieldname, frm, addl_filters) => {
-		let filters = [
-			["company", "=", frm.doc.company],
-			["is_group", "=", 0]
-		];
-		if(addl_filters){
-			filters = $.merge(filters , addl_filters);
-		}
-
-		frm.set_query(fieldname, () => { return { "filters": filters }; });
-	},
-
-	refresh_filters: (frm) =>{
-		let invoice_accounts = Object.keys(frm.doc.invoices).map(function(key) {
-			return frm.doc.invoices[key].debit_to;
-		});
-		let filters = [
-			["account_type", "=", "Receivable"],
-			["name", "not in", invoice_accounts]
-		];
-		frm.events.filter_accounts("accounts_receivable_credit", frm, filters);
-		frm.events.filter_accounts("accounts_receivable_discounted", frm, filters);
-		frm.events.filter_accounts("accounts_receivable_unpaid", frm, filters);
-	},
-
-	refresh: (frm) => {
-		frm.events.show_general_ledger(frm);
-
-		if (frm.doc.docstatus === 0) {
-			frm.add_custom_button(__('Get Invoices'), function() {
-				frm.events.get_invoices(frm);
-			});
-		}
-
-		if (frm.doc.docstatus === 1 && frm.doc.status !== "Settled") {
-			if (frm.doc.status == "Sanctioned") {
-				frm.add_custom_button(__('Disburse Loan'), function() {
-					frm.events.create_disbursement_entry(frm);
-				}).addClass("btn-primary");
-			}
-			if (frm.doc.status == "Disbursed") {
-				frm.add_custom_button(__('Close Loan'), function() {
-					frm.events.close_loan(frm);
-				}).addClass("btn-primary");
-			}
-		}
-	},
-
-	loan_start_date: (frm) => {
-		frm.events.set_end_date(frm);
-	},
-
-	loan_period: (frm) => {
-		frm.events.set_end_date(frm);
-	},
-
-	set_end_date: (frm) => {
-		if (frm.doc.loan_start_date && frm.doc.loan_period) {
-			let end_date = frappe.datetime.add_days(frm.doc.loan_start_date, frm.doc.loan_period);
-			frm.set_value("loan_end_date", end_date);
-		}
-	},
-
-	validate: (frm) => {
-		frm.events.calculate_total_amount(frm);
-	},
-
-	calculate_total_amount: (frm) => {
-		let total_amount = 0.0;
-		for (let row of (frm.doc.invoices || [])) {
-			total_amount += flt(row.outstanding_amount);
-		}
-		frm.set_value("total_amount", total_amount);
-	},
-	get_invoices: (frm) => {
-		var d = new frappe.ui.Dialog({
-			title: __('Get Invoices based on Filters'),
-			fields: [
-				{
-					"label": "Customer",
-					"fieldname": "customer",
-					"fieldtype": "Link",
-					"options": "Customer"
-				},
-				{
-					"label": "From Date",
-					"fieldname": "from_date",
-					"fieldtype": "Date"
-				},
-				{
-					"label": "To Date",
-					"fieldname": "to_date",
-					"fieldtype": "Date"
-				},
-				{
-					"fieldname": "col_break",
-					"fieldtype": "Column Break",
-				},
-				{
-					"label": "Min Amount",
-					"fieldname": "min_amount",
-					"fieldtype": "Currency"
-				},
-				{
-					"label": "Max Amount",
-					"fieldname": "max_amount",
-					"fieldtype": "Currency"
-				}
-			],
-			primary_action: function() {
-				var data = d.get_values();
-
-				frappe.call({
-					method: "erpnext.accounts.doctype.invoice_discounting.invoice_discounting.get_invoices",
-					args: {
-						filters: data
-					},
-					callback: function(r) {
-						if(!r.exc) {
-							d.hide();
-							$.each(r.message, function(i, v) {
-								frm.doc.invoices = frm.doc.invoices.filter(row => row.sales_invoice);
-								let row = frm.add_child("invoices");
-								$.extend(row, v);
-								frm.events.refresh_filters(frm);
-							});
-							refresh_field("invoices");
-						}
-					}
-				});
-			},
-			primary_action_label: __('Get Invocies')
-		});
-		d.show();
-	},
-
-	create_disbursement_entry: (frm) => {
-		frappe.call({
-			method:"create_disbursement_entry",
-			doc: frm.doc,
-			callback: function(r) {
-				if(!r.exc){
-					var doclist = frappe.model.sync(r.message);
-					frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-				}
-			}
-		});
-
-	},
-
-	close_loan: (frm) => {
-		frappe.call({
-			method:"close_loan",
-			doc: frm.doc,
-			callback: function(r) {
-				if(!r.exc){
-					var doclist = frappe.model.sync(r.message);
-					frappe.set_route("Form", doclist[0].doctype, doclist[0].name);
-				}
-			}
-		});
-
-	},
-
-	show_general_ledger: (frm) => {
-		if(frm.doc.docstatus===1) {
-			cur_frm.add_custom_button(__('Accounting Ledger'), function() {
-				frappe.route_options = {
-					voucher_no: frm.doc.name,
-					from_date: frm.doc.posting_date,
-					to_date: frm.doc.posting_date,
-					company: frm.doc.company,
-					group_by: "Group by Voucher (Consolidated)"
-				};
-				frappe.set_route("query-report", "General Ledger");
-			}, __("View"));
-		}
-	}
-});
-
-frappe.ui.form.on('Discounted Invoice', {
-	sales_invoice: (frm) => {
-		frm.events.calculate_total_amount(frm);
-		frm.events.refresh_filters(frm);
-	},
-	invoices_remove: (frm) => {
-		frm.events.calculate_total_amount(frm);
-		frm.events.refresh_filters(frm);
-	}
-});

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json

@@ -1,197 +0,0 @@
-{
- "allow_import": 1,
- "autoname": "ACC-INV-DISC-.YYYY.-.#####",
- "creation": "2019-03-07 12:01:56.296952",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "posting_date",
-  "loan_start_date",
-  "loan_period",
-  "loan_end_date",
-  "column_break_3",
-  "status",
-  "company",
-  "section_break_5",
-  "invoices",
-  "section_break_7",
-  "total_amount",
-  "column_break_9",
-  "bank_charges",
-  "section_break_6",
-  "short_term_loan",
-  "bank_account",
-  "bank_charges_account",
-  "column_break_15",
-  "accounts_receivable_credit",
-  "accounts_receivable_discounted",
-  "accounts_receivable_unpaid",
-  "amended_from"
- ],
- "fields": [
-  {
-   "default": "Today",
-   "fieldname": "posting_date",
-   "fieldtype": "Date",
-   "in_list_view": 1,
-   "label": "Posting Date",
-   "reqd": 1
-  },
-  {
-   "fieldname": "loan_start_date",
-   "fieldtype": "Date",
-   "label": "Loan Start Date"
-  },
-  {
-   "fieldname": "loan_period",
-   "fieldtype": "Int",
-   "label": "Loan Period (Days)"
-  },
-  {
-   "fieldname": "loan_end_date",
-   "fieldtype": "Date",
-   "label": "Loan End Date",
-   "no_copy": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_3",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "status",
-   "fieldtype": "Select",
-   "label": "Status",
-   "no_copy": 1,
-   "options": "Draft\nSanctioned\nDisbursed\nSettled\nCancelled",
-   "read_only": 1
-  },
-  {
-   "fieldname": "company",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "Company",
-   "options": "Company",
-   "reqd": 1
-  },
-  {
-   "fieldname": "section_break_5",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "invoices",
-   "fieldtype": "Table",
-   "label": "Invoices",
-   "options": "Discounted Invoice",
-   "reqd": 1
-  },
-  {
-   "fieldname": "section_break_7",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "total_amount",
-   "fieldtype": "Currency",
-   "label": "Total Amount",
-   "options": "Company:company:default_currency",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_9",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "bank_charges",
-   "fieldtype": "Currency",
-   "label": "Bank Charges",
-   "options": "Company:company:default_currency"
-  },
-  {
-   "fieldname": "section_break_6",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "short_term_loan",
-   "fieldtype": "Link",
-   "label": "Short Term Loan Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "bank_account",
-   "fieldtype": "Link",
-   "label": "Bank Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "bank_charges_account",
-   "fieldtype": "Link",
-   "label": "Bank Charges Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break_15",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "accounts_receivable_credit",
-   "fieldtype": "Link",
-   "label": "Accounts Receivable Credit Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "accounts_receivable_discounted",
-   "fieldtype": "Link",
-   "label": "Accounts Receivable Discounted Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "accounts_receivable_unpaid",
-   "fieldtype": "Link",
-   "label": "Accounts Receivable Unpaid Account",
-   "options": "Account",
-   "reqd": 1
-  },
-  {
-   "fieldname": "amended_from",
-   "fieldtype": "Link",
-   "label": "Amended From",
-   "no_copy": 1,
-   "options": "Invoice Discounting",
-   "print_hide": 1,
-   "read_only": 1
-  }
- ],
- "is_submittable": 1,
- "modified": "2019-05-30 19:08:21.199759",
- "modified_by": "Administrator",
- "module": "Accounts",
- "name": "Invoice Discounting",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 1,
-   "cancel": 1,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "import": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "submit": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}

erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py

@@ -1,272 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe, json, erpnext
-from frappe import _
-from frappe.utils import flt, getdate, nowdate, add_days
-from erpnext.controllers.accounts_controller import AccountsController
-from erpnext.accounts.general_ledger import make_gl_entries
-from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
-
-class InvoiceDiscounting(AccountsController):
-	def validate(self):
-		self.validate_mandatory()
-		self.validate_invoices()
-		self.calculate_total_amount()
-		self.set_status()
-		self.set_end_date()
-
-	def set_end_date(self):
-		if self.loan_start_date and self.loan_period:
-			self.loan_end_date = add_days(self.loan_start_date, self.loan_period)
-
-	def validate_mandatory(self):
-		if self.docstatus == 1 and not (self.loan_start_date and self.loan_period):
-			frappe.throw(_("Loan Start Date and Loan Period are mandatory to save the Invoice Discounting"))
-
-	def validate_invoices(self):
-		discounted_invoices = [record.sales_invoice for record in
-			frappe.get_all("Discounted Invoice",fields=["sales_invoice"], filters={"docstatus":1})]
-
-		for record in self.invoices:
-			if record.sales_invoice in discounted_invoices:
-				frappe.throw(_("Row({0}): {1} is already discounted in {2}")
-					.format(record.idx, frappe.bold(record.sales_invoice), frappe.bold(record.parent)))
-
-			actual_outstanding = frappe.db.get_value("Sales Invoice", record.sales_invoice,"outstanding_amount")
-			if record.outstanding_amount > actual_outstanding :
-				frappe.throw(_
-					("Row({0}): Outstanding Amount cannot be greater than actual Outstanding Amount {1} in {2}").format(
-					record.idx, frappe.bold(actual_outstanding), frappe.bold(record.sales_invoice)))
-
-	def calculate_total_amount(self):
-		self.total_amount = sum([flt(d.outstanding_amount) for d in self.invoices])
-
-	def on_submit(self):
-		self.update_sales_invoice()
-		self.make_gl_entries()
-
-	def on_cancel(self):
-		self.set_status()
-		self.update_sales_invoice()
-		self.make_gl_entries()
-
-	def set_status(self, status=None):
-		if status:
-			self.status = status
-			self.db_set("status", status)
-			for d in self.invoices:
-				frappe.get_doc("Sales Invoice", d.sales_invoice).set_status(update=True, update_modified=False)
-		else:
-			self.status = "Draft"
-			if self.docstatus == 1:
-				self.status = "Sanctioned"
-			elif self.docstatus == 2:
-				self.status = "Cancelled"
-
-	def update_sales_invoice(self):
-		for d in self.invoices:
-			if self.docstatus == 1:
-				is_discounted = 1
-			else:
-				discounted_invoice = frappe.db.exists({
-					"doctype": "Discounted Invoice",
-					"sales_invoice": d.sales_invoice,
-					"docstatus": 1
-				})
-				is_discounted = 1 if discounted_invoice else 0
-			frappe.db.set_value("Sales Invoice", d.sales_invoice, "is_discounted", is_discounted)
-
-	def make_gl_entries(self):
-		company_currency = frappe.get_cached_value('Company',  self.company, "default_currency")
-
-
-		gl_entries = []
-		invoice_fields = ["debit_to", "party_account_currency", "conversion_rate", "cost_center"]
-		accounting_dimensions = get_accounting_dimensions()
-
-		invoice_fields.extend(accounting_dimensions)
-
-		for d in self.invoices:
-			inv = frappe.db.get_value("Sales Invoice", d.sales_invoice, invoice_fields, as_dict=1)
-
-			if d.outstanding_amount:
-				outstanding_in_company_currency = flt(d.outstanding_amount * inv.conversion_rate,
-					d.precision("outstanding_amount"))
-				ar_credit_account_currency = frappe.get_cached_value("Account", self.accounts_receivable_credit, "currency")
-
-				gl_entries.append(self.get_gl_dict({
-					"account": inv.debit_to,
-					"party_type": "Customer",
-					"party": d.customer,
-					"against": self.accounts_receivable_credit,
-					"credit": outstanding_in_company_currency,
-					"credit_in_account_currency": outstanding_in_company_currency \
-						if inv.party_account_currency==company_currency else d.outstanding_amount,
-					"cost_center": inv.cost_center,
-					"against_voucher": d.sales_invoice,
-					"against_voucher_type": "Sales Invoice"
-				}, inv.party_account_currency, item=inv))
-
-				gl_entries.append(self.get_gl_dict({
-					"account": self.accounts_receivable_credit,
-					"party_type": "Customer",
-					"party": d.customer,
-					"against": inv.debit_to,
-					"debit": outstanding_in_company_currency,
-					"debit_in_account_currency": outstanding_in_company_currency \
-						if ar_credit_account_currency==company_currency else d.outstanding_amount,
-					"cost_center": inv.cost_center,
-					"against_voucher": d.sales_invoice,
-					"against_voucher_type": "Sales Invoice"
-				}, ar_credit_account_currency, item=inv))
-
-		make_gl_entries(gl_entries, cancel=(self.docstatus == 2), update_outstanding='No')
-
-	def create_disbursement_entry(self):
-		je = frappe.new_doc("Journal Entry")
-		je.voucher_type = 'Journal Entry'
-		je.company = self.company
-		je.remark = 'Loan Disbursement entry against Invoice Discounting: ' + self.name
-
-		je.append("accounts", {
-			"account": self.bank_account,
-			"debit_in_account_currency": flt(self.total_amount) - flt(self.bank_charges),
-			"cost_center": erpnext.get_default_cost_center(self.company)
-		})
-
-		je.append("accounts", {
-			"account": self.bank_charges_account,
-			"debit_in_account_currency": flt(self.bank_charges),
-			"cost_center": erpnext.get_default_cost_center(self.company)
-		})
-
-		je.append("accounts", {
-			"account": self.short_term_loan,
-			"credit_in_account_currency": flt(self.total_amount),
-			"cost_center": erpnext.get_default_cost_center(self.company),
-			"reference_type": "Invoice Discounting",
-			"reference_name": self.name
-		})
-		for d in self.invoices:
-			je.append("accounts", {
-				"account": self.accounts_receivable_discounted,
-				"debit_in_account_currency": flt(d.outstanding_amount),
-				"cost_center": erpnext.get_default_cost_center(self.company),
-				"reference_type": "Invoice Discounting",
-				"reference_name": self.name,
-				"party_type": "Customer",
-				"party": d.customer
-			})
-
-			je.append("accounts", {
-				"account": self.accounts_receivable_credit,
-				"credit_in_account_currency": flt(d.outstanding_amount),
-				"cost_center": erpnext.get_default_cost_center(self.company),
-				"reference_type": "Invoice Discounting",
-				"reference_name": self.name,
-				"party_type": "Customer",
-				"party": d.customer
-			})
-
-		return je
-
-	def close_loan(self):
-		je = frappe.new_doc("Journal Entry")
-		je.voucher_type = 'Journal Entry'
-		je.company = self.company
-		je.remark = 'Loan Settlement entry against Invoice Discounting: ' + self.name
-
-		je.append("accounts", {
-			"account": self.short_term_loan,
-			"debit_in_account_currency": flt(self.total_amount),
-			"cost_center": erpnext.get_default_cost_center(self.company),
-			"reference_type": "Invoice Discounting",
-			"reference_name": self.name,
-		})
-
-		je.append("accounts", {
-			"account": self.bank_account,
-			"credit_in_account_currency": flt(self.total_amount),
-			"cost_center": erpnext.get_default_cost_center(self.company)
-		})
-
-		if getdate(self.loan_end_date) > getdate(nowdate()):
-			for d in self.invoices:
-				outstanding_amount = frappe.db.get_value("Sales Invoice", d.sales_invoice, "outstanding_amount")
-				if flt(outstanding_amount) > 0:
-					je.append("accounts", {
-						"account": self.accounts_receivable_discounted,
-						"credit_in_account_currency": flt(outstanding_amount),
-						"cost_center": erpnext.get_default_cost_center(self.company),
-						"reference_type": "Invoice Discounting",
-						"reference_name": self.name,
-						"party_type": "Customer",
-						"party": d.customer
-					})
-
-					je.append("accounts", {
-						"account": self.accounts_receivable_unpaid,
-						"debit_in_account_currency": flt(outstanding_amount),
-						"cost_center": erpnext.get_default_cost_center(self.company),
-						"reference_type": "Invoice Discounting",
-						"reference_name": self.name,
-						"party_type": "Customer",
-						"party": d.customer
-					})
-
-		return je
-
-@frappe.whitelist()
-def get_invoices(filters):
-	filters = frappe._dict(json.loads(filters))
-	cond = []
-	if filters.customer:
-		cond.append("customer=%(customer)s")
-	if filters.from_date:
-		cond.append("posting_date >= %(from_date)s")
-	if filters.to_date:
-		cond.append("posting_date <= %(to_date)s")
-	if filters.min_amount:
-		cond.append("base_grand_total >= %(min_amount)s")
-	if filters.max_amount:
-		cond.append("base_grand_total <= %(max_amount)s")
-
-	where_condition = ""
-	if cond:
-		where_condition += " and " + " and ".join(cond)
-
-	return frappe.db.sql("""
-		select
-			name as sales_invoice,
-			customer,
-			posting_date,
-			outstanding_amount,
-			debit_to
-		from `tabSales Invoice` si
-		where
-			docstatus = 1
-			and outstanding_amount > 0
-			%s
-			and not exists(select di.name from `tabDiscounted Invoice` di
-				where di.docstatus=1 and di.sales_invoice=si.name)
-	""" % where_condition, filters, as_dict=1)
-
-def get_party_account_based_on_invoice_discounting(sales_invoice):
-	party_account = None
-	invoice_discounting = frappe.db.sql("""
-		select par.accounts_receivable_discounted, par.accounts_receivable_unpaid, par.status
-		from `tabInvoice Discounting` par, `tabDiscounted Invoice` ch
-		where par.name=ch.parent
-			and par.docstatus=1
-			and ch.sales_invoice = %s
-	""", (sales_invoice), as_dict=1)
-	if invoice_discounting:
-		if invoice_discounting[0].status == "Disbursed":
-			party_account = invoice_discounting[0].accounts_receivable_discounted
-		elif invoice_discounting[0].status == "Settled":
-			party_account = invoice_discounting[0].accounts_receivable_unpaid
-
-	return party_account

erpnext/accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py

@@ -1,20 +0,0 @@
-from __future__ import unicode_literals
-from frappe import _
-
-def get_data():
-	return {
-		'fieldname': 'reference_name',
-		'internal_links': {
-			'Sales Invoice': ['invoices', 'sales_invoice']
-		},
-		'transactions': [
-			{
-				'label': _('Reference'),
-				'items': ['Sales Invoice']
-			},
-			{
-				'label': _('Payment'),
-				'items': ['Payment Entry', 'Journal Entry']
-			}
-		]
-	}

erpnext/accounts/doctype/invoice_discounting/invoice_discounting_list.js

@@ -1,21 +0,0 @@
-frappe.listview_settings['Invoice Discounting'] = {
-	add_fields: ["status"],
-	get_indicator: function(doc)
-	{
-		if(doc.status == "Draft") {
-			return [__("Draft"), "red", "status,=,Draft"];
-		}
-		else if(doc.status == "Sanctioned") {
-			return [__("Sanctioned"), "green", "status,=,Sanctioned"];
-		}
-		else if(doc.status == "Disbursed") {
-			return [__("Disbursed"), "blue", "status,=,Disbursed"];
-		}
-		else if(doc.status == "Settled") {
-			return [__("Settled"), "orange", "status,=,Settled"];
-		}
-		else if(doc.status == "Canceled") {
-			return [__("Canceled"), "red", "status,=,Canceled"];
-		}
-	}
-};

erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py

@@ -1,302 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-from frappe.utils import nowdate, add_days, flt
-import unittest
-from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import get_gl_entries
-from erpnext.accounts.doctype.account.test_account import create_account
-from erpnext.accounts.doctype.journal_entry.journal_entry import get_payment_entry_against_invoice
-class TestInvoiceDiscounting(unittest.TestCase):
-	def setUp(self):
-		self.ar_credit = create_account(account_name="_Test Accounts Receivable Credit", parent_account = "Accounts Receivable - _TC", company="_Test Company")
-		self.ar_discounted = create_account(account_name="_Test Accounts Receivable Discounted", parent_account = "Accounts Receivable - _TC", company="_Test Company")
-		self.ar_unpaid = create_account(account_name="_Test Accounts Receivable Unpaid", parent_account = "Accounts Receivable - _TC", company="_Test Company")
-		self.short_term_loan = create_account(account_name="_Test Short Term Loan", parent_account = "Source of Funds (Liabilities) - _TC", company="_Test Company")
-		self.bank_account = create_account(account_name="_Test Bank 2", parent_account = "Bank Accounts - _TC", company="_Test Company")
-		self.bank_charges_account = create_account(account_name="_Test Bank Charges Account", parent_account = "Expenses - _TC", company="_Test Company")
-		frappe.db.set_value("Company", "_Test Company", "default_bank_account", self.bank_account)
-
-	def test_total_amount(self):
-		inv1 = create_sales_invoice(rate=200)
-		inv2 = create_sales_invoice(rate=500)
-
-		inv_disc = create_invoice_discounting([inv1.name, inv2.name],
-			do_not_submit=True,
-			accounts_receivable_credit=self.ar_credit,
-			accounts_receivable_discounted=self.ar_discounted,
-			accounts_receivable_unpaid=self.ar_unpaid,
-			short_term_loan=self.short_term_loan,
-			bank_charges_account=self.bank_charges_account,
-			bank_account=self.bank_account
-			)
-		self.assertEqual(inv_disc.total_amount, 700)
-
-	def test_gl_entries_in_base_currency(self):
-		inv = create_sales_invoice(rate=200)
-		inv_disc = create_invoice_discounting([inv.name],
-			accounts_receivable_credit=self.ar_credit,
-			accounts_receivable_discounted=self.ar_discounted,
-			accounts_receivable_unpaid=self.ar_unpaid,
-			short_term_loan=self.short_term_loan,
-			bank_charges_account=self.bank_charges_account,
-			bank_account=self.bank_account
-			)
-
-		gle = get_gl_entries("Invoice Discounting", inv_disc.name)
-
-		expected_gle = {
-			inv.debit_to: [0.0, 200],
-			self.ar_credit: [200, 0.0]
-		}
-		for i, gle in enumerate(gle):
-			self.assertEqual([gle.debit, gle.credit], expected_gle.get(gle.account))
-
-	def test_loan_on_submit(self):
-		inv = create_sales_invoice(rate=300)
-		inv_disc = create_invoice_discounting([inv.name],
-			accounts_receivable_credit=self.ar_credit,
-			accounts_receivable_discounted=self.ar_discounted,
-			accounts_receivable_unpaid=self.ar_unpaid,
-			short_term_loan=self.short_term_loan,
-			bank_charges_account=self.bank_charges_account,
-			bank_account=self.bank_account,
-			start=nowdate(),
-			period=60
-			)
-		self.assertEqual(inv_disc.status, "Sanctioned")
-		self.assertEqual(inv_disc.loan_end_date, add_days(inv_disc.loan_start_date, inv_disc.loan_period))
-
-
-	def test_on_disbursed(self):
-		inv = create_sales_invoice(rate=500)
-		inv_disc = create_invoice_discounting([inv.name],
-			accounts_receivable_credit=self.ar_credit,
-			accounts_receivable_discounted=self.ar_discounted,
-			accounts_receivable_unpaid=self.ar_unpaid,
-			short_term_loan=self.short_term_loan,
-			bank_charges_account=self.bank_charges_account,
-			bank_account=self.bank_account,
-			)
-
-		je = inv_disc.create_disbursement_entry()
-
-		self.assertEqual(je.accounts[0].account, self.bank_account)
-		self.assertEqual(je.accounts[0].debit_in_account_currency, flt(inv_disc.total_amount) - flt(inv_disc.bank_charges))
-
-		self.assertEqual(je.accounts[1].account, self.bank_charges_account)
-		self.assertEqual(je.accounts[1].debit_in_account_currency, flt(inv_disc.bank_charges))
-
-		self.assertEqual(je.accounts[2].account, self.short_term_loan)
-		self.assertEqual(je.accounts[2].credit_in_account_currency, flt(inv_disc.total_amount))
-
-		self.assertEqual(je.accounts[3].account, self.ar_discounted)
-		self.assertEqual(je.accounts[3].debit_in_account_currency, flt(inv.outstanding_amount))
-
-		self.assertEqual(je.accounts[4].account, self.ar_credit)
-		self.assertEqual(je.accounts[4].credit_in_account_currency, flt(inv.outstanding_amount))
-
-
-		je.posting_date = nowdate()
-		je.submit()
-
-		inv_disc.reload()
-		self.assertEqual(inv_disc.status, "Disbursed")
-
-		inv.reload()
-		self.assertEqual(inv.outstanding_amount, 500)
-
-	def test_on_close_after_loan_period(self):
-		inv = create_sales_invoice(rate=600)
-		inv_disc = create_invoice_discounting([inv.name],
-			accounts_receivable_credit=self.ar_credit,
-			accounts_receivable_discounted=self.ar_discounted,
-			accounts_receivable_unpaid=self.ar_unpaid,
-			short_term_loan=self.short_term_loan,
-			bank_charges_account=self.bank_charges_account,
-			bank_account=self.bank_account,
-			start=nowdate(),
-			period=60
-			)
-
-		je1 = inv_disc.create_disbursement_entry()
-		je1.posting_date = nowdate()
-		je1.submit()
-
-		je2 = inv_disc.close_loan()
-
-		self.assertEqual(je2.accounts[0].account, self.short_term_loan)
-		self.assertEqual(je2.accounts[0].debit_in_account_currency, flt(inv_disc.total_amount))
-
-		self.assertEqual(je2.accounts[1].account, self.bank_account)
-		self.assertEqual(je2.accounts[1].credit_in_account_currency, flt(inv_disc.total_amount))
-
-		self.assertEqual(je2.accounts[2].account, self.ar_discounted)
-		self.assertEqual(je2.accounts[2].credit_in_account_currency, flt(inv.outstanding_amount))
-
-		self.assertEqual(je2.accounts[3].account, self.ar_unpaid)
-		self.assertEqual(je2.accounts[3].debit_in_account_currency, flt(inv.outstanding_amount))
-
-		je2.posting_date = nowdate()
-		je2.submit()
-		inv_disc.reload()
-
-		self.assertEqual(inv_disc.status, "Settled")
-
-	def test_on_close_after_loan_period_after_inv_payment(self):
-		inv = create_sales_invoice(rate=600)
-		inv_disc = create_invoice_discounting([inv.name],
-			accounts_receivable_credit=self.ar_credit,
-			accounts_receivable_discounted=self.ar_discounted,
-			accounts_receivable_unpaid=self.ar_unpaid,
-			short_term_loan=self.short_term_loan,
-			bank_charges_account=self.bank_charges_account,
-			bank_account=self.bank_account,
-			start=nowdate(),
-			period=60
-			)
-
-		je1 = inv_disc.create_disbursement_entry()
-		je1.posting_date = nowdate()
-		je1.submit()
-
-		je_on_payment = frappe.get_doc(get_payment_entry_against_invoice("Sales Invoice", inv.name))
-		je_on_payment.posting_date = nowdate()
-		je_on_payment.cheque_no = "126981"
-		je_on_payment.cheque_date = nowdate()
-		je_on_payment.save()
-		je_on_payment.submit()
-
-		je2 = inv_disc.close_loan()
-
-		self.assertEqual(je2.accounts[0].account, self.short_term_loan)
-		self.assertEqual(je2.accounts[0].debit_in_account_currency, flt(inv_disc.total_amount))
-
-		self.assertEqual(je2.accounts[1].account, self.bank_account)
-		self.assertEqual(je2.accounts[1].credit_in_account_currency, flt(inv_disc.total_amount))
-
-	def test_on_close_before_loan_period(self):
-		inv = create_sales_invoice(rate=700)
-		inv_disc = create_invoice_discounting([inv.name],
-			accounts_receivable_credit=self.ar_credit,
-			accounts_receivable_discounted=self.ar_discounted,
-			accounts_receivable_unpaid=self.ar_unpaid,
-			short_term_loan=self.short_term_loan,
-			bank_charges_account=self.bank_charges_account,
-			bank_account=self.bank_account,
-			start=add_days(nowdate(), -80),
-			period=60
-		)
-
-		je1 = inv_disc.create_disbursement_entry()
-		je1.posting_date = nowdate()
-		je1.submit()
-
-		je2 = inv_disc.close_loan()
-		je2.posting_date = nowdate()
-		je2.submit()
-
-		self.assertEqual(je2.accounts[0].account, self.short_term_loan)
-		self.assertEqual(je2.accounts[0].debit_in_account_currency, flt(inv_disc.total_amount))
-
-		self.assertEqual(je2.accounts[1].account, self.bank_account)
-		self.assertEqual(je2.accounts[1].credit_in_account_currency, flt(inv_disc.total_amount))
-
-	def test_make_payment_before_loan_period(self):
-		#it has problem
-		inv = create_sales_invoice(rate=700)
-		inv_disc = create_invoice_discounting([inv.name],
-				accounts_receivable_credit=self.ar_credit,
-				accounts_receivable_discounted=self.ar_discounted,
-				accounts_receivable_unpaid=self.ar_unpaid,
-				short_term_loan=self.short_term_loan,
-				bank_charges_account=self.bank_charges_account,
-				bank_account=self.bank_account
-				)
-		je = inv_disc.create_disbursement_entry()
-		inv_disc.reload()
-		je.posting_date = nowdate()
-		je.submit()
-
-		je_on_payment = frappe.get_doc(get_payment_entry_against_invoice("Sales Invoice", inv.name))
-		je_on_payment.posting_date = nowdate()
-		je_on_payment.cheque_no = "126981"
-		je_on_payment.cheque_date = nowdate()
-		je_on_payment.save()
-		je_on_payment.submit()
-
-		self.assertEqual(je_on_payment.accounts[0].account, self.ar_discounted)
-		self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
-		self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
-		self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
-
-		inv.reload()
-		self.assertEqual(inv.outstanding_amount, 0)
-
-	def test_make_payment_before_after_period(self):
-		#it has problem
-		inv = create_sales_invoice(rate=700)
-		inv_disc = create_invoice_discounting([inv.name],
-				accounts_receivable_credit=self.ar_credit,
-				accounts_receivable_discounted=self.ar_discounted,
-				accounts_receivable_unpaid=self.ar_unpaid,
-				short_term_loan=self.short_term_loan,
-				bank_charges_account=self.bank_charges_account,
-				bank_account=self.bank_account,
-				loan_start_date=add_days(nowdate(), -10),
-				period=5
-				)
-		je = inv_disc.create_disbursement_entry()
-		inv_disc.reload()
-		je.posting_date = nowdate()
-		je.submit()
-
-		je = inv_disc.close_loan()
-		inv_disc.reload()
-		je.posting_date = nowdate()
-		je.submit()
-
-		je_on_payment = frappe.get_doc(get_payment_entry_against_invoice("Sales Invoice", inv.name))
-		je_on_payment.posting_date = nowdate()
-		je_on_payment.cheque_no = "126981"
-		je_on_payment.cheque_date = nowdate()
-		je_on_payment.submit()
-
-		self.assertEqual(je_on_payment.accounts[0].account, self.ar_unpaid)
-		self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
-		self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
-		self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
-
-		inv.reload()
-		self.assertEqual(inv.outstanding_amount, 0)
-
-
-def create_invoice_discounting(invoices, **args):
-	args = frappe._dict(args)
-	inv_disc = frappe.new_doc("Invoice Discounting")
-	inv_disc.posting_date = args.posting_date or nowdate()
-	inv_disc.company = args.company or "_Test Company"
-	inv_disc.bank_account = args.bank_account
-	inv_disc.short_term_loan = args.short_term_loan
-	inv_disc.accounts_receivable_credit = args.accounts_receivable_credit
-	inv_disc.accounts_receivable_discounted = args.accounts_receivable_discounted
-	inv_disc.accounts_receivable_unpaid = args.accounts_receivable_unpaid
-	inv_disc.short_term_loan=args.short_term_loan
-	inv_disc.bank_charges_account=args.bank_charges_account
-	inv_disc.bank_account=args.bank_account
-	inv_disc.loan_start_date = args.start or nowdate()
-	inv_disc.loan_period = args.period or 30
-
-	for d in invoices:
-		inv_disc.append("invoices", {
-			"sales_invoice": d
-		})
-	inv_disc.insert()
-
-	if not args.do_not_submit:
-		inv_disc.submit()
-
-	return inv_disc

erpnext/accounts/doctype/item_tax_template/item_tax_template.js

@@ -1,15 +0,0 @@
-// Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Item Tax Template', {
-	setup: function(frm) {
-		frm.set_query("tax_type", "taxes", function(doc) {
-			return {
-				filters: [
-					['Account', 'is_group', '=', 0],
-					['Account', 'account_type', 'in', ['Tax', 'Chargeable', 'Income Account', 'Expense Account', 'Expenses Included In Valuation']]
-				]
-			}
-		});
-	}
-});

erpnext/accounts/doctype/item_tax_template/item_tax_template.py

@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-from frappe import _
-
-class ItemTaxTemplate(Document):
-	def validate(self):
-		self.validate_tax_accounts()
-
-	def validate_tax_accounts(self):
-		"""Check whether Tax Rate is not entered twice for same Tax Type"""
-		check_list = []
-		for d in self.get('taxes'):
-			if d.tax_type:
-				account_type = frappe.db.get_value("Account", d.tax_type, "account_type")
-
-				if account_type not in ['Tax', 'Chargeable', 'Income Account', 'Expense Account', 'Expenses Included In Valuation']:
-					frappe.throw(
-						_("Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable").format(
-							d.idx))
-				else:
-					if d.tax_type in check_list:
-						frappe.throw(_("{0} entered twice in Item Tax").format(d.tax_type))
-					else:
-						check_list.append(d.tax_type)